diff options
Diffstat (limited to 'data/maps/Route24/scripts.inc')
| -rw-r--r-- | data/maps/Route24/scripts.inc | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 2760e17a3..e30913e52 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -4,12 +4,12 @@ Route24_MapScripts:: @ 816861F Route24_EventScript_168620:: @ 8168620 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 - goto_if eq, EventScript_168656 + compare VAR_MAP_SCENE_ROUTE24, 1 + goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16864C + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16864C call EventScript_1686B9 release end @@ -26,41 +26,40 @@ EventScript_168656:: @ 8168656 Route24_EventScript_168660:: @ 8168660 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_168678 end Route24_EventScript_16866C:: @ 816866C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_168678 end EventScript_168678:: @ 8168678 textcolor 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1686FD - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_168708 - applymovement 255, Movement_1A75EB + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1686FD + compare VAR_TEMP_1, 1 + call_if_eq EventScript_168708 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168713 + compare VAR_RESULT, 0 + goto_if_eq EventScript_168713 call EventScript_1686B9 releaseall end EventScript_1686B9:: @ 81686B9 - additem ITEM_NUGGET, 1 - giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET + giveitem_msg gUnknown_8188C93, ITEM_NUGGET message Text_188CDB waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC msgbox gUnknown_8188DF1 setvar VAR_MAP_SCENE_ROUTE24, 1 return @@ -71,17 +70,17 @@ EventScript_1686FD:: @ 81686FD return EventScript_168708:: @ 8168708 - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_168713:: @ 8168713 msgbox gUnknown_8188CC2 closemessage - applymovement 255, Movement_168743 + applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_168733 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_168733 release end @@ -91,14 +90,14 @@ EventScript_168733:: @ 8168733 return Movement_16873E:: @ 816873E - step_12 + walk_left step_end Movement_168740:: @ 8168740 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end Movement_168743:: @ 8168743 - step_10 + walk_down step_end |