Eduardo Quezada 566ec93492 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # data/battle_scripts_1.s # include/constants/battle_move_effects.h # include/constants/battle_script_commands.h # include/constants/battle_string_ids.h # src/battle_script_commands.c # src/data/battle_moves.h		2023-09-24 20:32:45 -03:00
..
ability	Fix Toxic Debris after user faints (#3323)	2023-09-19 15:54:52 +02:00
form_change	Fixed Ultra Burst + Mega Evolution test	2023-08-31 22:33:20 -04:00
hold_effect	Merge branch 'RHH/master' into RHH/upcoming	2023-09-14 08:34:47 -03:00
item_effect	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
move_effect	Merge branch 'RHH/master' into RHH/upcoming	2023-09-24 20:32:45 -03:00
move_flags	Missing master merge organization	2023-08-13 19:01:03 -04:00
status1	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
terrain	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
type	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
weather	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
damage_formula.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
move.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
trainer_control.c	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer	2023-08-17 17:52:28 -04:00