Document Battle Factory scripts

7 files changed, 571 insertions, 585 deletions

diff --git a/asm/macros/battle_frontier/battle_factory.inc b/asm/macros/battle_frontier/battle_factory.inc
index 5a1eb33b7..684eeb98d 100644
--- a/asm/macros/battle_frontier/battle_factory.inc
+++ b/asm/macros/battle_frontier/battle_factory.inc
@@ -1,5 +1,3 @@
-@ TODO: Add explanatory comments to macros
-
 	@ Initialize the Battle Factory challenge
 	.macro factory_init
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_INIT
@@ -34,68 +32,68 @@
 	special CallBattleFactoryFunction
 	.endm
 
-	@  
+	@ Select the initial rental mons for the challenge
 	.macro factory_rentmons
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SELECT_RENT_MONS
 	special CallBattleFactoryFunction
 	.endm
 
-	@ 
+	@ Select a mon to swap for from the previously defeated team
 	.macro factory_swapmons
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SWAP_RENT_MONS
 	special CallBattleFactoryFunction
 	.endm
 
-	@
+	@ Allows FACTORY_DATA_WIN_STREAK_SWAPS to be incremented once
 	.macro factory_setswapped
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_SWAPPED
 	special CallBattleFactoryFunction
 	.endm
 
-	@ 
+	@ Update gEnemyParty with the next set of rental mons
 	.macro factory_setopponentmons
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_OPPONENT_MONS
 	special CallBattleFactoryFunction
 	.endm
 
-	@ 
+	@ Populate gPlayerParty and gEnemyParty with the rental mons. Only needed when resuming a challenge, otherwise only factory_setopponentmons and factory_rentmons/factory_swapmons are needed
 	.macro factory_setparties arg:req
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_PARTIES
 	setvar VAR_0x8005, \arg
 	special CallBattleFactoryFunction
 	.endm
 
-	@ 
+	@ Set the object event gfx for the opponent trainer
 	.macro factory_setopponentgfx
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_SET_OPPONENT_GFX
 	special CallBattleFactoryFunction
 	.endm
 
-	@  
+	@ Generate the mons for the opponents team
 	.macro factory_generateopponentmons
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GENERATE_OPPONENT_MONS
 	special CallBattleFactoryFunction
 	.endm
 
-	@  
+	@ Generate the random 6 mons to choose from for the initial rental
 	.macro factory_generaterentalmons
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GENERATE_RENTAL_MONS
 	special CallBattleFactoryFunction
 	.endm
 
-	@  
+	@ Return the pokemon type most common in the opponents team, or NUMBER_OF_MON_TYPES if there is no standout type
 	.macro factory_getopponentmontype
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_MON_TYPE
 	special CallBattleFactoryFunction
 	.endm
 
-	@ 
+	@ Return the FACTORY_STYLE_* dependent on what types of moves the opponents team has, or FACTORY_NUM_STYLES if multiple styles tie for the same amount of moves
 	.macro factory_getopponentstyle 
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE
 	special CallBattleFactoryFunction
 	.endm
 
-	@  
+	@ Restore the held items for the players party to what they were pre-battle
 	.macro factory_resethelditems
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_RESET_HELD_ITEMS
 	special CallBattleFactoryFunction
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index f1b3e3b91..9a1d15292 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -1,81 +1,82 @@
 BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_OnTransition
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnFrame
 	.byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
+	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
+	@ The player is represented instead by object event 8, which has the gfx id VAR_OBJ_GFX_ID_F
+
+BattleFrontier_BattleFactoryBattleRoom_OnTransition: @ 825ADBB
 	frontier_settrainers
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
+	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
+	call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj:: @ 825ADF3
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	setobjectxyperm 2, 7, 9
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A
+BattleFrontier_BattleFactoryBattleRoom_OnWarp: @ 825AE00
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects
 	.2byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A
+BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: @ 825AE0A
 	setvar VAR_TEMP_1, 1
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
-	compare VAR_TEMP_F, 0
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
+	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
 	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects:: @ 825AE24
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale:: @ 825AE25
 	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale:: @ 825AE2B
 	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67
+BattleFrontier_BattleFactoryBattleRoom_OnFrame: @ 825AE31
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle:: @ 825AE3B
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
+	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
 	waitmovement 0
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
-	compare VAR_TEMP_F, 0
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
+	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
 	waitmovement 0
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle
 	factory_setopponentgfx
 	removeobject 2
 	setobjectxyperm 2, 7, 1
 	addobject 2
-	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B184
+	applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter
 	waitmovement 0
-
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
-	compare VAR_TEMP_F, 0
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
+	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland
 	palace_getopponentintro
 	lockall
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -88,98 +89,96 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
 	special DoSpecialTrainerBattle
 	waitstate
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
+	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost:: @ 825AEF8
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
-@ 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent:: @ 825AF0F
 	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
-	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	factory_set FACTORY_DATA_WIN_STREAK_SWAPS  @ uses VAR_0x8006 above
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak:: @ 825AF3E
 	call BattleFrontier_EventScript_IncrementWinStreak
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum:: @ 825AF43
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
-	case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
+	case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon
 	setvar VAR_0x8006, 1
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
 	waitstate
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon:: @ 825AF85
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland:: @ 825AF9C
 	switch VAR_TEMP_F
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver:: @ 825AFEF
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn, MSGBOX_DEFAULT
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B00C
 	frontier_getsymbols
 	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
 	waitmovement 0
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleFactoryBattleRoom_Text_25B460
+	message BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold:: @ 825B051
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT
-	call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold:: @ 825B07E
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn, MSGBOX_DEFAULT
+	call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09B
 	frontier_getsymbols
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass, MSGBOX_DEFAULT
 	waitmessage
-	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
+	applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
 	waitmovement 0
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattleFactoryBattleRoom_Text_25B640
+	message BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
+	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
 	closemessage
 	frontier_set FRONTIER_DATA_6, 0
 	special HealPlayerParty
@@ -189,24 +188,24 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
 	waitstate
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland:: @ 825B105
 	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
-	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	factory_set FACTORY_DATA_WIN_STREAK_SWAPS  @ uses VAR_0x8006 above
 	factory_get FACTORY_DATA_WIN_STREAK
 	compare VAR_RESULT, MAX_STREAK
-	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum
 	addvar VAR_RESULT, 1
 	factory_set FACTORY_DATA_WIN_STREAK, VAR_RESULT
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
-	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
+	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B
+BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom: @ 825B17B
 	walk_up
 	walk_up
 	walk_up
@@ -215,11 +214,11 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B
 	face_right
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182
+BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland: @ 825B182
 	walk_right
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184
+BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter: @ 825B184
 	walk_down
 	walk_down
 	walk_down
@@ -228,28 +227,27 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184
 	face_left
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
+BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle: @ 825B18B
 	walk_up
 	walk_up
 	walk_up
 	face_left
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby:: @ 825B190
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
+	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles:: @ 825B1AA
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
+BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle:: @ 825B1B4
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	applymovement 3, Common_Movement_WalkInPlaceFastestRight
 	applymovement 4, Common_Movement_WalkInPlaceFastestRight
@@ -259,11 +257,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
 	waitmovement 0
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2
+BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn: @ 825B1E2
 	.string "Hey, hey!\n"
 	.string "Get a move on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB
+BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead: @ 825B1FB
 	.string "Hey, my name's NOLAND!\n"
 	.string "I'm basically in charge of this place,\l"
 	.string "which is why I'm the FACTORY HEAD!\p"
@@ -280,26 +278,26 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB
 	.string "conditions as you.\p"
 	.string "I'll be using rental POKéMON, too!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1
+BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn: @ 825B3F1
 	.string "Shake out every last bit of your\n"
 	.string "knowledge and bring it on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D
+BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass: @ 825B42D
 	.string "NOLAND: Smart going!\n"
 	.string "Let's see your FRONTIER PASS.$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460
+BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol: @ 825B460
 	.string "The Knowledge Symbol was embossed\n"
 	.string "on the FRONTIER PASS!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498
+BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred: @ 825B498
 	.string "Heh…\n"
 	.string "You're a pretty bright spark…\p"
 	.string "Next time, I'll come after you hard.\n"
 	.string "No holds barred, understand?\p"
 	.string "You keep up your studies!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517
+BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime: @ 825B517
 	.string "NOLAND: Hey, hey! How's it going?\n"
 	.string "You keeping up with your studies?\p"
 	.string "…Oh?\p"
@@ -308,21 +306,21 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517
 	.string "Now, this should be fun!\n"
 	.string "I'm getting excited, hey!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF
+BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn: @ 825B5CF
 	.string "All right!\n"
 	.string "Bring it on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7
+BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass: @ 825B5E7
 	.string "NOLAND: What the…\n"
 	.string "You're getting out of my league!\p"
 	.string "Sheesh!\n"
 	.string "Let's see that FRONTIER PASS!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640
+BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine: @ 825B640
 	.string "The Knowledge Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D
+BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou: @ 825B66D
 	.string "Pfft, man!\p"
 	.string "That's absolutely the last time\n"
 	.string "I lose to you!\p"
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json
index 8ed837413..ade32b054 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_Camper",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_Picnicker",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant",
       "flag": "0"
     }
   ],
@@ -117,7 +117,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587E1"
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults"
     },
     {
       "type": "sign",
@@ -125,7 +125,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587FA"
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults"
     },
     {
       "type": "sign",
@@ -133,7 +133,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839"
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index fec051025..370bc237b 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -1,32 +1,32 @@
 BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2583FD
+BattleFrontier_BattleFactoryLobby_OnWarp: @ 82583F3
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
+BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth:: @ 82583FD
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258431
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleFactoryLobby_EventScript_25843A
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleFactoryLobby_EventScript_258592
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleFactoryLobby_EventScript_25849B
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleFactoryLobby_EventScript_258506
+BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
+BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus:: @ 8258431
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
+BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving:: @ 825843A
 	lockall
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
 	factory_setswapped
 	factory_set FACTORY_DATA_WIN_STREAK_SWAPS, 0
@@ -37,36 +37,35 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
+BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge:: @ 825849B
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead
+	msgbox BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins, MSGBOX_DEFAULT
 	waitmessage
-	goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6
+	goto BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
-	msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead:: @ 82584BD
+	msgbox BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead, MSGBOX_DEFAULT
 	waitmessage
-
-BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints:: @ 82584C6
+	msgbox BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
-	message BattleFrontier_BattleFactoryLobby_Text_259323
+	message BattleFrontier_BattleFactoryLobby_Text_ExchangeMonsAndSave
 	waitmessage
 	frontier_checkairshow
 	special LoadPlayerParty
 	factory_save 0
 	playse SE_SAVE
 	waitse
-	goto BattleFrontier_BattleFactoryLobby_EventScript_25853B
+	goto BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
+BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
 	lockall
-	message BattleFrontier_BattleFactoryLobby_Text_258CC7
+	message BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults
 	waitmessage
 	frontier_checkairshow
 	special LoadPlayerParty
@@ -75,30 +74,30 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
 	playse SE_SAVE
 	waitse
 
-BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B
+BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
 	call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258582
-	message BattleFrontier_BattleFactoryLobby_Text_259388
+	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
+	message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_258582
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
 
-BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D
+BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle:: @ 825857D
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle:: @ 8258582
+	msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
+BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge:: @ 8258592
 	lockall
-	message BattleFrontier_BattleFactoryLobby_Text_258E77
+	message BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume
 	waitmessage
 	factory_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
@@ -106,57 +105,56 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	setvar VAR_0x8006, 2
-	goto BattleFrontier_BattleFactoryLobby_EventScript_25871A
+	goto BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_2585CB:: @ 82585CB
+BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant:: @ 82585CB
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
+	goto BattleFrontier_BattleFactoryLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
+BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant:: @ 82585DD
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	goto BattleFrontier_BattleFactoryLobby_EventScript_2585ED
+	goto BattleFrontier_BattleFactoryLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
+BattleFrontier_BattleFactoryLobby_EventScript_Attendant:: @ 82585ED
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA
-
-BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle
+BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768
-	case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge
+	case 2, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
-	message BattleFrontier_BattleFactoryLobby_Text_258BE9
+BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge:: @ 8258653
+	message BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case FRONTIER_LVL_TENT, BattleFrontier_BattleFactoryLobby_EventScript_25879D
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO
+	msgbox BattleFrontier_BattleFactoryLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleFactoryLobby_EventScript_25879A
-	case YES, BattleFrontier_BattleFactoryLobby_EventScript_2586B9
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879A
+	case NO, BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge
+	case YES, BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
+BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge:: @ 82586B9
 	setvar VAR_TEMP_0, 0
 	factory_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
@@ -167,90 +165,89 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783
+	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed
 	setvar VAR_0x8006, 0
-
-BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
+BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
 	special SavePlayerParty
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762
-	applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant
+	applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor
 	waitmovement 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_25875C:: @ 825875C
+BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant:: @ 825875C
 	setvar VAR_LAST_TALKED, 1
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
+BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant:: @ 8258762
 	setvar VAR_LAST_TALKED, 6
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge:: @ 8258768
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
-	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258606
+	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge
+	goto BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
+BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed:: @ 8258783
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
+	goto BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
+BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825879A
 	special LoadPlayerParty
-BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge:: @ 825879D
+	msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7
+BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor: @ 82587A7
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC
+BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor: @ 82587AC
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle:: @ 82587B1
+	msgbox BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA
-	msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle:: @ 82587BA
+	msgbox BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3
-	message BattleFrontier_BattleFactoryLobby_Text_25897A
+BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge:: @ 82587C3
+	message BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9
-	message BattleFrontier_BattleFactoryLobby_Text_25901F
+BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge:: @ 82587C9
+	message BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge:: @ 82587CF
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259058, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge:: @ 82587D8
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
+BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults:: @ 82587E1
 	lockall
 	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -258,7 +255,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
+BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults:: @ 82587FA
 	lockall
 	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -266,85 +263,85 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, MSGBOX_NPC
+BattleFrontier_BattleFactoryLobby_EventScript_Woman:: @ 8258813
+	msgbox BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, MSGBOX_NPC
+BattleFrontier_BattleFactoryLobby_EventScript_Camper:: @ 825881C
+	msgbox BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825
+BattleFrontier_BattleFactoryLobby_EventScript_Picnicker:: @ 8258825
 	lock
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259547, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, MSGBOX_NPC
+BattleFrontier_BattleFactoryLobby_EventScript_FatMan:: @ 8258830
+	msgbox BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839
+BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard:: @ 8258839
 	lockall
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259721, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+	msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848
-	message BattleFrontier_BattleFactoryLobby_Text_259743
+BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard:: @ 8258848
+	message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6
-	case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4
-	case 2, BattleFrontier_BattleFactoryLobby_EventScript_2588C2
-	case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0
-	case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE
-	case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_2588EC
+	case 0, BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics
+	case 1, BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner
+	case 2, BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNumber
+	case 3, BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNotes
+	case 4, BattleFrontier_BattleFactoryLobby_EventScript_RulesOpenLv
+	case 5, BattleFrontier_BattleFactoryLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259766, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics:: @ 82588A6
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4
-	msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner:: @ 82588B4
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2
-	msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNumber:: @ 82588C2
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259920, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNotes:: @ 82588D0
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE
-	msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryLobby_EventScript_258848
+BattleFrontier_BattleFactoryLobby_EventScript_RulesOpenLv:: @ 82588DE
+	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_2588EC:: @ 82588EC
+BattleFrontier_BattleFactoryLobby_EventScript_ExitRules:: @ 82588EC
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_Text_2588EE: @ 82588EE
+BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle: @ 82588EE
 	.string "Where the intelligence of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE FACTORY!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Single Tournament.$"
 
-BattleFrontier_BattleFactoryLobby_Text_25897A: @ 825897A
+BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge: @ 825897A
 	.string "Would you like to take the Battle\n"
 	.string "Swap Single challenge?$"
 
-BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3
+BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge: @ 82589B3
 	.string "The Battle Swap Single Tournament\n"
 	.string "is a SINGLE BATTLE competition using\l"
 	.string "only rental POKéMON.\p"
@@ -362,79 +359,85 @@ BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3
 	.string "If you don't save, you will be\n"
 	.string "disqualified from your challenge.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5
+BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit: @ 8258BC5
 	.string "We look forward to your next visit.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258BE9: @ 8258BE9
+BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode: @ 8258BE9
 	.string "Which level do you wish to challenge?\n"
 	.string "Level 50 or Open Level?$"
 
-BattleFrontier_BattleFactoryLobby_Text_258C27: @ 8258C27
+BattleFrontier_BattleFactoryLobby_Text_OkayToSaveBeforeChallenge: @ 8258C27
 	.string "Before you begin your challenge,\n"
 	.string "I need to save the game. Is that okay?$"
 
-BattleFrontier_BattleFactoryLobby_Text_258C6F: @ 8258C6F
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_WillHoldMonsForSafekeeping: @ 8258C6F
 	.string "Okay, I will hold your POKéMON for\n"
 	.string "safekeeping while you compete.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258CB1: @ 8258CB1
+BattleFrontier_BattleFactoryLobby_Text_StepThisWay: @ 8258CB1
 	.string "Please step this way.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258CC7: @ 8258CC7
+BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults: @ 8258CC7
 	.string "Thank you for participating!\p"
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.\p"
 	.string "I must also save the event results.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_ReturnMons: @ 8258D54
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93
+BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins: @ 8258D93
 	.string "Congratulations! You've won seven\n"
 	.string "straight Battle Swap matches!$"
 
-BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_AwardBattlePointsForStreak: @ 8258DD3
 	.string "In recognition of your 7-win streak,\n"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_MaxBattlePoints: @ 8258E1C
 	.string "Oh, oh, oh!\p"
 	.string "Your Battle Points are maxed.\p"
 	.string "Please come back after using\n"
 	.string "some Battle Points.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77
+BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume: @ 8258E77
 	.string "We've been waiting for you!\p"
 	.string "Before we resume your challenge,\n"
 	.string "I must save the game.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA
+BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting: @ 8258ECA
 	.string "I'm sorry to say this, but you didn't\n"
 	.string "save before you quit playing last time.\p"
 	.string "As a result, you have been disqualified\n"
 	.string "from your challenge.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_WellReturnMons: @ 8258F55
 	.string "We'll return your personal POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_ReceivedPrizeItem: @ 8258F79
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattleFactoryLobby_Text_258F93: @ 8258F93
+BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle: @ 8258F93
 	.string "Where the intelligence of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE FACTORY!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Double Tournament.$"
 
-BattleFrontier_BattleFactoryLobby_Text_25901F: @ 825901F
+BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge: @ 825901F
 	.string "Would you like to take the Battle\n"
 	.string "Swap Double challenge?$"
 
-BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058
+BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge: @ 8259058
 	.string "The Battle Swap Double Tournament\n"
 	.string "is a DOUBLE BATTLE competition using\l"
 	.string "only rental POKéMON.\p"
@@ -452,28 +455,28 @@ BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A
+BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead: @ 825926A
 	.string "Congratulations for defeating\n"
 	.string "the FACTORY HEAD and winning\l"
 	.string "seven matches in a row!$"
 
-BattleFrontier_BattleFactoryLobby_Text_2592BD: @ 82592BD
+BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints: @ 82592BD
 	.string "In recognition of your wealth of\n"
 	.string "knowledge and keen intelligence,\l"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_BattleFactoryLobby_Text_259323: @ 8259323
+BattleFrontier_BattleFactoryLobby_Text_ExchangeMonsAndSave: @ 8259323
 	.string "Let me exchange your POKéMON\n"
 	.string "for our rental POKéMON.\p"
 	.string "I need to save the battle data,\n"
 	.string "so please wait.$"
 
-BattleFrontier_BattleFactoryLobby_Text_259388: @ 8259388
+BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch: @ 8259388
 	.string "Would you like to record your last\n"
 	.string "BATTLE FACTORY match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7
+BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves: @ 82593D7
 	.string "Hi!\n"
 	.string "You, there!\p"
 	.string "Are you thinking that the events here\n"
@@ -485,25 +488,26 @@ BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7
 	.string "about POKéMON and their moves,\l"
 	.string "it will be tough to keep winning.$"
 
-BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5
+BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon: @ 82594E5
 	.string "I swapped for a weak POKéMON…\n"
 	.string "I thought it was a good kind to have…\p"
 	.string "They wiped the floor with us…$"
 
-BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547
+BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons: @ 8259547
 	.string "Things haven't been going my way\n"
 	.string "at all.\p"
 	.string "You need to check your opponent's\n"
 	.string "POKéMON during battle to see if\l"
 	.string "they're any good.$"
 
-BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4
+BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints: @ 82595C4
 	.string "You know how the staff here give you\n"
 	.string "a few hints about your next opponent?\p"
 	.string "Well, I'm a full-grown man, but I have\n"
 	.string "trouble figuring out their hints.$"
 
-BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658
+@ Unused
+BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried: @ 8259658
 	.string "Like, I'm really tough, but I get bored\n"
 	.string "really easily, so I just kept swapping\l"
 	.string "and battling over and over.\p"
@@ -511,35 +515,33 @@ BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658
 	.string "Battle Swap events, I noticed they\l"
 	.string "varied the rental POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_259721: @ 8259721
-SlateportCity_BattleTentLobby_Text_259721: @ 8259721
+BattleFrontier_BattleFactoryLobby_Text_RulesAreListed: @ 8259721
 	.string "The Battle Swap rules are listed.$"
 
-BattleFrontier_BattleFactoryLobby_Text_259743: @ 8259743
-SlateportCity_BattleTentLobby_Text_259743: @ 8259743
+BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading: @ 8259743
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleFactoryLobby_Text_259766: @ 8259766
+BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules: @ 8259766
 	.string "In a Battle Swap event, you may use\n"
 	.string "only three POKéMON.\p"
 	.string "Whether you are renting or swapping,\n"
 	.string "your team may not have two or more\l"
 	.string "of the same POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules: @ 82597FB
 	.string "You may swap POKéMON only with\n"
 	.string "the TRAINER you have just defeated.\p"
 	.string "You may swap for only those POKéMON\n"
 	.string "used by the beaten TRAINER.$"
 
-BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules: @ 825987E
 	.string "After every battle you win, you may\n"
 	.string "swap for one of your defeated\l"
 	.string "opponent's POKéMON.\p"
 	.string "You will not be able to swap POKéMON\n"
 	.string "with the seventh TRAINER in the event.$"
 
-BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules: @ 8259920
 	.string "There are two key points to be aware\n"
 	.string "of when swapping POKéMON.\p"
 	.string "First, when swapping, you can't check\n"
@@ -551,7 +553,7 @@ BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920
 	.string "This sequence remains unchanged\n"
 	.string "even when swaps are made.$"
 
-BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E
+BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules: @ 8259A5E
 	.string "In the Open Level, the rental POKéMON\n"
 	.string "and the opposing TRAINERS' POKéMON\l"
 	.string "are all Level 100.$"
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index 98589b97b..11c731f24 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -1,211 +1,209 @@
 BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF
+BattleFrontier_BattleFactoryPreBattleRoom_OnWarp: @ 8259AC5
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects:: @ 8259ACF
 	setvar VAR_TEMP_1, 1
 	compare VAR_0x8006, 1
-	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
+	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth
 	setobjectxy 1, 8, 7
 	turnobject 1, DIR_SOUTH
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: @ 8259AEA
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9
+BattleFrontier_BattleFactoryPreBattleRoom_OnFrame: @ 8259AEF
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
 	compare VAR_0x8006, 1
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5
+	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
 	setvar VAR_TEMP_0, 1
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom
 	waitmovement 0
 	compare VAR_0x8006, 2
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
+	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge
 	factory_generaterentalmons
 	factory_generateopponentmons
 	factory_getopponentmontype
 	setorcopyvar VAR_0x8005, VAR_RESULT
 	factory_getopponentstyle
 	setorcopyvar VAR_0x8006, VAR_RESULT
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, MSGBOX_DEFAULT
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
 	fadescreen 1
 	factory_setswapped
 	factory_rentmons
 	waitstate
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom:: @ 8259B74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_EventScript_GetLvlMode
 	compare VAR_RESULT, FRONTIER_LVL_50
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50
 	compare VAR_RESULT, FRONTIER_LVL_OPEN
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen
 	waitmovement 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @ 8259BA5
 	factory_setopponentmons
 	factory_resethelditems
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
+	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
 	playse SE_TOREEYE
 	waitse
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall
 	waitmovement 0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow, MSGBOX_DEFAULT
 	closemessage
 	delay 16
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent:: @ 8259C13
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
+	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent:: @ 8259C26
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent
 	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent
 	compare VAR_RESULT, 3
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent
 	compare VAR_RESULT, 4
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent
 	compare VAR_RESULT, 5
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent
 	compare VAR_RESULT, 6
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
+	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
+	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8259CC6
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CFC
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle:: @ 8259D2E
 	call BattleFrontier_EventScript_SaveBattle
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, MSGBOX_YESNO
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge:: @ 8259D38
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
+	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 8259D66
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
+	case 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98
 	factory_generateopponentmons
 	factory_getopponentmontype
 	setorcopyvar VAR_0x8005, VAR_RESULT
 	factory_getopponentstyle
 	setorcopyvar VAR_0x8006, VAR_RESULT
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
-	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
+	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
 	fadescreen 1
 	factory_swapmons
 	waitstate
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 	factory_setswapped
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8259E1D
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24:: @ 8259E24
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8259E24
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B:: @ 8259E2B
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8259E2B
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32:: @ 8259E32
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8259E32
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39:: @ 8259E39
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8259E39
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8259E40
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	factory_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
@@ -214,223 +212,223 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
 	frontier_reset
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69
 	special SavePlayerParty
 	factory_setparties 0
 	frontier_set FRONTIER_DATA_6, 1
 	special CalculatePlayerPartyCount
-	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
+	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType:: @ 8259E93
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent, MSGBOX_DEFAULT
 	compare VAR_0x8005, TYPE_NORMAL
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal
 	compare VAR_0x8005, TYPE_FIGHTING
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting
 	compare VAR_0x8005, TYPE_FLYING
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying
 	compare VAR_0x8005, TYPE_POISON
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison
 	compare VAR_0x8005, TYPE_GROUND
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround
 	compare VAR_0x8005, TYPE_ROCK
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock
 	compare VAR_0x8005, TYPE_BUG
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug
 	compare VAR_0x8005, TYPE_GHOST
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost
 	compare VAR_0x8005, TYPE_STEEL
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel
 	compare VAR_0x8005, TYPE_FIRE
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire
 	compare VAR_0x8005, TYPE_WATER
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater
 	compare VAR_0x8005, TYPE_GRASS
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass
 	compare VAR_0x8005, TYPE_ELECTRIC
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric
 	compare VAR_0x8005, TYPE_PSYCHIC
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic
 	compare VAR_0x8005, TYPE_ICE
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce
 	compare VAR_0x8005, TYPE_DRAGON
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon
 	compare VAR_0x8005, TYPE_DARK
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark
 	compare VAR_0x8005, NUMBER_OF_MON_TYPES
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal:: @ 8259F62
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting:: @ 8259F6B
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying:: @ 8259F74
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison:: @ 8259F7D
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround:: @ 8259F86
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock:: @ 8259F8F
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug:: @ 8259F98
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost:: @ 8259FA1
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel:: @ 8259FAA
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire:: @ 8259FB3
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater:: @ 8259FBC
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass:: @ 8259FC5
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric:: @ 8259FCE
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic:: @ 8259FD7
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce:: @ 8259FE0
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon:: @ 8259FE9
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark:: @ 8259FF2
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType:: @ 8259FFB
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle:: @ 825A004
 	compare VAR_0x8006, FACTORY_STYLE_NONE
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained
 	compare VAR_0x8006, FACTORY_STYLE_PREPARATION
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation
 	compare VAR_0x8006, FACTORY_STYLE_SLOW_STEADY
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady
 	compare VAR_0x8006, FACTORY_STYLE_ENDURANCE
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance
 	compare VAR_0x8006, FACTORY_STYLE_HIGH_RISK
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk
 	compare VAR_0x8006, FACTORY_STYLE_WEAKENING
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe
 	compare VAR_0x8006, FACTORY_STYLE_UNPREDICTABLE
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict
 	compare VAR_0x8006, FACTORY_STYLE_WEATHER
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow
 	compare VAR_0x8006, FACTORY_NUM_STYLES
-	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
+	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068
-	msgbox Text_StyleUnrestrained, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained:: @ 825A068
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071
-	msgbox Text_StyleTotalPreparation, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation:: @ 825A071
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A
-	msgbox Text_StyleSlowAndSteady, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady:: @ 825A07A
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083
-	msgbox Text_StyleEndurance, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance:: @ 825A083
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C
-	msgbox Text_StyleHighRisk, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk:: @ 825A08C
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095
-	msgbox Text_StyleWeakenFoe, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe:: @ 825A095
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E
-	msgbox Text_StyleImpossibleToPredict, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict:: @ 825A09E
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7
-	msgbox Text_StyleDependsOnFlow, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow:: @ 825A0A7
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0
-	msgbox Text_StyleFlexible, MSGBOX_DEFAULT
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible:: @ 825A0B0
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9
-	message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead
 	waitmessage
 	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110
+	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
 	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
+	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord:: @ 825A110
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
-	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38
-	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
-
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT
-	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO
+	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
+	case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge
+	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
+
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A146
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
-	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2
-	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
+	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
+	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons
+	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50:: @ 825A17C
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B
-	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen:: @ 825A18B
+	applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A
 	walk_up
 	walk_up
 	walk_up
@@ -438,7 +436,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50: @ 825A1A0
 	walk_up
 	walk_left
 	walk_left
@@ -446,7 +444,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen: @ 825A1A6
 	walk_up
 	walk_right
 	walk_right
@@ -454,7 +452,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom: @ 825A1AC
 	walk_up
 	walk_up
 	walk_up
@@ -463,7 +461,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC
 	face_down
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50: @ 825A1B3
 	walk_left
 	walk_left
 	walk_up
@@ -471,7 +469,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen: @ 825A1B9
 	walk_right
 	walk_right
 	walk_up
@@ -479,211 +477,201 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall: @ 825A1BF
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer: @ 825A1C3
 	walk_right
 	walk_right
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8
-SlateportCity_BattleTentCorridor_Text_25A1C8: @ 825A1C8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection: @ 825A1C8
 	.string "First, we will hold your POKéMON for\n"
 	.string "safekeeping.\p"
 	.string "You may then choose from our\n"
 	.string "selection of POKéMON.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D: @ 825A22D
-SlateportCity_BattleTentCorridor_Text_25A22D: @ 825A22D
+BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons: @ 825A22D
 	.string "Thank you for competing!\n"
 	.string "Let us restore your POKéMON!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A263: @ 825A263
-SlateportCity_BattleTentCorridor_Text_25A263: @ 825A263
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent: @ 825A263
 	.string "The 2nd match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A289: @ 825A289
-SlateportCity_BattleTentCorridor_Text_25A289: @ 825A289
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent: @ 825A289
 	.string "The 3rd match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2AF: @ 825A2AF
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent: @ 825A2AF
 	.string "The 4th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2D5: @ 825A2D5
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent: @ 825A2D5
 	.string "The 5th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A2FB: @ 825A2FB
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent: @ 825A2FB
 	.string "The 6th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A321: @ 825A321
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent: @ 825A321
 	.string "Finally, the 7th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350: @ 825A350
-SlateportCity_BattleTentCorridor_Text_25A350: @ 825A350
+BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame: @ 825A350
 	.string "Would you like to save and quit\n"
 	.string "the game?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A: @ 825A37A
-SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge: @ 825A37A
 	.string "Would you like to retire from your\n"
 	.string "Battle Swap challenge?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4
+BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent: @ 825A3B4
 	.string "I've conducted a little investigation\n"
 	.string "about your upcoming opponent.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType: @ 825A3F8
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the NORMAL type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E: @ 825A43E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType: @ 825A43E
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FIRE type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482: @ 825A482
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType: @ 825A482
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the WATER type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7: @ 825A4C7
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType: @ 825A4C7
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ELECTRIC type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F: @ 825A50F
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType: @ 825A50F
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GRASS type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554: @ 825A554
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType: @ 825A554
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ICE type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597: @ 825A597
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType: @ 825A597
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FIGHTING type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF: @ 825A5DF
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType: @ 825A5DF
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the POISON type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625: @ 825A625
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType: @ 825A625
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GROUND type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B: @ 825A66B
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType: @ 825A66B
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FLYING type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1: @ 825A6B1
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType: @ 825A6B1
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the PSYCHIC type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8: @ 825A6F8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType: @ 825A6F8
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the BUG type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B: @ 825A73B
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType: @ 825A73B
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ROCK type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F: @ 825A77F
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType: @ 825A77F
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GHOST type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4: @ 825A7C4
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType: @ 825A7C4
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the DRAGON type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A: @ 825A80A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType: @ 825A80A
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the DARK type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E: @ 825A84E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType: @ 825A84E
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the STEEL type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite: @ 825A893
 	.string "The TRAINER appears to have no clear\n"
 	.string "favorites when it comes to type.$"
 
-Text_StyleSlowAndSteady: @ 825A8D9
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady: @ 825A8D9
 	.string "The favorite battle style appears to\n"
 	.string "be slow and steady.$"
 
-Text_StyleEndurance: @ 825A912
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance: @ 825A912
 	.string "The favorite battle style appears to\n"
 	.string "be one of endurance.$"
 
-Text_StyleHighRisk: @ 825A94C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk: @ 825A94C
 	.string "The favorite battle style appears to\n"
 	.string "be high risk, high return.$"
 
-Text_StyleDependsOnFlow: @ 825A98C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow: @ 825A98C
 	.string "The favorite battle style appears to\n"
 	.string "depend on the battle's flow.$"
 
-Text_StyleTotalPreparation: @ 825A9CE
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation: @ 825A9CE
 	.string "The favorite battle style appears to\n"
 	.string "be one based on total preparation.$"
 
-Text_StyleWeakenFoe: @ 825AA16
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe: @ 825AA16
 	.string "The favorite battle style appears\n"
 	.string "to be weakening the foe to start.$"
 
-Text_StyleFlexible: @ 825AA5A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible: @ 825AA5A
 	.string "The favorite battle style appears to\n"
 	.string "be flexibly adaptable to the situation.$"
 
-Text_StyleImpossibleToPredict: @ 825AAA7
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict: @ 825AAA7
 	.string "The favorite battle style appears to\n"
 	.string "be impossible to predict.$"
 
-Text_StyleUnrestrained: @ 825AAE6
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained: @ 825AAE6
 	.string "The favorite battle style appears to\n"
 	.string "be free-spirited and unrestrained.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E: @ 825AB2E
-SlateportCity_BattleTentCorridor_Text_25AB2E: @ 825AB2E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon: @ 825AB2E
 	.string "Before starting the battle, would you\n"
 	.string "like to swap a POKéMON?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C: @ 825AB6C
-SlateportCity_BattleTentCorridor_Text_25AB6C: @ 825AB6C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete: @ 825AB6C
 	.string "Thank you!\n"
 	.string "Your POKéMON swap is complete.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96: @ 825AB96
-SlateportCity_BattleTentCorridor_Text_25AB96: @ 825AB96
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay: @ 825AB96
 	.string "Right this way, please!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE: @ 825ABAE
-SlateportCity_BattleTentCorridor_Text_25ABAE: @ 825ABAE
+BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait: @ 825ABAE
 	.string "I am saving your data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2: @ 825ABD2
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle: @ 825ABD2
 	.string "Would you like to record your latest\n"
 	.string "battle on your FRONTIER PASS?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15: @ 825AC15
+BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments: @ 825AC15
 	.string "Excuse me! Excuse me, please!\n"
 	.string "May I get you to wait a few moments?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58
+BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo: @ 825AC58
 	.string "…Uh-huh? What?! …Whoa!\n"
 	.string "Understood, sir! Will do!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89
+BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow: @ 825AC89
 	.string "Oh, my…\n"
 	.string "Sorry to keep you waiting!\p"
 	.string "I have a message from this facility's\n"
@@ -691,10 +679,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89
 	.string "He says, “We're going to do it!\n"
 	.string "Come here right now!”$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20
+BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead: @ 825AD20
 	.string "The FACTORY HEAD is demanding you.\n"
 	.string "Are you prepared to face him?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61
+BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead: @ 825AD61
 	.string "I'm terribly sorry, but I can't tell you\n"
 	.string "anything about the FACTORY HEAD.$"
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index 493fd3f69..8e9b5f1b4 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -33,12 +33,12 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044
 	slateporttent_generaterentalmons
 	slateporttent_generateopponentmons
-	msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
 	fadescreen 1
 	slateporttent_rentmons
 	waitstate
 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -56,7 +56,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
 SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
 	factory_setopponentmons
 	factory_resethelditems
-	msgbox SlateportCity_BattleTentCorridor_Text_25A22D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
@@ -73,14 +73,14 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
 	case 2, SlateportCity_BattleTentCorridor_EventScript_208F89
 
 SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B
-	msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, SlateportCity_BattleTentCorridor_EventScript_208F0D
 	case YES, SlateportCity_BattleTentCorridor_EventScript_209022
 	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
 
 SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
-	message SlateportCity_BattleTentCorridor_Text_25A37A
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
@@ -90,7 +90,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
 
 SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
 	slateporttent_generateopponentmons
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4
 	case YES, SlateportCity_BattleTentCorridor_EventScript_208FF1
@@ -102,21 +102,21 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
 	waitstate
 	compare VAR_RESULT, 1
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentCorridor_EventScript_208EB4
 
 SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014
-	message SlateportCity_BattleTentCorridor_Text_25A263
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
 SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
-	message SlateportCity_BattleTentCorridor_Text_25A289
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
 SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
-	message SlateportCity_BattleTentCorridor_Text_25ABAE
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	slateporttent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index 1a9801dd1..793e96c10 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -228,12 +228,12 @@ SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90
 
 SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99
 	lockall
-	msgbox SlateportCity_BattleTentLobby_Text_259721, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_208AA8
 	end
 
 SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8
-	message SlateportCity_BattleTentLobby_Text_259743
+	message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, 0
 	switch VAR_RESULT