summaryrefslogtreecommitdiff
path: root/data/maps/SeafloorCavern_Entrance/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SeafloorCavern_Entrance/scripts.inc')
-rw-r--r--data/maps/SeafloorCavern_Entrance/scripts.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 9bbb9cbdc..1bf570549 100644
--- a/data/maps/SeafloorCavern_Entrance/scripts.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Entrance_MapScripts:: @ 823446E
- map_script 5, SeafloorCavern_Entrance_MapScript1_234474
+ map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474
.byte 0
SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
@@ -9,13 +9,13 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
lockall
- compare VAR_0x40D9, 1
+ compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED
waitse
playse SE_PIN
- applymovement 1, SeafloorCavern_Entrance_Movement_272598
+ applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 1, SeafloorCavern_Entrance_Movement_27259A
+ applymovement 1, Common_Movement_Delay48
waitmovement 0
delay 20
compare VAR_FACING, 3
@@ -25,11 +25,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
compare VAR_FACING, 2
call_if_eq SeafloorCavern_Entrance_EventScript_234539
delay 30
- setvar VAR_0x40D9, 1
+ setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
moveobjectoffscreen 1
msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
closemessage
- applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
+ applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
releaseall
end
@@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
call_if_eq SeafloorCavern_Entrance_EventScript_234539
msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
closemessage
- applymovement 1, SeafloorCavern_Entrance_Movement_2725A6
+ applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
releaseall
end
SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
- applymovement 1, SeafloorCavern_Entrance_Movement_2725A4
+ applymovement 1, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
- applymovement 1, SeafloorCavern_Entrance_Movement_2725A8
+ applymovement 1, Common_Movement_WalkInPlaceRight
waitmovement 0
return
SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
- applymovement 1, SeafloorCavern_Entrance_Movement_2725AA
+ applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0
return