Merge master into ObjEvent rename and prune accidental inclusions
This commit is contained in:
1 parent
68cdd7b1cb
commit
ef67f2d33b
85 files changed
+4548
-4729
No files matched your search
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user