summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-16 18:12:21 -0500
committerhuderlem <huderlem@gmail.com>2019-11-17 08:16:28 -0600
commit6ac7efb54f79a3ecd216cdc560bf2703b6c799c2 (patch)
tree16b81bf939ce3f96c513c6b63b4575a8148ce0f1 /data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
parentf7e17ca985fcc2b027a16d2cba30e6500e664207 (diff)
Document Scotts House and begin frontier macros
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc')
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index c26a8098e..9da5e6a14 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -20,8 +20,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
- setvar VAR_0x8004, 10
- special sub_8161F74
+ setvar VAR_0x8004, BATTLE_TOWER_FUNC_10
+ special CallBattleTowerFunc
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
@@ -166,27 +166,27 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
setvar VAR_0x8005, 0
- special sub_8161F74
+ special CallBattleTowerFunc
waitmessage
waitbuttonpress
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
setvar VAR_0x8005, 1
- special sub_8161F74
+ special CallBattleTowerFunc
waitmessage
waitbuttonpress
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
setvar VAR_0x8005, 2
- special sub_8161F74
+ special CallBattleTowerFunc
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
setvar VAR_0x8005, 3
- special sub_8161F74
+ special CallBattleTowerFunc
waitmessage
waitbuttonpress
closemessage
@@ -202,9 +202,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
setvar VAR_0x8005, 4
- special sub_8161F74
+ special CallBattleTowerFunc
waitmessage
waitbuttonpress
release