Hedara 4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge ... Conflicts: asm/macros/battle_script.inc data/battle_anim_scripts.s include/battle.h include/battle_controllers.h include/battle_setup.h include/constants/battle.h src/battle_anim_normal.c src/battle_anim_utility_funcs.c src/battle_bg.c src/battle_controllers.c src/battle_main.c src/battle_script_commands.c		2025-04-29 20:27:33 +02:00
..
battle_frontier	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01:00
asm.inc
battle_anim_script.inc
battle_script.inc	Merge remote-tracking branch 'pret/master' into new-pret-merge	2025-04-29 20:27:33 +02:00
battle_tent.inc
contest_ai_script.inc
event.inc	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-13 13:06:32 -03:00
field_effect_script.inc
function.inc
m4a.inc
map.inc
movement.inc	Replace Incorrect Slow Stairs Movement with Correct One (#6275)	2025-03-16 14:51:36 -07:00
music_voice.inc
trainer_hill.inc