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

Merge master into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-15 16:11:20 -05:00
parent e92cc7752b 5fff2f2234
commit ea8b1011d3
21 changed files with 135 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@@ -447,10 +447,10 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/AlteringCave/scripts.inc"
.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
.include "data/scripts/shared_secret_base.inc"
.include "data/maps/BattleColosseum2P/scripts.inc"
.include "data/maps/BattleColosseum_2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/BattleColosseum4P/scripts.inc"
.include "data/maps/BattleColosseum_4P/scripts.inc"
.include "data/maps/ContestHall/scripts.inc"
.include "data/maps/InsideOfTruck/scripts.inc"
.include "data/maps/SSTidalCorridor/scripts.inc"