diff options
Diffstat (limited to 'data/maps/Route6_NorthEntrance/scripts.inc')
-rw-r--r-- | data/maps/Route6_NorthEntrance/scripts.inc | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 6edd20f21..d1b9a4555 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -2,36 +2,35 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, 2 + msgbox gUnknown_819E2A3, MSGBOX_NPC end Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F9F4 end EventScript_16F9F4:: @ 816F9F4 textcolor 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FA1E + goto_if_set FLAG_GOT_TEA, EventScript_16FA1E msgbox gUnknown_819E181 closemessage - applymovement 255, Movement_16FA8A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A waitmovement 0 releaseall end @@ -44,45 +43,45 @@ EventScript_16FA1E:: @ 816FA1E EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16FA62 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16FA6D - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16FA78 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16FA62 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16FA6D + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end EventScript_16FA62:: @ 816FA62 - applymovement 255, Movement_16FA83 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83 waitmovement 0 return EventScript_16FA6D:: @ 816FA6D - applymovement 255, Movement_16FA86 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86 waitmovement 0 return EventScript_16FA78:: @ 816FA78 - applymovement 255, Movement_16FA88 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88 waitmovement 0 return Movement_16FA83:: @ 816FA83 - step_13 - step_13 + walk_right + walk_right step_end Movement_16FA86:: @ 816FA86 - step_13 + walk_right step_end Movement_16FA88:: @ 816FA88 - step_28 + walk_in_place_right step_end Movement_16FA8A:: @ 816FA8A - step_10 + walk_down step_end |