summaryrefslogtreecommitdiff
path: root/data/maps/CeruleanCity_House3/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/CeruleanCity_House3/scripts.inc')
-rw-r--r--data/maps/CeruleanCity_House3/scripts.inc17
1 files changed, 8 insertions, 9 deletions
diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc
index 36ce99bdb..ce76ef039 100644
--- a/data/maps/CeruleanCity_House3/scripts.inc
+++ b/data/maps/CeruleanCity_House3/scripts.inc
@@ -2,7 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7
.byte 0
CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8
- msgbox gUnknown_8191F80, 2
+ msgbox gUnknown_8191F80, MSGBOX_NPC
end
CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
@@ -10,17 +10,16 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
faceplayer
setvar VAR_0x8008, 1
call EventScript_1A8CAD
- checkflag FLAG_DID_ZYNX_TRADE
- goto_if TRUE, EventScript_16AA23
+ goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23
msgbox gUnknown_81A59FE, MSGBOX_YESNO
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16AA0B
+ compare VAR_RESULT, NO
+ goto_if_eq EventScript_16AA0B
call EventScript_1A8CBD
- compare_var_to_value VAR_0x8004, 6
- goto_if ge, EventScript_16AA0B
+ compare VAR_0x8004, 6
+ goto_if_ge EventScript_16AA0B
call EventScript_1A8CC9
- compare_var_to_var VAR_RESULT, VAR_0x8009
- goto_if ne, EventScript_16AA15
+ compare VAR_RESULT, VAR_0x8009
+ goto_if_ne EventScript_16AA15
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
setflag FLAG_DID_ZYNX_TRADE