Document Battle Pike scripts

14 files changed, 569 insertions, 561 deletions

diff --git a/asm/macros/battle_frontier/battle_pike.inc b/asm/macros/battle_frontier/battle_pike.inc
index d40cb0bac..30f5c88d8 100644
--- a/asm/macros/battle_frontier/battle_pike.inc
+++ b/asm/macros/battle_frontier/battle_pike.inc
@@ -1,6 +1,4 @@
-@ TODO: Add explanatory comments to macros
-
-	@
+	@ Set sRoomType to the next PIKE_ROOM_* id
 	.macro pike_setnextroom
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE
 	special CallBattlePikeFunction
@@ -25,19 +23,19 @@
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ TRUE if the next room is the last (15th) room, FALSE otherwise
 	.macro pike_isfinalroom
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_FINAL_ROOM
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Set the object event gfx for the room being entered
 	.macro pike_setroomobjects
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Get the current room type (sRoomType)
 	.macro pike_getroomtype
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
 	special CallBattlePikeFunction
@@ -62,33 +60,33 @@
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Returns the PIKE_STATUS_* to be afflicted for the status room
 	.macro pike_getstatus
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Returns the PIKE_STATUSMON_* that attacks the player for the status room
 	.macro pike_getstatusmon
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Randomly heals either one or two party mons and returns the number of mons healed
 	.macro pike_healonetwomons
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Buffers a message for the lone NPC in the NPC room to gStringVar4
 	.macro pike_getnpcmsg
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
 	special CallBattlePikeFunction
 	.endm
 
-	@
-	.macro pike_fadescreen
-	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
+	@ Flashes the screen 3 times for when the Dusclops/Kirlia attacks the player
+	.macro pike_flashscreen
+	setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH
 	special CallBattlePikeFunction
 	.endm
 
@@ -98,31 +96,31 @@
 	special CallBattlePikeFunction
 	.endm
 
-	@ TRUE if its the Pike Queens room
+	@ Set which room to give a hint about. TRUE if its the Pike Queens room next
 	.macro pike_sethintroom
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Get PIKE_ROOM_(LEFT/CENTER/RIGHT) for which room to give a hint about
 	.macro pike_gethintroomid
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Get the PIKE_HINT_* to give about the next room
 	.macro pike_gethint
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Reset the frontier trainer ids for the start of the challenge
 	.macro pike_cleartrainerids
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
 	special CallBattlePikeFunction
 	.endm
 
-	@ 
+	@ Buffer the opponents battle intro speech to gStringVar4. \trainer 0 for Trainer A, 1 for Trainer B
 	.macro pike_gettrainerintro trainer:req
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_TRAINER_INTRO
 	setvar VAR_0x8005, \trainer
@@ -135,32 +133,32 @@
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Heal 0-2 party mons depending on which room was chosen for the Pike Queen battle. Return the number healed
 	.macro pike_prequeenheal
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ When \set is TRUE, prevent healing rooms from appearing (for 1st room or when party is full health). \set FALSE to re-enable healing rooms
 	.macro pike_nohealing set:req
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEAL_ROOMS_DISABLED
 	setvar VAR_0x8005, \set
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ TRUE if the party is full health (full HP, PP, and no status), FALSE otherwise
 	.macro pike_ispartyfullhealth
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Save the party held items in pikeHeldItemsBackup
 	.macro pike_savehelditems
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_HELD_ITEMS
 	special CallBattlePikeFunction
 	.endm
 
-	@
+	@ Restore the party held items from pikeHeldItemsBackup
 	.macro pike_resethelditems
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_RESET_HELD_ITEMS
 	special CallBattlePikeFunction
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index 06f0e0516..cb164c4bb 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -1,25 +1,25 @@
 BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C786
+BattleFrontier_BattlePikeCorridor_OnFrame: @ 825C77C
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
+BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
 	delay 16
 	frontier_set FRONTIER_DATA_BATTLE_NUM, 1
 	pike_cleartrainerids
 	pike_nohealing TRUE
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
-	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor
+	applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor
 	waitmovement 0
 	lockall
 	msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor
 	waitmovement 0
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -27,27 +27,27 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
 	waitstate
 	end
 
-BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_25C801
+BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
+BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
+BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
+BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor: @ 825C80E
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
+BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor: @ 825C812
 	walk_up
 	walk_up
 	walk_left
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json
index 5854c6bf7..598c49444 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/map.json
+++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD",
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_Beauty",
       "flag": "0"
     }
   ],
@@ -98,7 +98,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BA80"
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_ShowResults"
     },
     {
       "type": "sign",
@@ -106,7 +106,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6"
+      "script": "BattleFrontier_BattlePikeLobby_EventScript_RulesBoard"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 69b8d3b13..f0c7b941b 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -1,33 +1,33 @@
 BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B707
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_25B710
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_25B762
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_25B806
+BattleFrontier_BattlePikeLobby_OnFrame: @ 825B6D1
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_WonChallenge
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
-	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_25B6FD
+BattleFrontier_BattlePikeLobby_OnWarp: @ 825B6F3
+	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
+BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD
 	setvar VAR_TEMP_1, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
+BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
+BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving:: @ 825B710
 	special HealPlayerParty
 	pike_resethelditems
 	lockall
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
 	pike_set PIKE_DATA_WIN_STREAK 0
 	pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE
@@ -36,21 +36,20 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
+BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: @ 825B762
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen
+	msgbox BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance, MSGBOX_DEFAULT
 	waitmessage
-	goto BattleFrontier_BattlePikeLobby_EventScript_25B78D
+	goto BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C383, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen:: @ 825B784
+	msgbox BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen, MSGBOX_DEFAULT
 	waitmessage
-
-BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints:: @ 825B78D
+	msgbox BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	frontier_checkairshow
@@ -60,20 +59,20 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	special LoadPlayerParty
 	special HealPlayerParty
 	pike_resethelditems
-	message BattleFrontier_BattlePikeLobby_Text_25C1DF
+	message BattleFrontier_BattlePikeLobby_Text_ShallRecordResults
 	waitmessage
 	pike_save 0
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
+BattleFrontier_BattlePikeLobby_EventScript_LostChallenge:: @ 825B806
 	lockall
-	message BattleFrontier_BattlePikeLobby_Text_25C146
+	message BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults
 	waitmessage
 	frontier_checkairshow
 	frontier_set FRONTIER_DATA_BATTLE_NUM, 0
@@ -84,42 +83,41 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	pike_save 0
 	playse SE_SAVE
 	waitse
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
+BattleFrontier_BattlePikeLobby_EventScript_Attendant:: @ 825B868
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PIKE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, MSGBOX_DEFAULT
-
-BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F
-	message BattleFrontier_BattlePikeLobby_Text_25BBC1
+	msgbox BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
+	message BattleFrontier_BattlePikeLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
-	message BattleFrontier_BattlePikeLobby_Text_25BE35
+BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
+	message BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, 0
 	switch VAR_RESULT
-	case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_25BA76
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 	frontier_checkineligible
 	compare VAR_0x8004, TRUE
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons
 	frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C094, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT
 	fadescreen 1
 	call BattleFrontier_EventScript_GetLvlMode
 	copyvar VAR_0x8004, VAR_RESULT
@@ -127,14 +125,14 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
 	special ChoosePartyForBattleFrontier
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
+	msgbox BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePikeLobby_EventScript_25BA73
-	case YES, BattleFrontier_BattlePikeLobby_EventScript_25B95C
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA73
+	case NO, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
+	case YES, BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
+BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge:: @ 825B95C
 	setvar VAR_TEMP_0, 0
 	setvar VAR_TEMP_1, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
@@ -150,13 +148,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	setvar VAR_TEMP_0, 255
 	pike_savehelditems
 	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
+	goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	frontier_settrainers
-	call BattleFrontier_BattlePikeLobby_EventScript_25BA94
+	call BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor
 	special HealPlayerParty
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
@@ -164,36 +162,36 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	waitstate
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25B87F
+BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge:: @ 825BA1A
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons:: @ 825BA27
 	switch VAR_RESULT
-	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_25BA42
-	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_25BA4F
+	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50
+	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50:: @ 825BA42
+	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 825BA4F
+	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed:: @ 825BA5C
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
+	goto BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
+BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825BA73
 	special LoadPlayerParty
-BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76
-	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
-BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge:: @ 825BA76
+	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge:: @ 825BA7E
 	release
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
+BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
 	lockall
 	frontier_results FRONTIER_FACILITY_PIKE
 	waitbuttonpress
@@ -201,67 +199,66 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94
-	applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6
+BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94
+	applymovement 1, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6
+BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor: @ 825BAA6
 	walk_up
-
-BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7
+BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor: @ 825BAA7
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C422, MSGBOX_NPC
+BattleFrontier_BattlePikeLobby_EventScript_Hiker:: @ 825BAAB
+	msgbox BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, MSGBOX_NPC
+BattleFrontier_BattlePikeLobby_EventScript_Twin:: @ 825BAB4
+	msgbox BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, MSGBOX_NPC
+BattleFrontier_BattlePikeLobby_EventScript_Beauty:: @ 825BABD
+	msgbox BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6
+BattleFrontier_BattlePikeLobby_EventScript_RulesBoard:: @ 825BAC6
 	lockall
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+	msgbox BattleFrontier_BattlePikeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5
-	message BattleFrontier_BattlePikeLobby_Text_25C621
+BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
+	message BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D
-	case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B
-	case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39
-	case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BB47
+	case 0, BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag
+	case 1, BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems
+	case 2, BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder
+	case 3, BattleFrontier_BattlePikeLobby_EventScript_ExitRules
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C644, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag:: @ 825BB1D
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems:: @ 825BB2B
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39
-	msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5
+BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder:: @ 825BB39
+	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47
+BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
 	releaseall
 	end
 
@@ -272,17 +269,17 @@ BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
 	waitse
 	return
 
-BattleFrontier_BattlePikeLobby_Text_25BB52: @ 825BB52
+BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike: @ 825BB52
 	.string "Where the luck of TRAINERS\n"
 	.string "is put to the test…\p"
 	.string "Welcome to the BATTLE PIKE…\p"
 	.string "I am your guide to the BATTLE PIKE…$"
 
-BattleFrontier_BattlePikeLobby_Text_25BBC1: @ 825BBC1
+BattleFrontier_BattlePikeLobby_Text_TakeChallenge: @ 825BBC1
 	.string "Would you like to take the Battle\n"
 	.string "Choice challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5
+BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike: @ 825BBF5
 	.string "Here we conduct an event we call\n"
 	.string "the Battle Choice.\p"
 	.string "The Battle Choice rules are very\n"
@@ -301,16 +298,16 @@ BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02
+BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou: @ 825BE02
 	.string "We look forward to seeing you\n"
 	.string "on another occasion…$"
 
-BattleFrontier_BattlePikeLobby_Text_25BE35: @ 825BE35
+BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode: @ 825BE35
 	.string "You have the choice of two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50: @ 825BE8C
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -322,7 +319,7 @@ BattleFrontier_BattlePikeLobby_Text_25BE8C: @ 825BE8C
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen: @ 825BF9A
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -334,98 +331,101 @@ BattleFrontier_BattlePikeLobby_Text_25BF9A: @ 825BF9A
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C094: @ 825C094
+BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons: @ 825C094
 	.string "Please choose the three POKéMON\n"
 	.string "you wish to enter in the challenge…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C0D8: @ 825C0D8
+BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge: @ 825C0D8
 	.string "Before starting your Battle Choice\n"
 	.string "challenge, I must save the game.\l"
 	.string "Is that acceptable?$"
 
-BattleFrontier_BattlePikeLobby_Text_25C130: @ 825C130
+BattleFrontier_BattlePikeLobby_Text_StepThisWay: @ 825C130
 	.string "Please step this way…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C146: @ 825C146
+BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults: @ 825C146
 	.string "Your challenge has ended…\p"
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C18A: @ 825C18A
+BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance: @ 825C18A
 	.string "You have completed the challenge…\p"
 	.string "I must say… You seem to possess luck\n"
 	.string "in abundance…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C1DF: @ 825C1DF
+BattleFrontier_BattlePikeLobby_Text_ShallRecordResults: @ 825C1DF
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C209: @ 825C209
+@ Unused
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2: @ 825C209
 	.string "To commemorate your completion of\n"
 	.string "the Battle Choice challenge, we award\l"
 	.string "you these Battle Point(s)…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C26C: @ 825C26C
+@ Unused
+BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit: @ 825C26C
 	.string "You appear to have reached the limit\n"
 	.string "for Battle Points…\pPlease exchange some Battle Points\n"
 	.string "for prizes, then return…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C2E0: @ 825C2E0
+BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting: @ 825C2E0
 	.string "I beg your pardon, but…\p"
 	.string "You failed to save before you quit\n"
 	.string "your challenge the last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. I am sorry…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C383: @ 825C383
+BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen: @ 825C383
 	.string "Congratulations…\p"
 	.string "You have snatched victory from the\n"
 	.string "PIKE QUEEN and cleared the event…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints: @ 825C3D9
 	.string "In recognition of your amazing luck,\n"
 	.string "we award you these Battle Point(s)…$"
 
-BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422
+BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal: @ 825C422
 	.string "Arrgh! I blew my chance!\n"
 	.string "I was one room away from the goal!\p"
 	.string "In this place, you'd better watch out\n"
 	.string "for poison, freezing, and so on.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5
+BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer: @ 825C4A5
 	.string "I've completed the challenge 10 times\n"
 	.string "now, but I've never had to battle\l"
 	.string "a TRAINER once.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD
+BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere: @ 825C4FD
 	.string "Listen! Listen!\p"
 	.string "Don't you think that the special\n"
 	.string "abilities of POKéMON will be useful\l"
 	.string "here?$"
 
-BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558
+@ Unused
+BattleFrontier_BattlePikeLobby_Text_TrainersWhicheverPathIChoose: @ 825C558
 	.string "What is this weird place?\n"
 	.string "I can't figure it out at all!\p"
 	.string "I've taken the challenge a bunch\n"
 	.string "of times, but all I ever do is run into\l"
 	.string "TRAINERS whichever path I choose.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB
+BattleFrontier_BattlePikeLobby_Text_RulesAreListed: @ 825C5FB
 	.string "The Battle Choice's rules are listed.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621
+BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading: @ 825C621
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePikeLobby_Text_25C644: @ 825C644
+BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules: @ 825C644
 	.string "The BAG and POKéNAV may not be used\n"
 	.string "during a Battle Choice challenge.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C68A: @ 825C68A
+BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules: @ 825C68A
 	.string "During a Battle Choice challenge,\n"
 	.string "any BERRY or HERB held by POKéMON\l"
 	.string "will be effective only once.$"
 
-BattleFrontier_BattlePikeLobby_Text_25C6EB: @ 825C6EB
+BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules: @ 825C6EB
 	.string "During a Battle Choice challenge,\n"
 	.string "the sequence of POKéMON cannot be\l"
 	.string "changed.\p"
diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
index 2eaaa20b4..d547a200f 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
@@ -4,12 +4,12 @@ BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392
 	.byte 0
 
 BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7
+BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7
 	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB
+	applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer
 	waitmovement 0
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	lockall
@@ -20,7 +20,7 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB: @ 825E3DB
+BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer: @ 825E3DB
 	walk_down
 	walk_down
 	step_end
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
index 6eef87962..4413e35f3 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED",
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NPC",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D",
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -77,7 +77,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -86,7 +86,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -95,7 +95,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -104,7 +104,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
+      "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
index 5419eb081..184bf9324 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -6,25 +6,25 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts:: @ 825D152
 	.byte 0
 
 BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D171
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D171:: @ 825D171
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 825D171
 	setvar VAR_TEMP_0, 1
 	pike_getroomtype
 	switch VAR_RESULT
-	case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6
-	case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E
-	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D605
-	case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D231
-	case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E
-	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF
+	case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom
+	case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom
+	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom
+	case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom
+	case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom
+	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: @ 825D1C6
 	lockall
 	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
 	waitmovement 0
 	pike_gettrainerintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -36,25 +36,25 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6
 	special DoSpecialTrainerBattle
 	waitstate
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D226
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A:: @ 825D20A
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle
+BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost:: @ 825D20A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D226:: @ 825D226
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle:: @ 825D226
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D231:: @ 825D231
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: @ 825D231
 	lockall
 	delay 16
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDFE, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
 	waitmovement 0
 	pike_gettrainerintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -66,131 +66,131 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D231:: @ 825D231
 	special DoSpecialTrainerBattle
 	waitstate
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D285
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D285:: @ 825D285
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B6
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer
 	waitmovement 0
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DE3F, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DE94, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2, MSGBOX_DEFAULT
 	closemessage
 	release
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF:: @ 825D2BF
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom:: @ 825D2BF
 	delay 22
 	lockall
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer
 	waitmovement 0
 	pike_prequeenheal
 	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC
-	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA
-	case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4FC
+	case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon
+	case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E311, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster, MSGBOX_DEFAULT
 	closemessage
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2
+	applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
 	waitmovement 0
 	playse SE_CURTAIN
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed
 	delay 4
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
 	delay 4
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed
 	delay 4
 	waitse
 	delay 60
 	playse SE_CURTAIN1
 	delay 65
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
 	showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
 	delay 4
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed
 	delay 4
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen
 	waitse
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter
 	waitmovement 0
 	pike_getbrainstatus
 	switch VAR_RESULT
-	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416
-	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
-	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443
+	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold
+	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
+	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DED2, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD:: @ 825D3BD
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DF71, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B
+BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver:: @ 825D3BD
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D3DA
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D3DA:: @ 825D3DA
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
 	frontier_getsymbols
 	compare VAR_RESULT, 0
-	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DFA2, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT
 	waitmessage
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DFD0
+	message BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E003, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_AllThereIsDisappear, MSGBOX_DEFAULT
 	closemessage
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D416:: @ 825D416
+BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold:: @ 825D416
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
-	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D443
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E02C, MSGBOX_DEFAULT
+	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D443:: @ 825D443
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E0E8, MSGBOX_DEFAULT
-	call BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B
+BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold:: @ 825D443
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn, MSGBOX_DEFAULT
+	call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D460
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D460:: @ 825D460
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
 	frontier_getsymbols
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E0F6, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT
 	waitmessage
 	playfanfare MUS_ME_SYMBOLGET
-	message BattleFrontier_BattlePikeRoomNormal_Text_25E118
+	message BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
 	frontier_givesymbol
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E140, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_IWontForget, MSGBOX_DEFAULT
 	closemessage
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
 	waitmovement 0
 	pike_get PIKE_DATA_WIN_STREAK
 	addvar VAR_RESULT, 1
@@ -199,61 +199,61 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC:: @ 825D4DC
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E15D, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal, MSGBOX_DEFAULT
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA:: @ 825D4EA
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E1DD, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D4FC:: @ 825D4FC
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E238, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT
 	playfanfare MUS_ME_ASA
 	waitfanfare
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E:: @ 825D50E
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
 	lockall
 	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
 	waitmovement 0
-	message BattleFrontier_BattlePikeRoomNormal_Text_25D9B6
+	message BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth
 	waitmessage
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special HealPlayerParty
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DA13, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	releaseall
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53E
 	lockall
 	delay 16
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C1
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C3
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2WalkLeft
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1
 	waitmovement 0
 	pike_gettrainerintro 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
 	delay 16
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
 	waitmovement 0
 	pike_gettrainerintro 1
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -263,136 +263,136 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E
 	special DoSpecialTrainerBattle
 	waitstate
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC
-	goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A
+	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle
+	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC:: @ 825D5DC
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D605:: @ 825D605
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom:: @ 825D605
 	lockall
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DBD1
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA
+	message BattleFrontier_BattlePikeRoomNormal_Text_WatchOut
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer
 	waitmovement 0
 	pike_getstatusmon
 	copyvar VAR_0x8004, VAR_RESULT
-	compare VAR_0x8004, PIKE_STATUS_KIRLIA
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D643
-	compare VAR_0x8004, PIKE_STATUS_DUSCLOPS
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD3F, MSGBOX_DEFAULT
+	compare VAR_0x8004, PIKE_STATUSMON_KIRLIA
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack
+	compare VAR_0x8004, PIKE_STATUSMON_DUSCLOPS
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D643:: @ 825D643
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DBE4, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack:: @ 825D643
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
 	playmoncry SPECIES_KIRLIA, 0
 	waitmoncry
 	pike_getstatus
 	compare VAR_RESULT, PIKE_STATUS_TOXIC
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D751
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic
 	compare VAR_RESULT, PIKE_STATUS_BURN
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D758
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp
 	compare VAR_RESULT, PIKE_STATUS_PARALYSIS
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave
 	compare VAR_RESULT, PIKE_STATUS_SLEEP
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D766
-	pike_fadescreen
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis
+	pike_flashscreen
 	waitstate
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KIRLIA, 0
 	waitmoncry
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCAF, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT
 	waitse
 	playmoncry SPECIES_KIRLIA, 0
 	waitmoncry
 	closemessage
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCCF, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5:: @ 825D6D5
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DC01, MSGBOX_DEFAULT
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack:: @ 825D6D5
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
 	playmoncry SPECIES_DUSCLOPS, 0
 	waitmoncry
 	pike_getstatus
 	compare VAR_RESULT, PIKE_STATUS_FREEZE
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam
 	compare VAR_RESULT, PIKE_STATUS_BURN
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D774
-	pike_fadescreen
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp
+	pike_flashscreen
 	waitstate
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_DUSCLOPS, 0
 	waitmoncry
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCAF, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT
 	waitse
 	playmoncry SPECIES_DUSCLOPS, 0
 	waitmoncry
 	closemessage
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer
 	waitmovement 0
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD06, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D751:: @ 825D751
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DC20
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic:: @ 825D751
+	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D758:: @ 825D758
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DC63
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp:: @ 825D758
+	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F:: @ 825D75F
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DC49
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave:: @ 825D75F
+	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D766:: @ 825D766
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DC33
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis:: @ 825D766
+	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D:: @ 825D76D
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DC97
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam:: @ 825D76D
+	message BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D774:: @ 825D774
-	message BattleFrontier_BattlePikeRoomNormal_Text_25DC7C
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp:: @ 825D774
+	message BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B:: @ 825D77B
+BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
 	waitmovement 0
 	setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
 	setvar VAR_0x8005, 0
@@ -400,12 +400,12 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B:: @ 825D77B
 	waitstate
 	return
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D795: @ 825D795
+BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer: @ 825D795
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D798: @ 825D798
+BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit: @ 825D798
 	walk_up
 	walk_up
 	walk_up
@@ -413,17 +413,17 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D798: @ 825D798
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D79E: @ 825D79E
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit: @ 825D79E
 	walk_up
 	set_invisible
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2: @ 825D7A2
+BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon: @ 825D7A2
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4: @ 825D7A4
+BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer: @ 825D7A4
 	walk_down
 	face_left
 	delay_16
@@ -431,7 +431,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4: @ 825D7A4
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA: @ 825D7AA
+BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer: @ 825D7AA
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -440,58 +440,57 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA: @ 825D7AA
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1: @ 825D7B1
+BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC: @ 825D7B1
 	face_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3: @ 825D7B3
+BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside: @ 825D7B3
 	walk_left
-
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7B4: @ 825D7B4
+BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight: @ 825D7B4
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7B6: @ 825D7B6
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer: @ 825D7B6
 	walk_down
 	walk_down
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB: @ 825D7BB
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1: @ 825D7BB
 	face_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD: @ 825D7BD
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2: @ 825D7BD
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF: @ 825D7BF
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp: @ 825D7BF
 	face_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7C1: @ 825D7C1
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight: @ 825D7C1
 	walk_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7C3: @ 825D7C3
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2WalkLeft: @ 825D7C3
 	walk_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5: @ 825D7C5
+BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown: @ 825D7C5
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8: @ 825D7C8
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer: @ 825D7C8
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA: @ 825D7CA
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer: @ 825D7CA
 	face_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC: @ 825D7CC
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit: @ 825D7CC
 	walk_up
 	walk_up
 	walk_up
@@ -501,7 +500,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC: @ 825D7CC
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4: @ 825D7D4
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit: @ 825D7D4
 	walk_up
 	walk_up
 	walk_up
@@ -511,40 +510,41 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4: @ 825D7D4
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC: @ 825D7DC
+@ For approaching Lucy and exiting room after defeating Lucy
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2: @ 825D7DC
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF: @ 825D7DF
+BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer: @ 825D7DF
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2: @ 825D7E2
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy: @ 825D7E2
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7: @ 825D7E7
+BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter: @ 825D7E7
 	set_visible
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA: @ 825D7EA
+BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside: @ 825D7EA
 	walk_left
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED
+BattleFrontier_BattlePikeRoomNormal_EventScript_NPC:: @ 825D7ED
 	pike_getroomtype
 	switch VAR_RESULT
-	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B
-	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D831
-	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B:: @ 825D81B
+	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC
+	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC
+	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC
+BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC:: @ 825D81B
 	lock
 	faceplayer
 	pike_getnpcmsg
@@ -554,54 +554,55 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B:: @ 825D81B
 	release
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D831:: @ 825D831
+BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC:: @ 825D831
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDA3, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E:: @ 825D83E
+BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
 	pike_healonetwomons
 	compare VAR_RESULT, 2
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D881
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
 	compare VAR_RESULT, 1
-	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D875
+	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
 	playfanfare MUS_ME_ASA
 	waitfanfare
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DABE, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT
 	closemessage
 	release
-	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D79E
+	applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D875:: @ 825D875
+BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon:: @ 825D875
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DA51, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon, MSGBOX_DEFAULT
 	closemessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D881:: @ 825D881
+BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons:: @ 825D881
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E32E, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons, MSGBOX_DEFAULT
 	closemessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D:: @ 825D88D
+@ Dusclops or Kirlia
+BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon:: @ 825D88D
 	lock
 	faceplayer
-	msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDE6, MSGBOX_DEFAULT
+	msgbox BattleFrontier_BattlePikeRoomNormal_Text_Silence, MSGBOX_DEFAULT
 	closemessage
 	release
-	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B4
+	applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4:: @ 825D8A4
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: @ 825D8A4
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
@@ -612,7 +613,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4:: @ 825D8A4
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7:: @ 825D8E7
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed:: @ 825D8E7
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
@@ -623,7 +624,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7:: @ 825D8E7
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A:: @ 825D92A
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen:: @ 825D92A
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
@@ -634,7 +635,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A:: @ 825D92A
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D:: @ 825D96D
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed:: @ 825D96D
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
@@ -645,128 +646,136 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D:: @ 825D96D
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0: @ 825D9B0
+BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp: @ 825D9B0
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_25D9B3: @ 825D9B3
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown: @ 825D9B3
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Text_25D9B6: @ 825D9B6
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth: @ 825D9B6
 	.string "Welcome…\n"
 	.string "You must be commended for your luck…\p"
 	.string "Your POKéMON shall be restored\n"
 	.string "to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DA13: @ 825DA13
+BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge: @ 825DA13
 	.string "I urge you to enjoy the rest of your\n"
 	.string "Battle Choice challenge…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DA51: @ 825DA51
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon: @ 825DA51
 	.string "Ah, you're a lucky one.\n"
 	.string "I'm in somewhat-good spirits now.\p"
 	.string "I will restore one of your POKéMON\n"
 	.string "to full health.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DABE: @ 825DABE
+BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell: @ 825DABE
 	.string "The best of luck to you.\n"
 	.string "Farewell.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DAE1: @ 825DAE1
+@ Seems there was a planned room type where the player could choose to battle and would be healed if they won
+@ Possibly replaced/superseded by the hard battle room, which is the same but the battle isnt optional
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Text_CareForBattleWillRestoreMons: @ 825DAE1
 	.string "Excuse me…\p"
 	.string "Would you care for a battle?\n"
 	.string "I'll restore your POKéMON if you win.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DB2F: @ 825DB2F
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Text_NowShallWe: @ 825DB2F
 	.string "Very well…\n"
 	.string "Now, shall we?$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DB49: @ 825DB49
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Text_HowUnsportingOfYou: @ 825DB49
 	.string "I see…\n"
 	.string "How unsporting of you…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DB67: @ 825DB67
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreMonsAsPromised: @ 825DB67
 	.string "Magnificent…\p"
 	.string "As promised, I shall restore your\n"
 	.string "POKéMON to full health.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DBAE: @ 825DBAE
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell2: @ 825DBAE
 	.string "The best of luck to you.\n"
 	.string "Farewell.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DBD1: @ 825DBD1
+BattleFrontier_BattlePikeRoomNormal_Text_WatchOut: @ 825DBD1
 	.string "Oh, my!\p"
 	.string "Watch out!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DBE4: @ 825DBE4
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop: @ 825DBE4
 	.string "Now, now!\n"
 	.string "KIRLIA, stop that!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC01: @ 825DC01
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop: @ 825DC01
 	.string "Now, now!\n"
 	.string "DUSCLOPS, stop that!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC20: @ 825DC20
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic: @ 825DC20
 	.string "KIRLIA used TOXIC!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC33: @ 825DC33
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis: @ 825DC33
 	.string "KIRLIA used HYPNOSIS!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC49: @ 825DC49
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave: @ 825DC49
 	.string "KIRLIA used THUNDER WAVE!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC63: @ 825DC63
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp: @ 825DC63
 	.string "KIRLIA used WILL-O-WISP!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC7C: @ 825DC7C
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp: @ 825DC7C
 	.string "DUSCLOPS used WILL-O-WISP!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DC97: @ 825DC97
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam: @ 825DC97
 	.string "DUSCLOPS used ICE BEAM!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DCAF: @ 825DCAF
+BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough: @ 825DCAF
 	.string "Look here!\n"
 	.string "That's quite enough!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DCCF: @ 825DCCF
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia: @ 825DCCF
 	.string "I must apologize to you…\p"
 	.string "My KIRLIA has a TIMID nature…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DD06: @ 825DD06
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops: @ 825DD06
 	.string "I must apologize to you…\p"
 	.string "My DUSCLOPS has a TIMID nature…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DD3F: @ 825DD3F
+BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled: @ 825DD3F
 	.string "It attacks without warning if it is\n"
 	.string "startled by another person…\p"
 	.string "Are you and your POKéMON all right?$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DDA3: @ 825DDA3
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine: @ 825DDA3
 	.string "I do apologize for what happened…\n"
 	.string "I do hope your POKéMON are fine.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DDE6: @ 825DDE6
+BattleFrontier_BattlePikeRoomNormal_Text_Silence: @ 825DDE6
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DDFE: @ 825DDFE
+BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer: @ 825DDFE
 	.string "Welcome…\p"
 	.string "Here, we will have you battle\n"
 	.string "a somewhat-tough TRAINER…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DE3F: @ 825DE3F
+BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth: @ 825DE3F
 	.string "How wonderful…\p"
 	.string "To honor your victory, your POKéMON\n"
 	.string "shall be restored to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DE94: @ 825DE94
+BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2: @ 825DE94
 	.string "I urge you to enjoy the rest of your\n"
 	.string "Battle Choice challenge…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DED2: @ 825DED2
+BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen: @ 825DED2
 	.string "I am LUCY…\n"
 	.string "I am the law here…\l"
 	.string "For I am the PIKE QUEEN…\p"
@@ -775,23 +784,23 @@ BattleFrontier_BattlePikeRoomNormal_Text_25DED2: @ 825DED2
 	.string "…I'm not one for idle chatter.\n"
 	.string "Hurry. Come on…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DF71: @ 825DF71
+BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck: @ 825DF71
 	.string "Your luck…\n"
 	.string "I hope you didn't use it all up here…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DFA2: @ 825DFA2
+BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass: @ 825DFA2
 	.string "LUCY: … … … … … …\n"
 	.string "Show me your FRONTIER PASS…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25DFD0: @ 825DFD0
+BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol: @ 825DFD0
 	.string "The Luck Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E003: @ 825E003
+BattleFrontier_BattlePikeRoomNormal_Text_AllThereIsDisappear: @ 825E003
 	.string "…That's all there is…\n"
 	.string "Disappear already…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E02C: @ 825E02C
+BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain: @ 825E02C
 	.string "LUCY: …You again…\p"
 	.string "… … … … … …\p"
 	.string "…I've trampled flowers and braved\n"
@@ -801,50 +810,51 @@ BattleFrontier_BattlePikeRoomNormal_Text_25E02C: @ 825E02C
 	.string "… … … … … …\n"
 	.string "Fine… I'll do it…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E0E8: @ 825E0E8
+BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn: @ 825E0E8
 	.string "Now!\n"
 	.string "Come on!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E0F6: @ 825E0F6
+BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass: @ 825E0F6
 	.string "LUCY: … … … … … …\p"
 	.string "…FRONTIER PASS…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E118: @ 825E118
+BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine: @ 825E118
 	.string "The Luck Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E140: @ 825E140
+BattleFrontier_BattlePikeRoomNormal_Text_IWontForget: @ 825E140
 	.string "…You, I won't forget…\n"
 	.string "…Ever…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E15D: @ 825E15D
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal: @ 825E15D
 	.string "I welcome you…\p"
 	.string "Giggle…\n"
 	.string "You seem to be bereft of luck…\p"
 	.string "If only you hadn't chosen this room,\n"
 	.string "your POKéMON could have been healed…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E1DD: @ 825E1DD
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne: @ 825E1DD
 	.string "I welcome you…\p"
 	.string "Since you have chosen this room, I will\n"
 	.string "restore one POKéMON to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E238: @ 825E238
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo: @ 825E238
 	.string "I welcome you…\p"
 	.string "Since you have chosen this room, I will\n"
 	.string "restore two POKéMON to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E293: @ 825E293
+@ Unused
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreAllMons: @ 825E293
 	.string "I welcome you…\p"
 	.string "Giggle…\n"
 	.string "You should thank your lucky stars…\p"
 	.string "Since you have chosen this room,\n"
 	.string "all your POKéMON will be restored…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E311: @ 825E311
+BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster: @ 825E311
 	.string "I shall go fetch our master…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_25E32E: @ 825E32E
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons: @ 825E32E
 	.string "Ah, you're a lucky one!\n"
 	.string "I'm in good spirits now.\p"
 	.string "I will restore two of your POKéMON\n"
diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
index 3a8362b7f..6dd45dc34 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
@@ -23,7 +23,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit"
     },
     {
       "type": "trigger",
@@ -32,7 +32,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -41,7 +41,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -50,7 +50,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -68,7 +68,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -77,7 +77,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D"
+      "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
index 356e88366..418a9e764 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
@@ -1,44 +1,44 @@
 BattleFrontier_BattlePikeRoomWildMons_MapScripts:: @ 825E41A
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C
-	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A
+BattleFrontier_BattlePikeRoomWildMons_OnFrame: @ 825E42A
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom
+	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom:: @ 825E43C
 	setvar VAR_TEMP_0, 1
 	pike_inwildmonroom
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A
+BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost:: @ 825E44A
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466: @ 825E466
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470
+BattleFrontier_BattlePikeRoomWildMons_OnWarp: @ 825E466
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470:: @ 825E470
+BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A: @ 825E47A
+BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A
 	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	compare VAR_RESULT, B_OUTCOME_LOST
-	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3
+	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
 	compare VAR_RESULT, B_OUTCOME_DREW
-	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3
+	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3:: @ 825E4A3
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost:: @ 825E4A3
 	setvar VAR_TEMP_1, 1
 	end
 
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
index aa512a0a7..4f6bd9a7c 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908",
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -86,7 +86,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
     },
     {
       "type": "trigger",
@@ -95,7 +95,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -104,7 +104,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -113,7 +113,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
     },
     {
       "type": "trigger",
@@ -122,7 +122,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_3",
       "var_value": "1",
-      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+      "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index a0bf811a5..a0c7ece1d 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -5,23 +5,23 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
 	.byte 0
 
 BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby
-	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4
-	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78
-	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97
+	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge
+	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom
+	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint
 	.2byte 0
 
 BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
+BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus:: @ 825C891
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891
 	frontier_getstatus
 	end
 
@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: @ 825C89A
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
+BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge:: @ 825C8A4
 	lockall
 	message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
 	waitmessage
@@ -48,76 +48,76 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
+BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant:: @ 825C908
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Room number
 	switch VAR_RESULT
-	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
-	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
-	case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988
-	case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998
-	case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8
-	case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8
-	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8
+	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1
+	case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3
+	case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5
+	case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7
+	case 9, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9
+	case 11, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11
+	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1:: @ 825C968
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3:: @ 825C978
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5:: @ 825C988
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7:: @ 825C998
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9:: @ 825C9A8
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11:: @ 825C9B8
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13:: @ 825C9C8
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13, MSGBOX_DEFAULT
-	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8
+	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge:: @ 825C9D8
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
+BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
 	frontier_saveparty
 	message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
 	waitmessage
@@ -129,16 +129,16 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
 	frontier_reset
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit, MSGBOX_YESNO
 	switch VAR_RESULT
-	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD
-	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
-	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A
+	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge
+	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge
+	case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5A
 	message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
@@ -147,24 +147,24 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom:: @ 825CA78
 	pike_sethintroom
 	compare VAR_RESULT, TRUE
-	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
+	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91:: @ 825CA91
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint:: @ 825CA91
 	setvar VAR_TEMP_5, 1
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
-	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97
+	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer
 	waitmovement 0
 	lockall
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent, MSGBOX_DEFAULT
 	releaseall
-	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5
+	applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos
 	waitmovement 0
 	setvar VAR_TEMP_5, 255
 	end
@@ -244,7 +244,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint:: @ 825CBC2
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer: @ 825CBCE
 	walk_left
 	walk_left
 	walk_down
@@ -253,7 +253,7 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos: @ 825CBD5
 	walk_up
 	walk_up
 	walk_up
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index a0f0f6618..dd730a644 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -6,71 +6,71 @@ BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
 	pike_setroomobjects
 	pike_getroomtype
 	switch VAR_RESULT
-	case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
-	case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
-	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0
-	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2
-	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
-	case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93
-	case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2
-	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF
+	case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos
+	case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos
+	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos
+	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos
+	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos
+	case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos
+	case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos
+	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93:: @ 82C3E93
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos:: @ 82C3E93
 	setobjectxyperm 1, 2, 5
 	setobjectxyperm 2, 6, 5
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2:: @ 82C3EA2
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos:: @ 82C3EA2
 	setobjectxyperm 1, 4, 4
 	setobjectxyperm 2, 3, 4
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1:: @ 82C3EB1
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos:: @ 82C3EB1
 	setobjectxyperm 1, 4, 4
 	setobjectxyperm 2, 0, 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0:: @ 82C3EC0
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos:: @ 82C3EC0
 	setobjectxyperm 1, 5, 5
 	setobjectxyperm 2, 0, 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF:: @ 82C3ECF
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos:: @ 82C3ECF
 	setobjectxyperm 1, 4, 3
 	setobjectxyperm 2, 4, 4
 	end
 
 BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
-	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom
+	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
 	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
 	pike_getroomtype
 	compare VAR_RESULT, PIKE_ROOM_STATUS
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
 	compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
 	compare VAR_RESULT, PIKE_ROOM_DOUBLE_BATTLE
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
 	compare VAR_RESULT, PIKE_ROOM_BRAIN
-	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F
+	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects
 	hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35:: @ 82C3F35
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F:: @ 82C3F3F
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F
 	setvar VAR_TEMP_4, 1
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
-	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
+	hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL  @ Pike Queen hidden initially
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E
@@ -125,12 +125,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom:: @ 82C4062
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_2, 1
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D
+BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_2, 0
 	lockall
@@ -138,12 +138,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D
 	closemessage
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082:: @ 82C4082
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom:: @ 82C4082
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_2, 1
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D
+BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_2, 0
 	lockall
@@ -193,7 +193,7 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
 	return
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174
+BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174
 	pike_exitwildmonroom
 	pike_ispartyfullhealth
 	compare VAR_RESULT, TRUE
@@ -214,12 +214,12 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202:: @ 82C4202
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom:: @ 82C4202
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_2, 1
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D:: @ 82C420D
+BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_2, 0
 	lockall
@@ -234,14 +234,14 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
 	end
 
 BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E
-	setorcopyvar VAR_0x8006, VAR_RESULT
+	setorcopyvar VAR_0x8006, VAR_RESULT  @ Save VAR_RESULT from being overwritten
 	frontier_get FRONTIER_DATA_CHALLENGE_STATUS
 	compare VAR_RESULT, CHALLENGE_STATUS_PAUSED
-	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B
+	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume
 	compare VAR_RESULT, CHALLENGE_STATUS_SAVING
-	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B
+	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume
 	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B
+BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume:: @ 82C426B
 	setorcopyvar VAR_RESULT, VAR_0x8006
 	end
 
diff --git a/include/constants/battle_pike.h b/include/constants/battle_pike.h
index c25f76aaa..9187ae28c 100644
--- a/include/constants/battle_pike.h
+++ b/include/constants/battle_pike.h
@@ -23,8 +23,8 @@
 #define PIKE_HINT_BRAIN      4
 
 // For the room with a status effect.
-#define PIKE_STATUS_KIRLIA   0
-#define PIKE_STATUS_DUSCLOPS 1
+#define PIKE_STATUSMON_KIRLIA   0
+#define PIKE_STATUSMON_DUSCLOPS 1
 
 #define PIKE_STATUS_FREEZE      0
 #define PIKE_STATUS_BURN        1
@@ -48,7 +48,7 @@
 #define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON       12
 #define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS         13
 #define BATTLE_PIKE_FUNC_BUFFER_NPC_MSG            14
-#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE        15
+#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH       15
 #define BATTLE_PIKE_FUNC_IS_IN                     16
 #define BATTLE_PIKE_FUNC_SET_HINT_ROOM             17
 #define BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID          18
diff --git a/src/battle_pike.c b/src/battle_pike.c
index f9c6c84a4..e7da8d038 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -64,7 +64,7 @@ static void GetRoomInflictedStatus(void);
 static void GetRoomInflictedStatusMon(void);
 static void HealOneOrTwoMons(void);
 static void BufferNPCMessage(void);
-static void StatusInflictionScreenFade(void);
+static void StatusInflictionScreenFlash(void);
 static void GetInBattlePike(void);
 static void SetHintedRoom(void);
 static void GetHintedRoomIndex(void);
@@ -83,7 +83,7 @@ static void PrepareOneTrainer(bool8 difficult);
 static u16 GetNPCRoomGraphicsId(void);
 static void PrepareTwoTrainers(void);
 static void TryHealMons(u8 healCount);
-static void Task_DoStatusInflictionScreenFade(u8 taskId);
+static void Task_DoStatusInflictionScreenFlash(u8 taskId);
 static bool8 AtLeastTwoAliveMons(void);
 static u8 SpeciesToPikeMonId(u16 species);
 static bool8 CanEncounterWildMon(u8 monLevel);
@@ -495,7 +495,7 @@ static void (* const sBattlePikeFunctions[])(void) =
     [BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON]     = GetRoomInflictedStatusMon,
     [BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS]       = HealOneOrTwoMons,
     [BATTLE_PIKE_FUNC_BUFFER_NPC_MSG]          = BufferNPCMessage,
-    [BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE]      = StatusInflictionScreenFade,
+    [BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH]     = StatusInflictionScreenFlash,
     [BATTLE_PIKE_FUNC_IS_IN]                   = GetInBattlePike,
     [BATTLE_PIKE_FUNC_SET_HINT_ROOM]           = SetHintedRoom,
     [BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID]        = GetHintedRoomIndex,
@@ -533,7 +533,7 @@ static const u8 sNumMonsToHealBeforePikeQueen[][3] =
     {0, 1, 2},
 };
 
-static bool8 (* const sStatusInflictionScreenFadeFuncs[])(struct Task *) =
+static bool8 (* const sStatusInflictionScreenFlashFuncs[])(struct Task *) =
 {
     StatusInflictionFadeOut, StatusInflictionFadeIn
 };
@@ -579,7 +579,7 @@ static void SetupRoomEventObjects(void)
         break;
     case PIKE_ROOM_STATUS:
         objGfx1 = EVENT_OBJ_GFX_GENTLEMAN;
-        if (sStatusMon == PIKE_STATUS_DUSCLOPS)
+        if (sStatusMon == PIKE_STATUSMON_DUSCLOPS)
             objGfx2 = EVENT_OBJ_GFX_DUSCLOPS;
         else
             objGfx2 = EVENT_OBJ_GFX_KIRLIA;
@@ -774,9 +774,9 @@ static void BufferNPCMessage(void)
     FrontierSpeechToString(sNPCSpeeches[speechId]);
 }
 
-static void StatusInflictionScreenFade(void)
+static void StatusInflictionScreenFlash(void)
 {
-    CreateTask(Task_DoStatusInflictionScreenFade, 2);
+    CreateTask(Task_DoStatusInflictionScreenFlash, 2);
 }
 
 static void HealMon(struct Pokemon *mon)
@@ -946,19 +946,19 @@ static bool8 TryInflictRandomStatus(void)
     switch (sStatusFlags)
     {
     case STATUS1_FREEZE:
-        sStatusMon = PIKE_STATUS_DUSCLOPS;
+        sStatusMon = PIKE_STATUSMON_DUSCLOPS;
         break;
     case STATUS1_BURN:
         if (Random() % 2 != 0)
-            sStatusMon = PIKE_STATUS_DUSCLOPS;
+            sStatusMon = PIKE_STATUSMON_DUSCLOPS;
         else
-            sStatusMon = PIKE_STATUS_KIRLIA;
+            sStatusMon = PIKE_STATUSMON_KIRLIA;
         break;
     case STATUS1_PARALYSIS:
     case STATUS1_SLEEP:
     case STATUS1_TOXIC_POISON:
     default:
-        sStatusMon = PIKE_STATUS_KIRLIA;
+        sStatusMon = PIKE_STATUSMON_KIRLIA;
         break;
     }
 
@@ -1172,9 +1172,9 @@ u8 GetBattlePikeWildMonHeaderId(void)
     return headerId;
 }
 
-static void DoStatusInflictionScreenFade(u8 taskId)
+static void DoStatusInflictionScreenFlash(u8 taskId)
 {
-    while (sStatusInflictionScreenFadeFuncs[gTasks[taskId].data[0]](&gTasks[taskId]));
+    while (sStatusInflictionScreenFlashFuncs[gTasks[taskId].data[0]](&gTasks[taskId]));
 }
 
 static bool8 StatusInflictionFadeOut(struct Task *task)
@@ -1211,7 +1211,7 @@ static bool8 StatusInflictionFadeIn(struct Task *task)
     {
         if (--task->data[3] == 0)
         {
-            DestroyTask(FindTaskIdByFunc(DoStatusInflictionScreenFade));
+            DestroyTask(FindTaskIdByFunc(DoStatusInflictionScreenFlash));
         }
         else
         {
@@ -1222,9 +1222,9 @@ static bool8 StatusInflictionFadeIn(struct Task *task)
     return FALSE;
 }
 
-static void StartStatusInflictionScreenFade(s16 fadeOutDelay, s16 fadeInDelay, s16 numFades, s16 fadeOutSpeed, s16 fadeInSpped)
+static void StartStatusInflictionScreenFlash(s16 fadeOutDelay, s16 fadeInDelay, s16 numFades, s16 fadeOutSpeed, s16 fadeInSpped)
 {
-    u8 taskId = CreateTask(DoStatusInflictionScreenFade, 3);
+    u8 taskId = CreateTask(DoStatusInflictionScreenFlash, 3);
 
     gTasks[taskId].data[1] = fadeOutDelay;
     gTasks[taskId].data[2] = fadeInDelay;
@@ -1234,24 +1234,24 @@ static void StartStatusInflictionScreenFade(s16 fadeOutDelay, s16 fadeInDelay, s
     gTasks[taskId].data[6] = fadeOutDelay;
 }
 
-static bool8 IsStatusInflictionScreenFadeTaskFinished(void)
+static bool8 IsStatusInflictionScreenFlashTaskFinished(void)
 {
-    if (FindTaskIdByFunc(DoStatusInflictionScreenFade) == 0xFF)
+    if (FindTaskIdByFunc(DoStatusInflictionScreenFlash) == 0xFF)
         return TRUE;
     else
         return FALSE;
 }
 
-static void Task_DoStatusInflictionScreenFade(u8 taskId)
+static void Task_DoStatusInflictionScreenFlash(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
         gTasks[taskId].data[0]++;
-        StartStatusInflictionScreenFade(0, 0, 3, 2, 2);
+        StartStatusInflictionScreenFlash(0, 0, 3, 2, 2);
     }
     else
     {
-        if (IsStatusInflictionScreenFadeTaskFinished())
+        if (IsStatusInflictionScreenFlashTaskFinished())
         {
             EnableBothScriptContexts();
             DestroyTask(taskId);