summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc')
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
index 3beaa38c7..b9fc7d554 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
@@ -87,8 +87,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant::
message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
- compare VAR_RESULT, 0
- goto_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
+ goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2, MSGBOX_DEFAULT
release
end
@@ -183,10 +182,8 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
waitmessage
waitbuttonpress
closemessage
- compare VAR_FACING, DIR_SOUTH
- call_if_ne BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit
- compare VAR_FACING, DIR_SOUTH
- call_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
+ call_if_ne VAR_FACING, DIR_SOUTH, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit
+ call_if_eq VAR_FACING, DIR_SOUTH, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
removeobject VAR_LAST_TALKED
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 3