summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_Lounge6
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/BattleFrontier_Lounge6
parent87fd6b8dc21b37b656f16e3f11832c6951328750 (diff)
improve goto_if macros
Diffstat (limited to 'data/maps/BattleFrontier_Lounge6')
-rw-r--r--data/maps/BattleFrontier_Lounge6/scripts.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index 495a604d4..3c1852283 100644
--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -4,25 +4,24 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
lock
faceplayer
- checkflag FLAG_0x09C
- goto_eq BattleFrontier_Lounge6_EventScript_265083
+ goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_eq BattleFrontier_Lounge6_EventScript_26506B
+ goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
special sub_81B94B0
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, 255
- goto_eq BattleFrontier_Lounge6_EventScript_26506B
+ goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
- goto_if 5, BattleFrontier_Lounge6_EventScript_265075
+ goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10