summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
diff options
context:
space:
mode:
authorTetrable <atifhuss386@gmail.com>2019-01-02 21:12:43 +0000
committerTetrable <atifhuss386@gmail.com>2019-01-02 21:12:43 +0000
commit1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (patch)
tree806828b7a2be77e7afc2017b34cef7f5c35324d0 /data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
parent2dd706ca5410d98ad214ceff7026d6db276f4d5a (diff)
Finish off labelling flags
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc')
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index ee63e72a1..7dbfbbc13 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -11,7 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
- goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
+ goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, 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
@@ -165,7 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
- goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
+ goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
setvar VAR_0x8004, 11
setvar VAR_0x8005, 0
special sub_8161F74
@@ -195,7 +195,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
compare VAR_FACING, 1
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED
- setflag FLAG_0x152
+ setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
waitstate
release