9d80ad530d
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
5 lines
111 B
Plaintext
Executable File
5 lines
111 B
Plaintext
Executable File
heal_locations.h
|
|
wild_encounters.h
|
|
region_map/region_map_entries.h
|
|
region_map/porymap_config.json
|
|
tutor_moves.h |