summaryrefslogtreecommitdiff
path: root/data/maps/Route8_WestEntrance/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route8_WestEntrance/scripts.inc')
-rw-r--r--data/maps/Route8_WestEntrance/scripts.inc43
1 files changed, 21 insertions, 22 deletions
diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc
index dfdb0b7ae..df9d1035c 100644
--- a/data/maps/Route8_WestEntrance/scripts.inc
+++ b/data/maps/Route8_WestEntrance/scripts.inc
@@ -2,36 +2,35 @@ Route8_WestEntrance_MapScripts:: @ 816FB53
.byte 0
Route8_WestEntrance_EventScript_16FB54:: @ 816FB54
- msgbox gUnknown_819E50F, 2
+ msgbox gUnknown_819E50F, MSGBOX_NPC
end
Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D
lockall
- setvar VAR_0x4001, 0
+ setvar VAR_TEMP_1, 0
goto EventScript_16FB81
end
Route8_WestEntrance_EventScript_16FB69:: @ 816FB69
lockall
- setvar VAR_0x4001, 1
+ setvar VAR_TEMP_1, 1
goto EventScript_16FB81
end
Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
lockall
- setvar VAR_0x4001, 2
+ setvar VAR_TEMP_1, 2
goto EventScript_16FB81
end
EventScript_16FB81:: @ 816FB81
textcolor 0
- applymovement 255, Movement_1A75E9
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
- checkflag FLAG_GOT_TEA
- goto_if TRUE, EventScript_16FBAB
+ goto_if_set FLAG_GOT_TEA, EventScript_16FBAB
msgbox gUnknown_819E3ED
closemessage
- applymovement 255, Movement_16FC2D
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D
waitmovement 0
releaseall
end
@@ -54,45 +53,45 @@ EventScript_16FBC1:: @ 816FBC1
EventScript_16FBCC:: @ 816FBCC
msgbox gUnknown_819E43D
closemessage
- compare_var_to_value VAR_0x4001, 0
- call_if eq, EventScript_16FC05
- compare_var_to_value VAR_0x4001, 1
- call_if eq, EventScript_16FC10
- compare_var_to_value VAR_0x4001, 2
- call_if eq, EventScript_16FC1B
+ compare VAR_TEMP_1, 0
+ call_if_eq EventScript_16FC05
+ compare VAR_TEMP_1, 1
+ call_if_eq EventScript_16FC10
+ compare VAR_TEMP_1, 2
+ call_if_eq EventScript_16FC1B
msgbox gUnknown_819E463
setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
releaseall
end
EventScript_16FC05:: @ 816FC05
- applymovement 255, Movement_16FC2B
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B
waitmovement 0
return
EventScript_16FC10:: @ 816FC10
- applymovement 255, Movement_16FC26
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26
waitmovement 0
return
EventScript_16FC1B:: @ 816FC1B
- applymovement 255, Movement_16FC28
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28
waitmovement 0
return
Movement_16FC26:: @ 816FC26
- step_11
+ walk_up
step_end
Movement_16FC28:: @ 816FC28
- step_11
- step_11
+ walk_up
+ walk_up
step_end
Movement_16FC2B:: @ 816FC2B
- step_26
+ walk_in_place_up
step_end
Movement_16FC2D:: @ 816FC2D
- step_13
+ walk_right
step_end