summaryrefslogtreecommitdiff
path: root/data/maps/Route18_EastEntrance_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route18_EastEntrance_1F/scripts.inc')
-rw-r--r--data/maps/Route18_EastEntrance_1F/scripts.inc61
1 files changed, 30 insertions, 31 deletions
diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc
index 784d1d37f..e49eb285f 100644
--- a/data/maps/Route18_EastEntrance_1F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_1F/scripts.inc
@@ -1,19 +1,18 @@
Route18_EastEntrance_1F_MapScripts:: @ 8170378
- map_script 3, Route18_EastEntrance_1F_MapScript1_17037E
+ map_script MAP_SCRIPT_ON_TRANSITION, Route18_EastEntrance_1F_OnTransition
.byte 0
-Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E
+Route18_EastEntrance_1F_OnTransition:: @ 817037E
clearflag FLAG_SYS_ON_CYCLING_ROAD
- checkflag FLAG_GOT_BICYCLE
- call_if TRUE, EventScript_17038B
+ call_if_set FLAG_GOT_BICYCLE, EventScript_17038B
end
EventScript_17038B:: @ 817038B
- setvar VAR_0x4001, 1
+ setvar VAR_TEMP_1, 1
return
Route18_EastEntrance_1F_EventScript_170391:: @ 8170391
- msgbox gUnknown_819FD3A, 2
+ msgbox gUnknown_819FD3A, MSGBOX_NPC
end
Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A
@@ -50,66 +49,66 @@ EventScript_1703D6:: @ 81703D6
textcolor 0
msgbox gUnknown_819FD60
closemessage
- applymovement 255, Movement_1A75E9
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
- compare_var_to_value VAR_0x8008, 1
- call_if eq, EventScript_17042F
- compare_var_to_value VAR_0x8008, 2
- call_if eq, EventScript_17043A
- compare_var_to_value VAR_0x8008, 3
- call_if eq, EventScript_170445
- compare_var_to_value VAR_0x8008, 4
- call_if eq, EventScript_170450
+ compare VAR_0x8008, 1
+ call_if_eq EventScript_17042F
+ compare VAR_0x8008, 2
+ call_if_eq EventScript_17043A
+ compare VAR_0x8008, 3
+ call_if_eq EventScript_170445
+ compare VAR_0x8008, 4
+ call_if_eq EventScript_170450
msgbox gUnknown_819FD0C
closemessage
- applymovement 255, Movement_170469
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_170469
waitmovement 0
releaseall
end
EventScript_17042F:: @ 817042F
- applymovement 255, Movement_17045B
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B
waitmovement 0
return
EventScript_17043A:: @ 817043A
- applymovement 255, Movement_17045D
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D
waitmovement 0
return
EventScript_170445:: @ 8170445
- applymovement 255, Movement_170460
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_170460
waitmovement 0
return
EventScript_170450:: @ 8170450
- applymovement 255, Movement_170464
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_170464
waitmovement 0
return
Movement_17045B:: @ 817045B
- step_11
+ walk_up
step_end
Movement_17045D:: @ 817045D
- step_11
- step_11
+ walk_up
+ walk_up
step_end
Movement_170460:: @ 8170460
- step_11
- step_11
- step_11
+ walk_up
+ walk_up
+ walk_up
step_end
Movement_170464:: @ 8170464
- step_11
- step_11
- step_11
- step_11
+ walk_up
+ walk_up
+ walk_up
+ walk_up
step_end
Movement_170469:: @ 8170469
- step_13
+ walk_right
step_end