Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ... Conflicts: Makefile data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc data/maps/MtChimney/scripts.inc data/maps/MtPyre_Summit/scripts.inc data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc include/constants/event_objects.h include/constants/expansion.h src/battle_script_commands.c src/battle_util.c src/field_screen_effect.c		2025-05-28 14:26:15 +02:00
..
battle_frontier
asm.inc
battle_anim_script.inc
battle_script.inc	Fixes Gen3 berry activation timing (#6993)	2025-05-27 23:36:00 +02:00
battle_tent.inc
contest_ai_script.inc
event.inc	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02:00
field_effect_script.inc
function.inc
m4a.inc
map.inc
movement.inc
music_voice.inc
trainer_hill.inc