Eduardo Quezada 98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/frontier_util.c # test/battle/ai/ai.c		2024-07-19 09:20:05 -04:00
..
bug_bite.c
burn.c
confusion.c
def_minus_1.c
dire_claw.c	Added missing redirect abilities Gen 3-4 config (#4920)	2024-07-07 09:52:59 +02:00
double_power_on_arg_status.c
flinch.c
freeze.c	fix tests when B_USE_FROSTBITE is TRUE (#4986)	2024-07-17 23:23:52 +02:00
paralysis.c
pay_day.c
poison.c
psychic_noise.c	Merge branch '_RHH/master' into _RHH/upcoming	2024-05-06 15:29:21 -04:00
rapid_spin.c
sp_atk_minus_2.c	Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557)	2024-05-12 15:07:43 +02:00
spd_minus_2.c
spikes.c
stealth_rock.c
syrup_bomb.c	Add switching message macros for tests (#4717)	2024-06-03 19:59:28 -04:00
thrash.c	Rampage moves always confuse on final turn (#4722)	2024-06-05 05:38:04 +02:00
throat_chop.c
trap_both.c
tri_attack.c	fix tests when B_USE_FROSTBITE is TRUE (#4986)	2024-07-17 23:23:52 +02:00