Merge pull request #949 from GriffinRichards/doc-dome

Document Battle Dome and add facility party constants

1 files changed, 343 insertions, 347 deletions

diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index 6edc0e1d5..2d03b461a 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -1,16 +1,20 @@
 BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_OnWarp
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_OnResume
 	.byte 0
 
-BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
+	.set NO_DRAW,       0
+	.set DRAW_TRAINER,  1
+	.set DRAW_TUCKER,   2
+
+BattleFrontier_BattleDomeBattleRoom_OnTransition: @ 824BCB1
 	dome_setopponentgfx
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	copyvar VAR_TEMP_F, VAR_RESULT
-	compare VAR_RESULT, 0
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
+	compare VAR_RESULT, DOME_ROUND1
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
 	end
 
@@ -30,441 +34,431 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A
+BattleFrontier_BattleDomeBattleRoom_OnFrame: @ 824BD00
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
+BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: @ 824BD0A
 	lockall
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
-	compare VAR_RESULT, 0
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
+	compare VAR_RESULT, DOME_ROUND1
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat
 	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome, MSGBOX_DEFAULT
 	closemessage
 	showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
-	compare VAR_TEMP_F, 3
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
+	compare VAR_TEMP_F, DOME_FINAL
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter
 	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A:: @ 824BD5A
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77F
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker
+BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitmovement 0
-	compare VAR_TEMP_F, 3
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
+	compare VAR_TEMP_F, DOME_FINAL
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent
 	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
 	dome_getopponentname
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer, MSGBOX_DEFAULT
 	closemessage
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward
 	waitmovement 0
 	tower_getopponentintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
 	dome_initopponentparty
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
-	setvar VAR_TEMP_2, 0
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle
+	setvar VAR_TEMP_2, NO_DRAW
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
-	setvar VAR_TEMP_2, 1
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, MSGBOX_DEFAULT
+	case B_OUTCOME_WON, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent
+	case B_OUTCOME_LOST, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
+	case B_OUTCOME_FORFEITED, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
+	setvar VAR_TEMP_2, DRAW_TRAINER
+BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT
 	closemessage
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
-	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C964
+	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_TieRefereeEnter
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C969
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeFaceLeft
 	waitmovement 0
 	delay 180
-	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B
+	applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_TieRefereeExit
 	waitmovement 0
-	compare VAR_TEMP_2, 2
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
+	compare VAR_TEMP_2, DRAW_TUCKER  @ Tucker always wins on a draw
+	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
 	dome_compareseeds
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
+	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
 	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	dome_getopponentname
-	compare VAR_TEMP_2, 0
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
-	compare VAR_TEMP_2, 1
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5
-	compare VAR_TEMP_2, 2
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9
+	compare VAR_TEMP_2, NO_DRAW
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon
+	compare VAR_TEMP_2, DRAW_TRAINER
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw
+	compare VAR_TEMP_2, DRAW_TUCKER
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
-	dome_resolvewinners 2
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D
+	dome_resolvewinners DOME_PLAYER_LOST_MATCH
+BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost:: @ 824BE9A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
-@ 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
+BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon:: @ 824BEB1
 	frontier_gettrainername 1
-	message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
+	message BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
+BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw:: @ 824BEC5
 	frontier_gettrainername 0
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
+	message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9
-	message BattleFrontier_BattleDomeBattleRoom_Text_24D6BE
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw:: @ 824BED9
+	message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
+BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
 	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	compare VAR_TEMP_2, 0
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
-	compare VAR_TEMP_2, 1
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC
+	compare VAR_TEMP_2, NO_DRAW
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon
+	compare VAR_TEMP_2, DRAW_TRAINER
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
 	dome_getroundtext
-	dome_resolvewinners 1
+	dome_resolvewinners DOME_PLAYER_WON_MATCH
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
-	case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	case DOME_ROUNDS_COUNT, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 	setvar VAR_0x8006, 1
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3
 	waitstate
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D
+BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: @ 824BF62
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience
 	waitmovement 0
 	frontier_get FRONTIER_DATA_LVL_MODE
 	switch VAR_RESULT
-	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, MSGBOX_DEFAULT
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
-	special sub_8175280
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
+	special DoConfettiEffect
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon:: @ 824BFC3
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw:: @ 824BFCC
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
-	dome_get DOME_DATA_6
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
-	dome_get DOME_DATA_7
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer:: @ 824BFD5
+	dome_get DOME_DATA_ATTEMPTED_CHALLENGE
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt
+	dome_get DOME_DATA_HAS_WON_CHALLENGE
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon
 	dome_get DOME_DATA_WIN_STREAK_ACTIVE
 	compare VAR_RESULT, FALSE
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
+	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C023:: @ 824C023
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt:: @ 824C023
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C061
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C068
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F
+	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1
+	case DOME_ROUND2, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound2
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptSemifinal
+	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C05A:: @ 824C05A
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC06
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1:: @ 824C05A
+	message BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C061:: @ 824C061
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC1C
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound2:: @ 824C061
+	message BattleFrontier_BattleDomeBattleRoom_Text_RisingStar
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C068:: @ 824C068
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC2E
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptSemifinal:: @ 824C068
+	message BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C06F:: @ 824C06F
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC5B
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal:: @ 824C06F
+	message BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C076:: @ 824C076
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon:: @ 824C076
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2
+	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1
+	case DOME_ROUND2, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound2
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonSemifinal
+	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0AD:: @ 824C0AD
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CC99
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1:: @ 824C0AD
+	message BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0B4:: @ 824C0B4
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CCC5
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound2:: @ 824C0B4
+	message BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0BB:: @ 824C0BB
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CCFD
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonSemifinal:: @ 824C0BB
+	message BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CD33
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal:: @ 824C0C2
+	message BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9
-	compare VAR_TEMP_F, 3
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion:: @ 824C0C9
+	compare VAR_TEMP_F, DOME_FINAL
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker
 	switch VAR_TEMP_E
-	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker:: @ 824C105
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C143
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C151
+	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1
+	case DOME_ROUND2, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound2
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionSemifinal
+	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C13C:: @ 824C13C
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CD72
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1:: @ 824C13C
+	message BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C143:: @ 824C143
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CD8C
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound2:: @ 824C143
+	message BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C14A:: @ 824C14A
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CDB3
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionSemifinal:: @ 824C14A
+	message BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CDDE
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal:: @ 824C151
+	message BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver:: @ 824C158
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold:: @ 824C161
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak:: @ 824C16A
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1
-	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6
+	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1
+	case DOME_ROUND2, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound2
+	case DOME_SEMIFINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakSemifinal
+	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A1:: @ 824C1A1
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE10
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1:: @ 824C1A1
+	message BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1A8:: @ 824C1A8
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE33
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound2:: @ 824C1A8
+	message BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1AF:: @ 824C1AF
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE57
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakSemifinal:: @ 824C1AF
+	message BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CE94
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal:: @ 824C1B6
+	message BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
+BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum:: @ 824C1BD
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker:: @ 824C1CB
 	switch VAR_TEMP_E
-	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, MSGBOX_DEFAULT
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
+	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver:: @ 824C1FC
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter
+
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold:: @ 824C209
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
 	closemessage
-	applymovement 2, BattleFrontier_BattleDomeBattleRoom_Movement_24C94B
-	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78E
+	applymovement 2, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump
+	applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeMoveForTuckerEntrance
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	waitmovement 0
-	message BattleFrontier_BattleDomeBattleRoom_Text_24CF7A
+	message BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant
 	waitmessage
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	switch VAR_TEMP_E
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, MSGBOX_DEFAULT
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy, MSGBOX_DEFAULT
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	dome_resolvewinners 1
+	case B_OUTCOME_LOST, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker
+	case B_OUTCOME_FORFEITED, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker
+	case B_OUTCOME_DREW, BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer, MSGBOX_DEFAULT
+	dome_resolvewinners DOME_PLAYER_WON_MATCH
 	frontier_getsymbols
 	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 	closemessage
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA
+	message BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro:: @ 824C346
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, MSGBOX_DEFAULT
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess, MSGBOX_DEFAULT
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
-	case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
-	dome_resolvewinners 1
+	case B_OUTCOME_LOST, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker
+	case B_OUTCOME_FORFEITED, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker
+	case B_OUTCOME_DREW, BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer, MSGBOX_DEFAULT
+	dome_resolvewinners DOME_PLAYER_WON_MATCH
 	frontier_getsymbols
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 	closemessage
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleDomeBattleRoom_Text_24D522
+	message BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker, MSGBOX_DEFAULT
 	closemessage
-	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829
+	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward
 	waitmovement 0
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420
-	msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, MSGBOX_DEFAULT
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420
+	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT
 	playse SE_W227B
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
-	setvar VAR_TEMP_2, 2
-	goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw:: @ 824C436
+	setvar VAR_TEMP_2, DRAW_TUCKER
+	goto BattleFrontier_BattleDomeBattleRoom_EventScript_Draw
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
+BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 824C440
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_DOME
@@ -478,56 +472,56 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
 	dome_resetsketch
 	return
 
-BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B
+BattleFrontier_BattleDomeBattleRoom_OnWarp: @ 824C481
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
 	hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
 	setvar VAR_TEMP_1, 1
 	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
 	frontier_get FRONTIER_DATA_BATTLE_NUM
-	compare VAR_RESULT, 3
-	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
+	compare VAR_RESULT, DOME_FINAL
+	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_E, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
+	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	setobjectxyperm 15, 13, 9
 	removeobject 15
 	addobject 15
-	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C78B
-
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF
+	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp
+BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects:: @ 824C4EF
 	end
 
-BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0
+BattleFrontier_BattleDomeBattleRoom_OnResume: @ 824C4F0
 	compare VAR_TEMP_9, 1
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience
 	end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
-	call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
+BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience:: @ 824C4FC
+	call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502
-	compare VAR_TEMP_F, 0
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F
-	compare VAR_TEMP_F, 1
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C530
-	compare VAR_TEMP_F, 2
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C594
-	compare VAR_TEMP_F, 3
-	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C652
+@ Add audience members to supplement the permanent object event audience
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience:: @ 824C502
+	compare VAR_TEMP_F, DOME_ROUND1
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience
+	compare VAR_TEMP_F, DOME_ROUND2
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience
+	compare VAR_TEMP_F, DOME_SEMIFINAL
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience
+	compare VAR_TEMP_F, DOME_FINAL
+	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience:: @ 824C52F
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
 	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
 	createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
@@ -541,7 +535,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
 	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
 	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
 	createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
@@ -565,7 +559,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
 	createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
 	createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
 	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
@@ -604,23 +598,23 @@ BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter: @ 824C775
 	set_visible
 	delay_16
 	walk_up
 	walk_up
 	walk_up
 	walk_right
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward: @ 824C77B
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience: @ 824C77D
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
+@ Identical to Movement_PlayerEnter
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker: @ 824C77F
 	set_visible
 	delay_16
 	walk_up
@@ -630,20 +624,20 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2: @ 824C787
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789
+BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward: @ 824C789
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B
+BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp: @ 824C78B
 	face_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance: @ 824C78E
 	set_visible
 	walk_up
 	walk_up
@@ -752,7 +746,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
+BattleFrontier_BattleDomeBattleRoom_Movement_RefereeMoveForTuckerEntrance: @ 824C7F9
 	delay_16
 	delay_16
 	walk_left
@@ -802,16 +796,16 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward: @ 824C829
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer: @ 824C82B
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
+BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround:: @ 824C82E
 	turnvobject 0, DIR_EAST
 	turnvobject 2, DIR_EAST
 	turnvobject 4, DIR_EAST
@@ -880,21 +874,21 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
 	delay 20
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
+BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby:: @ 824C8F5
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
-	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
+	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
 	waitstate
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles:: @ 824C90F
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
 	waitstate
 	end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
+@ On round 1 there's a 50% chance that a specific audience member will walk to his seat
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos:: @ 824C919
 	random 2
 	copyvar VAR_TEMP_D, VAR_RESULT
 	compare VAR_TEMP_D, 0
@@ -903,13 +897,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
 	setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
+BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat:: @ 824C938
 	compare VAR_TEMP_D, 0
 	goto_if_eq Common_EventScript_NopReturn
-	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
+	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat
 	return
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B
+BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump: @ 824C94B
 	delay_16
 	delay_16
 	delay_16
@@ -930,7 +924,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B
 	enable_jump_landing_ground_effect
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
+BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat: @ 824C95E
 	walk_down
 	walk_down
 	walk_right
@@ -938,52 +932,52 @@ BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964
+BattleFrontier_BattleDomeBattleRoom_Movement_TieRefereeEnter: @ 824C964
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969
+BattleFrontier_BattleDomeBattleRoom_Movement_RefereeFaceLeft: @ 824C969
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B
+BattleFrontier_BattleDomeBattleRoom_Movement_TieRefereeExit: @ 824C96B
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome: @ 824C970
 	.string "{PLAYER} has entered the BATTLE DOME!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24C990: @ 824C990
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer: @ 824C990
 	.string "{STR_VAR_1}\n"
 	.string "match!\p"
 	.string "{PLAYER} versus {STR_VAR_2}!\p"
 	.string "Let the battle begin!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24C9BE: @ 824C9BE
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner: @ 824C9BE
 	.string "{PLAYER} is the winner!\n"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24C9E1: @ 824C9E1
+BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner: @ 824C9E1
 	.string "{STR_VAR_2} is the winner!\n"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CA04: @ 824CA04
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ: @ 824CA04
 	.string "{PLAYER} is the Level 50\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CA44: @ 824CA44
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp: @ 824CA44
 	.string "{PLAYER} is the Open Level\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86
+BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait: @ 824CA86
 	.string "What an unbelievable finish!\n"
 	.string "We have a double knockout!\p"
 	.string "In this event, the Battle Tournament\n"
@@ -991,7 +985,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86
 	.string "Please wait while the judging\n"
 	.string "is under way.$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer: @ 824CB34
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
@@ -999,7 +993,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CB34: @ 824CB34
 	.string "The winner is {STR_VAR_1}!\l"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer: @ 824CB9D
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
@@ -1007,85 +1001,85 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CB9D: @ 824CB9D
 	.string "The winner is {PLAYER}!\l"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CC06: @ 824CC06
+BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope: @ 824CC06
 	.string "The bright new hope!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CC1C: @ 824CC1C
+BattleFrontier_BattleDomeBattleRoom_Text_RisingStar: @ 824CC1C
 	.string "The rising star!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CC2E: @ 824CC2E
+BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship: @ 824CC2E
 	.string "Will this TRAINER race to\n"
 	.string "the championship?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CC5B: @ 824CC5B
+BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry: @ 824CC5B
 	.string "Can the feat of a championship\n"
 	.string "on the first try be achieved?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CC99: @ 824CC99
+BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged: @ 824CC99
 	.string "Can the loss of the last match\n"
 	.string "be avenged?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CCC5: @ 824CCC5
+BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship: @ 824CCC5
 	.string "The TRAINER is on fire for\n"
 	.string "the first championship try!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CCFD: @ 824CCFD
+BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal: @ 824CCFD
 	.string "A win here means this TRAINER\n"
 	.string "advances to the final!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CD33: @ 824CD33
+BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue: @ 824CD33
 	.string "Will the long-held dream of\n"
 	.string "a championship finally come true?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CD72: @ 824CD72
+BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion: @ 824CD72
 	.string "The invincible champion!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CD8C: @ 824CD8C
+BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer: @ 824CD8C
 	.string "Can anyone hope to beat this\n"
 	.string "TRAINER?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CDB3: @ 824CDB3
+BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer: @ 824CDB3
 	.string "Do battles exist solely for\n"
 	.string "this TRAINER?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CDDE: @ 824CDDE
+BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle: @ 824CDDE
 	.string "The current champion aiming to\n"
 	.string "retain the title!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CE10: @ 824CE10
+BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned: @ 824CE10
 	.string "The former champion has returned!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CE33: @ 824CE33
+BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned: @ 824CE33
 	.string "The former toughness has returned!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CE57: @ 824CE57
+BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals: @ 824CE57
 	.string "Will this TRAINER do as expected\n"
 	.string "and advance to the finals?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CE94: @ 824CE94
+BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory: @ 824CE94
 	.string "Will the former champ regain\n"
 	.string "lost glory?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE
+BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster: @ 824CEBE
 	.string "Feel the glow of a true master!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE
+BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker: @ 824CEDE
 	.string "And now… The TRAINER standing in\n"
 	.string "{PLAYER}'s record-setting path…\p"
 	.string "Yes! The one and only!\n"
@@ -1093,11 +1087,11 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE
 	.string "Our very own DOME ACE!\l"
 	.string "Make way for TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A
+BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant: @ 824CF7A
 	.string "Spectators: TUCKER! TUCKER!\n"
 	.string "TUCKER! TUCKER! TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE
+BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro: @ 824CFAE
 	.string "TUCKER: Ahahah!\p"
 	.string "Do you hear it? This crowd!\n"
 	.string "They're all itching to see our match!\p"
@@ -1109,37 +1103,37 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE
 	.string "I, TUCKER the DOME ACE, will bathe you\l"
 	.string "in my brilliant glow!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9
+BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy: @ 824D0D9
 	.string "Your strategy!\n"
 	.string "Let's see it!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6
+BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer: @ 824D0F6
 	.string "Unbelievable! It's incredible!\n"
 	.string "The victor is {PLAYER}!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127
+BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker: @ 824D127
 	.string "The winner is TUCKER!\n"
 	.string "The DOME ACE has prevailed!\p"
 	.string "Congratulations, TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D172: @ 824D172
+BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass: @ 824D172
 	.string "TUCKER: Rules are rules!\n"
 	.string "Let me see your FRONTIER PASS.$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA
+BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol: @ 824D1AA
 	.string "The Tactics Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0
+BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime: @ 824D1E0
 	.string "… … … … … …\p"
 	.string "I sorely underestimated you. I won't\n"
 	.string "make the same mistake next time…$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232
+BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched: @ 824D232
 	.string "Can the win streak be stretched?\n"
 	.string "The confidence is there!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C
+BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker: @ 824D26C
 	.string "Ladies and gentlemen!\n"
 	.string "Boys, girls, and POKéMON!\p"
 	.string "Finally!\n"
@@ -1148,7 +1142,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C
 	.string "Our very own DOME ACE!\l"
 	.string "It's none other than TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319
+BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro: @ 824D319
 	.string "TUCKER: Ah…\n"
 	.string "The pummeling roar of the crowd…\l"
 	.string "Their furnace-like heat of excitement…\l"
@@ -1160,22 +1154,22 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319
 	.string "Brighter and more brilliant!\l"
 	.string "I must light all that gather here!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E
+BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess: @ 824D43E
 	.string "I will unleash all the power that\n"
 	.string "I possess! Right here and now!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F
+BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed: @ 824D47F
 	.string "TUCKER: You're genuinely fantastic!\p"
 	.string "Never before! I haven't ever lost in the\n"
 	.string "times I've had to unleash my power.\p"
 	.string "Yes, quite fantastic!\n"
 	.string "Your FRONTIER PASS, please?$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522
+BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine: @ 824D522
 	.string "The Tactics Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D
+BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter: @ 824D54D
 	.string "You're strong, but above all,\n"
 	.string "you have a unique charm!\p"
 	.string "In you, I see a definite potential for\n"
@@ -1183,22 +1177,24 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D
 	.string "I will very much look forward to\n"
 	.string "our next encounter!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D5F5: @ 824D5F5
+@ Unused
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ2: @ 824D5F5
 	.string "{PLAYER} is the Level 50\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D635: @ 824D635
+@ Unused
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp2: @ 824D635
 	.string "{PLAYER} is the Open Level\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker: @ 824D677
 	.string "The final match!\p"
 	.string "{PLAYER} versus the DOME ACE, TUCKER!\p"
 	.string "Let the battle begin!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker: @ 824D6BE
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"