Merge master into ObjEvent rename

This commit is contained in:
GriffinR committed 2019-12-15 02:00:00 -05:00
commit 82f55f2381
49 files changed
+1845 -1829

No files matched your search

@@ -1,15 +1,14 @@
BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
.byte 0
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
dome_21
end
BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805
.2byte 0