Merge branch 'master' into document-gyms2

This commit is contained in:
GriffinR authored and GitHub committed 2019-10-16 04:22:34 -04:00
commit b4a9298205
361 files changed
+10596 -11077

No files matched your search

+4 -4
View File
@@ -1,10 +1,10 @@
MirageTower_2F_MapScripts:: @ 823AD11
map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331
map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21
map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_SetHoleWarp
.byte 0
MirageTower_2F_MapScript1_23AD21: @ 823AD21
MirageTower_2F_SetHoleWarp: @ 823AD21
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
end