Set up remaining facility script doc, use Palace macros

12 files changed, 95 insertions, 122 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1167562ce..332712863 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -2,6 +2,7 @@
 #include "constants/apprentice.h"
 #include "constants/battle.h"
 #include "constants/battle_arena.h"
+#include "constants/battle_dome.h"
 #include "constants/battle_frontier.h"
 #include "constants/battle_palace.h"
 #include "constants/battle_pike.h"
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index fc9c17977..af899bcb9 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -6,7 +6,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
 	.byte 0
 
 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
-	setvar VAR_0x8004, 10
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_GFX
 	special CallBattleDomeFunction
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	copyvar VAR_TEMP_F, VAR_RESULT
@@ -68,7 +68,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
 	special CallBattleDomeFunction
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT
 	closemessage
@@ -80,7 +80,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
 	special CallBattleTowerFunc
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY
 	special CallBattleDomeFunction
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
 	setvar VAR_TEMP_2, 0
@@ -105,7 +105,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
 	waitmovement 0
 	compare VAR_TEMP_2, 2
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	setvar VAR_0x8004, 19
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_COMPARE_SEEDS
 	special CallBattleDomeFunction
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
@@ -113,7 +113,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
 	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
 	special CallBattleDomeFunction
 	compare VAR_TEMP_2, 0
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
@@ -126,7 +126,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
 	delay 60
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
 	setvar VAR_0x8005, 2
 	special CallBattleDomeFunction
 
@@ -162,9 +162,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
 	playse SE_W227B
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
 	delay 60
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_ROUND_TEXT
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
 	frontier_get FRONTIER_DATA_BATTLE_NUM
@@ -205,18 +205,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 6
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
+	setvar VAR_0x8005, DOME_DATA_6
 	special CallBattleDomeFunction
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 7
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
+	setvar VAR_0x8005, DOME_DATA_7
 	special CallBattleDomeFunction
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
+	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
 	special CallBattleDomeFunction
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
@@ -417,7 +417,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
 	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
 	frontier_getsymbols
@@ -449,7 +449,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
 	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
 	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
 	setvar VAR_0x8005, 1
 	special CallBattleDomeFunction
 	frontier_getsymbols
@@ -496,10 +496,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
 	special DoSpecialTrainerBattle
 	waitstate
 	setvar VAR_TEMP_9, 0
-	setvar VAR_0x8004, 17
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS
 	special CallBattleDomeFunction
 	special HealPlayerParty
-	setvar VAR_0x8004, 16
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESET_SKETCH
 	special CallBattleDomeFunction
 	return
 
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index f02c02d98..cc07dc47d 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -5,7 +5,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
 	.byte 0
 
 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
-	setvar VAR_0x8004, 21
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_21
 	special CallBattleDomeFunction
 	end
 
@@ -35,16 +35,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_STREAK
 	setvar VAR_0x8006, 0
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
+	setvar VAR_0x8006, FALSE
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_6
 	setvar VAR_0x8006, 1
 	special CallBattleDomeFunction
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -73,17 +73,17 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_6
 	setvar VAR_0x8006, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 7
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_7
 	setvar VAR_0x8006, 1
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
+	setvar VAR_0x8006, TRUE
 	special CallBattleDomeFunction
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -97,19 +97,19 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	frontier_checkairshow
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_STREAK_ACTIVE
+	setvar VAR_0x8006, FALSE
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 6
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_6
 	setvar VAR_0x8006, 1
 	special CallBattleDomeFunction
 	special LoadPlayerParty
 	special HealPlayerParty
 
 BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
-	setvar VAR_0x8004, 13
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
 	setvar VAR_0x8005, 0
 	special CallBattleDomeFunction
 	playse SE_SAVE
@@ -139,8 +139,8 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_24A61A
 	waitmessage
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 1
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
+	setvar VAR_0x8005, CHALLENGE_STATUS_SAVING
 	special CallBattleDomeFunction
 	playse SE_SAVE
 	waitse
@@ -213,7 +213,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, 0
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT
 	special CallBattleDomeFunction
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -224,13 +224,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
-	setvar VAR_0x8004, 22
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS
 	special CallBattleDomeFunction
 
 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	setvar VAR_0x8004, 15
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
 	special CallBattleDomeFunction
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
 	closemessage
@@ -392,8 +392,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 9
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_DATA
+	setvar VAR_0x8005, DOME_DATA_9
 	special CallBattleDomeFunction
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
@@ -404,7 +404,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
 	compare VAR_RESULT, 3
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
 	fadescreen 1
-	setvar VAR_0x8004, 8
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE
 	special CallBattleDomeFunction
 	waitstate
 	end
@@ -426,7 +426,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
 	return
 
 BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
-	setvar VAR_0x8004, 20
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_WINNER_NAME
 	special CallBattleDomeFunction
 	msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
 	end
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 2c9cb94b8..357a7279f 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -82,7 +82,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
 	setvar VAR_0x8005, 9
 	special CallBattleDomeFunction
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
@@ -90,8 +90,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
 	waitmessage
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SAVE
+	setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
 	special CallBattleDomeFunction
 	playse SE_SAVE
 	waitse
@@ -102,7 +102,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
 	fadescreen 1
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO
 	special CallBattleDomeFunction
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -110,7 +110,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
 	fadescreen 1
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE
 	special CallBattleDomeFunction
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -153,12 +153,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	frontier_resetsketch
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 8
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_DATA
+	setvar VAR_0x8005, DOME_DATA_8
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 18
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_REDUCE_PARTY
 	special CallBattleDomeFunction
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_ID
 	special CallBattleDomeFunction
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT
 	closemessage
@@ -238,7 +238,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	special HealPlayerParty
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
 	fadescreen 1
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE
 	special CallBattleDomeFunction
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index 30cbd039a..3f8484f6f 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -164,9 +164,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
 	message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
 	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	special CallBattlePalaceFunction
+	palace_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
 	fadescreen 1
@@ -233,8 +231,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
-	setvar VAR_0x8004, 6
-	special CallBattlePalaceFunction
+	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -269,8 +266,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
-	setvar VAR_0x8004, 6
-	special CallBattlePalaceFunction
+	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
index f36a1d366..5d834532d 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -12,8 +12,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
 	waitmovement 0
 	lockall
-	setvar VAR_0x8004, 3
-	special CallBattlePalaceFunction
+	palace_getcomment
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
 	compare VAR_RESULT, 1
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 49e658a38..a311363a5 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -28,14 +28,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattlePalaceFunction
+	palace_set PALACE_DATA_STREAK, 0
+	palace_set PALACE_DATA_STREAK_ACTIVE, FALSE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
 	releaseall
@@ -51,7 +45,6 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT
-
 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
 	frontier_givepoints
@@ -69,10 +62,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
 	lockall
 	message BattleFrontier_BattlePalaceLobby_Text_24E41E
 	waitmessage
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special CallBattlePalaceFunction
+	palace_set PALACE_DATA_STREAK_ACTIVE, FALSE
 	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
 	closemessage
@@ -84,9 +74,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special CallBattlePalaceFunction
+	palace_save 0
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
@@ -110,9 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePalaceLobby_Text_24E5F6
 	waitmessage
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special CallBattlePalaceFunction
+	palace_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -136,17 +122,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
 	end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	special CallBattlePalaceFunction
-	compare VAR_RESULT, 0
+	palace_get PALACE_DATA_PRIZE
+	compare VAR_RESULT, ITEM_NONE
 	goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
-
 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
@@ -189,12 +172,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
-	setvar VAR_0x8004, 0
-	special CallBattlePalaceFunction
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 1
-	special CallBattlePalaceFunction
+	palace_init
+	palace_set PALACE_DATA_STREAK_ACTIVE, TRUE
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	special LoadPlayerParty
@@ -245,10 +224,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
 	special LoadPlayerParty
-
 BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
-
 BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C
 	release
 	end
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index a6d4281a8..cbdf0ca7b 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -72,7 +72,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	special CallBattlePikeFunction
 	message BattleFrontier_BattlePikeLobby_Text_25C1DF
 	waitmessage
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	playse SE_SAVE
@@ -97,7 +97,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	special HealPlayerParty
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
 	special CallBattlePikeFunction
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
 	setvar VAR_0x8005, 0
 	special CallBattlePikeFunction
 	playse SE_SAVE
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index 1faf878a3..cd8f3dd4f 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -34,8 +34,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	lockall
 	message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
 	waitmessage
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
-	setvar VAR_0x8005, 1
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
+	setvar VAR_0x8005, CHALLENGE_STATUS_SAVING
 	special CallBattlePikeFunction
 	playse SE_SAVE
 	waitse
@@ -124,8 +124,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
 	message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
 	waitmessage
 	special LoadPlayerParty
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE
+	setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
 	special CallBattlePikeFunction
 	playse SE_SAVE
 	waitse
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index 86a5e72e7..864f61e3b 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -48,7 +48,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
@@ -141,7 +141,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index 02bc267a3..008aab8d1 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -110,7 +110,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
@@ -220,7 +220,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 3
 	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index cf6f682f7..20097f1eb 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -51,11 +51,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 	faceplayer
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleTowerFunc
@@ -93,7 +93,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_DATA
 	setvar VAR_0x8005, 1
 	special CallBattleTowerFunc
 	compare VAR_RESULT, 49
@@ -111,14 +111,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_DATA
 	setvar VAR_0x8005, 1
 	special CallBattleTowerFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
 
 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
 	special CallBattleTowerFunc
@@ -253,9 +253,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
@@ -324,9 +324,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
@@ -396,9 +396,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc
@@ -467,9 +467,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_INIT
 	special CallBattleTowerFunc
-	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_DATA
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
 	special CallBattleTowerFunc