summaryrefslogtreecommitdiff
path: root/data/event_scripts.s
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-05-21 15:50:02 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-07-20 17:53:45 -0400
commitf0bf1e641cb8532611c97354beaf46afaca7c417 (patch)
treede5b21bda34c0ec67c0262cf80f8b2a603d59577 /data/event_scripts.s
parent4722b1e2a2a659e71999b7513876b14507d4366a (diff)
Sync cave_hole.inc
Diffstat (limited to 'data/event_scripts.s')
-rw-r--r--data/event_scripts.s41
1 files changed, 1 insertions, 40 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 9df3adcdb..83e558714 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1634,46 +1634,7 @@ MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
.include "data/text/berries.inc"
.include "data/text/shoal_cave.inc"
.include "data/text/check_furniture.inc"
-
-GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
-MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
-SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
-SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
- map_script_2 VAR_ICE_STEP_COUNT, 0, S_FallDownHole
- .2byte 0
-
-GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
-MtPyre_2F_MapScript1_1C6BBF:: @ 81C6BBF
-SkyPillar_2F_MapScript1_1C6BBF:: @ 81C6BBF
-SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
- copyvar VAR_ICE_STEP_COUNT, 0x1
- end
-
-S_FallDownHole:: @ 81C6BC5
- lockall
- delay 20
- applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B1F_Movement_1C6BF7
- waitmovement 0
- playse SE_RU_HYUU
- delay 60
- warphole MAP_UNDEFINED
- waitstate
- end
-
-gUnknown_081C6BDE:: @ 81C6BDE
- lockall
- delay 20
- applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B1F_Movement_1C6BF7
- waitmovement 0
- playse SE_RU_HYUU
- delay 60
- special sp13F_fall_to_last_warp
- waitstate
- end
-
-GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7
- set_invisible
- step_end
+ .include "data/scripts/cave_hole.inc"
@ 81C6BF9
msgbox Text_1C6C2B, MSGBOX_NPC