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

..

map.json

Finish adding local IDs to map.json files

2024-10-12 23:32:28 -04:00

scripts.inc

Merge branch 'master' into master-to-upcoming

2025-05-28 14:26:15 +02:00