diff options
| author | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
| commit | ac2e4adf2da2f30a741556e20e5bc9a494997581 (patch) | |
| tree | 1a05a202cfece044d546094581d8463a9b6e452c /data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 03bb7be63..8406cb644 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -11,8 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 @@ -89,7 +88,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A waitmessage multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT release end @@ -166,8 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 setvar VAR_0x8004, 11 setvar VAR_0x8005, 0 special sub_8161F74 |