Set up Battle Dome and Tower macros

1 files changed, 16 insertions, 52 deletions

diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index cc07dc47d..67fccf7d6 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -35,18 +35,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_STREAK
-	setvar VAR_0x8006, 0
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
-	setvar VAR_0x8006, FALSE
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_6
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_WIN_STREAK, 0
+	dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
+	dome_set DOME_DATA_6, 1
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -73,18 +64,9 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_6
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_7
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
-	setvar VAR_0x8006, TRUE
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_6, 1
+	dome_set DOME_DATA_7, 1
+	dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE
 	special LoadPlayerParty
 	special HealPlayerParty
 	goto BattleFrontier_BattleDomeLobby_EventScript_249991
@@ -97,21 +79,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
-	setvar VAR_0x8006, FALSE
-	special CallBattleDomeFunction
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
-	setvar VAR_0x8005, DOME_DATA_6
-	setvar VAR_0x8006, 1
-	special CallBattleDomeFunction
+	dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
+	dome_set DOME_DATA_6, 1
 	special LoadPlayerParty
 	special HealPlayerParty
 
 BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
-	setvar VAR_0x8005, 0
-	special CallBattleDomeFunction
+	dome_save 0
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
@@ -139,9 +113,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_24A61A
 	waitmessage
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
-	setvar VAR_0x8005, CHALLENGE_STATUS_SAVING
-	special CallBattleDomeFunction
+	dome_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -213,8 +185,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT
-	special CallBattleDomeFunction
+	dome_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
@@ -224,14 +195,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS
-	special CallBattleDomeFunction
-
+	dome_inittrainers
 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
-	special CallBattleDomeFunction
+	dome_settrainers
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_BattleDomeLobby_EventScript_249C6E
@@ -392,9 +360,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
-	setvar VAR_0x8005, DOME_DATA_9
-	special CallBattleDomeFunction
+	dome_get DOME_DATA_9
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
 	compare VAR_RESULT, 1
@@ -404,8 +370,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
 	compare VAR_RESULT, 3
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
 	fadescreen 1
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE
-	special CallBattleDomeFunction
+	dome_showresultstree
 	waitstate
 	end
 
@@ -426,8 +391,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
 	return
 
 BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
-	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_WINNER_NAME
-	special CallBattleDomeFunction
+	dome_getwinnersname
 	msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
 	end