dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into ObjEvent rename and prune accidental inclusions

Browse Source
This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@@ -473,9 +473,9 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/SafariZone_Northeast/scripts.inc"
.include "data/maps/SafariZone_Southeast/scripts.inc"
.include "data/maps/BattleFrontier_OutsideEast/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc"
.include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc"
.include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc"