diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-16 04:22:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 04:22:34 -0400 |
| commit | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (patch) | |
| tree | 156f18275a5187ae20fc5f5c3a72d61635f126ec /data/maps/GraniteCave_B1F/scripts.inc | |
| parent | 20fa13616f3ad2ec2f7d68668b9f386355a10fa7 (diff) | |
| parent | 60a592a2c32d07d47c892204659a8576017584d1 (diff) | |
Merge branch 'master' into document-gyms2
Diffstat (limited to 'data/maps/GraniteCave_B1F/scripts.inc')
| -rw-r--r-- | data/maps/GraniteCave_B1F/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index fafd05647..f465b0694 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,10 +1,10 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp .byte 0 -GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E +GraniteCave_B1F_SetHoleWarp: @ 822DC6E setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end |