diff options
Diffstat (limited to 'data/maps/Route18_EastEntrance_2F/scripts.inc')
| -rw-r--r-- | data/maps/Route18_EastEntrance_2F/scripts.inc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index d262aad30..83c79b9ae 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -2,11 +2,11 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - msgbox gUnknown_819FD6B, 3 + msgbox gUnknown_819FD6B, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - msgbox gUnknown_819FDB3, 3 + msgbox gUnknown_819FDB3, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E @@ -14,17 +14,16 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E faceplayer setvar VAR_0x8008, 5 call EventScript_1A8CAD - checkflag FLAG_DID_MARC_TRADE - goto_if TRUE, EventScript_1704F0 + goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1704D8 + compare VAR_RESULT, NO + goto_if_eq EventScript_1704D8 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_1704D8 + compare VAR_0x8004, 6 + goto_if_ge EventScript_1704D8 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_1704E2 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MARC_TRADE |