summaryrefslogtreecommitdiff
path: root/data/maps/FortreeCity
diff options
context:
space:
mode:
authorMelody <melody@pallet.town>2018-12-21 20:28:24 -0500
committerMelody <melody@pallet.town>2018-12-21 20:28:24 -0500
commitac2e4adf2da2f30a741556e20e5bc9a494997581 (patch)
tree1a05a202cfece044d546094581d8463a9b6e452c /data/maps/FortreeCity
parent87fd6b8dc21b37b656f16e3f11832c6951328750 (diff)
improve goto_if macros
Diffstat (limited to 'data/maps/FortreeCity')
-rw-r--r--data/maps/FortreeCity/scripts.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
index 948f443d2..d1c80c9f9 100644
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -18,8 +18,7 @@ FortreeCity_EventScript_1E25B6:: @ 81E25B6
FortreeCity_EventScript_1E25BF:: @ 81E25BF
lock
faceplayer
- checkflag FLAG_0x127
- goto_eq FortreeCity_EventScript_1E25D4
+ goto_if_set FLAG_0x127, FortreeCity_EventScript_1E25D4
msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT
release
end
@@ -58,7 +57,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614
faceplayer
checkitem ITEM_DEVON_SCOPE, 1
compare VAR_RESULT, 1
- goto_eq FortreeCity_EventScript_1E2630
+ goto_if_eq FortreeCity_EventScript_1E2630
msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT
release
end
@@ -66,7 +65,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614
FortreeCity_EventScript_1E2630:: @ 81E2630
msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_eq FortreeCity_EventScript_1E2645
+ goto_if_eq FortreeCity_EventScript_1E2645
release
end