diff options
Diffstat (limited to 'data/maps/Route118/scripts.inc')
| -rw-r--r-- | data/maps/Route118/scripts.inc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index e7aac8ac8..91067e786 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -7,18 +7,18 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_0x4039, 1 - call_if 1, Route118_EventScript_273D13 + call_if_eq Route118_EventScript_273D13 compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273D1B + call_if_eq Route118_EventScript_273D1B compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273D1B + call_if_eq Route118_EventScript_273D1B end Route118_MapScript1_1F3DF3: @ 81F3DF3 compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273985 + call_if_eq Route118_EventScript_273985 compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273998 + call_if_eq Route118_EventScript_273998 end Route118_MapScript2_1F3E0A: @ 81F3E0A @@ -28,13 +28,12 @@ Route118_MapScript2_1F3E0A: @ 81F3E0A Route118_EventScript_1F3E14:: @ 81F3E14 lock faceplayer - checkflag FLAG_0x0E3 - goto_eq Route118_EventScript_1F3E69 + goto_if_set FLAG_0x0E3, Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3E3E + goto_if_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 - goto_eq Route118_EventScript_1F3E5F + goto_if_eq Route118_EventScript_1F3E5F end Route118_EventScript_1F3E3E:: @ 81F3E3E @@ -103,11 +102,11 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, Route118_EventScript_1F3F28 + call_if_eq Route118_EventScript_1F3F28 compare VAR_0x8008, 1 - call_if 1, Route118_EventScript_1F3F3A + call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 - call_if 1, Route118_EventScript_1F3F4C + call_if_eq Route118_EventScript_1F3F4C setvar VAR_0x4071, 1 removeobject 19 releaseall @@ -190,7 +189,7 @@ Route118_EventScript_1F3F87:: @ 81F3F87 trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3FD2 + goto_if_eq Route118_EventScript_1F3FD2 msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end @@ -222,7 +221,7 @@ Route118_EventScript_1F4017:: @ 81F4017 trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F4062 + goto_if_eq Route118_EventScript_1F4062 msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end |