Merge branch 'master' into document-gyms2

This commit is contained in:
GriffinR
2019-10-16 04:22:34 -04:00
committed by GitHub
361 changed files with 10599 additions and 11080 deletions

View File

@@ -1,10 +1,10 @@
MirageTower_3F_MapScripts:: @ 823AD2C
map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331
map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C
map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_SetHoleWarp
.byte 0
MirageTower_3F_MapScript1_23AD3C: @ 823AD3C
MirageTower_3F_SetHoleWarp: @ 823AD3C
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
end