Merge master into doc-tower

author: GriffinR <griffin.richards@comcast.net> 2019-12-17 21:17:46 -0500
committer: GriffinR <griffin.richards@comcast.net> 2019-12-17 21:17:46 -0500
commit: 23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch)
tree: 9e276d9e08c46e9fe4f92af636d53f1dda33190a /data
parent: ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff)
parent: f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff)
77 files changed, 2831 insertions, 2290 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 79592caa6..2d56bae9f 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -24,6 +24,7 @@
 #include "constants/field_poison.h"
 #include "constants/field_specials.h"
 #include "constants/field_tasks.h"
+#include "constants/field_weather.h"
 #include "constants/flags.h"
 #include "constants/frontier_util.h"
 #include "constants/game_stat.h"
@@ -86,16 +87,16 @@ gSpecialVars:: @ 81DBA0C
 	.include "data/specials.inc"
 
 gStdScripts:: @ 81DC2A0
-	.4byte Std_ObtainItem
-	.4byte Std_FindItem
-	.4byte Std_MsgboxNPC
-	.4byte Std_MsgboxSign
-	.4byte Std_MsgboxDefault
-	.4byte Std_MsgboxYesNo
-	.4byte Std_MsgboxAutoclose
-	.4byte Std_ObtainDecoration
-	.4byte Std_RegisteredInMatchCall
-	.4byte Std_MsgboxGetPoints
+	.4byte Std_ObtainItem              @ STD_OBTAIN_ITEM
+	.4byte Std_FindItem                @ STD_FIND_ITEM
+	.4byte Std_MsgboxNPC               @ MSGBOX_NPC
+	.4byte Std_MsgboxSign              @ MSGBOX_SIGN
+	.4byte Std_MsgboxDefault           @ MSGBOX_DEFAULT
+	.4byte Std_MsgboxYesNo             @ MSGBOX_YESNO
+	.4byte Std_MsgboxAutoclose         @ MSGBOX_AUTOCLOSE
+	.4byte Std_ObtainDecoration        @ STD_OBTAIN_DECORATION
+	.4byte Std_RegisteredInMatchCall   @ STD_REGISTER_MATCH_CALL
+	.4byte Std_MsgboxGetPoints         @ MSGBOX_GETPOINTS
 	.4byte Std_10
 gStdScripts_End:: @ 81DC2CC
 
@@ -483,7 +484,7 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc"
 	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc"
 	.include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc"
-	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc"
 	.include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc"
 	.include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc"
 	.include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc"
@@ -720,9 +721,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
 	end
 
 Common_ShowEasyChatScreen:: @ 8271E7C
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ShowEasyChatScreen
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	return
 
 Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
@@ -773,17 +774,17 @@ Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
 	return
 
 Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	return
 
 EventScript_RegionMap:: @ 827208F
 	lockall
 	msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special FieldShowRegionMap
 	waitstate
 	releaseall
@@ -868,7 +869,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
 	.include "data/scripts/kecleon.inc"
 
 Common_EventScript_NameReceivedPartyMon:: @ 82723DD
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChangePokemonNickname
 	waitstate
 	return
@@ -1045,16 +1046,16 @@ Common_EventScript_DirectCornerAttendant:: @ 8273767
 	end
 
 Common_EventScript_RemoveStaticPokemon:: @ 827376D
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	release
 	end
 
 Common_EventScript_LegendaryFlewAway:: @ 8273776
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	bufferspeciesname 0, VAR_0x8004
 	msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
 	release
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin
index 7c224d524..7c224d524 100644
--- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index c41bf92bd..cb41ff9e9 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -3602,14 +3602,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
     },
     {
-      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
-      "name": "BattleFrontier_BattlePyramidEmptySquare_Layout",
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
+      "name": "BattleFrontier_BattlePyramidFloor_Layout",
       "width": 8,
       "height": 8,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattlePyramid",
-      "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin",
-      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
+      "border_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index a4aa93836..7f4439682 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -240,7 +240,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A
 	arena_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index b9e79fb10..b1830f167 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -133,7 +133,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index c0b5426b9..d77683564 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -1,15 +1,14 @@
 BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
 	dome_21
 	end
 
-BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
-BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
+BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805
 	.2byte 0
 
@@ -167,7 +166,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -368,7 +367,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
 	compare VAR_RESULT, 3
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	dome_showresultstree
 	waitstate
 	end
@@ -541,11 +540,12 @@ BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
 	.string "Here is your prize for your Battle\n"
 	.string "Tournament victory.$"
 
-VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554
+BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E
+@ Unused
+BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
 	.string "Oh, your BAG appears to be full.\p"
 	.string "Please make room in your BAG, then come\n"
 	.string "see me.$"
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index a083a6079..9dc268b4c 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -91,20 +91,20 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
 	dome_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	dome_showopponentinfo
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	dome_showtourneytree
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -138,7 +138,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
 	message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C
 	waitmessage
 	waitbuttonpress
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, 2  @ 2 of the 3 party mons are selected for battle
@@ -227,7 +227,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	waitfanfare
 	special HealPlayerParty
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	dome_showstatictourneytree
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index 526048d55..af3322f7e 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_RECORD_DISABLED, FALSE
 	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 67ab1bdda..7d272ed84 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_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
-	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 d7399298d..8e98dccae 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -1,436 +1,434 @@
 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
-	fadescreen 1
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType
+	call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	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_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
-	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
-	fadescreen 1
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
+	fadescreen FADE_TO_BLACK
 	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
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69
 	special SavePlayerParty
 	factory_setparties 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	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_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
-	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/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index 83d1f9936..10a6bd5a3 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -168,7 +168,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
 	palace_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 97f0b6915..e015a2d42 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -155,7 +155,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index f0c7b941b..4389d0d0f 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -118,7 +118,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
 	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index a0c7ece1d..825530806 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -125,7 +125,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
 	pike_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidFloor/map.json
index 3f4739b26..2b3baf425 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidFloor/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
-  "name": "BattleFrontier_BattlePyramidEmptySquare",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
+  "name": "BattleFrontier_BattlePyramidFloor",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
   "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
index e73b9d917..f590ff890 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
@@ -1,73 +1,72 @@
-BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
+BattleFrontier_BattlePyramidFloor_MapScripts:: @ 8252A33
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidFloor_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidFloor_OnFrame
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidFloor_OnTransition
 	.byte 0
 
-BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
-	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D
-	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98
-	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F
+BattleFrontier_BattlePyramidFloor_OnFrame: @ 8252A43
+	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight
+	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic
+	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName
 	.2byte 0
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
+BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D
 	lockall
+	@ pyramid_updatelight, cant use macro because it straddles the loop
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS
 	setvar VAR_0x8007, SE_SAVE
 	setvar VAR_RESULT, 0
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
+BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77
 	special CallBattlePyramidFunction
 	delay 2
 	compare VAR_RESULT, 2
-	goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
+	goto_if_ne BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop
 	setvar VAR_TEMP_D, 0
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F
+BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F
 	special ShowMapNamePopup
 	setvar VAR_TEMP_F, 0
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
+BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98
 	playbgm MUS_PYRAMID, 0
 	setvar VAR_TEMP_E, 1
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
+BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2
 	pyramid_setfloorpal
 	frontier_getstatus
 	switch VAR_TEMP_0
-	case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
-	case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
-	case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
+	case 0, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge
+	case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby
+	case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
+	goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
+	goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
+	goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
 	compare VAR_RESULT, B_OUTCOME_LOST
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	compare VAR_RESULT, B_OUTCOME_DREW
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	compare VAR_RESULT, B_OUTCOME_FORFEITED
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	frontier_isbattletype BATTLE_TYPE_TRAINER  @ VAR_RESULT seems to be ignored here
 	setvar VAR_TEMP_D, 1
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
-	pyramid_healparty
+BattleFrontier_BattlePyramidFloor_EventScript_ResetParty:: @ 8252B39
+	pyramid_resetparty
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
-BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
+BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost:: @ 8252B42
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
-BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
+BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66
 	pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
 	pyramid_clearhelditems
 	special HealPlayerParty
@@ -75,39 +74,39 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
+BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D
 	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	pyramid_inittrainers
+	pyramid_settrainers
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
-	call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5
+BattleFrontier_BattlePyramidFloor_OnTransition: @ 8252BCA
+	call BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
+BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius:: @ 8252BD5
 	pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS
 	return
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
+BattlePyramid_WarpToNextFloor:: @ 8252BE8
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Floor number
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	compare VAR_RESULT, 7
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
+	goto_if_eq BattlePyramid_WarpToTop
 	pyramid_seedfloor
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
-	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
+BattlePyramid_WarpToTop:: @ 8252C45
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
 	waitstate
 	end
@@ -126,14 +125,15 @@ BattlePyramid_FindItemBall:: @ 8252C6A
 	pyramid_setitem
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
-	goto_if_eq BattlePyramid_FindItemBall_End
+	goto_if_eq BattlePyramid_FindItemBallEnd
 	pyramid_hideitem
-BattlePyramid_FindItemBall_End:: @ 8252C87
+BattlePyramid_FindItemBallEnd:: @ 8252C87
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
-	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
+BattlePyramid_Retire:: @ 8252C88
+	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
+@ Also used by Trainer Hill
 BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
 	.string "This is a sample message.$"
 
@@ -146,595 +146,595 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB
 	.string "Are you sure you want to quit your\n"
 	.string "PYRAMID quest?$"
 
-BattlePyramid_ExitHintUp_Text1:: @ 8252D2D
+BattlePyramid_Text_ExitHintUp1:: @ 8252D2D
 	.string "This floor's exit is in\n"
 	.string "that direction: {UP_ARROW}$"
 
-BattlePyramid_ExitHintLeft_Text1:: @ 8252D57
+BattlePyramid_Text_ExitHintLeft1:: @ 8252D57
 	.string "This floor's exit is in\n"
 	.string "that direction: {LEFT_ARROW}$"
 
-BattlePyramid_ExitHintRight_Text1:: @ 8252D81
+BattlePyramid_Text_ExitHintRight1:: @ 8252D81
 	.string "This floor's exit is in\n"
 	.string "that direction: {RIGHT_ARROW}$"
 
-BattlePyramid_ExitHintDown_Text1:: @ 8252DAB
+BattlePyramid_Text_ExitHintDown1:: @ 8252DAB
 	.string "This floor's exit is in\n"
 	.string "that direction: {DOWN_ARROW}$"
 
-BattlePyramid_ExitHintUp_Text2:: @ 8252DD5
+BattlePyramid_Text_ExitHintUp2:: @ 8252DD5
 	.string "The exit on this floor is in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattlePyramid_ExitHintLeft_Text2:: @ 8252E03
+BattlePyramid_Text_ExitHintLeft2:: @ 8252E03
 	.string "The exit on this floor is in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattlePyramid_ExitHintRight_Text2:: @ 8252E31
+BattlePyramid_Text_ExitHintRight2:: @ 8252E31
 	.string "The exit on this floor is in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_ExitHintDown_Text2:: @ 8252E5F
+BattlePyramid_Text_ExitHintDown2:: @ 8252E5F
 	.string "The exit on this floor is in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattlePyramid_ExitHintUp_Text3:: @ 8252E8D
+BattlePyramid_Text_ExitHintUp3:: @ 8252E8D
 	.string "The exit is over\n"
 	.string "that {UP_ARROW} way.$"
 
-BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA
+BattlePyramid_Text_ExitHintLeft3:: @ 8252EAA
 	.string "The exit is over\n"
 	.string "that {LEFT_ARROW} way.$"
 
-BattlePyramid_ExitHintRight_Text3:: @ 8252EC7
+BattlePyramid_Text_ExitHintRight3:: @ 8252EC7
 	.string "The exit is over\n"
 	.string "that {RIGHT_ARROW} way.$"
 
-BattlePyramid_ExitHintDown_Text3:: @ 8252EE4
+BattlePyramid_Text_ExitHintDown3:: @ 8252EE4
 	.string "The exit is over\n"
 	.string "that {DOWN_ARROW} way.$"
 
-BattlePyramid_ExitHintUp_Text4:: @ 8252F01
+BattlePyramid_Text_ExitHintUp4:: @ 8252F01
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {UP_ARROW} direction.$"
 
-BattlePyramid_ExitHintLeft_Text4:: @ 8252F3A
+BattlePyramid_Text_ExitHintLeft4:: @ 8252F3A
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {LEFT_ARROW} direction.$"
 
-BattlePyramid_ExitHintRight_Text4:: @ 8252F73
+BattlePyramid_Text_ExitHintRight4:: @ 8252F73
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_ExitHintDown_Text4:: @ 8252FAC
+BattlePyramid_Text_ExitHintDown4:: @ 8252FAC
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {DOWN_ARROW} direction.$"
 
-BattlePyramid_ExitHintUp_Text5:: @ 8252FE5
+BattlePyramid_Text_ExitHintUp5:: @ 8252FE5
 	.string "The exit?\n"
 	.string "It's that {UP_ARROW} way.$"
 
-BattlePyramid_ExitHintLeft_Text5:: @ 8253000
+BattlePyramid_Text_ExitHintLeft5:: @ 8253000
 	.string "The exit?\n"
 	.string "It's that {LEFT_ARROW} way.$"
 
-BattlePyramid_ExitHintRight_Text5:: @ 825301B
+BattlePyramid_Text_ExitHintRight5:: @ 825301B
 	.string "The exit?\n"
 	.string "It's that {RIGHT_ARROW} way.$"
 
-BattlePyramid_ExitHintDown_Text5:: @ 8253036
+BattlePyramid_Text_ExitHintDown5:: @ 8253036
 	.string "The exit?\n"
 	.string "It's that {DOWN_ARROW} way.$"
 
-BattlePyramid_ExitHintUp_Text6:: @ 8253051
+BattlePyramid_Text_ExitHintUp6:: @ 8253051
 	.string "The exit happens to be in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattlePyramid_ExitHintLeft_Text6:: @ 825307C
+BattlePyramid_Text_ExitHintLeft6:: @ 825307C
 	.string "The exit happens to be in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattlePyramid_ExitHintRight_Text6:: @ 82530A7
+BattlePyramid_Text_ExitHintRight6:: @ 82530A7
 	.string "The exit happens to be in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_ExitHintDown_Text6:: @ 82530D2
+BattlePyramid_Text_ExitHintDown6:: @ 82530D2
 	.string "The exit happens to be in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattlePyramid_EightItemsRemaining_Text1:: @ 82530FD
+BattlePyramid_Text_EightItemsRemaining1:: @ 82530FD
 	.string "Are you looking for items?\p"
 	.string "There are eight items left to\n"
 	.string "be found.$"
 
-BattlePyramid_SevenItemsRemaining_Text1:: @ 8253140
+BattlePyramid_Text_SevenItemsRemaining1:: @ 8253140
 	.string "Are you looking for items?\p"
 	.string "There are seven items left to\n"
 	.string "be found.$"
 
-BattlePyramid_SixItemsRemaining_Text1:: @ 8253183
+BattlePyramid_Text_SixItemsRemaining1:: @ 8253183
 	.string "Are you looking for items?\p"
 	.string "There are six items left to\n"
 	.string "be found.$"
 
-BattlePyramid_FiveItemsRemaining_Text1:: @ 82531C4
+BattlePyramid_Text_FiveItemsRemaining1:: @ 82531C4
 	.string "Are you looking for items?\p"
 	.string "There are five items left to\n"
 	.string "be found.$"
 
-BattlePyramid_FourItemsRemaining_Text1:: @ 8253206
+BattlePyramid_Text_FourItemsRemaining1:: @ 8253206
 	.string "Are you looking for items?\p"
 	.string "There are four items left to\n"
 	.string "be found.$"
 
-BattlePyramid_ThreeItemsRemaining_Text1:: @ 8253248
+BattlePyramid_Text_ThreeItemsRemaining1:: @ 8253248
 	.string "Are you looking for items?\p"
 	.string "There are three items left to\n"
 	.string "be found.$"
 
-BattlePyramid_TwoItemsRemaining_Text1:: @ 825328B
+BattlePyramid_Text_TwoItemsRemaining1:: @ 825328B
 	.string "Are you looking for items?\p"
 	.string "There are two items left to\n"
 	.string "be found.$"
 
-BattlePyramid_OneItemRemaining_Text1:: @ 82532CC
+BattlePyramid_Text_OneItemRemaining1:: @ 82532CC
 	.string "Are you looking for items?\p"
 	.string "There is one item left to\n"
 	.string "be found.$"
 
-BattlePyramid_ZeroItemsRemaining_Text1:: @ 825330B
+BattlePyramid_Text_ZeroItemsRemaining1:: @ 825330B
 	.string "Are you looking for items?\p"
 	.string "There isn't anything left to\n"
 	.string "be found!$"
 
-BattlePyramid_EightItemsRemaining_Text2:: @ 825334D
+BattlePyramid_Text_EightItemsRemaining2:: @ 825334D
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are eight items\n"
 	.string "lying around here.$"
 
-BattlePyramid_SevenItemsRemaining_Text2:: @ 82533A6
+BattlePyramid_Text_SevenItemsRemaining2:: @ 82533A6
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are seven items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_SixItemsRemaining_Text2:: @ 8253404
+BattlePyramid_Text_SixItemsRemaining2:: @ 8253404
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are six items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_FiveItemsRemaining_Text2:: @ 8253460
+BattlePyramid_Text_FiveItemsRemaining2:: @ 8253460
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are five items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_FourItemsRemaining_Text2:: @ 82534BD
+BattlePyramid_Text_FourItemsRemaining2:: @ 82534BD
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are four items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_ThreeItemsRemaining_Text2:: @ 825351A
+BattlePyramid_Text_ThreeItemsRemaining2:: @ 825351A
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are three items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_TwoItemsRemaining_Text2:: @ 8253578
+BattlePyramid_Text_TwoItemsRemaining2:: @ 8253578
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are two items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_OneItemRemaining_Text2:: @ 82535D4
+BattlePyramid_Text_OneItemRemaining2:: @ 82535D4
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There is just one item\n"
 	.string "lying around here.$"
 
-BattlePyramid_ZeroItemsRemaining_Text2:: @ 825362E
+BattlePyramid_Text_ZeroItemsRemaining2:: @ 825362E
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There isn't anything left\n"
 	.string "lying around here.$"
 
-BattlePyramid_EightItemsRemaining_Text3:: @ 825368B
+BattlePyramid_Text_EightItemsRemaining3:: @ 825368B
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are eight items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_SevenItemsRemaining_Text3:: @ 82536F8
+BattlePyramid_Text_SevenItemsRemaining3:: @ 82536F8
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are seven items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_SixItemsRemaining_Text3:: @ 8253765
+BattlePyramid_Text_SixItemsRemaining3:: @ 8253765
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are six items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_FiveItemsRemaining_Text3:: @ 82537D0
+BattlePyramid_Text_FiveItemsRemaining3:: @ 82537D0
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are five items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_FourItemsRemaining_Text3:: @ 825383C
+BattlePyramid_Text_FourItemsRemaining3:: @ 825383C
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are four items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_ThreeItemsRemaining_Text3:: @ 82538A8
+BattlePyramid_Text_ThreeItemsRemaining3:: @ 82538A8
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are three items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_TwoItemsRemaining_Text3:: @ 8253915
+BattlePyramid_Text_TwoItemsRemaining3:: @ 8253915
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are two items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_OneItemRemaining_Text3:: @ 8253980
+BattlePyramid_Text_OneItemRemaining3:: @ 8253980
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there's but one item left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_ZeroItemsRemaining_Text3:: @ 82539EC
+BattlePyramid_Text_ZeroItemsRemaining3:: @ 82539EC
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are no more items\n"
 	.string "waiting to be found on this floor.\l"
 	.string "You take care now!$"
 
-BattlePyramid_EightItemsRemaining_Text4:: @ 8253A69
+BattlePyramid_Text_EightItemsRemaining4:: @ 8253A69
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be eight more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_SevenItemsRemaining_Text4:: @ 8253AC4
+BattlePyramid_Text_SevenItemsRemaining4:: @ 8253AC4
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be seven more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_SixItemsRemaining_Text4:: @ 8253B1F
+BattlePyramid_Text_SixItemsRemaining4:: @ 8253B1F
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be six more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_FiveItemsRemaining_Text4:: @ 8253B78
+BattlePyramid_Text_FiveItemsRemaining4:: @ 8253B78
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be five more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_FourItemsRemaining_Text4:: @ 8253BD2
+BattlePyramid_Text_FourItemsRemaining4:: @ 8253BD2
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be four more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_ThreeItemsRemaining_Text4:: @ 8253C2C
+BattlePyramid_Text_ThreeItemsRemaining4:: @ 8253C2C
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be three more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_TwoItemsRemaining_Text4:: @ 8253C87
+BattlePyramid_Text_TwoItemsRemaining4:: @ 8253C87
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be two more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_OneItemRemaining_Text4:: @ 8253CE0
+BattlePyramid_Text_OneItemRemaining4:: @ 8253CE0
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appears to be only one more\n"
 	.string "item on the ground.$"
 
-BattlePyramid_ZeroItemsRemaining_Text4:: @ 8253D3E
+BattlePyramid_Text_ZeroItemsRemaining4:: @ 8253D3E
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be no more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_EightItemsRemaining_Text5:: @ 8253D96
+BattlePyramid_Text_EightItemsRemaining5:: @ 8253D96
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are eight items…$"
 
-BattlePyramid_SevenItemsRemaining_Text5:: @ 8253DD2
+BattlePyramid_Text_SevenItemsRemaining5:: @ 8253DD2
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are seven items…$"
 
-BattlePyramid_SixItemsRemaining_Text5:: @ 8253E0E
+BattlePyramid_Text_SixItemsRemaining5:: @ 8253E0E
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are six items…$"
 
-BattlePyramid_FiveItemsRemaining_Text5:: @ 8253E48
+BattlePyramid_Text_FiveItemsRemaining5:: @ 8253E48
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are five items…$"
 
-BattlePyramid_FourItemsRemaining_Text5:: @ 8253E83
+BattlePyramid_Text_FourItemsRemaining5:: @ 8253E83
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are four items…$"
 
-BattlePyramid_ThreeItemsRemaining_Text5:: @ 8253EBE
+BattlePyramid_Text_ThreeItemsRemaining5:: @ 8253EBE
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are three items…$"
 
-BattlePyramid_TwoItemsRemaining_Text5:: @ 8253EFA
+BattlePyramid_Text_TwoItemsRemaining5:: @ 8253EFA
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are two items…$"
 
-BattlePyramid_OneItemRemaining_Text5:: @ 8253F34
+BattlePyramid_Text_OneItemRemaining5:: @ 8253F34
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there is one item…$"
 
-BattlePyramid_ZeroItemsRemaining_Text5:: @ 8253F6C
+BattlePyramid_Text_ZeroItemsRemaining5:: @ 8253F6C
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are no items…$"
 
-BattlePyramid_EightItemsRemaining_Text6:: @ 8253FA5
+BattlePyramid_Text_EightItemsRemaining6:: @ 8253FA5
 	.string "Have you collected any items?\p"
 	.string "I believe there are eight more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_SevenItemsRemaining_Text6:: @ 8253FF7
+BattlePyramid_Text_SevenItemsRemaining6:: @ 8253FF7
 	.string "Have you collected any items?\p"
 	.string "I believe there are seven more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_SixItemsRemaining_Text6:: @ 8254049
+BattlePyramid_Text_SixItemsRemaining6:: @ 8254049
 	.string "Have you collected any items?\p"
 	.string "I believe there are six more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_FiveItemsRemaining_Text6:: @ 8254099
+BattlePyramid_Text_FiveItemsRemaining6:: @ 8254099
 	.string "Have you collected any items?\p"
 	.string "I believe there are five more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_FourItemsRemaining_Text6:: @ 82540EA
+BattlePyramid_Text_FourItemsRemaining6:: @ 82540EA
 	.string "Have you collected any items?\p"
 	.string "I believe there are four more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_ThreeItemsRemaining_Text6:: @ 825413B
+BattlePyramid_Text_ThreeItemsRemaining6:: @ 825413B
 	.string "Have you collected any items?\p"
 	.string "I believe there are three more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_TwoItemsRemaining_Text6:: @ 825418D
+BattlePyramid_Text_TwoItemsRemaining6:: @ 825418D
 	.string "Have you collected any items?\p"
 	.string "I believe there are two more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_OneItemRemaining_Text6:: @ 82541DD
+BattlePyramid_Text_OneItemRemaining6:: @ 82541DD
 	.string "Have you collected any items?\p"
 	.string "I believe there is one more\n"
 	.string "item on this floor.$"
 
-BattlePyramid_ZeroItemsRemaining_Text6:: @ 825422B
+BattlePyramid_Text_ZeroItemsRemaining6:: @ 825422B
 	.string "Have you collected any items?\p"
 	.string "I believe there are no more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_SevenTrainersRemaining_Text1:: @ 825427A
+BattlePyramid_Text_SevenTrainersRemaining1:: @ 825427A
 	.string "You were really awesome!\p"
 	.string "But there are still seven tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_SixTrainersRemaining_Text1:: @ 82542CB
+BattlePyramid_Text_SixTrainersRemaining1:: @ 82542CB
 	.string "You were really awesome!\p"
 	.string "But there are still six tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_FiveTrainersRemaining_Text1:: @ 825431A
+BattlePyramid_Text_FiveTrainersRemaining1:: @ 825431A
 	.string "You were really awesome!\p"
 	.string "But there are still five tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_FourTrainersRemaining_Text1:: @ 825436A
+BattlePyramid_Text_FourTrainersRemaining1:: @ 825436A
 	.string "You were really awesome!\p"
 	.string "But there are still four tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_ThreeTrainersRemaining_Text1:: @ 82543BA
+BattlePyramid_Text_ThreeTrainersRemaining1:: @ 82543BA
 	.string "You were really awesome!\p"
 	.string "But there are still three tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_TwoTrainersRemaining_Text1:: @ 825440B
+BattlePyramid_Text_TwoTrainersRemaining1:: @ 825440B
 	.string "You were really awesome!\p"
 	.string "But there are still two tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_OneTrainersRemaining_Text1:: @ 825445A
+BattlePyramid_Text_OneTrainersRemaining1:: @ 825445A
 	.string "You were really awesome!\p"
 	.string "But there's still one tough\n"
 	.string "TRAINER other than me!$"
 
-BattlePyramid_ZeroTrainersRemaining_Text1:: @ 82544A6
+BattlePyramid_Text_ZeroTrainersRemaining1:: @ 82544A6
 	.string "You were really awesome!\p"
 	.string "There's no one left that\n"
 	.string "can beat you!$"
 
-BattlePyramid_SevenTrainersRemaining_Text2:: @ 82544E6
+BattlePyramid_Text_SevenTrainersRemaining2:: @ 82544E6
 	.string "This is so upsetting!\p"
 	.string "But there are seven TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_SixTrainersRemaining_Text2:: @ 8254538
+BattlePyramid_Text_SixTrainersRemaining2:: @ 8254538
 	.string "This is so upsetting!\p"
 	.string "But there are six TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_FiveTrainersRemaining_Text2:: @ 8254588
+BattlePyramid_Text_FiveTrainersRemaining2:: @ 8254588
 	.string "This is so upsetting!\p"
 	.string "But there are five TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_FourTrainersRemaining_Text2:: @ 82545D9
+BattlePyramid_Text_FourTrainersRemaining2:: @ 82545D9
 	.string "This is so upsetting!\p"
 	.string "But there are four TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_ThreeTrainersRemaining_Text2:: @ 825462A
+BattlePyramid_Text_ThreeTrainersRemaining2:: @ 825462A
 	.string "This is so upsetting!\p"
 	.string "But there are three TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_TwoTrainersRemaining_Text2:: @ 825467C
+BattlePyramid_Text_TwoTrainersRemaining2:: @ 825467C
 	.string "This is so upsetting!\p"
 	.string "But there are two TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_OneTrainersRemaining_Text2:: @ 82546CC
+BattlePyramid_Text_OneTrainersRemaining2:: @ 82546CC
 	.string "This is so upsetting!\p"
 	.string "But there's one TRAINER left!\n"
 	.string "I'm sure you will be humbled!$"
 
-BattlePyramid_ZeroTrainersRemaining_Text2:: @ 825471E
+BattlePyramid_Text_ZeroTrainersRemaining2:: @ 825471E
 	.string "This is so upsetting!\p"
 	.string "But there are no more TRAINERS\n"
 	.string "who can engage you!$"
 
-BattlePyramid_SevenTrainersRemaining_Text3:: @ 8254767
+BattlePyramid_Text_SevenTrainersRemaining3:: @ 8254767
 	.string "That's pretty impressive!\p"
 	.string "But there are seven more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_SixTrainersRemaining_Text3:: @ 82547C9
+BattlePyramid_Text_SixTrainersRemaining3:: @ 82547C9
 	.string "That's pretty impressive!\p"
 	.string "But there are six more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_FiveTrainersRemaining_Text3:: @ 8254829
+BattlePyramid_Text_FiveTrainersRemaining3:: @ 8254829
 	.string "That's pretty impressive!\p"
 	.string "But there are five more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_FourTrainersRemaining_Text3:: @ 825488A
+BattlePyramid_Text_FourTrainersRemaining3:: @ 825488A
 	.string "That's pretty impressive!\p"
 	.string "But there are four more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_ThreeTrainersRemaining_Text3:: @ 82548EB
+BattlePyramid_Text_ThreeTrainersRemaining3:: @ 82548EB
 	.string "That's pretty impressive!\p"
 	.string "But there are three more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_TwoTrainersRemaining_Text3:: @ 825494D
+BattlePyramid_Text_TwoTrainersRemaining3:: @ 825494D
 	.string "That's pretty impressive!\p"
 	.string "But there are two more TRAINERS\n"
 	.string "on this floor. Can you beat them both?$"
 
-BattlePyramid_OneTrainersRemaining_Text3:: @ 82549AE
+BattlePyramid_Text_OneTrainersRemaining3:: @ 82549AE
 	.string "That's pretty impressive!\p"
 	.string "But there's still one more TRAINER\n"
 	.string "on this floor. Can you prevail?$"
 
-BattlePyramid_ZeroTrainersRemaining_Text3:: @ 8254A0B
+BattlePyramid_Text_ZeroTrainersRemaining3:: @ 8254A0B
 	.string "That's pretty impressive!\p"
 	.string "You've gone through all the TRAINERS\n"
 	.string "on this floor.$"
 
-BattlePyramid_SevenTrainersRemaining_Text4:: @ 8254A59
+BattlePyramid_Text_SevenTrainersRemaining4:: @ 8254A59
 	.string "Maybe you could sweep through\n"
 	.string "the seven TRAINERS left on this floor.$"
 
-BattlePyramid_SixTrainersRemaining_Text4:: @ 8254A9E
+BattlePyramid_Text_SixTrainersRemaining4:: @ 8254A9E
 	.string "Maybe you could sweep through\n"
 	.string "the six TRAINERS left on this floor.$"
 
-BattlePyramid_FiveTrainersRemaining_Text4:: @ 8254AE1
+BattlePyramid_Text_FiveTrainersRemaining4:: @ 8254AE1
 	.string "Maybe you could sweep through\n"
 	.string "the five TRAINERS left on this floor.$"
 
-BattlePyramid_FourTrainersRemaining_Text4:: @ 8254B25
+BattlePyramid_Text_FourTrainersRemaining4:: @ 8254B25
 	.string "Maybe you could sweep through\n"
 	.string "the four TRAINERS left on this floor.$"
 
-BattlePyramid_ThreeTrainersRemaining_Text4:: @ 8254B69
+BattlePyramid_Text_ThreeTrainersRemaining4:: @ 8254B69
 	.string "Maybe you could sweep through\n"
 	.string "the three TRAINERS left on this floor.$"
 
-BattlePyramid_TwoTrainersRemaining_Text4:: @ 8254BAE
+BattlePyramid_Text_TwoTrainersRemaining4:: @ 8254BAE
 	.string "Maybe you could sweep through\n"
 	.string "the two TRAINERS left on this floor.$"
 
-BattlePyramid_OneTrainersRemaining_Text4:: @ 8254BF1
+BattlePyramid_Text_OneTrainersRemaining4:: @ 8254BF1
 	.string "Maybe you could complete your sweep\n"
 	.string "with the one TRAINER left on this floor.$"
 
-BattlePyramid_ZeroTrainersRemaining_Text4:: @ 8254C3E
+BattlePyramid_Text_ZeroTrainersRemaining4:: @ 8254C3E
 	.string "There isn't a single person left who\n"
 	.string "can defeat you now…$"
 
-BattlePyramid_SevenTrainersRemaining_Text5:: @ 8254C77
+BattlePyramid_Text_SevenTrainersRemaining5:: @ 8254C77
 	.string "You may have what it takes to beat\n"
 	.string "the seven expert TRAINERS who remain.$"
 
-BattlePyramid_SixTrainersRemaining_Text5:: @ 8254CC0
+BattlePyramid_Text_SixTrainersRemaining5:: @ 8254CC0
 	.string "You may have what it takes to beat\n"
 	.string "the six expert TRAINERS who remain.$"
 
-BattlePyramid_FiveTrainersRemaining_Text5:: @ 8254D07
+BattlePyramid_Text_FiveTrainersRemaining5:: @ 8254D07
 	.string "You may have what it takes to beat\n"
 	.string "the five expert TRAINERS who remain.$"
 
-BattlePyramid_FourTrainersRemaining_Text5:: @ 8254D4F
+BattlePyramid_Text_FourTrainersRemaining5:: @ 8254D4F
 	.string "You may have what it takes to beat\n"
 	.string "the four expert TRAINERS who remain.$"
 
-BattlePyramid_ThreeTrainersRemaining_Text5:: @ 8254D97
+BattlePyramid_Text_ThreeTrainersRemaining5:: @ 8254D97
 	.string "You may have what it takes to beat\n"
 	.string "the three expert TRAINERS who remain.$"
 
-BattlePyramid_TwoTrainersRemaining_Text5:: @ 8254DE0
+BattlePyramid_Text_TwoTrainersRemaining5:: @ 8254DE0
 	.string "You may have what it takes to beat\n"
 	.string "the two expert TRAINERS who remain.$"
 
-BattlePyramid_OneTrainersRemaining_Text5:: @ 8254E27
+BattlePyramid_Text_OneTrainersRemaining5:: @ 8254E27
 	.string "You may have what it takes to beat\n"
 	.string "the one expert TRAINER who remains.$"
 
-BattlePyramid_ZeroTrainersRemaining_Text5:: @ 8254E6E
+BattlePyramid_Text_ZeroTrainersRemaining5:: @ 8254E6E
 	.string "Your skills are beyond reproach.\p"
 	.string "There are no more TRAINERS here\n"
 	.string "who have any chance of beating you.$"
 
-BattlePyramid_SevenTrainersRemaining_Text6:: @ 8254ED3
+BattlePyramid_Text_SevenTrainersRemaining6:: @ 8254ED3
 	.string "Can you keep winning against\n"
 	.string "the seven remaining TRAINERS?$"
 
-BattlePyramid_SixTrainersRemaining_Text6:: @ 8254F0E
+BattlePyramid_Text_SixTrainersRemaining6:: @ 8254F0E
 	.string "Can you keep winning against\n"
 	.string "the six remaining TRAINERS?$"
 
-BattlePyramid_FiveTrainersRemaining_Text6:: @ 8254F47
+BattlePyramid_Text_FiveTrainersRemaining6:: @ 8254F47
 	.string "Can you keep winning against\n"
 	.string "the five remaining TRAINERS?$"
 
-BattlePyramid_FourTrainersRemaining_Text6:: @ 8254F81
+BattlePyramid_Text_FourTrainersRemaining6:: @ 8254F81
 	.string "Can you keep winning against\n"
 	.string "the four remaining TRAINERS?$"
 
-BattlePyramid_ThreeTrainersRemaining_Text6:: @ 8254FBB
+BattlePyramid_Text_ThreeTrainersRemaining6:: @ 8254FBB
 	.string "Can you keep winning against\n"
 	.string "the three remaining TRAINERS?$"
 
-BattlePyramid_TwoTrainersRemaining_Text6:: @ 8254FF6
+BattlePyramid_Text_TwoTrainersRemaining6:: @ 8254FF6
 	.string "Can you keep winning against\n"
 	.string "the two remaining TRAINERS?$"
 
-BattlePyramid_OneTrainersRemaining_Text6:: @ 825502F
+BattlePyramid_Text_OneTrainersRemaining6:: @ 825502F
 	.string "Can you keep winning against\n"
 	.string "the last remaining TRAINER?$"
 
-BattlePyramid_ZeroTrainersRemaining_Text6:: @ 8255068
+BattlePyramid_Text_ZeroTrainersRemaining6:: @ 8255068
 	.string "There aren't any TRAINERS left that\n"
 	.string "can take you on now…$"
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
index 4f99b9488..0b0d1d1a1 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_HintGiver",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C",
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_FatMan",
       "flag": "0"
     }
   ],
@@ -84,7 +84,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42"
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_ShowResults"
     },
     {
       "type": "sign",
@@ -92,7 +92,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95"
+      "script": "BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index e7db4a459..6d6ce708a 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -1,32 +1,33 @@
 BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B
+@ Unused. Pyramid uses Dome's OnWarp (presumably by mistake). Their effects are identical
+BattleFrontier_BattlePyramidLobby_OnWarp: @ 8250721
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
+BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_250768
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_2508AC
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePyramidLobby_EventScript_2507B1
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_250852
+BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
+BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus:: @ 825075F
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
+BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
 	lockall
-	message BattleFrontier_BattlePyramidLobby_Text_2516D6
+	message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag
 	waitmessage
 	playse SE_EXPMAX
 	waitse
@@ -38,114 +39,113 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
+BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: @ 82507B1
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing
+	msgbox BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
+BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing:: @ 82507D2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
-	call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB
+	call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag
 	clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
 	frontier_checkairshow
 	special LoadPlayerParty
 	pyramid_clearhelditems
 	special HealPlayerParty
-	message BattleFrontier_BattlePyramidLobby_Text_2519F8
+	message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept
 	waitmessage
 	playse SE_EXPMAX
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
-	message BattleFrontier_BattlePyramidLobby_Text_251A77
+	message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait
 	waitmessage
 	pyramid_setprize
 	pyramid_save 0
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
+BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
 	frontier_checkairshow
 	special LoadPlayerParty
 	pyramid_clearhelditems
 	special HealPlayerParty
 	lockall
-	message BattleFrontier_BattlePyramidLobby_Text_251B5A
+	message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag
 	waitmessage
 	playse SE_EXPMAX
 	waitse
-	message BattleFrontier_BattlePyramidLobby_Text_251A77
+	message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait
 	waitmessage
 	pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, FALSE
 	pyramid_save 0
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250A21
+BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge:: @ 82508AC
+	goto BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
+BattleFrontier_BattlePyramidLobby_EventScript_Attendant:: @ 82508B1
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PYRAMID
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
-	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT
-
-BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8
-	message BattleFrontier_BattlePyramidLobby_Text_250FA7
+	msgbox BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
+	message BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
-	message BattleFrontier_BattlePyramidLobby_Text_251248
+BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
+	message BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
-	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT
-	fadescreen 1
+	msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
+	msgbox BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
-	case YES, BattleFrontier_BattlePyramidLobby_EventScript_2509A5
-	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
+	case NO, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
+	case YES, BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
+BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge:: @ 82509A5
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	pyramid_init
@@ -153,215 +153,215 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	pyramid_seedfloor
-	pyramid_inittrainers
+	pyramid_settrainers
 	special LoadPlayerParty
 	closemessage
 	delay 2
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
-
-BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed
+BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: @ 8250A21
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid, MSGBOX_DEFAULT
 	closemessage
-	call BattleFrontier_BattlePyramidLobby_EventScript_250D56
+	call BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_RESULT, 0
 	special HealPlayerParty
-	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
+	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8
+BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge:: @ 8250A68
+	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons:: @ 8250A75
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_250A90
-	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_250A9D
+	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50:: @ 8250A90
+	msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8250A9D
+	msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
+BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed:: @ 8250AAA
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
+BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8250AC1
 	special LoadPlayerParty
-BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4
-	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
+BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge:: @ 8250AC4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge:: @ 8250ACC
 	release
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
+BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePyramidLobby_EventScript_250AF0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252461, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePyramidLobby_EventScript_GiveHint
+	msgbox BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27
-	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250B27
+	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_NoHint
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_NoHint
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
+@ Shouldnt occur
+BattleFrontier_BattlePyramidLobby_EventScript_NoHint:: @ 8250B27
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: @ 8250B28
+	msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53
+	goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak
 	setvar VAR_RESULT, 0
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak:: @ 8250B53
 	pyramid_get PYRAMID_DATA_WIN_STREAK_50
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: @ 8250B66
+	msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91
+	goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak
 	setvar VAR_RESULT, 0
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak:: @ 8250B91
 	pyramid_get PYRAMID_DATA_WIN_STREAK_OPEN
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
+	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4
+BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment:: @ 8250BA4
 	copyvar VAR_0x8004, VAR_RESULT
 	special GetBattlePyramidHint
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250CA0
-	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250CA9
-	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250CB2
-	case 5, BattleFrontier_BattlePyramidLobby_EventScript_250CBB
-	case 6, BattleFrontier_BattlePyramidLobby_EventScript_250CC4
-	case 7, BattleFrontier_BattlePyramidLobby_EventScript_250CCD
-	case 8, BattleFrontier_BattlePyramidLobby_EventScript_250CD6
-	case 9, BattleFrontier_BattlePyramidLobby_EventScript_250CDF
-	case 10, BattleFrontier_BattlePyramidLobby_EventScript_250CE8
-	case 11, BattleFrontier_BattlePyramidLobby_EventScript_250CF1
-	case 12, BattleFrontier_BattlePyramidLobby_EventScript_250CFA
-	case 13, BattleFrontier_BattlePyramidLobby_EventScript_250D03
-	case 14, BattleFrontier_BattlePyramidLobby_EventScript_250D0C
-	case 15, BattleFrontier_BattlePyramidLobby_EventScript_250D15
-	case 16, BattleFrontier_BattlePyramidLobby_EventScript_250D1E
-	case 17, BattleFrontier_BattlePyramidLobby_EventScript_250D27
-	case 18, BattleFrontier_BattlePyramidLobby_EventScript_250D30
-	case 19, BattleFrontier_BattlePyramidLobby_EventScript_250D39
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_HintPoison
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_HintBurn
+	case 3, BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste
+	case 4, BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate
+	case 5, BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility
+	case 6, BattleFrontier_BattlePyramidLobby_EventScript_HintIce
+	case 7, BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion
+	case 8, BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic
+	case 9, BattleFrontier_BattlePyramidLobby_EventScript_HintRock
+	case 10, BattleFrontier_BattlePyramidLobby_EventScript_HintFighting
+	case 11, BattleFrontier_BattlePyramidLobby_EventScript_HintWeather
+	case 12, BattleFrontier_BattlePyramidLobby_EventScript_HintBug
+	case 13, BattleFrontier_BattlePyramidLobby_EventScript_HintDark
+	case 14, BattleFrontier_BattlePyramidLobby_EventScript_HintWater
+	case 15, BattleFrontier_BattlePyramidLobby_EventScript_HintGhost
+	case 16, BattleFrontier_BattlePyramidLobby_EventScript_HintSteel
+	case 17, BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon
+	case 18, BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve
+	case 19, BattleFrontier_BattlePyramidLobby_EventScript_HintNormal
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis:: @ 8250C8E
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintParalysis, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintPoison:: @ 8250C97
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPoison, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintBurn:: @ 8250CA0
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintBurn, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste:: @ 8250CA9
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPPWaste, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate:: @ 8250CB2
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintLevitate, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility:: @ 8250CBB
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintIce:: @ 8250CC4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintIce, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion:: @ 8250CCD
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintExplosion, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic:: @ 8250CD6
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPsychic, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintRock:: @ 8250CDF
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintRock, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252068, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintFighting:: @ 8250CE8
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintFighting, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintWeather:: @ 8250CF1
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintWeather, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252158, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintBug:: @ 8250CFA
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintBug, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintDark:: @ 8250D03
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintDark, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252206, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintWater:: @ 8250D0C
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintWater, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintGhost:: @ 8250D15
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintGhost, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintSteel:: @ 8250D1E
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintSteel, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon:: @ 8250D27
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252364, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve:: @ 8250D30
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252403, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HintNormal:: @ 8250D39
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HintNormal, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
+BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
 	lockall
 	frontier_results FRONTIER_FACILITY_PYRAMID
 	waitbuttonpress
@@ -369,33 +369,33 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
-	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
+BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56
+	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C
-
-BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
-	message BattleFrontier_BattlePyramidLobby_Text_25161E
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag
+	msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag
+
+BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94
+	msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
+	message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag
 	waitmessage
 	playse SE_EXPMAX
 	waitse
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251647, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5
+	applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4
+BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: @ 8250DC4
 	walk_up
 	walk_up
 	walk_up
@@ -406,7 +406,7 @@ BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4
 	face_down
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD
+BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel: @ 8250DCD
 	walk_up
 	walk_up
 	walk_up
@@ -416,135 +416,136 @@ BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD
 	walk_up
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5
+BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside: @ 8250DD5
 	walk_right
 	face_left
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
+BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel: @ 8250DD8
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag:: @ 8250DDB
+	msgbox BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake, MSGBOX_DEFAULT
 	setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
 	special TryStoreHeldItemsInPyramidBag
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00
-	message BattleFrontier_BattlePyramidLobby_Text_2518C6
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag
+	message BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep
 	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00
-	msgbox BattleFrontier_BattlePyramidLobby_Text_251881, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag:: @ 8250E00
+	msgbox BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09
+@ When exiting Battle Pyramid with a full pyramid bag and held items the player must select to keep/toss party held items and make room for any kept items by tossing from the pyramid bag
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09
 	multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60
-	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250E60
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40
-	special sub_81C4F24
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag:: @ 8250E40
+	special ChooseItemsToTossFromPyramidBag
 	waitstate
-	message BattleFrontier_BattlePyramidLobby_Text_25197E
+	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
 	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty:: @ 8250E50
 	special BattlePyramidChooseMonHeldItems
 	waitstate
-	message BattleFrontier_BattlePyramidLobby_Text_25197E
+	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
 	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60
+BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems:: @ 8250E60
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F
+	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, MSGBOX_DEFAULT
-	message BattleFrontier_BattlePyramidLobby_Text_25197E
+BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems:: @ 8250E6F
+	msgbox BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem, MSGBOX_DEFAULT
+	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
 	waitmessage
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
+	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, MSGBOX_NPC
+BattleFrontier_BattlePyramidLobby_EventScript_Woman:: @ 8250E83
+	msgbox BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252595, MSGBOX_NPC
+BattleFrontier_BattlePyramidLobby_EventScript_FatMan:: @ 8250E8C
+	msgbox BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95
+BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard:: @ 8250E95
 	lockall
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+	msgbox BattleFrontier_BattlePyramidLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4
-	message BattleFrontier_BattlePyramidLobby_Text_2526D9
+BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4
+	message BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7
-	case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05
-	case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13
-	case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21
-	case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
-	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250F2F
+	case 0, BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon
+	case 1, BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers
+	case 2, BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze
+	case 3, BattleFrontier_BattlePyramidLobby_EventScript_RulesBag
+	case 4, BattleFrontier_BattlePyramidLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon:: @ 8250EF7
+	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05
-	msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers:: @ 8250F05
+	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13
-	msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze:: @ 8250F13
+	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21
-	msgbox BattleFrontier_BattlePyramidLobby_Text_252924, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4
+BattleFrontier_BattlePyramidLobby_EventScript_RulesBag:: @ 8250F21
+	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_250F2F:: @ 8250F2F
+BattleFrontier_BattlePyramidLobby_EventScript_ExitRules:: @ 8250F2F
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_Text_250F31: @ 8250F31
+BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid: @ 8250F31
 	.string "Where the courage of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE PYRAMID!\p"
 	.string "I am your guide to\n"
 	.string "the Battle Quest.$"
 
-BattleFrontier_BattlePyramidLobby_Text_250FA7: @ 8250FA7
+BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge: @ 8250FA7
 	.string "Have you the courage to embark on\n"
 	.string "the Battle Quest challenge?$"
 
-BattleFrontier_BattlePyramidLobby_Text_250FE5: @ 8250FE5
+BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge: @ 8250FE5
 	.string "We await your challenge in the future!$"
 
-BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C
+BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid: @ 825100C
 	.string "The Battle Quest is a battling\n"
 	.string "event in which you must explore\l"
 	.string "the PYRAMID and try to reach the top.\p"
@@ -563,16 +564,16 @@ BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248
+BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode: @ 8251248
 	.string "The PYRAMID offers two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you enter?$"
 
-BattleFrontier_BattlePyramidLobby_Text_251297: @ 8251297
+BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons: @ 8251297
 	.string "Very good. Now, please select the three\n"
 	.string "POKéMON you wish to accompany you.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen: @ 82512E2
 	.string "A slight problem, adventurer!\p"
 	.string "You seem to not have the three\n"
 	.string "POKéMON qualified for the challenge.\p"
@@ -582,7 +583,7 @@ BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2
 	.string "When you are ready, please have\n"
 	.string "a word with me.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50: @ 82513C1
 	.string "A slight problem, adventurer!\p"
 	.string "You seem to not have the three\n"
 	.string "POKéMON qualified for the challenge.\p"
@@ -594,38 +595,38 @@ BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1
 	.string "When you are ready, please have\n"
 	.string "a word with me.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2514E6: @ 82514E6
+BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge: @ 82514E6
 	.string "Before you enter the BATTLE PYRAMID,\n"
 	.string "the game must be saved. Is that okay?$"
 
-BattleFrontier_BattlePyramidLobby_Text_251531: @ 8251531
+BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid: @ 8251531
 	.string "Very good. I will now show you into\n"
 	.string "the BATTLE PYRAMID.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251569: @ 8251569
+BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping: @ 8251569
 	.string "We will hold your BAG for safekeeping,\n"
 	.string "{PLAYER}, while you are exploring.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2515AD: @ 82515AD
+BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag: @ 82515AD
 	.string "In exchange, please take this BATTLE\n"
 	.string "BAG, the one you used previously.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2515F4: @ 82515F4
+BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag: @ 82515F4
 	.string "In exchange, please take this\n"
 	.string "BATTLE BAG.$"
 
-BattleFrontier_BattlePyramidLobby_Text_25161E: @ 825161E
+BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag: @ 825161E
 	.string "{PLAYER} exchanged the BAG for\n"
 	.string "the BATTLE BAG.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251647: @ 8251647
+BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel: @ 8251647
 	.string "When you step on this floor panel,\n"
 	.string "you will be transported to a higher\l"
 	.string "floor in the PYRAMID.\p"
 	.string "I hope for your sake that your\n"
 	.string "quest goes safely!$"
 
-BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6
+BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag: @ 82516D6
 	.string "A major problem, explorer!\p"
 	.string "You did not save before ending\n"
 	.string "your challenge the last time.\p"
@@ -635,107 +636,112 @@ BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6
 	.string "for you.\p"
 	.string "{PLAYER} got the BAG back.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5
+BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid: @ 82517B5
 	.string "Excellent to see you back!\p"
 	.string "You've conquered the PYRAMID!\n"
 	.string "How splendid!$"
 
-BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC
+BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake: @ 82517FC
 	.string "Ah, a slight problem.\p"
 	.string "At least one POKéMON is holding\n"
 	.string "an item.\p"
 	.string "I'm sorry to say, items obtained in\n"
 	.string "the PYRAMID cannot be taken away.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881
+BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag: @ 8251881
 	.string "All items held by your POKéMON will be\n"
 	.string "moved to your BATTLE BAG, {PLAYER}.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6
+BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep: @ 82518C6
 	.string "The BATTLE BAG cannot hold all your\n"
 	.string "items, I'm sorry to say.\p"
 	.string "Please pick the items you'll keep in the\n"
 	.string "BATTLE BAG, and with your POKéMON.$"
 
-BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F
+BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem: @ 825194F
 	.string "At least one POKéMON is still\n"
 	.string "holding an item.$"
 
-BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E
+BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep: @ 825197E
 	.string "Please pick the items you'll keep in the\n"
 	.string "BATTLE BAG, and with your POKéMON.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA
+@ Unused
+BattleFrontier_BattlePyramidLobby_Text_ReturnedEverythingMonsHeld: @ 82519CA
 	.string "{PLAYER} returned everything that\n"
 	.string "the POKéMON held.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8
+BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept: @ 82519F8
 	.string "The BATTLE BAG you used will be kept\n"
 	.string "in readiness for your next challenge.\p"
 	.string "{PLAYER} turned the BATTLE BAG over\n"
 	.string "for the BAG's return.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77
+BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait: @ 8251A77
 	.string "I must record your results.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251AA0: @ 8251AA0
+@ Unused
+BattleFrontier_BattlePyramidLobby_Text_ForConqueringPyramidTakeThis: @ 8251AA0
 	.string "As a memento for conquering\n"
 	.string "the BATTLE PYRAMID, please take this.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2
+@ Unused
+BattleFrontier_BattlePyramidLobby_Text_ReceivedPrizeItem: @ 8251AE2
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC
+@ Unused
+BattleFrontier_BattlePyramidLobby_Text_BagIsFull: @ 8251AFC
 	.string "…Ah…\n"
 	.string "Your BAG appears to be filled.\p"
 	.string "Please return after you've organized\n"
 	.string "your BAG's contents.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A
+BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag: @ 8251B5A
 	.string "How disappointing for you…\p"
 	.string "Here is the BAG we've been holding\n"
 	.string "for you.\p"
 	.string "{PLAYER} got the BAG back.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251BB6: @ 8251BB6
+BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge: @ 8251BB6
 	.string "We look forward to your\n"
 	.string "next challenge!$"
 
-BattleFrontier_BattlePyramidLobby_Text_251BDE: @ 8251BDE
+@ Unused
+BattleFrontier_BattlePyramidLobby_Text_HereIsPrize: @ 8251BDE
 	.string "We have been looking forward to\n"
 	.string "your arrival!\p"
 	.string "Here is your prize for conquering\n"
 	.string "the PYRAMID.$"
 
-BattleFrontier_BattlePyramidLobby_Text_251C3B: @ 8251C3B
+BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait: @ 8251C3B
 	.string "Welcome…\p"
 	.string "I shall be pleased to tell you what\n"
 	.string "misfortunes await in the PYRAMID…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251C8A: @ 8251C8A
+BattleFrontier_BattlePyramidLobby_Text_Aah: @ 8251C8A
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "… … … … … …\n"
 	.string "Aah!$"
 
-BattleFrontier_BattlePyramidLobby_Text_251CB3: @ 8251CB3
+BattleFrontier_BattlePyramidLobby_Text_HintParalysis: @ 8251CB3
 	.string "I see a shower of sparks…\p"
 	.string "…And in it, I see your POKéMON\n"
 	.string "struggling with paralysis…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251D07: @ 8251D07
+BattleFrontier_BattlePyramidLobby_Text_HintPoison: @ 8251D07
 	.string "I see poison…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from the effects of poison…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251D54: @ 8251D54
+BattleFrontier_BattlePyramidLobby_Text_HintBurn: @ 8251D54
 	.string "I see bright red flames…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from burns…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C
+BattleFrontier_BattlePyramidLobby_Text_HintPPWaste: @ 8251D9C
 	.string "I sense the tremendous pressure of\n"
 	.string "unrequited anger…\p"
 	.string "It is a curse…\p"
@@ -743,44 +749,44 @@ BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C
 	.string "Power Points and having no recourse\l"
 	.string "but to use STRUGGLE…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251E3D: @ 8251E3D
+BattleFrontier_BattlePyramidLobby_Text_HintLevitate: @ 8251E3D
 	.string "I see POKéMON loftily airborne…\p"
 	.string "…And, I see your POKéMON frustrated\n"
 	.string "by powerless GROUND-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1
+BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility: @ 8251EA1
 	.string "I sense terrific energy rising from\n"
 	.string "the ground below…\p"
 	.string "…And, I see your POKéMON unable to\n"
 	.string "escape the power's clutches…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17
+BattleFrontier_BattlePyramidLobby_Text_HintIce: @ 8251F17
 	.string "I see ICE-type POKéMON…\p"
 	.string "…And, I see your POKéMON fighting\n"
 	.string "the freezing effects of ice…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251F6E: @ 8251F6E
+BattleFrontier_BattlePyramidLobby_Text_HintExplosion: @ 8251F6E
 	.string "I see a flurry of moves that imperil\n"
 	.string "the user…\p"
 	.string "…And, I see your POKéMON falling\n"
 	.string "to them…$"
 
-BattleFrontier_BattlePyramidLobby_Text_251FC7: @ 8251FC7
+BattleFrontier_BattlePyramidLobby_Text_HintPsychic: @ 8251FC7
 	.string "I see PSYCHIC-type POKéMON…\p"
 	.string "…And, I see your POKéMON in torment\n"
 	.string "from PSYCHIC moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_25201B: @ 825201B
+BattleFrontier_BattlePyramidLobby_Text_HintRock: @ 825201B
 	.string "I see ROCK-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from ROCK moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_252068: @ 8252068
+BattleFrontier_BattlePyramidLobby_Text_HintFighting: @ 8252068
 	.string "I see FIGHTING-type POKéMON…\p"
 	.string "…And, I see your POKéMON pummeled\n"
 	.string "by FIGHTING moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA
+BattleFrontier_BattlePyramidLobby_Text_HintWeather: @ 82520BA
 	.string "RAIN DANCE… SUNNY DAY…\n"
 	.string "SANDSTORM… HAIL…\p"
 	.string "I see POKéMON that become stronger\n"
@@ -788,37 +794,37 @@ BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA
 	.string "…And, I see your POKéMON confounded\n"
 	.string "by different types of moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_252158: @ 8252158
+BattleFrontier_BattlePyramidLobby_Text_HintBug: @ 8252158
 	.string "I see BUG-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from different kinds of attacks…$"
 
-BattleFrontier_BattlePyramidLobby_Text_2521B4: @ 82521B4
+BattleFrontier_BattlePyramidLobby_Text_HintDark: @ 82521B4
 	.string "I see DARK-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from DARK-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_252206: @ 8252206
+BattleFrontier_BattlePyramidLobby_Text_HintWater: @ 8252206
 	.string "I see WATER-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from WATER-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_25225A: @ 825225A
+BattleFrontier_BattlePyramidLobby_Text_HintGhost: @ 825225A
 	.string "I see GHOST-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from GHOST-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_2522AE: @ 82522AE
+BattleFrontier_BattlePyramidLobby_Text_HintSteel: @ 82522AE
 	.string "I see STEEL-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_25230B: @ 825230B
+BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon: @ 825230B
 	.string "I see flying POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364
+BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve: @ 8252364
 	.string "I see those that have evolved from\n"
 	.string "the power of stones…\p"
 	.string "I also sense fire, water,\n"
@@ -826,18 +832,18 @@ BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from those three powers…$"
 
-BattleFrontier_BattlePyramidLobby_Text_252403: @ 8252403
+BattleFrontier_BattlePyramidLobby_Text_HintNormal: @ 8252403
 	.string "I see NORMAL-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_252461: @ 8252461
+BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot: @ 8252461
 	.string "Whether you believe my fortunes\n"
 	.string "or not, the choice is yours…\p"
 	.string "The future can be changed anytime…\n"
 	.string "I wish you safe passage…$"
 
-BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA
+BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning: @ 82524DA
 	.string "Did you know?\p"
 	.string "If you run fast, TRAINERS may notice\n"
 	.string "and come after you for a battle.\p"
@@ -845,37 +851,37 @@ BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA
 	.string "don't catch their eyes, but sneak\l"
 	.string "cautiously and quietly past them.$"
 
-BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595
+BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems: @ 8252595
 	.string "Awaaaaaaarrrrgh!\p"
 	.string "I had a whole lot of items, but I lost\n"
 	.string "them all when I lost!\p"
 	.string "Awaaaaaaarrrrgh!$"
 
-BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4
+BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing: @ 82525F4
 	.string "Welcome back!\n"
 	.string "You've done the unthinkable!\p"
 	.string "You've defeated the PYRAMID KING\n"
 	.string "and conquered the BATTLE PYRAMID!$"
 
-BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662
+BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints: @ 8252662
 	.string "Young explorer!\n"
 	.string "In commendation of your courage,\l"
 	.string "we give you these Battle Point(s)!$"
 
-BattleFrontier_BattlePyramidLobby_Text_2526B6: @ 82526B6
+BattleFrontier_BattlePyramidLobby_Text_RulesAreListed: @ 82526B6
 	.string "The Battle Quest rules are listed.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2526D9: @ 82526D9
+BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading: @ 82526D9
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePyramidLobby_Text_2526FC: @ 82526FC
+BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules: @ 82526FC
 	.string "When the PYRAMID is conquered,\n"
 	.string "the wild POKéMON that appear in it\l"
 	.string "are replaced by different kinds.\p"
 	.string "Explore, observe, and learn what kinds\n"
 	.string "of wild POKéMON you may encounter.$"
 
-BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9
+BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules: @ 82527A9
 	.string "TRAINERS are lying in wait for you\n"
 	.string "inside the PYRAMID.\p"
 	.string "On each floor, there are up to\n"
@@ -883,7 +889,7 @@ BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9
 	.string "When you defeat a TRAINER, you will\n"
 	.string "get a helpful hint for your adventure.$"
 
-BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A
+BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules: @ 825285A
 	.string "The mazes in the PYRAMID rearrange\n"
 	.string "themselves every time you enter it.\p"
 	.string "The mazes are poorly lit.\n"
@@ -891,7 +897,7 @@ BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A
 	.string "The light grows brighter whenever you\n"
 	.string "defeat a wild POKéMON or a TRAINER.$"
 
-BattleFrontier_BattlePyramidLobby_Text_252924: @ 8252924
+BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules: @ 8252924
 	.string "The BATTLE BAG serves as your BAG\n"
 	.string "while in the PYRAMID.\p"
 	.string "There are two separate BATTLE BAGS--\n"
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json
index d73dc1692..3a304f147 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0",
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "elevation": 4,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePyramidTop_EventScript_255256"
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 2e6b8f3a2..2d9006e9e 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -1,201 +1,197 @@
 BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_OnFrame
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_OnTransition
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
+BattleFrontier_BattlePyramidTop_OnTransition: @ 82550B6
 	pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8
+BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
+BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	compare VAR_TEMP_C, 0
-	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3
+	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
 	setobjectxyperm 2, 0, 0
-
-BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
+BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects:: @ 82550F3
 	end
 
-BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
+BattleFrontier_BattlePyramidTop_OnResume: @ 82550F4
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
+	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus
 	call BattleFrontier_EventScript_SetBrainObjectGfx
-BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
+BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C
 	copyvar VAR_TEMP_C, VAR_RESULT
 	frontier_getstatus
 	switch VAR_TEMP_0
-	case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
-	case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidTop_EventScript_252B66
-	case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_255193
+	case 0, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge
+	case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby
+	case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	compare VAR_RESULT, B_OUTCOME_LOST
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	compare VAR_RESULT, B_OUTCOME_DREW
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	compare VAR_RESULT, B_OUTCOME_FORFEITED
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E
-	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180
-	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A
+BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E
+	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic
+	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_ShowMapName
 	.2byte 0
 
-BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180
+BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180
 	playbgm MUS_PYRAMID_TOP, 0
 	setvar VAR_TEMP_E, 1
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
+BattleFrontier_BattlePyramidTop_EventScript_ShowMapName:: @ 825518A
 	special ShowMapNamePopup
 	setvar VAR_TEMP_F, 0
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
+BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193
 	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	pyramid_inittrainers
+	pyramid_settrainers
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
+BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
 	lock
 	faceplayer
 	compare VAR_TEMP_D, 0
-	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236
+	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady
 	compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY
-	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240
-	msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside
+	msgbox BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
+	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400
+	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath
 	waitmovement 0
-	message BattleFrontier_BattlePyramidTop_Text_2554E8
+	message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid
 	waitmessage
 	playfanfare MUS_ME_POINTGET
 	waitfanfare
 	closemessage
-
-BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
+BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236
-	msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, MSGBOX_DEFAULT
+BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady:: @ 8255236
+	msgbox BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady, MSGBOX_DEFAULT
 	closemessage
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240
-	msgbox BattleFrontier_BattlePyramidTop_Text_25551F, MSGBOX_DEFAULT
-	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside:: @ 8255240
+	msgbox BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere, MSGBOX_DEFAULT
+	applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
 	setvar VAR_TEMP_D, 1
 	closemessage
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
 	lockall
 	switch VAR_TEMP_C
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_255335
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_2552D0
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_255388
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0
+	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
+	applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT
 	closemessage
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidTop_EventScript_2552DA
+	msgbox BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-
-BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
-	msgbox BattleFrontier_BattlePyramidTop_Text_255846, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePyramidTop_EventScript_2553ED
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
+	msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
 	playbgm MUS_PYRAMID_TOP, 0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB
-	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
+	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
+BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
 	frontier_getsymbols
 	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A
-	msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
+	msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePyramidTop_Text_2558E9
+	message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
+	msgbox BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
+BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388
+	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
+	applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT
 	closemessage
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidTop_EventScript_255392
+	msgbox BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388
-	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388
+	applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-
-BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
-	msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePyramidTop_EventScript_2553ED
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
+	msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
 	playbgm MUS_PYRAMID_TOP, 0
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3
-	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
+	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
+BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
 	frontier_getsymbols
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
-	msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
+	msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePyramidTop_Text_255B59
+	message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePyramidTop_EventScript_25521A
+	msgbox BattleFrontier_BattlePyramidTop_Text_FarewellForNow, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
+BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED
 	closemessage
 	setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID
 	setvar VAR_0x8005, 0
@@ -203,17 +199,17 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
 	waitstate
 	return
 
-BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD
+BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside: @ 82553FD
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400
+BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath: @ 8255400
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
+BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403
 	walk_up
 	walk_up
 	walk_up
@@ -222,17 +218,17 @@ BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A
+BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer: @ 825540A
 	walk_fast_down
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C
+BattleFrontier_BattlePyramidTop_Movement_CameraPanUp: @ 825540C
 	walk_slow_up
 	walk_slow_up
 	delay_16
 	step_end
 
-BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410
+BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410
 	.string "It is a delight to see you here!\n"
 	.string "You have reached the summit of\l"
 	.string "the BATTLE PYRAMID!\p"
@@ -243,11 +239,11 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410
 	.string "Now, please!\n"
 	.string "Up you go!$"
 
-BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8
+BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid: @ 82554E8
 	.string "The PYRAMID's new conqueror!\n"
 	.string "Let the name {PLAYER} be known!$"
 
-BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F
+BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere: @ 825551F
 	.string "It is a delight to see you here!\p"
 	.string "Unfortunately, you were second by\n"
 	.string "a mere fraction of time!\p"
@@ -260,7 +256,7 @@ BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F
 	.string "Now, please! When you are ready,\n"
 	.string "take one more step of courage!$"
 
-BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669
+BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669
 	.string "Young adventurer…\p"
 	.string "Wouldn't you agree that explorations\n"
 	.string "are the grandest of adventures?\p"
@@ -270,7 +266,7 @@ BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669
 	.string "And, above all, only your own courage\n"
 	.string "to lead you through unknown worlds…$"
 
-BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E
+BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon: @ 825573E
 	.string "Aah, yes, indeed this life is grand!\n"
 	.string "Grand, it is! Eh?\p"
 	.string "I'm BRANDON!\p"
@@ -283,25 +279,25 @@ BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E
 	.string "Hahahah!\n"
 	.string "This should be exciting!$"
 
-BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846
+BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle: @ 8255846
 	.string "Now, then!\n"
 	.string "Bring your courage to our battle!$"
 
-BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873
+BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease: @ 8255873
 	.string "BRANDON: Hahahah! Grand it was!\n"
 	.string "Grand, yes, indeed!\p"
 	.string "Well done! You've earned recognition!\n"
 	.string "Your FRONTIER PASS, please!$"
 
-BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9
+BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol: @ 82558E9
 	.string "The Brave Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D
+BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting: @ 825591D
 	.string "Young explorer!\n"
 	.string "I look forward to our next meeting!$"
 
-BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951
+BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned: @ 8255951
 	.string "BRANDON: …You've finally returned,\n"
 	.string "young explorer…\p"
 	.string "Your love of adventure seems to come\n"
@@ -315,16 +311,16 @@ BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951
 	.string "Those days of death-defying,\n"
 	.string "life-affirming adventures are back…$"
 
-BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D
+BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter: @ 8255A6D
 	.string "Now, then!\p"
 	.string "I sense my own courage is off\n"
 	.string "the meter!$"
 
-BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1
+BattleFrontier_BattlePyramidTop_Text_EverythingYouHave: @ 8255AA1
 	.string "Everything you have!\n"
 	.string "I'm braced for it all!$"
 
-BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD
+BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD
 	.string "BRANDON: Hahahah!\n"
 	.string "Remarkable!\l"
 	.string "Yes, it's grand, indeed!\p"
@@ -332,17 +328,17 @@ BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD
 	.string "You've bested me through and through!\n"
 	.string "Here! I want you to have this!$"
 
-BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59
+BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine: @ 8255B59
 	.string "The Brave Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePyramidTop_Text_255B82: @ 8255B82
+BattleFrontier_BattlePyramidTop_Text_FarewellForNow: @ 8255B82
 	.string "Ah, yes! It just goes to show that\n"
 	.string "I have much to learn still!\p"
 	.string "May our paths cross again!\n"
 	.string "Farewell for now, young explorer!$"
 
-BattleFrontier_BattlePyramidTop_Text_255BFE: @ 8255BFE
+BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady: @ 8255BFE
 	.string "Now, when you are ready, take courage\n"
 	.string "and step forward.$"
 
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index f0ab1f58a..95b408528 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -144,7 +144,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
 	tower_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
new file mode 100644
index 000000000..6d7bb156f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -0,0 +1,507 @@
+BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
+	.byte 0
+
+BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
+	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
+	special CallBattleTowerFunc
+	checkplayergender
+	compare VAR_RESULT, FEMALE
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
+	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
+	setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
+	special SetBattleTowerLinkPlayerGfx
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
+	.2byte 0
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
+	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
+	.2byte 0
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
+	setvar VAR_TEMP_0, 1
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
+	waitmovement 0
+	frontier_get FRONTIER_DATA_BATTLE_NUM
+	compare VAR_RESULT, 0
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	waitmovement 0
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	waitmovement 0
+	frontier_set FRONTIER_DATA_6, 1
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
+	tower_setopponent
+	addobject 1
+	addobject 4
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
+	waitmovement 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
+	tower_getopponentintro 0
+	delay 15
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	waitmessage
+	tower_getopponentintro 1
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	msgbox gStringVar4, MSGBOX_DEFAULT
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
+	tower_getopponentintro 0
+	delay 15
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	messageautoscroll gStringVar4
+	waitmessage
+	delay 48
+	tower_getopponentintro 1
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
+	waitmovement 0
+	messageautoscroll gStringVar4
+	waitmessage
+	delay 48
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
+	tower_set TOWER_DATA_LVL_MODE
+	setvar VAR_0x8004, 3
+	special Script_TryGainNewFanFromCounter
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
+	call BattleFrontier_EventScript_IncrementWinStreak
+	tower_setbattlewon
+	switch VAR_RESULT
+	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
+	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
+	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
+	waitmovement 0
+	removeobject 1
+	removeobject 4
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
+	waitmovement 0
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
+	waitmovement 0
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
+	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
+	messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
+	waitmessage
+	delay 48
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
+	special LoadPlayerParty
+	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
+	frontier_get FRONTIER_DATA_BATTLE_NUM
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
+	call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
+	compare VAR_RESULT, 1
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
+	multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
+	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
+	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
+	waitmessage
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
+	call BattleFrontier_EventScript_SaveBattle
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
+	msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO
+	switch VAR_RESULT
+	case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
+	waitmessage
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
+	closemessage
+	clearflag FLAG_TEMP_2
+	applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
+	applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
+	waitmovement 0
+	applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
+	applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
+	waitmovement 0
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
+	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
+	tower_set TOWER_DATA_LVL_MODE
+	setvar VAR_0x8004, 3
+	special Script_TryGainNewFanFromCounter
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
+	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
+	waitmessage
+	tower_save CHALLENGE_STATUS_PAUSED
+	playse SE_SAVE
+	waitse
+	fadescreen FADE_TO_BLACK
+	frontier_reset
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
+	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
+	copyvar VAR_TEMP_F, VAR_RESULT
+	switch VAR_TEMP_F
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
+	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
+	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
+	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
+	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
+	waitmessage
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
+	copyvar VAR_TEMP_F, VAR_RESULT
+	switch VAR_TEMP_F
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
+	case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
+	case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
+	case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
+	case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249547
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
+	message BattleFrontier_BattleTowerBattleRoom2_Text_249578
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
+	waitmessage
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
+	waitmessage
+	delay 48
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
+	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
+	multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
+	case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
+	multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
+	switch VAR_RESULT
+	case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 0
+	message gText_LinkStandby3
+	waitmessage
+	special sub_813B568
+	waitstate
+	compare VAR_RESULT, 0
+	goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
+	message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
+	waitmessage
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
+	switch VAR_RESULT
+	case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	call BattleFrontier_EventScript_SaveBattle
+	setflag FLAG_TEMP_2
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
+	message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
+	waitmessage
+	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
+	compare VAR_RESULT, 0
+	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	message gText_LinkStandby3
+	waitmessage
+	special sub_813B568
+	waitstate
+	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
+	end
+
+BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
+	special sub_813B534
+	return
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
+	walk_right
+	walk_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
+	walk_in_place_left
+	step_end
+
+BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
+	.string "The 2nd set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
+	.string "The 3rd set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
+	.string "The 4th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
+	.string "The 5th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
+	.string "The 6th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
+	.string "The 7th set of opponents is next.\n"
+	.string "Are you ready?$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
+	.string "The 2nd set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
+	.string "The 3rd set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
+	.string "The 4th set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
+	.string "The 5th set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
+	.string "The 6th set of opponents is next.\n"
+	.string "Do your best!$"
+
+BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
+	.string "The 7th set of opponents is next.\n"
+	.string "Do your best!$"
+
+gText_LinkStandby3:: @ 824978D
+	.string "Link standby…$"
+
+gText_YourPartnerHasRetired:: @ 824979B
+	.string "Your partner has retired.\p"
+	.string "Your BATTLE ROOM challenge\n"
+	.string "will be canceled.$"
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index d4e5e8bb0..b3fd57a0a 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -195,14 +195,14 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge:: @ 823E984
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -261,14 +261,14 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge:: @ 823EAED
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE
@@ -328,14 +328,14 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge:: @ 823EC59
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
@@ -394,14 +394,14 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge:: @ 823E
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
+	case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
 	setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
@@ -991,7 +991,7 @@ BattleFrontier_BattleTowerLobby_Text_ReceivedPrize: @ 823F68C
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_BagAppearsToBeFull: @ 823F6A6
+BattleFrontier_BattleTowerLobby_Text_BagFullMakeRoom: @ 823F6A6
 	.string "Oh, your BAG appears to be full.\p"
 	.string "Please make room in your BAG, then come\n"
 	.string "see me.$"
diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
index e651f785c..ea32a8275 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts:: @ 8243D92
 	.byte 0
 
 BattleFrontier_BattleTowerMultiPartnerRoom_OnResume: @ 8243DA7
-	pyramid_healparty
+	pyramid_resetparty
 	end
 
 BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0
diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 97e41cd96..3dd8fc98c 100644
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -264,7 +264,7 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
 BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
 	msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
 	special GetBattleFrontierTutorMoveIndex
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special CloseBattlePointsWindow
 	special CloseBattleFrontierTutorWindow
 	special ChooseMonForMoveTutor
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 378819f43..552f3b095 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -50,12 +50,12 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
 	msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
 	closemessage
 	playse SE_KAIDAN
-	fadescreenspeed 1, 4
+	fadescreenspeed FADE_TO_BLACK, 4
 	setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 3
 	removeobject 1
 	clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	release
 	end
 
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 3fe146f99..89cda0e40 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -52,7 +52,7 @@ EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850
 
 EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
-	fadescreenspeed 1, 24
+	fadescreenspeed FADE_TO_BLACK, 24
 	special GameClear
 	waitstate
 	releaseall
@@ -60,7 +60,7 @@ EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
 
 EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
-	fadescreenspeed 1, 24
+	fadescreenspeed FADE_TO_BLACK, 24
 	special GameClear
 	waitstate
 	releaseall
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index ba8b3536f..d60b561ce 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -1,50 +1,53 @@
 FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_OnWarp
 	.byte 0
 
+	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
+	@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_1
+	@ The opponent is represented by object event 3, which has the gfx id VAR_OBJ_GFX_ID_0
+
 FallarborTown_BattleTentBattleRoom_OnTransition: @ 82008A9
-	call FallarborTown_BattleTentBattleRoom_EventScript_2008AF
+	call FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	end
 
-FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF
+FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 82008AF
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7
+	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2
+	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7
+FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 82008C7
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2
+FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82008D2
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD
-	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7
+FallarborTown_BattleTentBattleRoom_OnFrame: @ 82008DD
+	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
+FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82008E7
 	lockall
 	showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
-	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73
-
-FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
+	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge
+FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F
 	tower_setopponent
 	addobject 3
-	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
+	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter
 	waitmovement 0
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
 	playse SE_W187
 	waitse
 	waitmovement 0
@@ -54,40 +57,38 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
 	waitmessage
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
 	switch VAR_RESULT
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
 	playse SE_W173
 	waitse
 	waitmovement 0
 	fallarbortent_getopponentname
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
-
-FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
+FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 820097E
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
-FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3
+FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 820099C
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
 	playse SE_BAN
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT
 	closemessage
-
-FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
+FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
-	case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3
-	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E
+	case 3, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon
+	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_OpponentExit
 	waitmovement 0
 	removeobject 3
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer
 	waitmovement 0
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored, MSGBOX_DEFAULT
 	special LoadPlayerParty
@@ -96,99 +97,102 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-
-FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
+FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
-	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43
+	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
 	compare VAR_RESULT, 2
-	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A
+	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78
-	case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6
+	case 0, FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
+	case 2, FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge
 
-FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78
+FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 8200A78
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-	case YES, FallarborTown_BattleTentBattleRoom_EventScript_200B51
-	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case NO, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
+	case YES, FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge
+	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6
+FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 8200AA6
 	message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
-	case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E
-	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
+	case 0, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
+	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8
+FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 8200AD8
 	closemessage
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BAB
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos
 	waitmovement 0
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B92
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle
 	waitmovement 0
-	goto FallarborTown_BattleTentBattleRoom_EventScript_20090F
+	goto FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter
 	waitstate
 
-FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
+FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8200AF3
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
+
+@ Unreachable code block? The flow into the next block also doesnt make sense
 	arena_get ARENA_DATA_WIN_STREAK
 	compare VAR_RESULT, MAX_STREAK
-	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3
+	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum
 	addvar VAR_RESULT, 1
 	arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT
-FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43
+@ See above
+
+FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8200B43
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A
+FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8200B4A
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
+FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 8200B51
 	message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	fallarbortent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
-FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
-	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6
+FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge:: @ 8200B73
+	applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer
 	waitmovement 0
-	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
+	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant
 	waitmovement 0
-	goto FallarborTown_BattleTentBattleRoom_EventScript_200A2A
+	goto FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 	end
 
-FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D
+FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8200B8D
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92
+FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle: @ 8200B92
 	walk_in_place_fastest_right
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94
+FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant: @ 8200B94
 	walk_in_place_fastest_left
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
+FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 8200B96
 	walk_down
 	walk_down
 	walk_down
@@ -196,41 +200,42 @@ FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
 	walk_in_place_fastest_left
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C
+@ Unused
+FallarborTown_BattleTentBattleRoom_Movement_OpponentStepForward: @ 8200B9C
 	walk_left
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E
+FallarborTown_BattleTentBattleRoom_Movement_OpponentExit: @ 8200B9E
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3
+FallarborTown_BattleTentBattleRoom_Movement_AttendantJump: @ 8200BA3
 	disable_jump_landing_ground_effect
 	jump_in_place_down
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6
+FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer: @ 8200BA6
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB
+FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos: @ 8200BAB
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0
-	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA
+FallarborTown_BattleTentBattleRoom_OnWarp: @ 8200BB0
+	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA
+FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 8200BBA
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	removeobject 3
diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
index 327033829..bc8bdb512 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
@@ -1,21 +1,21 @@
 FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_OnFrame
 	.byte 0
 
-FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD
-	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7
+FallarborTown_BattleTentCorridor_OnFrame: @ 82006AD
+	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
+FallarborTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 82006B7
 	lockall
 	setvar VAR_TEMP_0, 1
-	applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB
-	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB
+	applymovement 1, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
+	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
 	waitmovement 0
 	opendoor 2, 1
 	waitdooranim
-	applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701
-	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700
+	applymovement 1, FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor
 	waitmovement 0
 	closedoor 2, 1
 	waitdooranim
@@ -25,40 +25,44 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
 	releaseall
 	end
 
-FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB
+FallarborTown_BattleTentCorridor_Movement_WalkToDoor: @ 82006FB
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700
+FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 8200700
 	walk_up
-
-FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
+FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 8200701
 	walk_up
 	set_invisible
 	step_end
 
-FallarborTown_BattleTentCorridor_Text_200704: @ 8200704
+@ Leftover text from when this was a Contest Hall in R/S
+@ Unused
+FallarborTown_ContestHall_Text_DoAllRightInPreliminary: @ 8200704
 	.string "We do all right in the preliminary round,\n"
 	.string "but we can never win the appeals…\p"
 	.string "Maybe it means I have to watch what\n"
 	.string "other contestants are doing…$"
 
-FallarborTown_BattleTentCorridor_Text_200791: @ 8200791
+@ Unused
+FallarborTown_ContestHall_Text_MonAllTheseRibbons: @ 8200791
 	.string "See!\n"
 	.string "My POKéMON won all these RIBBONS!\p"
 	.string "Have your POKéMON earned any RIBBONS?\n"
 	.string "You can check them on your POKéNAV.$"
 
-FallarborTown_BattleTentCorridor_Text_200802: @ 8200802
+@ Unused
+FallarborTown_ContestHall_Text_CantWinEverywhere: @ 8200802
 	.string "I can't beat GYM LEADERS…\p"
 	.string "I can't win any CONTESTS…\p"
 	.string "I've been here, there, and everywhere,\n"
 	.string "and it's all for naught…$"
 
-FallarborTown_BattleTentCorridor_Text_200876: @ 8200876
+@ Unused
+FallarborTown_ContestHall_Text_SuperRankStage: @ 8200876
 	.string "POKéMON CONTESTS\n"
 	.string "SUPER RANK STAGE!$"
 
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json
index 4c565ff8c..b48119689 100644
--- a/data/maps/FallarborTown_BattleTentLobby/map.json
+++ b/data/maps/FallarborTown_BattleTentLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_BattleTentLobby_EventScript_200001",
+      "script": "FallarborTown_BattleTentLobby_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_BattleTentLobby_EventScript_20020D",
+      "script": "FallarborTown_BattleTentLobby_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_BattleTentLobby_EventScript_200216",
+      "script": "FallarborTown_BattleTentLobby_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_BattleTentLobby_EventScript_20021F",
+      "script": "FallarborTown_BattleTentLobby_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_BattleTentLobby_EventScript_200228",
+      "script": "FallarborTown_BattleTentLobby_EventScript_Scott",
       "flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT"
     }
   ],
@@ -104,7 +104,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "FallarborTown_BattleTentLobby_EventScript_20024F"
+      "script": "FallarborTown_BattleTentLobby_EventScript_RulesBoard"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index fddadae15..53006f577 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -1,32 +1,32 @@
 FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_OnWarp
 	.byte 0
 
-FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
-	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B
+FallarborTown_BattleTentLobby_OnWarp: @ 81FFE71
+	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
+FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 81FFE7B
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
-	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, FallarborTown_BattleTentLobby_EventScript_1FFEB8
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, FallarborTown_BattleTentLobby_EventScript_1FFFCD
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, FallarborTown_BattleTentLobby_EventScript_1FFEED
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, FallarborTown_BattleTentLobby_EventScript_1FFF93
+FallarborTown_BattleTentLobby_OnFrame: @ 81FFE85
+	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, FallarborTown_BattleTentLobby_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, FallarborTown_BattleTentLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, FallarborTown_BattleTentLobby_EventScript_LostChallenge
 	.2byte 0
 
-FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
+FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus:: @ 81FFEAF
 	frontier_getstatus
 	end
 
-FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
+FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 81FFEB8
 	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT
+	msgbox FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
@@ -34,10 +34,10 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
+FallarborTown_BattleTentLobby_EventScript_WonChallenge:: @ 81FFEED
 	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
-	message FallarborTown_BattleTentLobby_Text_2C4EFF
+	msgbox FallarborTown_BattleTentLobby_Text_BeatThreeTrainers, MSGBOX_DEFAULT
+	message FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame
 	waitmessage
 	fallarbortent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
@@ -45,103 +45,102 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
 	playse SE_SAVE
 	waitse
 
-FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
-	msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT
+FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27
+	msgbox FallarborTown_BattleTentLobby_Text_PresentYouWithPrize, MSGBOX_DEFAULT
 	fallarbortent_giveprize
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
+	case FALSE, FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	message FallarborTown_BattleTentLobby_Text_2C4F69
+	message FallarborTown_BattleTentLobby_Text_ReceivedPrize
 	waitmessage
 	playfanfare MUS_FANFA4
 	waitfanfare
-	msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
+	msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73
-	msgbox FallarborTown_BattleTentLobby_Text_2C4F83, MSGBOX_DEFAULT
+FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 81FFF73
+	msgbox FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84
+FallarborTown_BattleTentLobby_EventScript_PrizeWaiting:: @ 81FFF84
 	lockall
-	msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_1FFF27
+	msgbox FallarborTown_BattleTentLobby_Text_BeatThreeTrainers, MSGBOX_DEFAULT
+	goto FallarborTown_BattleTentLobby_EventScript_GivePrize
 	end
 
-FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
+FallarborTown_BattleTentLobby_EventScript_LostChallenge:: @ 81FFF93
 	lockall
-	message FallarborTown_BattleTentLobby_Text_2C4FD7
+	message FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	fallarbortent_save 0
 	playse SE_SAVE
 	waitse
-	msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
+	msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
+FallarborTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 81FFFCD
 	lockall
-	message FallarborTown_BattleTentLobby_Text_2C504C
+	message FallarborTown_BattleTentLobby_Text_LookingForwardToArrival
 	waitmessage
 	fallarbortent_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
-	goto FallarborTown_BattleTentLobby_EventScript_20013C
+	goto FallarborTown_BattleTentLobby_EventScript_EnterChallenge
 
-FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
+FallarborTown_BattleTentLobby_EventScript_Attendant:: @ 8200001
 	lock
 	faceplayer
 	fallarbortent_getprize
-	compare VAR_RESULT, 0
-	goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84
+	compare VAR_RESULT, ITEM_NONE
+	goto_if_ne FallarborTown_BattleTentLobby_EventScript_PrizeWaiting
 	special SavePlayerParty
-	msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT
-
-FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
-	message FallarborTown_BattleTentLobby_Text_2C4843
+	msgbox FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
+FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8200021
+	message FallarborTown_BattleTentLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_20005D
-	case 1, FallarborTown_BattleTentLobby_EventScript_200169
-	case 2, FallarborTown_BattleTentLobby_EventScript_2001C5
-	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C5
+	case 0, FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge
+	case 1, FallarborTown_BattleTentLobby_EventScript_ExplainChallenge
+	case 2, FallarborTown_BattleTentLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_CancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
+FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 820005D
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	setvar VAR_RESULT, 2
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176
+	goto_if_eq FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
-	msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT
-	fadescreen 1
+	msgbox FallarborTown_BattleTentLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2
-	msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO
+	goto_if_eq FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
+	msgbox FallarborTown_BattleTentLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, FallarborTown_BattleTentLobby_EventScript_2001C2
-	case YES, FallarborTown_BattleTentLobby_EventScript_2000E2
-	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C2
+	case NO, FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
+	case YES, FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
+FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 82000E2
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	fallarbortent_init
@@ -153,170 +152,166 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB
-
-FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
+	goto_if_eq FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed
+FallarborTown_BattleTentLobby_EventScript_EnterChallenge:: @ 820013C
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT
+	msgbox FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent, MSGBOX_DEFAULT
 	closemessage
-	call FallarborTown_BattleTentLobby_EventScript_2001CF
+	call FallarborTown_BattleTentLobby_EventScript_WalkToDoor
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169
-	msgbox FallarborTown_BattleTentLobby_Text_2C48AC, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_200021
+FallarborTown_BattleTentLobby_EventScript_ExplainChallenge:: @ 8200169
+	msgbox FallarborTown_BattleTentLobby_Text_ExplainFallarborTent, MSGBOX_DEFAULT
+	goto FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge
 
-FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176
+FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons:: @ 8200176
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, FallarborTown_BattleTentLobby_EventScript_200191
-	case FRONTIER_LVL_OPEN, FallarborTown_BattleTentLobby_EventScript_20019E
+	case FRONTIER_LVL_50, FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50
+	case FRONTIER_LVL_OPEN, FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen
+FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50:: @ 8200191
+	msgbox FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+	goto FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191
-	msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_2001CD
+FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 820019E
+	msgbox FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+	goto FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E
-	msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_2001CD
-
-FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
+FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 82001AB
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto FallarborTown_BattleTentLobby_EventScript_2001C5
+	goto FallarborTown_BattleTentLobby_EventScript_CancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
+FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 82001C2
 	special LoadPlayerParty
-
-FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5
-	msgbox FallarborTown_BattleTentLobby_Text_2C487F, MSGBOX_DEFAULT
-
-FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD
+FallarborTown_BattleTentLobby_EventScript_CancelChallenge:: @ 82001C5
+	msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT
+FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge:: @ 82001CD
 	release
 	end
 
-FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF
-	applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE
-	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205
+FallarborTown_BattleTentLobby_EventScript_WalkToDoor:: @ 82001CF
+	applymovement 1, FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor
+	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor
 	waitmovement 0
 	opendoor 6, 1
 	waitdooranim
-	applymovement 1, FallarborTown_BattleTentLobby_Movement_200202
-	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209
+	applymovement 1, FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor
 	waitmovement 0
 	closedoor 6, 1
 	waitdooranim
 	return
 
-FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE
+FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor: @ 82001FE
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentLobby_Movement_200202: @ 8200202
+FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor: @ 8200202
 	walk_up
 	set_invisible
 	step_end
 
-FallarborTown_BattleTentLobby_Movement_200205: @ 8200205
+FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor: @ 8200205
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentLobby_Movement_200209: @ 8200209
+FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor: @ 8200209
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D
-	msgbox FallarborTown_BattleTentLobby_Text_20045A, MSGBOX_NPC
+FallarborTown_BattleTentLobby_EventScript_Hiker:: @ 820020D
+	msgbox FallarborTown_BattleTentLobby_Text_CameToCampOut, MSGBOX_NPC
 	end
 
-FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216
-	msgbox FallarborTown_BattleTentLobby_Text_200304, MSGBOX_NPC
+FallarborTown_BattleTentLobby_EventScript_LittleBoy:: @ 8200216
+	msgbox FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid, MSGBOX_NPC
 	end
 
-FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F
-	msgbox FallarborTown_BattleTentLobby_Text_200382, MSGBOX_NPC
+FallarborTown_BattleTentLobby_EventScript_Lass:: @ 820021F
+	msgbox FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite, MSGBOX_NPC
 	end
 
-FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
+FallarborTown_BattleTentLobby_EventScript_Scott:: @ 8200228
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245
-	msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo
+	msgbox FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone, MSGBOX_DEFAULT
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_FALLARBOR
 	release
 	end
 
-FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245
-	msgbox FallarborTown_BattleTentLobby_Text_200653, MSGBOX_DEFAULT
+FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo:: @ 8200245
+	msgbox FallarborTown_BattleTentLobby_Text_ScottMakeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F
+FallarborTown_BattleTentLobby_EventScript_RulesBoard:: @ 820024F
 	lockall
 	msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E
+FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 820025E
 	message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0
 	switch VAR_RESULT
-	case 0, FallarborTown_BattleTentLobby_EventScript_2002BC
-	case 1, FallarborTown_BattleTentLobby_EventScript_2002CA
-	case 2, FallarborTown_BattleTentLobby_EventScript_2002D8
-	case 3, FallarborTown_BattleTentLobby_EventScript_2002E6
-	case 4, FallarborTown_BattleTentLobby_EventScript_2002F4
-	case 5, FallarborTown_BattleTentLobby_EventScript_200302
-	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_200302
+	case 0, FallarborTown_BattleTentLobby_EventScript_RulesLevel
+	case 1, FallarborTown_BattleTentLobby_EventScript_RulesBattle
+	case 2, FallarborTown_BattleTentLobby_EventScript_RulesMind
+	case 3, FallarborTown_BattleTentLobby_EventScript_RulesSkill
+	case 4, FallarborTown_BattleTentLobby_EventScript_RulesBody
+	case 5, FallarborTown_BattleTentLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_ExitRules
 	end
 
-FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC
-	msgbox FallarborTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
+FallarborTown_BattleTentLobby_EventScript_RulesLevel:: @ 82002BC
+	msgbox BattleTentLobby_Text_ExplainLevelRules, MSGBOX_DEFAULT
+	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA
+FallarborTown_BattleTentLobby_EventScript_RulesBattle:: @ 82002CA
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8
+FallarborTown_BattleTentLobby_EventScript_RulesMind:: @ 82002D8
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6
+FallarborTown_BattleTentLobby_EventScript_RulesSkill:: @ 82002E6
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4
+FallarborTown_BattleTentLobby_EventScript_RulesBody:: @ 82002F4
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT
-	goto FallarborTown_BattleTentLobby_EventScript_20025E
+	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302
+FallarborTown_BattleTentLobby_EventScript_ExitRules:: @ 8200302
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_Text_200304: @ 8200304
+FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid: @ 8200304
 	.string "Fufufufufu.\p"
 	.string "I'm going to make everyone think\n"
 	.string "I'm just a kid and let them play down.\p"
 	.string "Then, I'll shock them and grab\n"
 	.string "the title!$"
 
-FallarborTown_BattleTentLobby_Text_200382: @ 8200382
+FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite: @ 8200382
 	.string "You know how BATTLE TENTS offer\n"
 	.string "different events in different towns?\p"
 	.string "My favorite is definitely the BATTLE\n"
@@ -325,7 +320,7 @@ FallarborTown_BattleTentLobby_Text_200382: @ 8200382
 	.string "try to win with all their faith in\l"
 	.string "their POKéMON.$"
 
-FallarborTown_BattleTentLobby_Text_20045A: @ 820045A
+FallarborTown_BattleTentLobby_Text_CameToCampOut: @ 820045A
 	.string "I heard something about some tent,\n"
 	.string "so I came to camp out.\p"
 	.string "I didn't know that tents these days\n"
@@ -333,7 +328,7 @@ FallarborTown_BattleTentLobby_Text_20045A: @ 820045A
 	.string "Since I'm here, I may as well try\n"
 	.string "my hand at battling!$"
 
-FallarborTown_BattleTentLobby_Text_200501: @ 8200501
+FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone: @ 8200501
 	.string "SCOTT: Hi, {PLAYER}{KUN}!\n"
 	.string "So you came out to this BATTLE TENT!\p"
 	.string "The people in these parts tend to be\n"
@@ -348,7 +343,7 @@ FallarborTown_BattleTentLobby_Text_200501: @ 8200501
 	.string "Whoops! Never mind!\n"
 	.string "Keep working at it!$"
 
-FallarborTown_BattleTentLobby_Text_200653: @ 8200653
+FallarborTown_BattleTentLobby_Text_ScottMakeChallenge: @ 8200653
 	.string "SCOTT: Instead of wasting your\n"
 	.string "time with the likes of me, why not\l"
 	.string "make a challenge?$"
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index 20121d500..2cdb626bd 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -190,10 +190,10 @@ FarawayIsland_Interior_EventScript_MewHideLeft:: @ 8267ED0
 
 FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB
 	lockall
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	setflag FLAG_HIDE_MEW
 	removeobject 1
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	msgbox FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded, MSGBOX_DEFAULT
 	closemessage
 	releaseall
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index b6874d99f..bdfce4325 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -42,7 +42,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 0
 	lockall
 	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
@@ -216,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 0
 	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -504,42 +504,42 @@ LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 1
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 2
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 3
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 4
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 5
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 6
 	releaseall
 	end
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 4279d3064..f3328a979 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -182,35 +182,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 9
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 10
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 11
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 12
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	showcontestwinner 13
 	releaseall
 	end
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index 7d9e0f239..2592ccd9c 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -25,9 +25,9 @@ LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove
 	msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special MoveDeleterChooseMoveToForget
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	compare VAR_0x8005, MAX_MON_MOVES
 	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget
 	special BufferMoveDeleterNicknameAndMove
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 08b59e1f0..e536709b1 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -62,14 +62,14 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
 	setvar VAR_SLATEPORT_CITY_STATE, 1
 	setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
 	setvar VAR_SLATEPORT_HARBOR_STATE, 1
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 6
 	removeobject 2
 	removeobject 3
 	removeobject 4
 	removeobject 5
 	setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	releaseall
 	end
 
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 403377161..32fb2aa7b 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	special SavePlayerParty
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
@@ -267,7 +267,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032
 	special LoadPlayerParty
 	switch VAR_RESULT
 	case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special SetCB2WhiteOut
 	waitstate
 
@@ -287,7 +287,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
 	closemessage
 	setvar VAR_MOSSDEEP_CITY_STATE, 3
 	fadedefaultbgm
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
@@ -304,10 +304,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
 	setobjectxy 1, 6, 2
 	turnobject 1, DIR_NORTH
 	call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
 	removeobject 4
@@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
 	setobjectxyperm 3, 5, 6
 	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND
 	addobject 3
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131
@@ -357,12 +357,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall:: @ 8224193
-	pokenavcall MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall
+	pokenavcall MatchCall_Text_MayRayquazaCall
 	waitmessage
 	return
 
 MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall:: @ 822419A
-	pokenavcall MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall
+	pokenavcall MatchCall_Text_BrendanRayquazaCall
 	waitmessage
 	return
 
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index cd552bc1d..b5598e60d 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B
 
 @ Unused, leftover from RS
 MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
-	giveitem_std ITEM_HM08, 1, 1
+	finditem_std ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	end
 
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index a70d7e3ae..e57260b2a 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -47,13 +47,13 @@ MtChimney_EventScript_Maxie:: @ 822EE0B
 	msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
 	removeobject 29
 	removeobject 3
 	removeobject 22
 	setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	setobjectxyperm 1, 10, 12
 	addobject 1
 	compare VAR_FACING, DIR_EAST
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 577b87076..c13dd0da7 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -45,7 +45,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
 	call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2
 	msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
 	removeobject 4
 	removeobject 5
@@ -54,7 +54,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
 	setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
 	setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
 	fadedefaultbgm
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	delay 20
 	setvar VAR_MT_PYRE_STATE, 1
 	compare VAR_0x8008, 0
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index dca3dc47d..56a256ca9 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -220,7 +220,7 @@ Route101_EventScript_BirchsBag:: @ 81EBE16
 	faceplayer
 	setflag FLAG_SYS_POKEMON_GET
 	setflag FLAG_RESCUED_BIRCH
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 4
 	setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 30d453abd..57c5f9f57 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -206,10 +206,10 @@ Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003
 Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
 	msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	playse SE_SELECT
 	delay 30
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT
 	compare VAR_0x8009, 0
 	call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index 0433877a5..7363b1331 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -64,7 +64,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
 	setvar VAR_WEATHER_INSTITUTE_STATE, 1
 	clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
 	fadedefaultbgm
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA
 	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
 	removeobject 1
@@ -74,7 +74,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
 	removeobject 7
 	applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition
 	waitmovement 0
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer
 	waitmovement 0
 	copyobjectxytoperm 5
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index a965ff060..6018e2d95 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -225,10 +225,10 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
 	end
 
 Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject 30 @ Invisible Bridge Kecleon
 	removeobject 36 @ Visible Bridge Kecleon
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	goto Route120_EventScript_StevenGiveDeconScope
 	end
 
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 49fdc6b9a..84d034237 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -80,12 +80,12 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
 	msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT
 	closemessage
 	playse SE_KAIDAN
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 4
 	removeobject 1
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	releaseall
 	end
 
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index e12919082..b67675d93 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -76,16 +76,16 @@ SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771
 	end
 
 SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	releaseall
 	end
 
 SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	bufferspeciesname 0, VAR_0x8004
 	msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
 	releaseall
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index 541dc3aae..00c093c49 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -1,51 +1,54 @@
 SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_OnFrame
 	.byte 0
 
+	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
+	@ The player is represented instead by object event 3, which has the gfx id VAR_OBJ_GFX_ID_1
+
 SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970
-	call SlateportCity_BattleTentBattleRoom_EventScript_209976
+	call SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	end
 
-SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976
+SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8209976
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E
+	goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_209994
+	goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E
+SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 820998E
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994
+SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8209994
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A
-	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4
+SlateportCity_BattleTentBattleRoom_OnWarp: @ 820999A
+	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4
+SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 82099A4
 	setvar VAR_TEMP_1, 1
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
 	end
 
-SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4
-	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE
+SlateportCity_BattleTentBattleRoom_OnFrame: @ 82099B4
+	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
-	applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99
+SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE
+	applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	factory_setopponentgfx
 	setobjectxyperm 2, 5, 1
 	removeobject 2
 	addobject 2
-	applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
+	applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter
 	waitmovement 0
 	battletent_getopponentintro
 	lockall
@@ -58,41 +61,40 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
 	special DoSpecialTrainerBattle
 	waitstate
 	switch VAR_RESULT
-	case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39
-
-SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
+	case 1, SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent
+SlateportCity_BattleTent_EventScript_WarpToLobbyLost:: @ 8209A1B
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
+@ forced stop
 
-SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
+SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 8209A39
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
-	case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B
-@ 	case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
+	case 3, SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon
 	setvar VAR_0x8006, 1
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3
 	waitstate
+@ forced stop
 
-SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B
-SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
+SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8209A7B
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 @ forced stop
 
-SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99
+SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter: @ 8209A99
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E
+SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter: @ 8209A9E
 	walk_down
 	walk_down
 	walk_down
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index 493fd3f69..718376c4f 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -1,51 +1,52 @@
 SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_OnWarp
 	.byte 0
 
-SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31
-	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B
+	@ This is Slateport Tent's version of the Battle Factory Pre-Battle Room
+
+SlateportCity_BattleTentCorridor_OnWarp: @ 8208E31
+	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_SetUpObjects
 	.2byte 0
 
-SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
+SlateportCity_BattleTentCorridor_EventScript_SetUpObjects:: @ 8208E3B
 	setvar VAR_TEMP_1, 1
 	compare VAR_0x8006, 1
-	goto_if_ne SlateportCity_BattleTentCorridor_EventScript_208E56
+	goto_if_ne SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth
 	setobjectxy 1, 2, 2
 	turnobject 1, DIR_SOUTH
-
-SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
+SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth:: @ 8208E56
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B
-	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65
+SlateportCity_BattleTentCorridor_OnFrame: @ 8208E5B
+	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
+SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: @ 8208E65
 	compare VAR_0x8006, 1
-	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE
+	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle
 	setvar VAR_TEMP_0, 1
-	applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059
+	applymovement 1, SlateportCity_BattleTentCorridor_Movement_AttendantEnter
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_PlayerEnter
 	waitmovement 0
 	compare VAR_0x8006, 2
-	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044
+	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge
 	slateporttent_generaterentalmons
 	slateporttent_generateopponentmons
-	msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT
-	fadescreen 1
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	slateporttent_rentmons
 	waitstate
-SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
+SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: @ 8208EB4
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	opendoor 2, 1
 	waitdooranim
-	applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E
+	applymovement 1, SlateportCity_BattleTentCorridor_Movement_AttendantExit
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_PlayerExit
 	waitmovement 0
 	closedoor 2, 1
 	waitdooranim
@@ -53,97 +54,97 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
 	waitstate
 	end
 
-SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
+SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 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
-SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
+SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014
+	call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent
 	compare VAR_RESULT, 2
-	call_if_eq SlateportCity_BattleTentCorridor_EventScript_20901B
+	call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB
-	case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B
-	case 2, SlateportCity_BattleTentCorridor_EventScript_208F89
+	case 0, SlateportCity_BattleTentCorridor_EventScript_AskSwapMon
+	case 1, SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge
+	case 2, SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge
 
-SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B
-	msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO
+SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge:: @ 8208F5B
+	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
+	case NO, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
+	case YES, SlateportCity_BattleTentCorridor_EventScript_PauseChallenge
+	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 
-SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
-	message SlateportCity_BattleTentCorridor_Text_25A37A
+SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge:: @ 8208F89
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D
-	case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B
-	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
+	case 1, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
+	case 0, SlateportCity_BattleTent_EventScript_WarpToLobbyLost
+	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 
-SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
+SlateportCity_BattleTentCorridor_EventScript_AskSwapMon:: @ 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
-	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208EB4
+	case NO, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
+	case YES, SlateportCity_BattleTentCorridor_EventScript_SwapMons
+	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
 
-SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
-	fadescreen 1
+SlateportCity_BattleTentCorridor_EventScript_SwapMons:: @ 8208FF1
+	fadescreen FADE_TO_BLACK
 	slateporttent_swapmons
 	waitstate
 	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
-	msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentCorridor_EventScript_208EB4
+	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
+	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
 
-SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014
-	message SlateportCity_BattleTentCorridor_Text_25A263
+SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent:: @ 8209014
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
-	message SlateportCity_BattleTentCorridor_Text_25A289
+SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent:: @ 820901B
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
-	message SlateportCity_BattleTentCorridor_Text_25ABAE
+SlateportCity_BattleTentCorridor_EventScript_PauseChallenge:: @ 8209022
+	message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	slateporttent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
-SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
+SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge:: @ 8209044
 	special SavePlayerParty
 	factory_setparties 0
-	goto SlateportCity_BattleTentCorridor_EventScript_208F0D
+	goto SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 
-SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059
+SlateportCity_BattleTentCorridor_Movement_PlayerEnter: @ 8209059
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E
+SlateportCity_BattleTentCorridor_Movement_PlayerExit: @ 820905E
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
+SlateportCity_BattleTentCorridor_Movement_AttendantEnter: @ 8209062
 	walk_up
 	walk_up
 	walk_up
@@ -151,12 +152,14 @@ SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068
+SlateportCity_BattleTentCorridor_Movement_AttendantExit: @ 8209068
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
+@ Leftover text from when this was a Contest Hall in R/S
+@ Unused
+SlateportCity_ContestHall_Text_AdviceForContests: @ 820906B
 	.string "Want a tasty little bit of advice\n"
 	.string "for CONTESTS?\p"
 	.string "Using a certain move after another\n"
@@ -167,12 +170,14 @@ SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
 	.string "Of course, your opponents might try\n"
 	.string "disrupting your POKéMON's showing.$"
 
-SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A
+@ Unused
+SlateportCity_ContestHall_Text_MyPapaIsContestJudge: @ 820917A
 	.string "My papa, he's a CONTEST JUDGE.\p"
 	.string "I wonder what I should be when I\n"
 	.string "grow up, a JUDGE or a GYM LEADER?$"
 
-SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
+@ Unused
+SlateportCity_ContestHall_Text_ImLikeMajorlyCheesed: @ 82091DC
 	.string "Hey, man, I'm like majorly cheesed,\n"
 	.string "you know. Like, you know, I just\l"
 	.string "wanted to know why my POKéMON\l"
@@ -184,7 +189,8 @@ SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
 	.string "Hey, like, you! Zip it, you know?\n"
 	.string "Just, you know, take this!$"
 
-SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
+@ Unused
+SlateportCity_ContestHall_Text_ExplainTorment: @ 8209322
 	.string "That's, like, TM41, you know?\n"
 	.string "Hey, it's TORMENT, you hearing me?\p"
 	.string "Like, it won't let the other guy\n"
@@ -192,7 +198,8 @@ SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
 	.string "Hey, now, you listen here, like,\n"
 	.string "I'm not laying a torment on you!$"
 
-SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
+@ Unused
+SlateportCity_ContestHall_Text_MCStepUpTakePartInContest: @ 82093ED
 	.string "MC: Oh, my, my!\n"
 	.string "Now isn't that a dandy of a POKéMON?\p"
 	.string "Please! Do step right up and take\n"
@@ -200,7 +207,8 @@ SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
 	.string "You'll do well! I'm sure of it!\n"
 	.string "My eyes have never failed me!$"
 
-SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
+@ Unused
+SlateportCity_ContestHall_Text_JudgeWouldntDoToMissContest: @ 82094A1
 	.string "JUDGE: Well, hello there!\n"
 	.string "I see that you're a TRAINER!\p"
 	.string "Then, it just wouldn't do for you\n"
@@ -208,17 +216,20 @@ SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
 	.string "Get a CONTEST PASS in VERDANTURF\n"
 	.string "CITY and enter anytime!$"
 
-SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E
+@ Unused
+SlateportCity_ContestHall_Text_ItsAppealTime: @ 820954E
 	.string "It's appeal time!\n"
 	.string "What should I lead with?$"
 
-SlateportCity_BattleTentCorridor_Text_209579: @ 8209579
+@ Unused
+SlateportCity_ContestHall_Text_DidntPayAttentionToAppeal: @ 8209579
 	.string "They didn't pay much attention to\n"
 	.string "my POKéMON's appeal…\p"
 	.string "Humph, that JUDGE, he doesn't know\n"
 	.string "a good thing when he sees it.$"
 
-SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
+@ Unused
+SlateportCity_ContestHall_Text_RewardWithSageAdvice: @ 82095F1
 	.string "Oh, hi! You must be a serious fan to get\n"
 	.string "this close to the action.\p"
 	.string "I'll reward your enthusiasm with\n"
@@ -230,35 +241,41 @@ SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
 	.string "Well, you'd think something good has\n"
 	.string "to happen!$"
 
-SlateportCity_BattleTentCorridor_Text_209718: @ 8209718
+@ Unused
+SlateportCity_ContestHall_Text_MoreFreakedOutThanMon: @ 8209718
 	.string "I can't do this! I'm more freaked out\n"
 	.string "than my POKéMON.\p"
 	.string "I'm shivering and my heart is racing!$"
 
-SlateportCity_BattleTentCorridor_Text_209775: @ 8209775
+@ Unused
+SlateportCity_ContestHall_Text_BattleAndContestAlike: @ 8209775
 	.string "A battle and a CONTEST aren't the\n"
 	.string "same, but they are alike, too.\p"
 	.string "You need to work hard and believe\n"
 	.string "in the POKéMON you've raised.$"
 
-SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6
+@ Unused
+SlateportCity_ContestHall_Text_MonLooksOnTopOfGame: @ 82097F6
 	.string "That POKéMON looks like it's on top\n"
 	.string "of its game, huh?\p"
 	.string "A POKéMON that does good in the\n"
 	.string "secondary judging seems to be more\l"
 	.string "relaxed when it's doing appeals.$"
 
-SlateportCity_BattleTentCorridor_Text_209890: @ 8209890
+@ Unused
+SlateportCity_ContestHall_Text_MyMonBetterThanThatLot: @ 8209890
 	.string "Will you look at that sorry sight?\p"
 	.string "Heh, my POKéMON's absolutely better\n"
 	.string "than that lot!$"
 
-SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6
+@ Unused
+SlateportCity_ContestHall_Text_GetUrgeToMoveWithMon: @ 82098E6
 	.string "Don't you get the urge to move with\n"
 	.string "POKéMON if they're putting on an\l"
 	.string "energetic appeal?$"
 
-SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D
+@ Unused
+SlateportCity_ContestHall_Text_HyperRankStage: @ 820993D
 	.string "POKéMON CONTESTS\n"
 	.string "HYPER RANK STAGE!$"
 
diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json
index 45783e2c9..b1d06a144 100644
--- a/data/maps/SlateportCity_BattleTentLobby/map.json
+++ b/data/maps/SlateportCity_BattleTentLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_BattleTentLobby_EventScript_2088AA",
+      "script": "SlateportCity_BattleTentLobby_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_BattleTentLobby_EventScript_208A3D",
+      "script": "SlateportCity_BattleTentLobby_EventScript_TormentGiver",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_BattleTentLobby_EventScript_208A7E",
+      "script": "SlateportCity_BattleTentLobby_EventScript_Man",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_BattleTentLobby_EventScript_208A87",
+      "script": "SlateportCity_BattleTentLobby_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_BattleTentLobby_EventScript_208A90",
+      "script": "SlateportCity_BattleTentLobby_EventScript_Woman",
       "flag": "0"
     }
   ],
@@ -104,7 +104,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_BattleTentLobby_EventScript_208A99"
+      "script": "SlateportCity_BattleTentLobby_EventScript_RulesBoard"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index d846c6028..6a74d6a6f 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -1,32 +1,32 @@
 SlateportCity_BattleTentLobby_MapScripts:: @ 8208730
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_OnWarp
 	.byte 0
 
-SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
-	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745
+SlateportCity_BattleTentLobby_OnWarp: @ 820873B
+	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
+SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 8208745
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
-	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, SlateportCity_BattleTentLobby_EventScript_208782
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, SlateportCity_BattleTentLobby_EventScript_208871
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, SlateportCity_BattleTentLobby_EventScript_2087B7
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, SlateportCity_BattleTentLobby_EventScript_208837
+SlateportCity_BattleTentLobby_OnFrame: @ 820874F
+	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, SlateportCity_BattleTentLobby_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, SlateportCity_BattleTentLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, SlateportCity_BattleTentLobby_EventScript_LostChallenge
 	.2byte 0
 
-SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
+SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus:: @ 8208779
 	frontier_getstatus
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
+SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8208782
 	lockall
-	msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT
+	msgbox SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	setvar VAR_TEMP_0, 255
@@ -34,50 +34,50 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
 	releaseall
 	end
 
-SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
+SlateportCity_BattleTentLobby_EventScript_WonChallenge:: @ 82087B7
 	lockall
-	message SlateportCity_BattleTentLobby_Text_2C5C6F
+	message SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons
 	waitmessage
 	slateporttent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	slateporttent_save 0
 	playse SE_SAVE
 	waitse
-SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
-	msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT
+SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9
+	msgbox SlateportCity_BattleTentLobby_Text_AwardYouThisPrize, MSGBOX_DEFAULT
 	slateporttent_giveprize
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_20882A
+	case FALSE, SlateportCity_BattleTentLobby_EventScript_NoRoomForPrize
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	message BattleFrontier_BattleTowerLobby_Text_ReceivedPrize
+	message BattleFrontier_BattleTowerLobby_Text_ReceivedPrize  @ Odd that it uses Tower's instead of Factory's or its own
 	waitmessage
 	playfanfare MUS_FANFA4
 	waitfanfare
-	goto SlateportCity_BattleTentLobby_EventScript_208861
+	goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
 
-SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A
-	msgbox SlateportCity_BattleTentLobby_Text_2C5D52, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208861
+SlateportCity_BattleTentLobby_EventScript_NoRoomForPrize:: @ 820882A
+	msgbox SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
 
-SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
+SlateportCity_BattleTentLobby_EventScript_LostChallenge:: @ 8208837
 	lockall
-	message SlateportCity_BattleTentLobby_Text_2C5BA2
+	message SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	slateporttent_save 0
 	playse SE_SAVE
 	waitse
 
-SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861
-	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT
+SlateportCity_BattleTentLobby_EventScript_EndGivePrize:: @ 8208861
+	msgbox SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
+SlateportCity_BattleTentLobby_EventScript_ResumeChallenge:: @ 8208871
 	lockall
-	message SlateportCity_BattleTentLobby_Text_2C5DA7
+	message SlateportCity_BattleTentLobby_Text_BeenWaitingForYou
 	waitmessage
 	slateporttent_save CHALLENGE_STATUS_SAVING
 	playse SE_SAVE
@@ -85,37 +85,37 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
 	setvar VAR_0x8006, 2
-	goto SlateportCity_BattleTentLobby_EventScript_2089AC
+	goto SlateportCity_BattleTentLobby_EventScript_EnterChallenge
 
-SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
+SlateportCity_BattleTentLobby_EventScript_Attendant:: @ 82088AA
 	lock
 	faceplayer
 	slateporttent_getprize
-	compare VAR_RESULT, 0
-	goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9
+	compare VAR_RESULT, ITEM_NONE
+	goto_if_ne SlateportCity_BattleTentLobby_EventScript_GivePrize
 	special SavePlayerParty
-	msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT
-SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
-	message SlateportCity_BattleTentLobby_Text_2C586A
+	msgbox SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
+SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge:: @ 82088CA
+	message SlateportCity_BattleTentLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_208906
-	case 1, SlateportCity_BattleTentLobby_EventScript_208A07
-	case 2, SlateportCity_BattleTentLobby_EventScript_208A2E
-	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2E
+	case 0, SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge
+	case 1, SlateportCity_BattleTentLobby_EventScript_ExplainChallenge
+	case 2, SlateportCity_BattleTentLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_CancelChallenge
 
-SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
+SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge:: @ 8208906
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
-	msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO
+	msgbox SlateportCity_BattleTentLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, SlateportCity_BattleTentLobby_EventScript_208A2B
-	case YES, SlateportCity_BattleTentLobby_EventScript_208950
-	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2B
+	case NO, SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge
+	case YES, SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge
 
-SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
+SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8208950
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	slateporttent_init
@@ -126,156 +126,156 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14
+	goto_if_eq SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed
 	setvar VAR_0x8006, 0
-SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC
-	msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT
+SlateportCity_BattleTentLobby_EventScript_EnterChallenge:: @ 82089AC
+	msgbox SlateportCity_BattleTentLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
-	call SlateportCity_BattleTentLobby_EventScript_2089C9
+	call SlateportCity_BattleTentLobby_EventScript_WalkToDoor
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9
-	applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF
+SlateportCity_BattleTentLobby_EventScript_WalkToDoor:: @ 82089C9
+	applymovement 1, SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor
 	waitmovement 0
 	opendoor 6, 1
 	waitdooranim
-	applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03
+	applymovement 1, SlateportCity_BattleTentLobby_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_PlayerEnterDoor
 	waitmovement 0
 	closedoor 6, 1
 	waitdooranim
 	return
 
-SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8
+SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor: @ 82089F8
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC
+SlateportCity_BattleTentLobby_Movement_AttendantEnterDoor: @ 82089FC
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF
+SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor: @ 82089FF
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03
+SlateportCity_BattleTentLobby_Movement_PlayerEnterDoor: @ 8208A03
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
-	msgbox SlateportCity_BattleTentLobby_Text_2C589C, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_2088CA
+SlateportCity_BattleTentLobby_EventScript_ExplainChallenge:: @ 8208A07
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainSlateportTent, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge
 
-SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
+SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 8208A14
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto SlateportCity_BattleTentLobby_EventScript_208A2E
+	goto SlateportCity_BattleTentLobby_EventScript_CancelChallenge
 
-SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
+SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 8208A2B
 	special LoadPlayerParty
-
-SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E
-	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT
+SlateportCity_BattleTentLobby_EventScript_CancelChallenge:: @ 8208A2E
+	msgbox SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38
+@ Unused
+SlateportCity_BattleTentLobby_Movement_UnusedEnterDoor:: @ 8208A38
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D
+SlateportCity_BattleTentLobby_EventScript_TormentGiver:: @ 8208A3D
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_208A74
-	msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_ReceivedTorment
+	msgbox SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM41
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM41
-	msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainTorment, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74
-	msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT
+SlateportCity_BattleTentLobby_EventScript_ReceivedTorment:: @ 8208A74
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainTorment, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E
-	msgbox SlateportCity_BattleTentLobby_Text_208D27, MSGBOX_NPC
+SlateportCity_BattleTentLobby_EventScript_Man:: @ 8208A7E
+	msgbox SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons, MSGBOX_NPC
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87
-	msgbox SlateportCity_BattleTentLobby_Text_208DA6, MSGBOX_NPC
+SlateportCity_BattleTentLobby_EventScript_Girl:: @ 8208A87
+	msgbox SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons, MSGBOX_NPC
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90
-	msgbox SlateportCity_BattleTentLobby_Text_208DF1, MSGBOX_NPC
+SlateportCity_BattleTentLobby_EventScript_Woman:: @ 8208A90
+	msgbox SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection, MSGBOX_NPC
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99
+SlateportCity_BattleTentLobby_EventScript_RulesBoard:: @ 8208A99
 	lockall
-	msgbox SlateportCity_BattleTentLobby_Text_259721, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+	msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8
-	message SlateportCity_BattleTentLobby_Text_259743
+SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8208AA8
+	message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_BattleTentLobby_EventScript_208B06
-	case 1, SlateportCity_BattleTentLobby_EventScript_208B14
-	case 2, SlateportCity_BattleTentLobby_EventScript_208B22
-	case 3, SlateportCity_BattleTentLobby_EventScript_208B30
-	case 4, SlateportCity_BattleTentLobby_EventScript_208B3E
-	case 5, SlateportCity_BattleTentLobby_EventScript_208B4C
-	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208B4C
+	case 0, SlateportCity_BattleTentLobby_EventScript_RulesBasics
+	case 1, SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner
+	case 2, SlateportCity_BattleTentLobby_EventScript_RulesSwapNumber
+	case 3, SlateportCity_BattleTentLobby_EventScript_RulesSwapNotes
+	case 4, SlateportCity_BattleTentLobby_EventScript_RulesMons
+	case 5, SlateportCity_BattleTentLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_ExitRules
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06
-	msgbox SlateportCity_BattleTentLobby_Text_2C5F08, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+SlateportCity_BattleTentLobby_EventScript_RulesBasics:: @ 8208B06
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainBasicRules, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14
-	msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner:: @ 8208B14
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22
-	msgbox SlateportCity_BattleTentLobby_Text_2C6020, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+SlateportCity_BattleTentLobby_EventScript_RulesSwapNumber:: @ 8208B22
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30
-	msgbox SlateportCity_BattleTentLobby_Text_2C60C0, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+SlateportCity_BattleTentLobby_EventScript_RulesSwapNotes:: @ 8208B30
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapNotes, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E
-	msgbox SlateportCity_BattleTentLobby_Text_2C61FE, MSGBOX_DEFAULT
-	goto SlateportCity_BattleTentLobby_EventScript_208AA8
+SlateportCity_BattleTentLobby_EventScript_RulesMons:: @ 8208B3E
+	msgbox SlateportCity_BattleTentLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
+	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C
+SlateportCity_BattleTentLobby_EventScript_ExitRules:: @ 8208B4C
 	releaseall
 	end
 
-SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E
+SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe: @ 8208B4E
 	.string "So, like, I couldn't find myself any\n"
 	.string "POKéMON that were, like, for me.\p"
 	.string "So, I figured, like, hey, I should file\n"
@@ -285,7 +285,7 @@ SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E
 	.string "Hey, like, you! Zip it, you know?\n"
 	.string "Just, you know, take this!$"
 
-SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C
+SlateportCity_BattleTentLobby_Text_ExplainTorment: @ 8208C5C
 	.string "That's, like, TM41, you know?\n"
 	.string "Hey, it's TORMENT, you hearing me?\p"
 	.string "Like, it won't let the other guy\n"
@@ -293,18 +293,18 @@ SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C
 	.string "Hey, now, you listen here, like,\n"
 	.string "I'm not laying a torment on you!$"
 
-SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27
+SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons: @ 8208D27
 	.string "I don't really like BUG POKéMON,\n"
 	.string "but maybe I'll try using some for\l"
 	.string "a change of pace.\p"
 	.string "Who knows, I might even get to like\n"
 	.string "them!$"
 
-SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6
+SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons: @ 8208DA6
 	.string "You can battle all you want here even\n"
 	.string "if you don't have any tough POKéMON.$"
 
-SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1
+SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection: @ 8208DF1
 	.string "Wouldn't it be nice if they had more of\n"
 	.string "a selection?$"
 
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 9facd0937..38fb70e7d 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -61,11 +61,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	closemessage
 	savebgm MUS_DUMMY
 	fadedefaultbgm
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
 	removeobject 3
 	removeobject 4
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	delay 30
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -75,7 +75,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	call Common_EventScript_PlayerHandedOverTheItem
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
@@ -87,7 +87,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
 	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	release
 	end
 
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index faec31717..6b80168b9 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -214,7 +214,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
-	fadescreenspeed 1, 8
+	fadescreenspeed FADE_TO_BLACK, 8
 	setweather WEATHER_ABNORMAL
 	doweather
 	setvar VAR_0x8004, 0
@@ -314,7 +314,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
-	fadescreenspeed 1, 8
+	fadescreenspeed FADE_TO_BLACK, 8
 	setweather WEATHER_ABNORMAL
 	doweather
 	setvar VAR_0x8004, 0
@@ -505,7 +505,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
-	fadescreenspeed 1, 8
+	fadescreenspeed FADE_TO_BLACK, 8
 	call SootopolisCity_EventScript_SetRoughWater
 	removeobject 9
 	removeobject 10
@@ -558,7 +558,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
-	fadescreenspeed 1, 8
+	fadescreenspeed FADE_TO_BLACK, 8
 	call SootopolisCity_EventScript_SetRoughWater
 	removeobject 9
 	removeobject 10
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 043d9ad82..949d199d5 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -126,7 +126,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	return
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 0e8d28c1d..cde7aae2f 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -219,7 +219,7 @@ TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
 
 TrainerHill_Entrance_EventScript_Records:: @ 8268388
 	lockall
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ShowTrainerHillRecords
 	waitstate
 	releaseall
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index 4760880e2..9f2b99090 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -1,68 +1,70 @@
 VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
 	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_OnWarp
 	.byte 0
 
+	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
+	@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_1
+	@ The opponent is represented by object event 2, which has the gfx id VAR_OBJ_GFX_ID_0
+
 VerdanturfTown_BattleTentBattleRoom_OnTransition: @ 820230A
-	call VerdanturfTown_BattleTentBattleRoom_EventScript_202310
+	call VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	end
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8202310
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328
+	goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333
+	goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 8202328
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8202333
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E
-	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348
+VerdanturfTown_BattleTentBattleRoom_OnFrame: @ 820233E
+	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
+VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 8202348
 	showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
-	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575
+	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
-	goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
+	goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
+VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820236F
 	tower_setopponent
 	addobject 2
-	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
+	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter
 	waitmovement 0
 	battletent_getopponentintro
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	switch VAR_RESULT
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8
-
-VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent
+VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 82023AA
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
+VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
 	switch VAR_RESULT
-	case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501
-	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
+	case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon
+	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit
 	waitmovement 0
 	removeobject 2
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
@@ -76,84 +78,84 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
 	waitfanfare
 	special HealPlayerParty
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
+VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 820243C
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
-	call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565
+	call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
 	compare VAR_RESULT, 2
-	call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_20256C
+	call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A
-	case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8
+	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
+	case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A
+VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 820248A
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-	case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F
-	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+	case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
+	case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8
+VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 82024B8
 	message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
-	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
-	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA
-	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
+	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
+	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA
+VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 82024EA
 	applymovement 3, Common_Movement_WalkInPlaceFastestRight
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	closemessage
-	goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F
+	goto VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
+VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8202501
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
+VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 820251F
 	message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData
 	waitmessage
 	verdanturftent_save CHALLENGE_STATUS_PAUSED
 	playse SE_SAVE
 	waitse
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	frontier_reset
 	end
 
-VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541
-	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B
+VerdanturfTown_BattleTentBattleRoom_OnWarp: @ 8202541
+	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 820254B
 	hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
-	call VerdanturfTown_BattleTentBattleRoom_EventScript_202310
+	call VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	setvar VAR_TEMP_1, 1
-	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573
+	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_SetInvisible
 	removeobject 2
 	end
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_202565:: @ 8202565
+VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8202565
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent
 	waitmessage
 	return
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C
+VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 820256C
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent
 	waitmessage
 	return
 
-VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573
+VerdanturfTown_BattleTentBattleRoom_Movement_SetInvisible: @ 8202573
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
+VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8202575
 	set_visible
 	walk_up
 	walk_up
@@ -161,7 +163,7 @@ VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
 	face_right
 	step_end
 
-VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
+VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 820257B
 	walk_down
 	walk_down
 	walk_down
@@ -169,7 +171,7 @@ VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
 	face_left
 	step_end
 
-VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581
+VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit: @ 8202581
 	walk_up
 	walk_up
 	walk_up
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
index 907ef3fd6..05991bef0 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
@@ -1,21 +1,21 @@
 VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_OnFrame
 	.byte 0
 
-VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090
-	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A
+VerdanturfTown_BattleTentCorridor_OnFrame: @ 8202090
+	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A
+VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 820209A
 	lockall
 	setvar VAR_TEMP_0, 1
-	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE
-	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE
+	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor
+	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor
 	waitmovement 0
 	opendoor 2, 1
 	waitdooranim
-	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4
-	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3
+	applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_PlayerEnterDoor
 	waitmovement 0
 	closedoor 2, 1
 	waitdooranim
@@ -25,22 +25,24 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A
 	releaseall
 	end
 
-VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE
+VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor: @ 82020DE
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3
+VerdanturfTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 82020E3
 	walk_up
-
-VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4
+VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 82020E4
 	walk_up
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
+
+@ Leftover text from when this was a Contest Hall in R/S
+@ Unused
+VerdanturfTown_ContestHall_Text_WhichContestYouEntering: @ 82020E7
 	.string "Which CONTEST are you entering?\n"
 	.string "Want a piece of advice?\p"
 	.string "In any CONTEST, for example, a CUTE\n"
@@ -49,21 +51,24 @@ VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
 	.string "You need to work out ways for raising\n"
 	.string "POKéMON better.$"
 
-VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4
+@ Unused
+VerdanturfTown_ContestHall_Text_RaisedMonToBeCute: @ 82021C4
 	.string "I raised my POKéMON to be cute.\p"
 	.string "I found out you can put POKéMON in\n"
 	.string "a CONTEST for cuteness!\p"
 	.string "I'm so glad I raised my POKéMON with\n"
 	.string "loving care…$"
 
-VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251
+@ Unused
+VerdanturfTown_ContestHall_Text_MyMonRules: @ 8202251
 	.string "My POKéMON rules!\p"
 	.string "It's cool, tough yet beautiful, cute,\n"
 	.string "and smart. It's complete!\p"
 	.string "I may as well go for wins in every\n"
 	.string "single CONTEST.$"
 
-VerdanturfTown_BattleTentCorridor_Text_2022D6: @ 82022D6
+@ Unused
+VerdanturfTown_ContestHall_Text_NormalRankStage: @ 82022D6
 	.string "POKéMON CONTESTS\n"
 	.string "NORMAL RANK STAGE!$"
 
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json
index 2a5660271..adc0be316 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/map.json
+++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201873",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_AttractGiver",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_Scott",
       "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7",
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_LittleBoy",
       "flag": "0"
     }
   ],
@@ -117,7 +117,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02"
+      "script": "VerdanturfTown_BattleTentLobby_EventScript_RulesBoard"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index f15bbd4f8..882b0e887 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -1,30 +1,30 @@
 VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_OnWarp
 	.byte 0
 
-VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
-	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5
+VerdanturfTown_BattleTentLobby_OnWarp: @ 82016DB
+	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
+VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 82016E5
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
-	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, VerdanturfTown_BattleTentLobby_EventScript_201722
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, VerdanturfTown_BattleTentLobby_EventScript_201837
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, VerdanturfTown_BattleTentLobby_EventScript_201757
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, VerdanturfTown_BattleTentLobby_EventScript_2017FD
+VerdanturfTown_BattleTentLobby_OnFrame: @ 82016EF
+	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, VerdanturfTown_BattleTentLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, VerdanturfTown_BattleTentLobby_EventScript_LostChallenge
 	.2byte 0
 
-VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
+VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus:: @ 8201719
 	frontier_getstatus
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
+VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8201722
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT
 	closemessage
@@ -34,10 +34,10 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
+VerdanturfTown_BattleTentLobby_EventScript_WonChallenge:: @ 8201757
 	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT
-	message VerdanturfTown_BattleTentLobby_Text_2C5791
+	msgbox VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak, MSGBOX_DEFAULT
+	message VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded
 	waitmessage
 	verdanturftent_setrandomprize
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
@@ -45,23 +45,23 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
 	playse SE_SAVE
 	waitse
 
-VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT
+VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791
+	msgbox VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize, MSGBOX_DEFAULT
 	verdanturftent_giveprize
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
+	case FALSE, VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	message VerdanturfTown_BattleTentLobby_Text_24A554
+	message BattleFrontier_BattleDomeLobby_Text_ReceivedPrize  @ Odd that it used Dome's copy instead of Palace's
 	waitmessage
 	playfanfare MUS_FANFA4
 	waitfanfare
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
+VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 82017DD
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
@@ -69,27 +69,27 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE
+VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting:: @ 82017EE
 	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201791
+	msgbox VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak, MSGBOX_DEFAULT
+	goto VerdanturfTown_BattleTentLobby_EventScript_GivePrize
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
+VerdanturfTown_BattleTentLobby_EventScript_LostChallenge:: @ 82017FD
 	lockall
-	message VerdanturfTown_BattleTentLobby_Text_2C56B8
+	message VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded
 	waitmessage
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	verdanturftent_save 0
 	playse SE_SAVE
 	waitse
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
+VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 8201837
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge
@@ -99,50 +99,49 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
 	waitse
 	frontier_set FRONTIER_DATA_PAUSED, FALSE
 	setvar VAR_TEMP_0, 255
-	goto VerdanturfTown_BattleTentLobby_EventScript_2019AE
+	goto VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
+VerdanturfTown_BattleTentLobby_EventScript_Attendant:: @ 8201873
 	lock
 	faceplayer
 	verdanturftent_getprize
-	compare VAR_RESULT, 0
-	goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE
+	compare VAR_RESULT, ITEM_NONE
+	goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting
 	special SavePlayerParty
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT
-
-VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893
-	message VerdanturfTown_BattleTentLobby_Text_2C5129
+	msgbox VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
+VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8201893
+	message VerdanturfTown_BattleTentLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB
-	case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37
-	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A37
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge
+	case 1, VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge
+	case 2, VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
+VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 82018CF
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	setvar VAR_RESULT, 2
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
+	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT
-	fadescreen 1
+	msgbox VerdanturfTown_BattleTentLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO
+	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
+	msgbox VerdanturfTown_BattleTentLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, VerdanturfTown_BattleTentLobby_EventScript_201A34
-	case YES, VerdanturfTown_BattleTentLobby_EventScript_201954
-	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A34
+	case NO, VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
+	case YES, VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
+VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8201954
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	verdanturftent_init
@@ -154,185 +153,184 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
-	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D
-
-VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
+	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed
+VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge:: @ 82019AE
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_BattleTentLobby_Text_NowFollowMe, MSGBOX_DEFAULT
 	closemessage
-	call VerdanturfTown_BattleTentLobby_EventScript_201A41
+	call VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
 	setvar VAR_TEMP_0, 0
 	waitstate
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201893
+VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge:: @ 82019DB
+	msgbox VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent, MSGBOX_DEFAULT
+	goto VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8
+VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons:: @ 82019E8
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, VerdanturfTown_BattleTentLobby_EventScript_201A03
-	case FRONTIER_LVL_OPEN, VerdanturfTown_BattleTentLobby_EventScript_201A10
+	case FRONTIER_LVL_50, VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50
+	case FRONTIER_LVL_OPEN, VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen
 
-VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
+VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50:: @ 8201A03
+	msgbox VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+	goto VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
+VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8201A10
+	msgbox VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+	goto VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
+VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 8201A1D
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto VerdanturfTown_BattleTentLobby_EventScript_201A37
+	goto VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
+VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 8201A34
 	special LoadPlayerParty
-VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
-VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F
+VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge:: @ 8201A37
+	msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
+VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge:: @ 8201A3F
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41
-	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70
-	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70
+VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor:: @ 8201A41
+	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_WalkToDoor
+	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_WalkToDoor
 	waitmovement 0
 	opendoor 6, 1
 	waitdooranim
-	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74
-	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77
+	applymovement 1, VerdanturfTown_BattleTentLobby_Movement_AttendantEnterDoor
+	applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_PlayerEnterDoor
 	waitmovement 0
 	closedoor 6, 1
 	waitdooranim
 	return
 
-VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70
+VerdanturfTown_BattleTentLobby_Movement_WalkToDoor: @ 8201A70
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74
+VerdanturfTown_BattleTentLobby_Movement_AttendantEnterDoor: @ 8201A74
 	walk_up
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77
+VerdanturfTown_BattleTentLobby_Movement_PlayerEnterDoor: @ 8201A77
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B
+VerdanturfTown_BattleTentLobby_EventScript_AttractGiver:: @ 8201A7B
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_201AB2
-	msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract
+	msgbox VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM45
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM45
-	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_BattleTentLobby_Text_AttractionMutual, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2
-	msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT
+VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract:: @ 8201AB2
+	msgbox VerdanturfTown_BattleTentLobby_Text_AttractionMutual, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC
-	msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, MSGBOX_NPC
+VerdanturfTown_BattleTentLobby_EventScript_Boy1:: @ 8201ABC
+	msgbox VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves, MSGBOX_NPC
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5
+VerdanturfTown_BattleTentLobby_EventScript_Boy2:: @ 8201AC5
 	lock
-	msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0
+VerdanturfTown_BattleTentLobby_EventScript_Scott:: @ 8201AD0
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED
-	msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo
+	msgbox VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers, MSGBOX_DEFAULT
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_VERDANTURF
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED
-	msgbox VerdanturfTown_BattleTentLobby_Text_202025, MSGBOX_DEFAULT
+VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo:: @ 8201AED
+	msgbox VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7
+VerdanturfTown_BattleTentLobby_EventScript_LittleBoy:: @ 8201AF7
 	lock
-	msgbox VerdanturfTown_BattleTentLobby_Text_201D11, MSGBOX_DEFAULT
+	msgbox VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02
+VerdanturfTown_BattleTentLobby_EventScript_RulesBoard:: @ 8201B02
 	lockall
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	msgbox VerdanturfTown_BattleTentLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11
+VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8201B11
 	message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BATTLE_TENT_RULES
 	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
-	case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E
-	case 1, VerdanturfTown_BattleTentLobby_EventScript_201B8C
-	case 2, VerdanturfTown_BattleTentLobby_EventScript_201B9A
-	case 3, VerdanturfTown_BattleTentLobby_EventScript_201BA8
-	case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6
-	case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4
-	case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2
-	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201BD2
+	case 0, VerdanturfTown_BattleTentLobby_EventScript_RulesLevel
+	case 1, VerdanturfTown_BattleTentLobby_EventScript_RulesBasics
+	case 2, VerdanturfTown_BattleTentLobby_EventScript_RulesNature
+	case 3, VerdanturfTown_BattleTentLobby_EventScript_RulesMoves
+	case 4, VerdanturfTown_BattleTentLobby_EventScript_RulesUnderpowered
+	case 5, VerdanturfTown_BattleTentLobby_EventScript_RulesWhenInDanger
+	case 6, VerdanturfTown_BattleTentLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_ExitRules
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E
-	msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+VerdanturfTown_BattleTentLobby_EventScript_RulesLevel:: @ 8201B7E
+	msgbox BattleTentLobby_Text_ExplainLevelRules, MSGBOX_DEFAULT
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C
+VerdanturfTown_BattleTentLobby_EventScript_RulesBasics:: @ 8201B8C
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A
+VerdanturfTown_BattleTentLobby_EventScript_RulesNature:: @ 8201B9A
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8
+VerdanturfTown_BattleTentLobby_EventScript_RulesMoves:: @ 8201BA8
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6
+VerdanturfTown_BattleTentLobby_EventScript_RulesUnderpowered:: @ 8201BB6
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4
+VerdanturfTown_BattleTentLobby_EventScript_RulesWhenInDanger:: @ 8201BC4
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT
-	goto VerdanturfTown_BattleTentLobby_EventScript_201B11
+	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2
+VerdanturfTown_BattleTentLobby_EventScript_ExitRules:: @ 8201BD2
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4
+VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves: @ 8201BD4
 	.string "If it doesn't like a certain move,\n"
 	.string "a POKéMON will be reluctant to use it.\p"
 	.string "It doesn't matter how strong it is,\n"
@@ -344,14 +342,14 @@ VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4
 	.string "potential, it's probably failing at\l"
 	.string "using a disliked move against its will.$"
 
-VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11
+VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry: @ 8201D11
 	.string "My big sister is gentle usually.\n"
 	.string "But when she gets angry,\l"
 	.string "she's really, really scary!\p"
 	.string "I bet a gentle POKéMON will be scary\n"
 	.string "if it gets angry!$"
 
-VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E
+VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep: @ 8201D9E
 	.string "My feelings toward my POKéMON…\n"
 	.string "The attraction runs deep…\p"
 	.string "Oh, hi, you didn't see that, did you?\n"
@@ -359,20 +357,20 @@ VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E
 	.string "How would you like this TM for\n"
 	.string "your POKéMON?$"
 
-VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43
+VerdanturfTown_BattleTentLobby_Text_AttractionMutual: @ 8201E43
 	.string "My feelings toward my POKéMON…\n"
 	.string "I'm sure the attraction is mutual!\p"
 	.string "They battle exactly the way I want\n"
 	.string "them to!$"
 
-VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1
+VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves: @ 8201EB1
 	.string "What kind of moves have you taught\n"
 	.string "your POKéMON?\p"
 	.string "I think you would give yourself\n"
 	.string "an advantage if they knew how to\l"
 	.string "heal or protect themselves.$"
 
-VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F
+VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers: @ 8201F3F
 	.string "SCOTT: Hey there, {PLAYER}{KUN}!\n"
 	.string "I thought I might see you here.\p"
 	.string "A BATTLE TENT's a place where\n"
@@ -382,7 +380,7 @@ VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F
 	.string "{PLAYER}{KUN}, I expect you to do\n"
 	.string "the best you can!$"
 
-VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025
+VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly: @ 8202025
 	.string "SCOTT: I visit here regularly in hopes\n"
 	.string "of seeing tough TRAINERS in action\l"
 	.string "in whatever the situation.$"
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 6ef8f816d..0a62eb0ea 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -521,7 +521,7 @@
     "BattleFrontier_BattlePalaceCorridor",
     "BattleFrontier_BattlePalaceBattleRoom",
     "BattleFrontier_BattlePyramidLobby",
-    "BattleFrontier_BattlePyramidEmptySquare",
+    "BattleFrontier_BattlePyramidFloor",
     "BattleFrontier_BattlePyramidTop",
     "BattleFrontier_BattleArenaLobby",
     "BattleFrontier_BattleArenaCorridor",
diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc
index 9a900f315..88da0405f 100644
--- a/data/scripts/abnormal_weather.inc
+++ b/data/scripts/abnormal_weather.inc
@@ -179,7 +179,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
 
 AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	closemessage
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	setweather WEATHER_SUNNY
 	doweather
 	call AbnormalWeather_EventScript_CleanupMapTiles
@@ -187,7 +187,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE
 	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	releaseall
 	end
 
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index 53b43a1f9..b3ae904a0 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -96,7 +96,7 @@ Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF
 	apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM
 	apprentice_freequestion
 Apprentice_EventScript_ChooseHoldItem: @ 82B6B09
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setvar VAR_RESULT, 0
 	apprentice_openbag
 	compare VAR_RESULT, FALSE
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index 1d0862a65..b699c8e04 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -302,7 +302,7 @@ BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
 @ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left
 BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
 	copyvar VAR_0x8004, VAR_0x8009
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special DoBerryBlending
 	waitstate
 	releaseall
@@ -629,7 +629,7 @@ BerryBlender_EventScript_FourPlayerLink: @ 8294139
 
 BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
 	setvar VAR_0x8004, 0
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 240
 	removeobject 239
 	removeobject 238
@@ -678,7 +678,7 @@ BerryBlender_EventScript_LinkError: @ 829419D
 	end
 
 BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	specialvar VAR_RESULT, GetLinkPartnerNames
 	copyvar VAR_0x8008, VAR_RESULT
 	copyvar VAR_0x8004, VAR_0x8008
@@ -687,7 +687,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
 	end
 
 BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	switch VAR_0x8008
 	case 2, BerryBlender_EventScript_TwoPlayerLink
 	case 3, BerryBlender_EventScript_ThreePlayerLink
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 6b2da5ccb..f4b592b69 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -39,7 +39,7 @@ BerryTree_EventScript_WantToPlant:: @ 8274374
 	end
 
 BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	closemessage
 	special Bag_ChooseBerry
 	waitstate
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index f37596961..2da5fa6b6 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -723,7 +723,7 @@ EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
 	end
 
 EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
@@ -734,7 +734,7 @@ EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
 	end
 
 EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
@@ -745,7 +745,7 @@ EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
 	end
 
 EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
@@ -756,7 +756,7 @@ EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
 	end
 
 EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
@@ -838,14 +838,14 @@ RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
 
 CableClub_EventScript_ReadTrainerCard:: @ 827747E
 	msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special Script_ShowLinkTrainerCard
 	waitstate
 	end
 
 CableClub_EventScript_ReadTrainerCardColored:: @ 827748D
 	msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special Script_ShowLinkTrainerCard
 	waitstate
 	end
@@ -1309,7 +1309,7 @@ EventScript_WirelessBoxResults:: @ 8277B8A
 	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, FALSE
 	goto_if_eq CableClub_EventScript_AdapterNotConnected
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_801A42C
 	waitstate
 	msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT
@@ -1408,7 +1408,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
 	compare VAR_RESULT, FALSE
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
 	msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setvar VAR_0x8005, 0
 	special ChooseMonForWirelessMinigame
 	waitstate
@@ -1427,7 +1427,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
 	compare VAR_RESULT, FALSE
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
 	msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setvar VAR_0x8005, 1
 	special ChooseMonForWirelessMinigame
 	waitstate
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 968464f9d..6506897ee 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -102,7 +102,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56
 	compare VAR_RESULT, 2
 	goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons
 	msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChooseSendDaycareMon
 	waitstate
 	compare VAR_0x8004, 255
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index d15da3399..3ce36b384 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -15,7 +15,7 @@ EventScript_FieldWhiteOut:: @ 82736D9
 	waitbuttonpress
 	special Script_FadeOutMapMusic
 	waitstate
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
 	special SetCB2WhiteOut
 	waitstate
@@ -34,15 +34,15 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
 	goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
 	pyramid_inchallenge
 	compare VAR_RESULT, 1  @ On Pyramid floor
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	compare VAR_RESULT, 2  @ On Pyramid peak
-	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
+	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	trainerhill_inchallenge
 	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_1F_EventScript_Lost
 	special Script_FadeOutMapMusic
 	waitstate
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special SetCB2WhiteOut
 	waitstate
 	end
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 045fbb5a7..5e926afc0 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,659 +1,659 @@
 Route102_EventScript_ItemPotion:: @ 8290CD8
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route103_EventScript_ItemGuardSpec:: @ 8290CE5
-	giveitem_std ITEM_GUARD_SPEC, 1, 1
+	finditem_std ITEM_GUARD_SPEC
 	end
 
 Route103_EventScript_ItemPPUp:: @ 8290CF2
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route104_EventScript_ItemPPUp:: @ 8290CFF
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route104_EventScript_ItemPokeBall:: @ 8290D0C
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem_std ITEM_POKE_BALL
 	end
 
 Route104_EventScript_ItemXAccuracy:: @ 8290D19
-	giveitem_std ITEM_X_ACCURACY, 1, 1
+	finditem_std ITEM_X_ACCURACY
 	end
 
 Route104_EventScript_ItemPotion:: @ 8290D26
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route105_EventScript_ItemIron:: @ 8290D33
-	giveitem_std ITEM_IRON, 1, 1
+	finditem_std ITEM_IRON
 	end
 
 Route106_EventScript_ItemProtein:: @ 8290D40
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem_std ITEM_PROTEIN
 	end
 
 Route108_EventScript_ItemStarPiece:: @ 8290D4D
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem_std ITEM_STAR_PIECE
 	end
 
 Route109_EventScript_ItemPPUp:: @ 8290D5A
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route109_EventScript_ItemPotion:: @ 8290D67
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route110_EventScript_ItemRareCandy:: @ 8290D74
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route110_EventScript_ItemDireHit:: @ 8290D81
-	giveitem_std ITEM_DIRE_HIT, 1, 1
+	finditem_std ITEM_DIRE_HIT
 	end
 
 Route110_EventScript_ItemElixir:: @ 8290D8E
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route111_EventScript_ItemTM37:: @ 8290D9B
-	giveitem_std ITEM_TM37, 1, 1
+	finditem_std ITEM_TM37
 	end
 
 Route111_EventScript_ItemStardust:: @ 8290DA8
-	giveitem_std ITEM_STARDUST, 1, 1
+	finditem_std ITEM_STARDUST
 	end
 
 Route111_EventScript_ItemHPUp:: @ 8290DB5
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem_std ITEM_HP_UP
 	end
 
 Route111_EventScript_ItemElixir:: @ 8290DC2
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route112_EventScript_ItemNugget:: @ 8290DCF
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 Route113_EventScript_ItemMaxEther:: @ 8290DDC
-	giveitem_std ITEM_MAX_ETHER, 1, 1
+	finditem_std ITEM_MAX_ETHER
 	end
 
 Route113_EventScript_ItemSuperRepel:: @ 8290DE9
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem_std ITEM_SUPER_REPEL
 	end
 
 Route113_EventScript_ItemHyperPotion:: @ 8290DF6
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route114_EventScript_ItemRareCandy:: @ 8290E03
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route114_EventScript_ItemProtein:: @ 8290E10
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem_std ITEM_PROTEIN
 	end
 
 Route114_EventScript_ItemEnergyPowder:: @ 8290E1D
-	giveitem_std ITEM_ENERGY_POWDER, 1, 1
+	finditem_std ITEM_ENERGY_POWDER
 	end
 
 Route115_EventScript_ItemSuperPotion:: @ 8290E2A
-	giveitem_std ITEM_SUPER_POTION, 1, 1
+	finditem_std ITEM_SUPER_POTION
 	end
 
 Route115_EventScript_ItemTM01:: @ 8290E37
-	giveitem_std ITEM_TM01, 1, 1
+	finditem_std ITEM_TM01
 	end
 
 Route115_EventScript_ItemIron:: @ 8290E44
-	giveitem_std ITEM_IRON, 1, 1
+	finditem_std ITEM_IRON
 	end
 
 Route115_EventScript_ItemGreatBall:: @ 8290E51
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem_std ITEM_GREAT_BALL
 	end
 
 Route115_EventScript_ItemHealPowder:: @ 8290E5E
-	giveitem_std ITEM_HEAL_POWDER, 1, 1
+	finditem_std ITEM_HEAL_POWDER
 	end
 
 Route115_EventScript_ItemPPUp:: @ 8290E6B
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route116_EventScript_ItemXSpecial:: @ 8290E78
-	giveitem_std ITEM_X_SPECIAL, 1, 1
+	finditem_std ITEM_X_SPECIAL
 	end
 
 Route116_EventScript_ItemEther:: @ 8290E85
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem_std ITEM_ETHER
 	end
 
 Route116_EventScript_ItemRepel:: @ 8290E92
-	giveitem_std ITEM_REPEL, 1, 1
+	finditem_std ITEM_REPEL
 	end
 
 Route116_EventScript_ItemHPUp:: @ 8290E9F
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem_std ITEM_HP_UP
 	end
 
 Route116_EventScript_ItemPotion:: @ 8290EAC
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route117_EventScript_ItemGreatBall:: @ 8290EB9
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem_std ITEM_GREAT_BALL
 	end
 
 Route117_EventScript_ItemRevive:: @ 8290EC6
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 Route118_EventScript_ItemHyperPotion:: @ 8290ED3
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemSuperRepel:: @ 8290EE0
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem_std ITEM_SUPER_REPEL
 	end
 
 Route119_EventScript_ItemZinc:: @ 8290EED
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem_std ITEM_ZINC
 	end
 
 Route119_EventScript_ItemElixir:: @ 8290EFA
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route119_EventScript_ItemLeafStone:: @ 8290F07
-	giveitem_std ITEM_LEAF_STONE, 1, 1
+	finditem_std ITEM_LEAF_STONE
 	end
 
 Route119_EventScript_ItemRareCandy:: @ 8290F14
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route119_EventScript_ItemHyperPotion:: @ 8290F21
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemHyperPotion2:: @ 8290F2E
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemElixir2:: @ 8290F3B
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route120_EventScript_ItemNugget:: @ 8290F48
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 Route120_EventScript_ItemFullHeal:: @ 8290F55
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 Route120_EventScript_ItemHyperPotion:: @ 8290F62
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route120_EventScript_ItemNestBall:: @ 8290F6F
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem_std ITEM_NEST_BALL
 	end
 
 Route120_EventScript_ItemRevive:: @ 8290F7C
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 Route121_EventScript_ItemCarbos:: @ 8290F89
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 Route121_EventScript_ItemRevive:: @ 8290F96
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 Route121_EventScript_ItemZinc:: @ 8290FA3
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem_std ITEM_ZINC
 	end
 
 Route123_EventScript_ItemCalcium:: @ 8290FB0
-	giveitem_std ITEM_CALCIUM, 1, 1
+	finditem_std ITEM_CALCIUM
 	end
 
 Route123_EventScript_ItemUltraBall:: @ 8290FBD
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem_std ITEM_ULTRA_BALL
 	end
 
 Route123_EventScript_ItemElixir:: @ 8290FCA
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route123_EventScript_ItemPPUp:: @ 8290FD7
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route123_EventScript_ItemRevivalHerb:: @ 8290FE4
-	giveitem_std ITEM_REVIVAL_HERB, 1, 1
+	finditem_std ITEM_REVIVAL_HERB
 	end
 
 Route124_EventScript_ItemRedShard:: @ 8290FF1
-	giveitem_std ITEM_RED_SHARD, 1, 1
+	finditem_std ITEM_RED_SHARD
 	end
 
 Route124_EventScript_ItemBlueShard:: @ 8290FFE
-	giveitem_std ITEM_BLUE_SHARD, 1, 1
+	finditem_std ITEM_BLUE_SHARD
 	end
 
 Route124_EventScript_ItemYellowShard:: @ 829100B
-	giveitem_std ITEM_YELLOW_SHARD, 1, 1
+	finditem_std ITEM_YELLOW_SHARD
 	end
 
 Route125_EventScript_ItemBigPearl:: @ 8291018
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 Route126_EventScript_ItemGreenShard:: @ 8291025
-	giveitem_std ITEM_GREEN_SHARD, 1, 1
+	finditem_std ITEM_GREEN_SHARD
 	end
 
 Route127_EventScript_ItemZinc:: @ 8291032
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem_std ITEM_ZINC
 	end
 
 Route127_EventScript_ItemCarbos:: @ 829103F
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 Route127_EventScript_ItemRareCandy:: @ 829104C
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route132_EventScript_ItemRareCandy:: @ 8291059
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route132_EventScript_ItemProtein:: @ 8291066
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem_std ITEM_PROTEIN
 	end
 
 Route133_EventScript_ItemBigPearl:: @ 8291073
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 Route133_EventScript_ItemStarPiece:: @ 8291080
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem_std ITEM_STAR_PIECE
 	end
 
 Route133_EventScript_ItemMaxRevive:: @ 829108D
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 Route134_EventScript_ItemCarbos:: @ 829109A
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 Route134_EventScript_ItemStarPiece:: @ 82910A7
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem_std ITEM_STAR_PIECE
 	end
 
 PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 PetalburgCity_EventScript_ItemEther:: @ 82910C1
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem_std ITEM_ETHER
 	end
 
 MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
-	giveitem_std ITEM_X_SPEED, 1, 1
+	finditem_std ITEM_X_SPEED
 	end
 
 RustboroCity_EventScript_ItemXDefend:: @ 82910DB
-	giveitem_std ITEM_X_DEFEND, 1, 1
+	finditem_std ITEM_X_DEFEND
 	end
 
 LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8
-	giveitem_std ITEM_MAX_REPEL, 1, 1
+	finditem_std ITEM_MAX_REPEL
 	end
 
 MossdeepCity_EventScript_ItemNetBall:: @ 82910F5
-	giveitem_std ITEM_NET_BALL, 1, 1
+	finditem_std ITEM_NET_BALL
 	end
 
 PetalburgWoods_EventScript_ItemXAttack:: @ 8291102
-	giveitem_std ITEM_X_ATTACK, 1, 1
+	finditem_std ITEM_X_ATTACK
 	end
 
 PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem_std ITEM_GREAT_BALL
 	end
 
 PetalburgWoods_EventScript_ItemEther:: @ 829111C
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem_std ITEM_ETHER
 	end
 
 PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129
-	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
+	finditem_std ITEM_PARALYZE_HEAL
 	end
 
 RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem_std ITEM_POKE_BALL
 	end
 
 RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143
-	giveitem_std ITEM_MAX_ETHER, 1, 1
+	finditem_std ITEM_MAX_ETHER
 	end
 
 GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
 
 GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem_std ITEM_POKE_BALL
 	end
 
 GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A
-	giveitem_std ITEM_REPEL, 1, 1
+	finditem_std ITEM_REPEL
 	end
 
 GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 JaggedPass_EventScript_ItemBurnHeal:: @ 8291184
-	giveitem_std ITEM_BURN_HEAL, 1, 1
+	finditem_std ITEM_BURN_HEAL
 	end
 
 FieryPath_EventScript_ItemFireStone:: @ 8291191
-	giveitem_std ITEM_FIRE_STONE, 1, 1
+	finditem_std ITEM_FIRE_STONE
 	end
 
 FieryPath_EventScript_ItemTM06:: @ 829119E
-	giveitem_std ITEM_TM06, 1, 1
+	finditem_std ITEM_TM06
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB
-	giveitem_std ITEM_TM23, 1, 1
+	finditem_std ITEM_TM23
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5
-	giveitem_std ITEM_MOON_STONE, 1, 1
+	finditem_std ITEM_MOON_STONE
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
-	giveitem_std ITEM_TM02, 1, 1
+	finditem_std ITEM_TM02
 	end
 
 NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem_std ITEM_ULTRA_BALL
 	end
 
 NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
 
 NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206
-	giveitem_std ITEM_THUNDER_STONE, 1, 1
+	finditem_std ITEM_THUNDER_STONE
 	end
 
 NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220
-	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
+	finditem_std ITEM_PARALYZE_HEAL
 	end
 
 AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D
-	giveitem_std ITEM_HARBOR_MAIL, 1, 1
+	finditem_std ITEM_HARBOR_MAIL
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
 
 AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247
-	giveitem_std ITEM_DIVE_BALL, 1, 1
+	finditem_std ITEM_DIVE_BALL
 	end
 
 AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254
-	giveitem_std ITEM_TM13, 1, 1
+	finditem_std ITEM_TM13
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E
-	giveitem_std ITEM_STORAGE_KEY, 1, 1
+	finditem_std ITEM_STORAGE_KEY
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B
-	giveitem_std ITEM_LUXURY_BALL, 1, 1
+	finditem_std ITEM_LUXURY_BALL
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288
-	giveitem_std ITEM_SCANNER, 1, 1
+	finditem_std ITEM_SCANNER
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295
-	giveitem_std ITEM_WATER_STONE, 1, 1
+	finditem_std ITEM_WATER_STONE
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2
-	giveitem_std ITEM_TM18, 1, 1
+	finditem_std ITEM_TM18
 	end
 
 ScorchedSlab_EventScript_ItemTM11:: @ 82912AF
-	giveitem_std ITEM_TM11, 1, 1
+	finditem_std ITEM_TM11
 	end
 
 SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC
-	giveitem_std ITEM_TM22, 1, 1
+	finditem_std ITEM_TM22
 	end
 
 SafariZone_North_EventScript_ItemCalcium:: @ 82912C9
-	giveitem_std ITEM_CALCIUM, 1, 1
+	finditem_std ITEM_CALCIUM
 	end
 
 SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem_std ITEM_ULTRA_BALL
 	end
 
 MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem_std ITEM_SUPER_REPEL
 	end
 
 MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317
-	giveitem_std ITEM_SEA_INCENSE, 1, 1
+	finditem_std ITEM_SEA_INCENSE
 	end
 
 MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324
-	giveitem_std ITEM_LAX_INCENSE, 1, 1
+	finditem_std ITEM_LAX_INCENSE
 	end
 
 MtPyre_6F_EventScript_ItemTM30:: @ 8291331
-	giveitem_std ITEM_TM30, 1, 1
+	finditem_std ITEM_TM30
 	end
 
 MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E
-	giveitem_std ITEM_MAX_POTION, 1, 1
+	finditem_std ITEM_MAX_POTION
 	end
 
 MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B
-	giveitem_std ITEM_TM48, 1, 1
+	finditem_std ITEM_TM48
 	end
 
 AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358
-	giveitem_std ITEM_MASTER_BALL, 1, 1
+	finditem_std ITEM_MASTER_BALL
 	end
 
 AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem_std ITEM_NEST_BALL
 	end
 
 AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C
-	giveitem_std ITEM_MASTER_BALL, 1, 1      // Unused
+	finditem_std ITEM_MASTER_BALL      // Unused
 	end
 
 Route119_EventScript_ItemNugget:: @ 8291399
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 Route119_EventScript_ItemMaxElixir:: @ 82913A6
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 Route119_EventScript_ItemNestBall:: @ 82913B3
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem_std ITEM_NEST_BALL
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA
-	giveitem_std ITEM_ICE_HEAL, 1, 1
+	finditem_std ITEM_ICE_HEAL
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7
-	giveitem_std ITEM_TM07, 1, 1
+	finditem_std ITEM_TM07
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4
-	giveitem_std ITEM_NEVER_MELT_ICE, 1, 1
+	finditem_std ITEM_NEVER_MELT_ICE
 	end
 
 SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401
-	giveitem_std ITEM_TM26, 1, 1
+	finditem_std ITEM_TM26
 	end
 
 Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E
-	giveitem_std ITEM_ORANGE_MAIL, 1, 1
+	finditem_std ITEM_ORANGE_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B
-	giveitem_std ITEM_HARBOR_MAIL, 1, 1
+	finditem_std ITEM_HARBOR_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428
-	giveitem_std ITEM_WAVE_MAIL, 1, 1
+	finditem_std ITEM_WAVE_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435
-	giveitem_std ITEM_SHADOW_MAIL, 1, 1
+	finditem_std ITEM_SHADOW_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442
-	giveitem_std ITEM_WOOD_MAIL, 1, 1
+	finditem_std ITEM_WOOD_MAIL
 	end
 
 Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F
-	giveitem_std ITEM_MECH_MAIL, 1, 1
+	finditem_std ITEM_MECH_MAIL
 	end
 
 Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C
-	giveitem_std ITEM_GLITTER_MAIL, 1, 1
+	finditem_std ITEM_GLITTER_MAIL
 	end
 
 Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469
-	giveitem_std ITEM_TROPIC_MAIL, 1, 1
+	finditem_std ITEM_TROPIC_MAIL
 	end
 
 Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476
-	giveitem_std ITEM_BEAD_MAIL, 1, 1
+	finditem_std ITEM_BEAD_MAIL
 	end
 
 VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D
-	giveitem_std ITEM_TM29, 1, 1
+	finditem_std ITEM_TM29
 	end
 
 VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA
-	giveitem_std ITEM_FULL_RESTORE, 1, 1
+	finditem_std ITEM_FULL_RESTORE
 	end
 
 VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem_std ITEM_HP_UP
 	end
 
 ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8
-	giveitem_std ITEM_FULL_RESTORE, 1, 1
+	finditem_std ITEM_FULL_RESTORE
 	end
 
 MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
-	giveitem_std ITEM_PP_MAX, 1, 1
+	finditem_std ITEM_PP_MAX
 	end
 
 MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index f553ea0ad..c2ff593cf 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -73,7 +73,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E
     end
 
 LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C
-    fadescreen 1
+    fadescreen FADE_TO_BLACK
     setvar VAR_RESULT, 0
     special Script_FavorLadyOpenBagMenu
     waitstate
@@ -326,7 +326,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778
 LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785
     msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT
 LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D
-    fadescreen 1
+    fadescreen FADE_TO_BLACK
     setvar VAR_RESULT, 0
     special Script_QuizLadyOpenBagMenu
     waitstate
@@ -350,7 +350,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE
     special ClearQuizLadyPlayerAnswer
     setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION
 LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1
-    fadescreen 1
+    fadescreen FADE_TO_BLACK
     special QuizLadySetCustomQuestion
     waitstate
     compare VAR_RESULT, 0
@@ -418,7 +418,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0
     end
 
 LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA
-    fadescreen 1
+    fadescreen FADE_TO_BLACK
     special OpenPokeblockCaseForContestLady
     waitstate
     compare VAR_RESULT, 0xFFFF
diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc
index cc583022d..ec58b26f1 100644
--- a/data/scripts/pc_transfer.inc
+++ b/data/scripts/pc_transfer.inc
@@ -6,7 +6,7 @@ Common_EventScript_GetGiftMonPartySlot:: @ 827378B
 	return
 
 Common_EventScript_NameReceivedBoxMon:: @ 8273797
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ChangeBoxPokemonNickname
 	waitstate
 	lock
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 1b706e603..58618efe7 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -101,14 +101,14 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
 
 PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F
 	incrementgamestat GAME_STAT_CHECKED_CLOCK
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special Special_ViewWallClock
 	waitstate
 	releaseall
 	end
 
 PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special StartWallClock
 	waitstate
 	return
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 72d1d3c92..6a811d935 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -52,7 +52,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC
 	end
 
 SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special OpenPokeblockCaseOnFeeder
 	waitstate
 	compare VAR_RESULT, 0xFFFF
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 617b19b42..0f2ad02b1 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -214,10 +214,10 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8
 	msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
-	fadescreenswapbuffers 1
+	fadescreenswapbuffers FADE_TO_BLACK
 	special MoveOutOfSecretBaseFromOutside
 	closemessage
-	fadescreenswapbuffers 0
+	fadescreenswapbuffers FADE_FROM_BLACK
 	msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SecretBase_EventScript_CancelOnEntrance
diff --git a/data/specials.inc b/data/specials.inc
index 9d738c1ea..4df6c5399 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -458,7 +458,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_813A630
 	def_special BufferBattleTowerElevatorFloors
 	def_special TryStoreHeldItemsInPyramidBag
-	def_special sub_81C4F24
+	def_special ChooseItemsToTossFromPyramidBag
 	def_special DoBattlePyramidMonsHaveHeldItem
 	def_special BattlePyramidChooseMonHeldItems
 	def_special SetBattleTowerLinkPlayerGfx
diff --git a/data/text/battle_tent.inc b/data/text/battle_tent.inc
index 48ea8f4d5..98aa689ce 100644
--- a/data/text/battle_tent.inc
+++ b/data/text/battle_tent.inc
@@ -1,17 +1,17 @@
-FallarborTown_BattleTentLobby_Text_2C47EB: @ 82C47EB
+FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C47EB
 	.string "I welcome you to the BATTLE TENT\n"
 	.string "FALLARBOR SITE!\p"
 	.string "I am your guide to the Set KO Tourney!$"
 
-FallarborTown_BattleTentLobby_Text_2C4843: @ 82C4843
+FallarborTown_BattleTentLobby_Text_TakeChallenge: @ 82C4843
 	.string "Now, do you wish to take the challenge\n"
 	.string "of a Set KO Tourney?$"
 
-FallarborTown_BattleTentLobby_Text_2C487F: @ 82C487F
+FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge: @ 82C487F
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC
+FallarborTown_BattleTentLobby_Text_ExplainFallarborTent: @ 82C48AC
 	.string "In the FALLARBOR BATTLE TENT,\n"
 	.string "we undertake the Set KO Tourney.\p"
 	.string "All participants enter with a team of\n"
@@ -32,20 +32,21 @@ FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC
 	.string "three TRAINERS in succession,\l"
 	.string "we will present you with a fine prize.$"
 
-FallarborTown_BattleTentLobby_Text_2C4B35: @ 82C4B35
+FallarborTown_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C4B35
 	.string "Before showing you to the BATTLE\n"
 	.string "TENT, I must save. Is that okay?$"
 
-FallarborTown_BattleTentLobby_Text_2C4B77: @ 82C4B77
+@ Unused
+FallarborTown_BattleTentLobby_Text_WhichLevelMode: @ 82C4B77
 	.string "We offer two levels of challenge,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-FallarborTown_BattleTentLobby_Text_2C4BC8: @ 82C4BC8
+FallarborTown_BattleTentLobby_Text_SelectThreeMons: @ 82C4BC8
 	.string "Very well, now select your\n"
 	.string "three POKéMON, please.$"
 
-FallarborTown_BattleTentLobby_Text_2C4BFA: @ 82C4BFA
+FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C4BFA
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -55,7 +56,7 @@ FallarborTown_BattleTentLobby_Text_2C4BFA: @ 82C4BFA
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-FallarborTown_BattleTentLobby_Text_2C4CC0: @ 82C4CC0
+FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C4CC0
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -67,11 +68,11 @@ FallarborTown_BattleTentLobby_Text_2C4CC0: @ 82C4CC0
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-FallarborTown_BattleTentLobby_Text_2C4DC3: @ 82C4DC3
+FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent: @ 82C4DC3
 	.string "I shall now guide you to\n"
 	.string "the BATTLE TENT.$"
 
-FallarborTown_BattleTentLobby_Text_2C4DED: @ 82C4DED
+FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C4DED
 	.string "My dear challenger!\p"
 	.string "You did not save the game before\n"
 	.string "shutting down, did you?\p"
@@ -81,52 +82,52 @@ FallarborTown_BattleTentLobby_Text_2C4DED: @ 82C4DED
 	.string "You may, of course, start with a fresh\n"
 	.string "challenge.$"
 
-FallarborTown_BattleTentLobby_Text_2C4EC3: @ 82C4EC3
+FallarborTown_BattleTentLobby_Text_BeatThreeTrainers: @ 82C4EC3
 	.string "How splendid! You have beaten\n"
 	.string "three TRAINERS in succession!$"
 
-FallarborTown_BattleTentLobby_Text_2C4EFF: @ 82C4EFF
+FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame: @ 82C4EFF
 	.string "Please wait while I save the game.$"
 
-FallarborTown_BattleTentLobby_Text_2C4F22: @ 82C4F22
+FallarborTown_BattleTentLobby_Text_PresentYouWithPrize: @ 82C4F22
 	.string "In commemoration of your 3-win streak,\n"
 	.string "we present you with this prize.$"
 
-FallarborTown_BattleTentLobby_Text_2C4F69: @ 82C4F69
+FallarborTown_BattleTentLobby_Text_ReceivedPrize: @ 82C4F69
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-FallarborTown_BattleTentLobby_Text_2C4F83: @ 82C4F83
+FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize: @ 82C4F83
 	.string "Oh?\n"
 	.string "Your BAG seems to be full.\p"
 	.string "I urge you to clear space and\n"
 	.string "return for your prize.$"
 
-FallarborTown_BattleTentLobby_Text_2C4FD7: @ 82C4FD7
+FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving: @ 82C4FD7
 	.string "Thank you so much for participating!\p"
 	.string "Please wait while I save the game.$"
 
-FallarborTown_BattleTentLobby_Text_2C501F: @ 82C501F
+FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2: @ 82C501F
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-FallarborTown_BattleTentLobby_Text_2C504C: @ 82C504C
+FallarborTown_BattleTentLobby_Text_LookingForwardToArrival: @ 82C504C
 	.string "We have been looking forward to\n"
 	.string "your arrival.\p"
 	.string "Before I show you to the BATTLE TENT,\n"
 	.string "I must save the game. Please wait.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C50C3: @ 82C50C3
+VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C50C3
 	.string "I welcome you to the BATTLE TENT\n"
 	.string "VERDANTURF SITE!\p"
 	.string "Here, the TRAINER's trust toward\n"
 	.string "POKéMON is tested.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5129: @ 82C5129
+VerdanturfTown_BattleTentLobby_Text_TakeChallenge: @ 82C5129
 	.string "Do you wish to take the VERDANTURF\n"
 	.string "BATTLE TENT challenge?$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163
+VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent: @ 82C5163
 	.string "In the VERDANTURF BATTLE TENT,\n"
 	.string "there is one crucial rule that must\l"
 	.string "be obeyed.\p"
@@ -146,16 +147,17 @@ VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C539A: @ 82C539A
+VerdanturfTown_BattleTentLobby_Text_ReturnFortified: @ 82C539A
 	.string "When you have fortified your heart\n"
 	.string "and POKéMON, you must return.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C53DB: @ 82C53DB
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_WhichLevelMode: @ 82C53DB
 	.string "There are two levels of difficulty,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice of a challenge?$"
 
-VerdanturfTown_BattleTentLobby_Text_2C543D: @ 82C543D
+VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C543D
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -167,7 +169,7 @@ VerdanturfTown_BattleTentLobby_Text_2C543D: @ 82C543D
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5538: @ 82C5538
+VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C5538
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -179,48 +181,48 @@ VerdanturfTown_BattleTentLobby_Text_2C5538: @ 82C5538
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5633: @ 82C5633
+VerdanturfTown_BattleTentLobby_Text_SelectThreeMons: @ 82C5633
 	.string "Good. Now, you must select your\n"
 	.string "three POKéMON.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5662: @ 82C5662
+VerdanturfTown_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C5662
 	.string "I must save before I show you to\n"
 	.string "the BATTLE TENT. Is that okay?$"
 
-VerdanturfTown_BattleTentLobby_Text_2C56A2: @ 82C56A2
+VerdanturfTown_BattleTentLobby_Text_NowFollowMe: @ 82C56A2
 	.string "Good.\n"
 	.string "Now, follow me.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C56B8: @ 82C56B8
+VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded: @ 82C56B8
 	.string "I feel privileged for having seen\n"
 	.string "your POKéMON's exploits.\p"
 	.string "The results will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5731: @ 82C5731
+VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak: @ 82C5731
 	.string "To achieve a 3-win streak…\p"
 	.string "The bonds that bind your heart with\n"
 	.string "your POKéMON seem firm and true.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C5791: @ 82C5791
+VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded: @ 82C5791
 	.string "Your feat will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C57CD: @ 82C57CD
+VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize: @ 82C57CD
 	.string "For the feat of your 3-win streak,\n"
 	.string "we present you with this prize.$"
 
-SlateportCity_BattleTentLobby_Text_2C5810: @ 82C5810
+SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C5810
 	.string "Welcome to the BATTLE TENT\n"
 	.string "SLATEPORT SITE!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Tournament.$"
 
-SlateportCity_BattleTentLobby_Text_2C586A: @ 82C586A
+SlateportCity_BattleTentLobby_Text_TakeChallenge: @ 82C586A
 	.string "Would you like to take the Battle\n"
 	.string "Swap challenge?$"
 
-SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C
+SlateportCity_BattleTentLobby_Text_ExplainSlateportTent: @ 82C589C
 	.string "Here at the SLATEPORT BATTLE TENT,\n"
 	.string "we hold Battle Swap events\l"
 	.string "using rental POKéMON.\p"
@@ -238,36 +240,39 @@ SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-SlateportCity_BattleTentLobby_Text_2C5AA5: @ 82C5AA5
+SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit: @ 82C5AA5
 	.string "We look forward to your next visit.$"
 
-SlateportCity_BattleTentLobby_Text_2C5AC9: @ 82C5AC9
+@ Unused
+SlateportCity_BattleTentLobby_Text_WhichLevelMode: @ 82C5AC9
 	.string "Which level do you wish to challenge?\n"
 	.string "Level 50 or Level 100?$"
 
-SlateportCity_BattleTentLobby_Text_2C5B06: @ 82C5B06
+SlateportCity_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C5B06
 	.string "Before you begin your challenge,\n"
 	.string "I need to save data. Is that okay?$"
 
-SlateportCity_BattleTentLobby_Text_2C5B4A: @ 82C5B4A
+@ Unused
+SlateportCity_BattleTentLobby_Text_HoldMonsForSafekeeping: @ 82C5B4A
 	.string "Okay, I will hold your POKéMON for\n"
 	.string "safekeeping while you compete.$"
 
-SlateportCity_BattleTentLobby_Text_2C5B8C: @ 82C5B8C
+SlateportCity_BattleTentLobby_Text_StepThisWay: @ 82C5B8C
 	.string "Please step this way.$"
 
-SlateportCity_BattleTentLobby_Text_2C5BA2: @ 82C5BA2
+SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults: @ 82C5BA2
 	.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 your event results.\n"
 	.string "Please wait.$"
 
-SlateportCity_BattleTentLobby_Text_2C5C30: @ 82C5C30
+@ Unused
+SlateportCity_BattleTentLobby_Text_ReturnMonsExchangeRentals: @ 82C5C30
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.$"
 
-SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F
+SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons: @ 82C5C6F
 	.string "Congratulations!\n"
 	.string "You've won three straight matches!\p"
 	.string "I will return your POKéMON in exchange\n"
@@ -275,61 +280,65 @@ SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F
 	.string "I must also save your event results.\n"
 	.string "Please wait.$"
 
-SlateportCity_BattleTentLobby_Text_2C5D14: @ 82C5D14
+SlateportCity_BattleTentLobby_Text_AwardYouThisPrize: @ 82C5D14
 	.string "In recognition of your 3-win streak,\n"
 	.string "we award you this prize.$"
 
-SlateportCity_BattleTentLobby_Text_2C5D52: @ 82C5D52
+SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom: @ 82C5D52
 	.string "Oh?\n"
 	.string "You seem to have no room for this.\p"
 	.string "Please make room in your BAG and\n"
 	.string "let me know.$"
 
-SlateportCity_BattleTentLobby_Text_2C5DA7: @ 82C5DA7
+SlateportCity_BattleTentLobby_Text_BeenWaitingForYou: @ 82C5DA7
 	.string "We've been waiting for you!\p"
 	.string "Before we resume your challenge,\n"
 	.string "I must save the game.$"
 
-SlateportCity_BattleTentLobby_Text_2C5DFA: @ 82C5DFA
+SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C5DFA
 	.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.$"
 
-SlateportCity_BattleTentLobby_Text_2C5E85: @ 82C5E85
+@ Unused
+SlateportCity_BattleTentLobby_Text_ReturnPersonalMons: @ 82C5E85
 	.string "We'll return your personal POKéMON.$"
 
-SlateportCity_BattleTentLobby_Text_2C5EA9: @ 82C5EA9
+@ Unused
+SlateportCity_BattleTentLobby_Text_ReceivedPrize: @ 82C5EA9
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-SlateportCity_BattleTentLobby_Text_2C5EC3: @ 82C5EC3
+@ Unused
+SlateportCity_BattleTentLobby_Text_RulesAreListed: @ 82C5EC3
 	.string "The Battle Swap rules are listed.$"
 
-SlateportCity_BattleTentLobby_Text_2C5EE5: @ 82C5EE5
+@ Unused
+SlateportCity_BattleTentLobby_Text_ReadWhichHeading: @ 82C5EE5
 	.string "Which heading do you want to read?$"
 
-SlateportCity_BattleTentLobby_Text_2C5F08: @ 82C5F08
+SlateportCity_BattleTentLobby_Text_ExplainBasicRules: @ 82C5F08
 	.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.$"
 
-SlateportCity_BattleTentLobby_Text_2C5F9D: @ 82C5F9D
+SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules: @ 82C5F9D
 	.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.$"
 
-SlateportCity_BattleTentLobby_Text_2C6020: @ 82C6020
+SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules: @ 82C6020
 	.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 third TRAINER in the event.$"
 
-SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0
+SlateportCity_BattleTentLobby_Text_ExplainSwapNotes: @ 82C60C0
 	.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"
@@ -341,20 +350,23 @@ SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0
 	.string "This sequence remains unchanged\n"
 	.string "even when swaps are made.$"
 
-SlateportCity_BattleTentLobby_Text_2C61FE: @ 82C61FE
+SlateportCity_BattleTentLobby_Text_ExplainMonRules: @ 82C61FE
 	.string "The POKéMON of the SLATEPORT\n"
 	.string "BATTLE TENT are all rentals.\p"
 	.string "All rental POKéMON are kept at\n"
 	.string "Level 30.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C6261: @ 82C6261
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_RulesAreListed2: @ 82C6261
 	.string "The VERDANTURF BATTLE TENT\n"
 	.string "rules are listed.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C628E: @ 82C628E
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_ReadWhichHeading: @ 82C628E
 	.string "Which heading do you want to read?$"
 
-VerdanturfTown_BattleTentLobby_Text_2C62B1: @ 82C62B1
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_ExplainBasicRules: @ 82C62B1
 	.string "Here at the VERDANTURF BATTLE TENT,\n"
 	.string "POKéMON are required to think and\l"
 	.string "battle by themselves.\p"
@@ -362,7 +374,8 @@ VerdanturfTown_BattleTentLobby_Text_2C62B1: @ 82C62B1
 	.string "with people behave differently\l"
 	.string "depending on their nature.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C636D: @ 82C636D
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_ExplainNatureRules: @ 82C636D
 	.string "Depending on its nature, a POKéMON\n"
 	.string "may prefer to attack no matter what.\p"
 	.string "Another POKéMON may prefer to protect\n"
@@ -375,7 +388,8 @@ VerdanturfTown_BattleTentLobby_Text_2C636D: @ 82C636D
 	.string "It may also dislike certain moves that\n"
 	.string "it has trouble using.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C64BA: @ 82C64BA
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_ExplainMoveRules: @ 82C64BA
 	.string "There are offensive moves that inflict\n"
 	.string "direct damage on the foe.\p"
 	.string "There are defensive moves that are\n"
@@ -388,7 +402,8 @@ VerdanturfTown_BattleTentLobby_Text_2C64BA: @ 82C64BA
 	.string "POKéMON will consider using moves in\n"
 	.string "these three categories.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_ExplainUnderpoweredRules: @ 82C6612
 	.string "When not under command by its TRAINER,\n"
 	.string "a POKéMON may be unable to effectively\l"
 	.string "use certain moves.\p"
@@ -398,21 +413,21 @@ VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612
 	.string "do not match its nature, it will often\l"
 	.string "be unable to live up to its potential.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C671E: @ 82C671E
+@ Unused
+VerdanturfTown_BattleTentLobby_Text_ExplainWhenInDangerRules: @ 82C671E
 	.string "Depending on its nature, a POKéMON may\n"
 	.string "start using moves that don't match its\l"
 	.string "nature when it is in trouble.\p"
 	.string "If a POKéMON begins behaving oddly\n"
 	.string "in a pinch, watch it carefully.$"
 
-FallarborTown_BattleTentLobby_Text_2C67CD: @ 82C67CD
-VerdanturfTown_BattleTentLobby_Text_2C67CD: @ 82C67CD
+BattleTentLobby_Text_ExplainLevelRules: @ 82C67CD
 	.string "At this BATTLE TENT, the levels of\n"
 	.string "your opponents will be adjusted to\l"
 	.string "match the levels of your POKéMON.\p"
 	.string "However, no TRAINER you face will\n"
 	.string "have any POKéMON below Level 30.$"
 
-VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878
+VerdanturfTown_BattleTentLobby_Text_RulesAreListed: @ 82C6878
 	.string "The VERDANTURF BATTLE TENT\n"
 	.string "rules are listed.$"
diff --git a/data/text/match_call.inc b/data/text/match_call.inc
index 9ecdd03c7..568ed2a86 100644
--- a/data/text/match_call.inc
+++ b/data/text/match_call.inc
@@ -2014,7 +2014,7 @@ MatchCall_BattlePyramidText14:: @ 82B21FC
 	.string "You're an inspiration!\n"
 	.string "See you again!$"
 
-gText_Mom_Pokenav_2B227B:: @ 82B227B
+MatchCall_Text_Mom1:: @ 82B227B
 	.string "MOM: Your father and you…\n"
 	.string "Everyone is captivated by POKéMON.\p"
 	.string "What is the charm of POKéMON?\p"
@@ -2022,7 +2022,7 @@ gText_Mom_Pokenav_2B227B:: @ 82B227B
 	.string "I adore POKéMON that help me with\l"
 	.string "my everyday chores.$"
 
-gText_Mom_Pokenav_2B2310:: @ 82B2310
+MatchCall_Text_Mom2:: @ 82B2310
 	.string "MOM: Hi, {PLAYER}!\n"
 	.string "Your father keeps himself locked\l"
 	.string "away in the PETALBURG GYM.\p"
@@ -2032,13 +2032,13 @@ gText_Mom_Pokenav_2B2310:: @ 82B2310
 	.string "I'm guessing that losing to you\n"
 	.string "was a big blow to his pride!$"
 
-gText_Mom_Pokenav_2B23F3:: @ 82B23F3
+MatchCall_Text_Mom3:: @ 82B23F3
 	.string "MOM: {PLAYER}…\n"
 	.string "Don't worry about me or the house.\p"
 	.string "Wear those RUNNING SHOES until\n"
 	.string "they fall apart, honey!$"
 
-gText_Roxanne_Pokenav_2B2456:: @ 82B2456
+MatchCall_Text_Roxanne1:: @ 82B2456
 	.string "ROXANNE: Oh, hello, {PLAYER}!\p"
 	.string "I've been hard at work retraining\n"
 	.string "since we met.\p"
@@ -2047,7 +2047,7 @@ gText_Roxanne_Pokenav_2B2456:: @ 82B2456
 	.string "But when I do, please visit my GYM\n"
 	.string "for a rematch!$"
 
-gText_Roxanne_Pokenav_2B250E:: @ 82B250E
+MatchCall_Text_Roxanne2:: @ 82B250E
 	.string "ROXANNE: Is this {PLAYER}?\n"
 	.string "Congratulations!\l"
 	.string "I've been hearing about you!\p"
@@ -2056,18 +2056,18 @@ gText_Roxanne_Pokenav_2B250E:: @ 82B250E
 	.string "But when I do, please visit my GYM\n"
 	.string "for a rematch!$"
 
-gText_Roxanne_Pokenav_2B25C1:: @ 82B25C1
+MatchCall_Text_Roxanne3:: @ 82B25C1
 	.string "ROXANNE: {PLAYER}!\n"
 	.string "My GYM is ready!\p"
 	.string "Please visit RUSTBORO whenever\n"
 	.string "you can!$"
 
-gText_Roxanne_Pokenav_2B2607:: @ 82B2607
+MatchCall_Text_Roxanne4:: @ 82B2607
 	.string "ROXANNE: At the RUSTBORO GYM,\n"
 	.string "the fact that we battled, {PLAYER},\l"
 	.string "is a matter of pride.$"
 
-gText_Brawly_Pokenav_2B2659:: @ 82B2659
+MatchCall_Text_Brawly1:: @ 82B2659
 	.string "BRAWLY: Hey, there, {PLAYER}{KUN}!\p"
 	.string "I learned a lot from the battle we\n"
 	.string "had together.\p"
@@ -2078,7 +2078,7 @@ gText_Brawly_Pokenav_2B2659:: @ 82B2659
 	.string "But if I can reopen the GYM,\n"
 	.string "I want you to challenge us again.$"
 
-gText_Brawly_Pokenav_2B275D:: @ 82B275D
+MatchCall_Text_Brawly2:: @ 82B275D
 	.string "BRAWLY: Hey, {PLAYER}{KUN}!\n"
 	.string "Congratulations!\p"
 	.string "Word about your exploits arrived\n"
@@ -2090,17 +2090,17 @@ gText_Brawly_Pokenav_2B275D:: @ 82B275D
 	.string "But if I can reopen the GYM,\n"
 	.string "I want you to challenge us again.$"
 
-gText_Brawly_Pokenav_2B286F:: @ 82B286F
+MatchCall_Text_Brawly3:: @ 82B286F
 	.string "BRAWLY: Hey, {PLAYER}{KUN}!\n"
 	.string "My GYM's ready for action!\p"
 	.string "Come back to DEWFORD anytime\n"
 	.string "for another challenge!$"
 
-gText_Brawly_Pokenav_2B28D1:: @ 82B28D1
+MatchCall_Text_Brawly4:: @ 82B28D1
 	.string "BRAWLY: {PLAYER}{KUN}, I don't think\n"
 	.string "I'll ever get bored of battling you!$"
 
-gText_Wattson_Pokenav_2B2912:: @ 82B2912
+MatchCall_Text_Wattson1:: @ 82B2912
 	.string "WATTSON: Oh, it's you!\p"
 	.string "After you left, I've been redoing\n"
 	.string "my training from scratch.\p"
@@ -2109,7 +2109,7 @@ gText_Wattson_Pokenav_2B2912:: @ 82B2912
 	.string "You'll have to wait till then!\n"
 	.string "Wahahahaha!$"
 
-gText_Wattson_Pokenav_2B29CA:: @ 82B29CA
+MatchCall_Text_Wattson2:: @ 82B29CA
 	.string "WATTSON: Wahahahaha!\p"
 	.string "You've really done it, haven't you?\n"
 	.string "I've been getting word about you!\p"
@@ -2120,18 +2120,18 @@ gText_Wattson_Pokenav_2B29CA:: @ 82B29CA
 	.string "You'll have to wait till then!\n"
 	.string "Wahahahaha!$"
 
-gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6
+MatchCall_Text_Wattson3:: @ 82B2AB6
 	.string "WATTSON: Oh, it's you!\n"
 	.string "My GYM's ready!\p"
 	.string "Visit MAUVILLE anytime!\n"
 	.string "Wahahahaha!$"
 
-gText_Wattson_Pokenav_2B2B01:: @ 82B2B01
+MatchCall_Text_Wattson4:: @ 82B2B01
 	.string "WATTSON: Wahahaha!\p"
 	.string "A battle with you is always charged\n"
 	.string "with shocking power!$"
 
-gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D
+MatchCall_Text_Flannery1:: @ 82B2B4D
 	.string "FLANNERY: {PLAYER}…\p"
 	.string "When we battled, I learned exactly\n"
 	.string "how immature I was.\p"
@@ -2141,7 +2141,7 @@ gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D
 	.string "When the time comes, {PLAYER},\n"
 	.string "please challenge us again.$"
 
-gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E
+MatchCall_Text_Flannery2:: @ 82B2C0E
 	.string "FLANNERY: Hello, {PLAYER}?\n"
 	.string "Congratulations!\p"
 	.string "Word of your success has reached\n"
@@ -2152,44 +2152,44 @@ gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E
 	.string "appear beside my name in the\l"
 	.string "MATCH CALL list.$"
 
-gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1
+MatchCall_Text_Flannery3:: @ 82B2CF1
 	.string "FLANNERY: Oh, {PLAYER}?\n"
 	.string "Our GYM's ready!\p"
 	.string "Come to LAVARIDGE for a soak\n"
 	.string "in the hot spring and a challenge!$"
 
-gText_Flannery_Pokenav_2B2D54:: @ 82B2D54
+MatchCall_Text_Flannery4:: @ 82B2D54
 	.string "FLANNERY: {PLAYER}…\n"
 	.string "I'm positive that you keep getting\l"
 	.string "better at training every time.$"
 
-gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4
+MatchCall_Text_Winona1:: @ 82B2DA4
 	.string "WINONA: Hello, {PLAYER}!\p"
 	.string "Thanks to our battle, I've come\n"
 	.string "to understand my weak points!\p"
 	.string "When I reopen the GYM, I won't go\n"
 	.string "down in defeat again!$"
 
-gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B
+MatchCall_Text_Winona2:: @ 82B2E2B
 	.string "WINONA: You've done it, {PLAYER}!\p"
 	.string "News about the new CHAMPION\n"
 	.string "has reached us in FORTREE!\p"
 	.string "But… The next time we battle,\n"
 	.string "it's not going to end the same way.$"
 
-gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2
+MatchCall_Text_Winona3:: @ 82B2EC2
 	.string "WINONA: Is this {PLAYER}?\n"
 	.string "Our GYM is back in operation!\p"
 	.string "We're waiting for you in FORTREE!$"
 
-gText_Winona_Pokenav_2B2F16:: @ 82B2F16
+MatchCall_Text_Winona4:: @ 82B2F16
 	.string "WINONA: {PLAYER}…\n"
 	.string "Though I have lost, my wings will\l"
 	.string "never break.\p"
 	.string "Yes, in exactly the same way that\n"
 	.string "you never lost sight of your dream.$"
 
-gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97
+MatchCall_Text_TateLiza1:: @ 82B2F97
 	.string "TATE: Oh! You're…\n"
 	.string "LIZA: {PLAYER}!\p"
 	.string "TATE: We're in training again…\n"
@@ -2199,7 +2199,7 @@ gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97
 	.string "TATE: A mark'll appear by our name…\n"
 	.string "LIZA: On the MATCH CALL list.$"
 
-gText_TateLiza_Pokenav_2B306E:: @ 82B306E
+MatchCall_Text_TateLiza2:: @ 82B306E
 	.string "TATE: {PLAYER}, congratulations!\n"
 	.string "LIZA: {PLAYER}, congratulations!\p"
 	.string "TATE: The two of us are…\n"
@@ -2209,7 +2209,7 @@ gText_TateLiza_Pokenav_2B306E:: @ 82B306E
 	.string "TATE: A mark'll appear by our name…\n"
 	.string "LIZA: On the MATCH CALL list.$"
 
-gText_TateLiza_Pokenav_2B3158:: @ 82B3158
+MatchCall_Text_TateLiza3:: @ 82B3158
 	.string "TATE: {PLAYER}!\n"
 	.string "LIZA: {PLAYER}!\p"
 	.string "TATE: Our GYM is ready!\n"
@@ -2217,13 +2217,13 @@ gText_TateLiza_Pokenav_2B3158:: @ 82B3158
 	.string "TATE: Please come visit…\n"
 	.string "LIZA: MOSSDEEP anytime!$"
 
-gText_TateLiza_Pokenav_2B31CD:: @ 82B31CD
+MatchCall_Text_TateLiza4:: @ 82B31CD
 	.string "TATE: {PLAYER}, the battle we had…\n"
 	.string "LIZA: Is an invaluable experience.\p"
 	.string "TATE: It would be nice if…\n"
 	.string "LIZA: We could all battle again!$"
 
-gText_Juan_Pokenav_2B3249:: @ 82B3249
+MatchCall_Text_Juan1:: @ 82B3249
 	.string "JUAN: Hmm…\n"
 	.string "{PLAYER}{KUN}… Was it?\p"
 	.string "Our battle together--it brought\n"
@@ -2232,7 +2232,7 @@ gText_Juan_Pokenav_2B3249:: @ 82B3249
 	.string "Perhaps you are a genius who may\n"
 	.string "yet surpass WALLACE!$"
 
-gText_Juan_Pokenav_2B32EC:: @ 82B32EC
+MatchCall_Text_Juan2:: @ 82B32EC
 	.string "JUAN: Fufu… {PLAYER}{KUN}…\n"
 	.string "You've finally achieved your goal.\p"
 	.string "My eye for appraising talent wasn't\n"
@@ -2241,14 +2241,14 @@ gText_Juan_Pokenav_2B32EC:: @ 82B32EC
 	.string "you, for you have scaled the peak\l"
 	.string "of power and prestige.$"
 
-gText_Juan_Pokenav_2B33AA:: @ 82B33AA
+MatchCall_Text_Juan3:: @ 82B33AA
 	.string "JUAN: Hoho… {PLAYER}{KUN}…\p"
 	.string "Our SOOTOPOLIS GYM has finally\n"
 	.string "reopened.\p"
 	.string "If you wish to see me, you are\n"
 	.string "welcome to visit anytime.$"
 
-gText_Juan_Pokenav_2B341E:: @ 82B341E
+MatchCall_Text_Juan4:: @ 82B341E
 	.string "JUAN: {PLAYER}{KUN}…\p"
 	.string "Like the finest music, the battles\n"
 	.string "we wage together strike chords\l"
@@ -2256,7 +2256,7 @@ gText_Juan_Pokenav_2B341E:: @ 82B341E
 	.string "When I close my eyes, I see visions\n"
 	.string "of you soaring with the melody…$"
 
-gText_Sidney_Pokenav_2B34CC:: @ 82B34CC
+MatchCall_Text_Sidney:: @ 82B34CC
 	.string "SIDNEY: Yo, {PLAYER}!\p"
 	.string "If you want to battle with me\n"
 	.string "again, you come on back whenever\l"
@@ -2264,7 +2264,7 @@ gText_Sidney_Pokenav_2B34CC:: @ 82B34CC
 	.string "I'll always be here!\n"
 	.string "I'll be waiting!$"
 
-gText_Phoebe_Pokenav_2B3561:: @ 82B3561
+MatchCall_Text_Phoebe:: @ 82B3561
 	.string "PHOEBE: Hi, {PLAYER}!\p"
 	.string "How about coming back here again\n"
 	.string "sometime?\p"
@@ -2272,7 +2272,7 @@ gText_Phoebe_Pokenav_2B3561:: @ 82B3561
 	.string "your bond has grown with your\l"
 	.string "POKéMON.$"
 
-gText_Glacia_Pokenav_2B35E4:: @ 82B35E4
+MatchCall_Text_Glacia:: @ 82B35E4
 	.string "GLACIA: Hello, {PLAYER}.\p"
 	.string "I trust you haven't become\n"
 	.string "complacent with your power?\p"
@@ -2280,7 +2280,7 @@ gText_Glacia_Pokenav_2B35E4:: @ 82B35E4
 	.string "hot emotions just a little, do come\l"
 	.string "to the POKéMON LEAGUE…$"
 
-gText_Drake_Pokenav_2B368B:: @ 82B368B
+MatchCall_Text_Drake:: @ 82B368B
 	.string "DRAKE: That voice… {PLAYER}, is it?\n"
 	.string "You sound well…\p"
 	.string "I understand that there is now\n"
@@ -2292,7 +2292,7 @@ gText_Drake_Pokenav_2B368B:: @ 82B368B
 	.string "the POKéMON LEAGUE!\p"
 	.string "Don't you agree, {PLAYER}?$"
 
-gText_Wallace_Pokenav_2B3790:: @ 82B3790
+MatchCall_Text_Wallace:: @ 82B3790
 	.string "WALLACE: Hello, {PLAYER}{KUN}.\n"
 	.string "Have you met STEVEN?\p"
 	.string "He is…\n"
@@ -2306,7 +2306,7 @@ gText_Wallace_Pokenav_2B3790:: @ 82B3790
 	.string "But what is a rare stone exactly?\n"
 	.string "All I can think of is a METEORITE…$"
 
-MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall: @ 82B38C1
+MatchCall_Text_MayRayquazaCall: @ 82B38C1
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
@@ -2321,7 +2321,7 @@ MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall: @ 82B38C1
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall: @ 82B39C6
+MatchCall_Text_BrendanRayquazaCall: @ 82B39C6
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "BRENDAN: Hey, {PLAYER}!\n"
@@ -2335,14 +2335,14 @@ MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall: @ 82B39C6
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-gText_May_Pokenav_2B3AB3:: @ 2B3AB3
+MatchCall_Text_May1:: @ 2B3AB3
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "MR. BRINEY retired as a SAILOR,\n"
 	.string "but I still see him out on the sea\l"
 	.string "with his pet PEEKO sometimes.\p"
 	.string "He must love the sea still.$"
 
-gText_May_Pokenav_2B3B3F:: @ 2B3B3F
+MatchCall_Text_May2:: @ 2B3B3F
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "You know how little towns like\n"
 	.string "PETALBURG and DEWFORD have GYMS?\p"
@@ -2351,7 +2351,7 @@ gText_May_Pokenav_2B3B3F:: @ 2B3B3F
 	.string "When they finally build a GYM there,\n"
 	.string "I should apply to be the LEADER.$"
 
-gText_May_Pokenav_2B3C13:: @ 2B3C13
+MatchCall_Text_May3:: @ 2B3C13
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "Do you remember a man named\n"
 	.string "the CUTTER in RUSTBORO?\l"
@@ -2363,13 +2363,13 @@ gText_May_Pokenav_2B3C13:: @ 2B3C13
 	.string "… … … … … …\p"
 	.string "The ROCK SMASH GUY!$"
 
-gText_May_Pokenav_2B3CF3:: @ 2B3CF3
+MatchCall_Text_May4:: @ 2B3CF3
 	.string "MAY: {PLAYER}{KUN}?\p"
 	.string "RUSTURF TUNNEL…\n"
 	.string "They named it that because it\l"
 	.string "joins RUSTBORO and VERDANTURF.$"
 
-gText_May_Pokenav_2B3D4B:: @ 2B3D4B
+MatchCall_Text_May5:: @ 2B3D4B
 	.string "MAY: {PLAYER}{KUN}, how are you?\p"
 	.string "I'm out on ROUTE 111 now.\p"
 	.string "I'm going to get a rest at an old\n"
@@ -2377,7 +2377,7 @@ gText_May_Pokenav_2B3D4B:: @ 2B3D4B
 	.string "She lives just north of\n"
 	.string "the desert.$"
 
-gText_May_Pokenav_2B3DD1:: @ 2B3DD1
+MatchCall_Text_May6:: @ 2B3DD1
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "Did you know about the MIRAGE\n"
 	.string "TOWER in the desert?\p"
@@ -2385,21 +2385,21 @@ gText_May_Pokenav_2B3DD1:: @ 2B3DD1
 	.string "to mysteriously come and go.\p"
 	.string "I wish I could see it.$"
 
-gText_May_Pokenav_2B3E69:: @ 2B3E69
+MatchCall_Text_May7:: @ 2B3E69
 	.string "MAY: {PLAYER}{KUN}, yahoo!\n"
 	.string "I'm on ROUTE 119 now.\p"
 	.string "There's a big river here, and\n"
 	.string "it often rains.\p"
 	.string "I got soaked!$"
 
-gText_May_Pokenav_2B3ECD:: @ 2B3ECD
+MatchCall_Text_May8:: @ 2B3ECD
 	.string "MAY: {PLAYER}{KUN}, hi.\p"
 	.string "MT. PYRE is a memorial to POKéMON\n"
 	.string "whose lives have ended.\p"
 	.string "Maybe as a result, it's infested\n"
 	.string "with many GHOST-type POKéMON!$"
 
-gText_May_Pokenav_2B3F2B:: @ 2B3F2B
+MatchCall_Text_May9:: @ 2B3F2B
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "I was thinking of going to the hot\n"
 	.string "spring in LAVARIDGE.\p"
@@ -2407,14 +2407,14 @@ gText_May_Pokenav_2B3F2B:: @ 2B3F2B
 	.string "PASS, I ran into some bad-looking\l"
 	.string "characters. The mood was ugly!$"
 
-gText_May_Pokenav_2B3FFB:: @ 2B3FFB
+MatchCall_Text_May10:: @ 2B3FFB
 	.string "MAY: Hi, {PLAYER}{KUN}!\n"
 	.string "Did you see the news?\p"
 	.string "They say CAPT. STERN discovered\n"
 	.string "the SEAFLOOR CAVERN while on his\l"
 	.string "submarine expedition.$"
 
-gText_May_Pokenav_2B402B:: @ 2B402B
+MatchCall_Text_May11:: @ 2B402B
 	.string "MAY: Hi, {PLAYER}{KUN}!\n"
 	.string "Don't you think it's neat?\p"
 	.string "Even if you don't have a boat,\n"
@@ -2424,7 +2424,7 @@ gText_May_Pokenav_2B402B:: @ 2B402B
 	.string "There's a POKéMON move that lets\n"
 	.string "you go to the bottom of the sea.$"
 
-gText_May_Pokenav_2B414B:: @ 2B414B
+MatchCall_Text_May12:: @ 2B414B
 	.string "MAY: Hi, {PLAYER}{KUN}!\n"
 	.string "Hope things are okay!\p"
 	.string "Have you been on the sea and\n"
@@ -2435,7 +2435,7 @@ gText_May_Pokenav_2B414B:: @ 2B414B
 	.string "When you get to the other side,\n"
 	.string "come up to the surface. Easy!$"
 
-gText_May_Pokenav_2B4228:: @ 2B4228
+MatchCall_Text_May13:: @ 2B4228
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "How's it going?\n"
 	.string "Are you filling your POKéDEX?\p"
@@ -2444,7 +2444,7 @@ gText_May_Pokenav_2B4228:: @ 2B4228
 	.string "And there are three of them!\p"
 	.string "I would love to see even one…$"
 
-gText_May_Pokenav_2B42E0:: @ 2B42E0
+MatchCall_Text_May14:: @ 2B42E0
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "I heard the rumors!\p"
 	.string "You beat the SOOTOPOLIS GYM\n"
@@ -2452,7 +2452,7 @@ gText_May_Pokenav_2B42E0:: @ 2B42E0
 	.string "That means you don't have far\n"
 	.string "to go, do you?$"
 
-gText_May_Pokenav_2B4350:: @ 2B4350
+MatchCall_Text_May15:: @ 2B4350
 	.string "MAY: There isn't a single TRAINER\n"
 	.string "left in HOENN who doesn't know who\l"
 	.string "you are, {PLAYER}{KUN}!\p"
@@ -2460,7 +2460,7 @@ gText_May_Pokenav_2B4350:: @ 2B4350
 	.string "with you, {PLAYER}{KUN}, they're all\l"
 	.string "surprised!$"
 
-gText_Brendan_Pokenav_2B43EF:: @ 2B43EF
+MatchCall_Text_Brendan1:: @ 2B43EF
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "MR. BRINEY retired as a SAILOR,\n"
 	.string "but I still see him out on the sea\l"
@@ -2468,7 +2468,7 @@ gText_Brendan_Pokenav_2B43EF:: @ 2B43EF
 	.string "I guess he must love\n"
 	.string "the sea still.$"
 
-gText_Brendan_Pokenav_2B4486:: @ 2B4486
+MatchCall_Text_Brendan2:: @ 2B4486
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "I don't get how little towns like\n"
 	.string "PETALBURG and DEWFORD have GYMS.\p"
@@ -2477,7 +2477,7 @@ gText_Brendan_Pokenav_2B4486:: @ 2B4486
 	.string "When they finally build a GYM there,\n"
 	.string "I should apply to be the LEADER.$"
 
-gText_Brendan_Pokenav_2B4560:: @ 2B4560
+MatchCall_Text_Brendan3:: @ 2B4560
 	.string "BRENDAN: Yo, {PLAYER}!\p"
 	.string "Do you remember a guy named\n"
 	.string "the CUTTER in RUSTBORO?\l"
@@ -2489,14 +2489,14 @@ gText_Brendan_Pokenav_2B4560:: @ 2B4560
 	.string "… … … … … …\p"
 	.string "The ROCK SMASH GUY!$"
 
-gText_Brendan_Pokenav_2B463F:: @ 2B463F
+MatchCall_Text_Brendan4:: @ 2B463F
 	.string "BRENDAN: This voice… {PLAYER}?\p"
 	.string "They gave RUSTURF TUNNEL its name\n"
 	.string "because it joins RUSTBORO and\l"
 	.string "VERDANTURF.\p"
 	.string "Did you know that?$"
 
-gText_Brendan_Pokenav_2B46B7:: @ 2B46B7
+MatchCall_Text_Brendan5:: @ 2B46B7
 	.string "BRENDAN: {PLAYER}, what's up?\p"
 	.string "Hey, I'm out on ROUTE 111 now.\p"
 	.string "I'm going to rest up at an old\n"
@@ -2504,7 +2504,7 @@ gText_Brendan_Pokenav_2B46B7:: @ 2B46B7
 	.string "If you're in the area, you should\n"
 	.string "visit her, too.$"
 
-gText_Brendan_Pokenav_2B4761:: @ 2B4761
+MatchCall_Text_Brendan6:: @ 2B4761
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "Did you know about the MIRAGE\n"
 	.string "TOWER in the desert?\p"
@@ -2512,21 +2512,21 @@ gText_Brendan_Pokenav_2B4761:: @ 2B4761
 	.string "seen only sometimes.\p"
 	.string "I'd like to see that!$"
 
-gText_Brendan_Pokenav_2B47F4:: @ 2B47F4
+MatchCall_Text_Brendan7:: @ 2B47F4
 	.string "BRENDAN: Who's this? Oh, {PLAYER}?\n"
 	.string "Guess what? I'm on ROUTE 119 now.\p"
 	.string "There's a big river here, and\n"
 	.string "it rains all the time.\p"
 	.string "I got soaked to the bone!$"
 
-gText_Brendan_Pokenav_2B4882:: @ 2B4882
+MatchCall_Text_Brendan8:: @ 2B4882
 	.string "BRENDAN: {PLAYER}!\p"
 	.string "MT. PYRE is a memorial to POKéMON\n"
 	.string "whose lives have ended.\p"
 	.string "That's probably why it's infested\n"
 	.string "with many GHOST-type POKéMON!$"
 
-gText_Brendan_Pokenav_2B4909:: @ 2B4909
+MatchCall_Text_Brendan9:: @ 2B4909
 	.string "BRENDAN: Hey there, {PLAYER}.\p"
 	.string "I was on my way back to the hot\n"
 	.string "spring in LAVARIDGE.\p"
@@ -2535,14 +2535,14 @@ gText_Brendan_Pokenav_2B4909:: @ 2B4909
 	.string "Those creeps…\n"
 	.string "I think they were TEAM MAGMA.$"
 
-gText_Brendan_Pokenav_2B49C4:: @ 2B49C4
+MatchCall_Text_Brendan10:: @ 2B49C4
 	.string "BRENDAN: Hi, {PLAYER}!\n"
 	.string "Did you catch the news?\p"
 	.string "They say CAPT. STERN discovered\n"
 	.string "the SEAFLOOR CAVERN while on his\l"
 	.string "submarine expedition.$"
 
-gText_Brendan_Pokenav_2B4A44:: @ 2B4A44
+MatchCall_Text_Brendan11:: @ 2B4A44
 	.string "BRENDAN: Hey there, {PLAYER}!\n"
 	.string "Don't you think it's awesome?\p"
 	.string "Even if you don't have a boat,\n"
@@ -2552,7 +2552,7 @@ gText_Brendan_Pokenav_2B4A44:: @ 2B4A44
 	.string "travel to the bottom of the sea.\p"
 	.string "Man, POKéMON can do anything!$"
 
-gText_Brendan_Pokenav_2B4B28:: @ 2B4B28
+MatchCall_Text_Brendan12:: @ 2B4B28
 	.string "BRENDAN: Howdy, {PLAYER}!\n"
 	.string "How are you holding up?\p"
 	.string "Ever found your way to the other\n"
@@ -2562,7 +2562,7 @@ gText_Brendan_Pokenav_2B4B28:: @ 2B4B28
 	.string "When you get to the other side,\n"
 	.string "come up to the surface. Simple!$"
 
-gText_Brendan_Pokenav_2B4C15:: @ 2B4C15
+MatchCall_Text_Brendan13:: @ 2B4C15
 	.string "BRENDAN: Hey there, {PLAYER}!\p"
 	.string "How's it going? Filling up your\n"
 	.string "POKéDEX successfully?\p"
@@ -2571,14 +2571,14 @@ gText_Brendan_Pokenav_2B4C15:: @ 2B4C15
 	.string "And not just one--three!\p"
 	.string "I'd love to catch even one…$"
 
-gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8
+MatchCall_Text_Brendan14:: @ 2B4CD8
 	.string "BRENDAN: {PLAYER}!\n"
 	.string "I heard the rumors!\p"
 	.string "You beat the SOOTOPOLIS GYM\n"
 	.string "LEADER? Awesome!\p"
 	.string "You're getting awful close now!$"
 
-gText_Brendan_Pokenav_2B4D46:: @ 2B4D46
+MatchCall_Text_Brendan15:: @ 2B4D46
 	.string "BRENDAN: There isn't a TRAINER in\n"
 	.string "all of HOENN who doesn't know who\l"
 	.string "you are, {PLAYER}!\p"
@@ -2586,19 +2586,19 @@ gText_Brendan_Pokenav_2B4D46:: @ 2B4D46
 	.string "with you, {PLAYER}, they get pretty\l"
 	.string "envious!$"
 
-gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2
+MatchCall_Text_Wally1:: @ 2B4DE2
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "I've been getting healthier and\n"
 	.string "more physically fit.\p"
 	.string "I hope I can become a TRAINER like\n"
 	.string "you soon, {PLAYER}!$"
 
-gText_Wally_Pokenav_2B4E57:: @ 2B4E57
+MatchCall_Text_Wally2:: @ 2B4E57
 	.string "WALLY: {PLAYER}, hello!\p"
 	.string "After RUSTURF TUNNEL went\n"
 	.string "through, WANDA's been very happy!$"
 
-gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5
+MatchCall_Text_Wally3:: @ 2B4EA5
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "I… I left my uncle's place in\n"
 	.string "VERDANTURF without telling anyone.\p"
@@ -2606,7 +2606,7 @@ gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5
 	.string "{PLAYER}, you understand how\n"
 	.string "I feel, don't you?$"
 
-gText_Wally_Pokenav_2B4F41:: @ 2B4F41
+MatchCall_Text_Wally4:: @ 2B4F41
 	.string "WALLY: {PLAYER}?\n"
 	.string "It's me, WALLY!\p"
 	.string "The world of TRAINERS is amazing!\p"
@@ -2615,7 +2615,7 @@ gText_Wally_Pokenav_2B4F41:: @ 2B4F41
 	.string "It's as if everyone's getting\n"
 	.string "connected through POKéMON!$"
 
-gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3
+MatchCall_Text_Wally5:: @ 2B4FF3
 	.string "WALLY: {PLAYER}? It's awesome!\n"
 	.string "That RALTS we caught together?\l"
 	.string "It evolved, {PLAYER}!\p"
@@ -2625,13 +2625,13 @@ gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3
 	.string "After all, it's the POKéMON that\n"
 	.string "should be praised!$"
 
-gText_Wally_Pokenav_2B50B1:: @ 2B50B1
+MatchCall_Text_Wally6:: @ 2B50B1
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "WALLY appears to be out of\n"
 	.string "the POKéNAV's service area…$"
 
-gText_Wally_Pokenav_2B5100:: @ 2B5100
+MatchCall_Text_Wally7:: @ 2B5100
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "Before I met you, I hardly ever\n"
 	.string "left my house…\p"
@@ -2640,7 +2640,7 @@ gText_Wally_Pokenav_2B5100:: @ 2B5100
 	.string "{PLAYER}…\n"
 	.string "Thank you…$"
 
-gText_Scott_Pokenav_2B5184:: @ 2B5184
+MatchCall_Text_Scott1:: @ 2B5184
 	.string "SCOTT: Howdy, {PLAYER}{KUN}!\p"
 	.string "You know how POKéMON can be found\n"
 	.string "everywhere?\p"
@@ -2651,7 +2651,7 @@ gText_Scott_Pokenav_2B5184:: @ 2B5184
 	.string "As a result, I have to hurry\n"
 	.string "everywhere, too. Busy, busy!$"
 
-gText_Scott_Pokenav_2B5275:: @ 2B5275
+MatchCall_Text_Scott2:: @ 2B5275
 	.string "SCOTT: I'm on ROUTE 119 right now.\n"
 	.string "It's teeming with TRAINERS!\p"
 	.string "It's also overgrown with tall grass\n"
@@ -2659,7 +2659,7 @@ gText_Scott_Pokenav_2B5275:: @ 2B5275
 	.string "Walking around in shorts here\n"
 	.string "makes me all ticklish!$"
 
-gText_Scott_Pokenav_2B5323:: @ 2B5323
+MatchCall_Text_Scott3:: @ 2B5323
 	.string "SCOTT: Hi, hi, {PLAYER}{KUN}!\p"
 	.string "Have you had the chance to climb\n"
 	.string "MT. PYRE?\p"
@@ -2668,7 +2668,7 @@ gText_Scott_Pokenav_2B5323:: @ 2B5323
 	.string "It's somewhere every TRAINER\n"
 	.string "should climb to the top of once.$"
 
-gText_Scott_Pokenav_2B53DB:: @ 2B53DB
+MatchCall_Text_Scott4:: @ 2B53DB
 	.string "SCOTT: Hi, {PLAYER}{KUN}!\p"
 	.string "I've been hearing about these odd\n"
 	.string "gangs being a nuisance.\p"
@@ -2678,7 +2678,7 @@ gText_Scott_Pokenav_2B53DB:: @ 2B53DB
 	.string "skilled TRAINERS among them.\p"
 	.string "…But if they're thugs…$"
 
-gText_Scott_Pokenav_2B54A5:: @ 2B54A5
+MatchCall_Text_Scott5:: @ 2B54A5
 	.string "SCOTT: Oh, hi, {PLAYER}{KUN}.\p"
 	.string "Might there be tough TRAINERS\n"
 	.string "at the bottom of the sea?\p"
@@ -2686,7 +2686,7 @@ gText_Scott_Pokenav_2B54A5:: @ 2B54A5
 	.string "I can't swim, for one.\l"
 	.string "And I don't raise POKéMON…$"
 
-gText_Scott_Pokenav_2B5541:: @ 2B5541
+MatchCall_Text_Scott6:: @ 2B5541
 	.string "SCOTT: Hi, hi, {PLAYER}{KUN}!\p"
 	.string "You know that you can challenge\n"
 	.string "the POKéMON LEAGUE when you've\l"
@@ -2703,20 +2703,20 @@ gText_Scott_Pokenav_2B5541:: @ 2B5541
 	.string "the POKéMON LEAGUE into the HALL\l"
 	.string "OF FAME!$"
 
-gText_Scott_Pokenav_2B56CA:: @ 2B56CA
+MatchCall_Text_Scott7:: @ 2B56CA
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "SCOTT appears to be out of\n"
 	.string "the POKéNAV's service area…$"
 
-gText_Norman_Pokenav_2B5719:: @ 82B5719
+MatchCall_Text_Norman1:: @ 82B5719
 	.string "DAD: In RUSTBORO, there's a man\n"
 	.string "that goes by the odd name of\l"
 	.string "the CUTTER.\p"
 	.string "If you're in the area, you should\n"
 	.string "pay him a visit.$"
 
-gText_Norman_Pokenav_2B5795:: @ 82B5795
+MatchCall_Text_Norman2:: @ 82B5795
 	.string "DAD: Hm… Little by little, but also\n"
 	.string "very surely, you're getting\l"
 	.string "tougher, {PLAYER}.\p"
@@ -2725,7 +2725,7 @@ gText_Norman_Pokenav_2B5795:: @ 82B5795
 	.string "and me…\p"
 	.string "This feeling is hard to explain.$"
 
-gText_Norman_Pokenav_2B584D:: @ 82B584D
+MatchCall_Text_Norman3:: @ 82B584D
 	.string "DAD: I see…\n"
 	.string "You've collected four GYM BADGES…\p"
 	.string "There's no avoiding it now.\n"
@@ -2733,7 +2733,7 @@ gText_Norman_Pokenav_2B584D:: @ 82B584D
 	.string "Come anytime.\n"
 	.string "We'll all be waiting for you!$"
 
-gText_Norman_Pokenav_2B58E3:: @ 82B58E3
+MatchCall_Text_Norman4:: @ 82B58E3
 	.string "DAD: {PLAYER}! You'd better go visit\n"
 	.string "Mother every so often.\p"
 	.string "I'm going to remain here and\n"
@@ -2741,27 +2741,27 @@ gText_Norman_Pokenav_2B58E3:: @ 82B58E3
 	.string "The way of battling is deep\n"
 	.string "and unforgiving!$"
 
-gText_Norman_Pokenav_2B5979:: @ 82B5979
+MatchCall_Text_Norman5:: @ 82B5979
 	.string "DAD: Oh, hi, {PLAYER}!\p"
 	.string "What's that? MAGMA EMBLEM?\n"
 	.string "I don't know what that's about.\p"
 	.string "But with a name like that, it may\n"
 	.string "be somehow linked to a volcano!$"
 
-gText_Norman_Pokenav_2B5A07:: @ 82B5A07
+MatchCall_Text_Norman6:: @ 82B5A07
 	.string "DAD: Hiyah! Haah! Dwah!\p"
 	.string "…Oh? {PLAYER}!\p"
 	.string "You caught me right in the middle\n"
 	.string "of a POKéMON training session!$"
 
-gText_Norman_Pokenav_2B5A69:: @ 82B5A69
+MatchCall_Text_Norman7:: @ 82B5A69
 	.string "DAD: {PLAYER}!\p"
 	.string "Who would've thought you'd become\n"
 	.string "the POKéMON LEAGUE CHAMPION…\p"
 	.string "Okay!\n"
 	.string "I won't be left behind!$"
 
-gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF
+MatchCall_Text_Norman8:: @ 82B5ACF
 	.string "DAD: Hm? {PLAYER}?\n"
 	.string "What good timing!\p"
 	.string "This time, I'm going to challenge\n"
@@ -2769,11 +2769,11 @@ gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF
 	.string "I'm waiting in the PETALBURG GYM.\n"
 	.string "Accept my challenge anytime!$"
 
-gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E
+MatchCall_Text_Norman9:: @ 82B5B5E
 	.string "DAD: …You amaze me, {PLAYER}.\n"
 	.string "How much higher will you soar?$"
 
-gText_Steven_Pokenav_2B5B95:: @ 82B5B95
+MatchCall_Text_Steven1:: @ 82B5B95
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "Have you been to MAUVILLE\n"
 	.string "already?\p"
@@ -2784,14 +2784,14 @@ gText_Steven_Pokenav_2B5B95:: @ 82B5B95
 	.string "You may make a new discovery\n"
 	.string "there.$"
 
-gText_Steven_Pokenav_2B5C53:: @ 82B5C53
+MatchCall_Text_Steven2:: @ 82B5C53
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "I've met a lot of different\n"
 	.string "TRAINERS so far.\p"
 	.string "But you're one of a kind.\n"
 	.string "You're not like anyone else.$"
 
-gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9
+MatchCall_Text_Steven3:: @ 82B5CC9
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "When you're on an adventure with\n"
 	.string "your POKéMON, what do you think?\p"
@@ -2802,7 +2802,7 @@ gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9
 	.string "Depending on how you think, your\n"
 	.string "adventure's significance changes.$"
 
-gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4
+MatchCall_Text_Steven4:: @ 82B5DB4
 	.string "STEVEN: Hello?\n"
 	.string "{PLAYER}{KUN}?\p"
 	.string "I'm involved in a spot of trouble\n"
@@ -2810,7 +2810,7 @@ gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4
 	.string "I'm sorry, but I can't talk now.\n"
 	.string "Bye!$"
 
-gText_Steven_Pokenav_2B5E26:: @ 82B5E26
+MatchCall_Text_Steven5:: @ 82B5E26
 	.string "STEVEN: Oh!\n"
 	.string "{PLAYER}{KUN}!\p"
 	.string "There's no need to talk.\n"
@@ -2818,12 +2818,12 @@ gText_Steven_Pokenav_2B5E26:: @ 82B5E26
 	.string "You have to believe in yourself\n"
 	.string "and do what's right.$"
 
-gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2
+MatchCall_Text_Steven6:: @ 82B5EA2
 	.string "… … … … … …\p"
 	.string "STEVEN appears not to be getting\n"
 	.string "the call…$"
 
-gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
+MatchCall_Text_Steven7:: @ 82B5ED9
 	.string "STEVEN: {PLAYER}{KUN}… Congratulations\n"
 	.string "for entering the HALL OF FAME.\p"
 	.string "… … … … … …\n"
@@ -2851,7 +2851,7 @@ MatchCall_Text_UnusedProfBirch:
 	.string "the POKéDEX and POKéNAV, studying\l"
 	.string "POKéMON becomes more fun, eh?$"
 
-gText_MrStone_Pokenav_2B60C0:: @ 82B60C0
+MatchCall_Text_MrStone1:: @ 82B60C0
 	.string "MR. STONE: Oh? {PLAYER}{KUN}!\p"
 	.string "Since you called me, the POKéNAV\n"
 	.string "must be working properly!\p"
@@ -2866,7 +2866,7 @@ gText_MrStone_Pokenav_2B60C0:: @ 82B60C0
 	.string "Wahahaha!\n"
 	.string "See you again!$"
 
-gText_MrStone_Pokenav_2B61E6:: @ 82B61E6
+MatchCall_Text_MrStone2:: @ 82B61E6
 	.string "MR. STONE: Oh? {PLAYER}{KUN}!\p"
 	.string "What's wrong? Have you forgotten\n"
 	.string "about that little errand of mine?\p"
@@ -2878,7 +2878,7 @@ gText_MrStone_Pokenav_2B61E6:: @ 82B61E6
 	.string "Now, since I am a busy PRESIDENT,\n"
 	.string "I have to go! Bye-bye!$"
 
-gText_MrStone_Pokenav_2B6302:: @ 82B6302
+MatchCall_Text_MrStone3:: @ 82B6302
 	.string "MR. STONE: Oh! {PLAYER}{KUN}!\p"
 	.string "Ah, so you've met STEVEN!\n"
 	.string "I'd better reward you, then!\p"
@@ -2886,7 +2886,7 @@ gText_MrStone_Pokenav_2B6302:: @ 82B6302
 	.string "come see me at my office.\p"
 	.string "I'll be waiting for you!$"
 
-gText_MrStone_Pokenav_2B63A0:: @ 82B63A0
+MatchCall_Text_MrStone4:: @ 82B63A0
 	.string "MR. STONE: Oh! {PLAYER}{KUN}!\p"
 	.string "Did you know that DEVON was\n"
 	.string "digging the RUSTURF TUNNEL?\p"
@@ -2897,14 +2897,14 @@ gText_MrStone_Pokenav_2B63A0:: @ 82B63A0
 	.string "live in peace than worry about our\l"
 	.string "own convenience.$"
 
-gText_MrStone_Pokenav_2B64A2:: @ 82B64A2
+MatchCall_Text_MrStone5:: @ 82B64A2
 	.string "MR. STONE: Hello, hello, {PLAYER}{KUN}!\p"
 	.string "I heard from someone in PETALBURG\n"
 	.string "that you're NORMAN's child!\p"
 	.string "No wonder you're such a capable\n"
 	.string "being!$"
 
-gText_MrStone_Pokenav_2B6526:: @ 82B6526
+MatchCall_Text_MrStone6:: @ 82B6526
 	.string "MR. STONE: What's that?\p"
 	.string "You battled your own father and\n"
 	.string "defeated him?\p"
@@ -2912,7 +2912,7 @@ gText_MrStone_Pokenav_2B6526:: @ 82B6526
 	.string "I had no idea that I befriended\n"
 	.string "someone so special! Wahaha!$"
 
-gText_MrStone_Pokenav_2B65BB:: @ 82B65BB
+MatchCall_Text_MrStone7:: @ 82B65BB
 	.string "Hello!\n"
 	.string "This is DEVON CORPORATI…\l"
 	.string "Oh, hello, {PLAYER}!\p"
@@ -2921,21 +2921,21 @@ gText_MrStone_Pokenav_2B65BB:: @ 82B65BB
 	.string "Our PRESIDENT is busy, but you\n"
 	.string "seem to be just as busy, {PLAYER}.$"
 
-gText_MrStone_Pokenav_2B6664:: @ 82B6664
+MatchCall_Text_MrStone8:: @ 82B6664
 	.string "…Huh? …What's that?\p"
 	.string "GROU… Yes? …DON?\p"
 	.string "You're breaking up…\n"
 	.string "…can't hear…\p"
 	.string "BZZZZ…$"
 
-gText_MrStone_Pokenav_2B66B1:: @ 82B66B1
+MatchCall_Text_MrStone9:: @ 82B66B1
 	.string "…Huh? …What's that?\p"
 	.string "Seaflo… Yes? …Caver…?\p"
 	.string "You're breaking up…\n"
 	.string "…can't hear…\p"
 	.string "BZZZZ…$"
 
-gText_MrStone_Pokenav_2B6703:: @ 82B6703
+MatchCall_Text_MrStone10:: @ 82B6703
 	.string "MR. STONE: {PLAYER}{KUN}! It's me!\p"
 	.string "You were apparently involved in all\n"
 	.string "sorts of things, but I, being busy,\l"
@@ -2945,7 +2945,7 @@ gText_MrStone_Pokenav_2B6703:: @ 82B6703
 	.string "I'll always be in your corner!\n"
 	.string "Take care!$"
 
-gText_MrStone_Pokenav_2B67ED:: @ 82B67ED
+MatchCall_Text_MrStone11:: @ 82B67ED
 	.string "MR. STONE: … … … … … …\n"
 	.string "Is this maybe {PLAYER}{KUN}?\p"
 	.string "Your voice is so full of confidence,\n"
author	GriffinR <griffin.richards@comcast.net>	2019-12-17 21:17:46 -0500
committer	GriffinR <griffin.richards@comcast.net>	2019-12-17 21:17:46 -0500
commit	23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch)
tree	9e276d9e08c46e9fe4f92af636d53f1dda33190a /data
parent	ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff)
parent	f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff)