Begin documenting Apprentice, merge with master

author: GriffinR <griffin.richards@comcast.net> 2019-11-18 12:45:56 -0500
committer: GriffinR <griffin.richards@comcast.net> 2019-11-18 12:47:10 -0500
commit: a486c8affd35bec6e3b71c8c1bfbaba2dc94ec4b (patch)
tree: 062ac919817dbfa142929167da4e131c2dc58d49 /data/maps
parent: fc3783b7395b25d290ec650d79fbdc80518046cd (diff)
parent: 5393b42f7ccfd10986a9a253e29ce54fae847a78 (diff)
126 files changed, 5053 insertions, 5061 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index f3f156a39..6eb7e515b 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -55,8 +55,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 7
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF
 	waitmovement 0
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index d5b79b684..34feceb39 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -61,7 +61,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
 	msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleArenaLobby_Text_256931
 	waitmessage
 	call BattleFrontier_BattleArenaLobby_EventScript_255D59
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index 60bca60cd..1ee9c29dc 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -78,9 +78,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
 	applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
 	applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
 	waitmovement 0
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, 5
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index 5699d268c..12940496d 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -73,7 +73,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
 	special LoadPlayerParty
@@ -482,16 +482,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10
 	msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19
+@ A few OutsideWest event scripts are inserted here instead, two of which are unused
+BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19
 	msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22
-	msgbox BattleFrontier_OutsideWest_Text_24AB44, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22
+	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B
-	msgbox BattleFrontier_OutsideWest_Text_24AB75, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B
+	msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34
@@ -699,11 +700,11 @@ BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06
 	.string "The BATTLE FRONTIER…\n"
 	.string "I've long dreamed about a place like it.$"
 
-BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44
+BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44
 	.string "The BATTLE DOME\n"
 	.string "Become the Unbeatable Superstar!$"
 
-BattleFrontier_OutsideWest_Text_24AB75: @ 824AB75
+BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75
 	.string "The ??????\n"
 	.string "Under Construction!$"
 
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index 7894dc558..cead1a1d7 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -69,7 +69,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
 	msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattleFactoryLobby_Text_259323
 	waitmessage
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index a85cac041..94c21a6d0 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -54,8 +54,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
 	waitmovement 0
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 2
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
 	waitmovement 0
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 10a6761cb..649b20f87 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePalaceLobby_Text_24E4F7
 	waitmessage
 	call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 23df44956..d145ba429 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -65,7 +65,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
deleted file mode 100644
index 8fc97e74a..000000000
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
+++ /dev/null
@@ -1,764 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070
-	.byte 0
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT
-	special ShowBattlePointsWindow
-	return
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT
-	special CloseBattlePointsWindow
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A
-	specialvar VAR_TEMP_1, GetFrontierBattlePoints
-	compare VAR_TEMP_1, VAR_0x8008
-	goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT
-	compare VAR_TEMP_2, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	compare VAR_TEMP_2, 1
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	compare VAR_TEMP_2, 2
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9
-	compare VAR_TEMP_2, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
-	compare VAR_TEMP_2, 1
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
-	checkdecorspace VAR_0x8009
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
-	copyvar VAR_0x8004, VAR_0x8008
-	special TakeFrontierBattlePoints
-	givedecoration VAR_0x8009
-	special UpdateBattlePointsWindow
-	playse SE_REGI
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT
-	compare VAR_TEMP_2, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT
-	special CloseBattlePointsWindow
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
-	checkitemspace VAR_0x8009, 1
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
-	copyvar VAR_0x8004, VAR_0x8008
-	special TakeFrontierBattlePoints
-	giveitem VAR_0x8009, 1
-	special UpdateBattlePointsWindow
-	playse SE_REGI
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT
-	compare VAR_TEMP_2, 2
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT
-	special CloseBattlePointsWindow
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173:: @ 825F173
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 0
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD
-	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0
-	case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313
-	case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336
-	case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359
-	case 10, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 16
-	setvar VAR_0x8009, DECOR_KISS_POSTER
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, DECOR_KISS_CUSHION
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 32
-	setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_TOGEPI_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_MEOWTH_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, DECOR_DITTO_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
-	setvar VAR_0x8008, 80
-	setvar VAR_0x8009, DECOR_TOTODILE_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C:: @ 825F37C
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 1
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, DECOR_LAPRAS_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 128
-	setvar VAR_0x8009, DECOR_SNORLAX_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
-	setvar VAR_0x8008, 256
-	setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F:: @ 825F49F
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 2
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD
-	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_PROTEIN
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_CALCIUM
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_IRON
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_ZINC
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_CARBOS
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, ITEM_HP_UP
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0:: @ 825F5F0
-	lock
-	faceplayer
-	setvar VAR_TEMP_2, 3
-	call BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
-	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
-	special ShowFrontierExchangeCornerItemIconWindow
-	special ShowScrollableMultichoice
-	waitstate
-	special CloseFrontierExchangeCornerItemIconWindow
-	switch VAR_RESULT
-	case 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690
-	case 1, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3
-	case 2, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6
-	case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9
-	case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C
-	case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F
-	case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762
-	case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785
-	case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8
-	case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_LEFTOVERS
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_WHITE_HERB
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_QUICK_CLAW
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 48
-	setvar VAR_0x8009, ITEM_MENTAL_HERB
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_BRIGHT_POWDER
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_CHOICE_BAND
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_KINGS_ROCK
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_FOCUS_BAND
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
-	setvar VAR_0x8008, 64
-	setvar VAR_0x8009, ITEM_SCOPE_LENS
-	goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD
-	lock
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
-	release
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1
-	msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, MSGBOX_NPC
-	end
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA
-	.string "Hello, this is the EXCHANGE SERVICE\n"
-	.string "CORNER.\p"
-	.string "We exchange the Battle Points you\n"
-	.string "have collected for lovely prizes.\p"
-	.string "Please choose a prize from this list.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F890: @ 825F890
-	.string "Please choose a prize from this list.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6: @ 825F8B6
-	.string "You've chosen the KISS POSTER.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6: @ 825F8E6
-	.string "You've chosen the KISS CUSHION.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917: @ 825F917
-	.string "You've chosen the SMOOCHUM DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949: @ 825F949
-	.string "You've chosen the TOGEPI DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979: @ 825F979
-	.string "You've chosen the MEOWTH DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9: @ 825F9A9
-	.string "You've chosen the CLEFAIRY DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB: @ 825F9DB
-	.string "You've chosen the DITTO DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A: @ 825FA0A
-	.string "You've chosen the CYNDAQUIL DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D: @ 825FA3D
-	.string "You've chosen the CHIKORITA DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70: @ 825FA70
-	.string "You've chosen the TOTODILE DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2: @ 825FAA2
-	.string "You've chosen the LAPRAS DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2: @ 825FAD2
-	.string "You've chosen the SNORLAX DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03: @ 825FB03
-	.string "You've chosen the VENUSAUR DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35: @ 825FB35
-	.string "You've chosen the CHARIZARD DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68: @ 825FB68
-	.string "You've chosen the BLASTOISE DOLL.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B: @ 825FB9B
-	.string "You've chosen the PROTEIN.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7: @ 825FBC7
-	.string "You've chosen the CALCIUM.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3: @ 825FBF3
-	.string "You've chosen the IRON.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C: @ 825FC1C
-	.string "You've chosen the ZINC.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45: @ 825FC45
-	.string "You've chosen the CARBOS.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70: @ 825FC70
-	.string "You've chosen the HP UP.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A: @ 825FC9A
-	.string "You've chosen the BRIGHTPOWDER.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB: @ 825FCCB
-	.string "You've chosen the WHITE HERB.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA: @ 825FCFA
-	.string "You've chosen the QUICK CLAW.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29: @ 825FD29
-	.string "You've chosen the MENTAL HERB.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59: @ 825FD59
-	.string "You've chosen the CHOICE BAND.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89: @ 825FD89
-	.string "You've chosen the KING'S ROCK.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9: @ 825FDB9
-	.string "You've chosen the FOCUS BAND.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8: @ 825FDE8
-	.string "You've chosen the SCOPE LENS.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17: @ 825FE17
-	.string "You've chosen the LEFTOVERS.\n"
-	.string "Is that correct?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45: @ 825FE45
-	.string "Thank you!\n"
-	.string "We'll send it to your PC at home.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72: @ 825FE72
-	.string "Here is your prize!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86: @ 825FE86
-	.string "I'm so sorry…\n"
-	.string "You don't have enough Battle Points…$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9: @ 825FEB9
-	.string "I'm so sorry…\n"
-	.string "Your PC appears to be full…$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3: @ 825FEE3
-	.string "I'm so sorry…\n"
-	.string "You don't have space to hold it…$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12
-	.string "Thank you very much.\p"
-	.string "Please visit us when you have\n"
-	.string "saved up Battle Points.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D
-	.string "Oh, they're so nice!\n"
-	.string "I wish I had them!\l"
-	.string "Cute cushions!\l"
-	.string "Big plush DOLLS!\l"
-	.string "Little plush DOLLS!\l"
-	.string "I wish I had them all!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0: @ 825FFD0
-	.string "Leave it to your mommy!\p"
-	.string "If it's anything you want, I'll go\n"
-	.string "through anything to get it, honey!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E
-	.string "If I can get hold of the items here,\n"
-	.string "my POKéMON will get tougher.\p"
-	.string "You bet they will!\n"
-	.string "No question about it!$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260099: @ 8260099
-	.string "Hah?\n"
-	.string "What are you gawking at?\p"
-	.string "I don't like you staring at my plush\n"
-	.string "doll like that.\p"
-	.string "If you want it, go get one yourself!\n"
-	.string "Isn't that right, SMOOCHUM?$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D
-	.string "Did you know?\p"
-	.string "If you stretch your record at any of\n"
-	.string "the BATTLE facilities, they start\l"
-	.string "giving you more and more Battle Points.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA:: @ 82601AA
-	.string "A large poster with a SMOOCHUM print.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0:: @ 82601D0
-	.string "A SMOOCHUM cushion.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260201:: @ 8260201
-	.string "A SMOOCHUM DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F:: @ 826022F
-	.string "A TOGEPI DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B:: @ 826025B
-	.string "A MEOWTH DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260287:: @ 8260287
-	.string "A CLEFAIRY DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5:: @ 82602B5
-	.string "A DITTO DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0:: @ 82602E0
-	.string "A CYNDAQUIL DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F:: @ 826030F
-	.string "A CHIKORITA DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E:: @ 826033E
-	.string "A TOTODILE DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C:: @ 826036C
-	.string "A large DOLL.\n"
-	.string "Place it on a mat or a desk.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260397:: @ 8260397
-	.string "Raises the stat ATTACK of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE:: @ 82603BE
-	.string "Raises the stat SP. ATK of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6:: @ 82603E6
-	.string "Raises the stat DEFENSE of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E:: @ 826040E
-	.string "Raises the stat SP. DEF of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260436:: @ 8260436
-	.string "Raises the stat SPEED of one\n"
-	.string "POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C:: @ 826045C
-	.string "Raises the HP of one POKéMON.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A:: @ 826047A
-	.string "A hold item that gradually restores\n"
-	.string "HP in battle.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC:: @ 82604AC
-	.string "A hold item that restores any\n"
-	.string "lowered stat.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8:: @ 82604D8
-	.string "A hold item that occasionally allows\n"
-	.string "the first strike.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F:: @ 826050F
-	.string "A hold item that snaps POKéMON out\n"
-	.string "of infatuation.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542
-	.string "A hold item that casts a glare to\n"
-	.string "reduce accuracy.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575
-	.string "Raises a move's power, but permits\n"
-	.string "only that move.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8
-	.string "A hold item that may cause flinching\n"
-	.string "when the foe is hit.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2:: @ 82605E2
-	.string "A hold item that occasionally\n"
-	.string "prevents fainting.$"
-
-BattleFrontier_BattlePointExchangeServiceCorner_Text_260613:: @ 8260613
-	.string "A hold item that raises the\n"
-	.string "critical-hit rate.$"
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 98d7a22b0..1bcf1814a 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -152,6 +152,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	waitstate
 	end
 
+@ TRAINER_PHILLIP is used as a placeholder
 BattlePyramid_TrainerBattle:: @ 8252C4F
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 4ec807768..0b30d96e3 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -78,7 +78,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index 958c92c09..f2971d3a1 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -37,14 +37,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 1
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
 	waitmovement 0
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
@@ -57,17 +57,17 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
 	special sub_813BF7C
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
-	setvar VAR_0x8004, 4
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
+	special CallBattleTowerFunc
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
@@ -157,9 +157,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
 	special sub_813BF7C
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
@@ -167,9 +167,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
 BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
 	message BattleFrontier_BattleTowerBattleRoom_Text_242426
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 2
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	fadescreen 1
@@ -376,8 +376,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
 	special CallFrontierUtilFunc
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
-	setvar VAR_0x8004, 15
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_15
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
 	setvar VAR_0x8005, 5
 	special CallFrontierUtilFunc
@@ -506,8 +506,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
-	setvar VAR_0x8004, 13
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_13
+	special CallBattleTowerFunc
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
 	waitstate
 	end
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index d5c990623..e280edbe7 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
@@ -12,8 +12,8 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
 	end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
-	setvar VAR_0x8004, 14
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
+	special CallBattleTowerFunc
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
@@ -63,8 +63,8 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 1
 	addobject 4
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
@@ -72,17 +72,17 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	waitmovement 0
 	compare VAR_FRONTIER_BATTLE_MODE, 3
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	delay 15
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -90,18 +90,18 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	delay 15
 	applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	messageautoscroll 0x2021fc4
 	waitmessage
 	delay 48
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
 	waitmovement 0
 	messageautoscroll 0x2021fc4
@@ -118,17 +118,17 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
 	special sub_813BF7C
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
 	call BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA
-	setvar VAR_0x8004, 4
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
+	special CallBattleTowerFunc
 	switch VAR_RESULT
 	case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
 	applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
@@ -235,9 +235,9 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, 3
 	special sub_813BF7C
 	goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
@@ -245,9 +245,9 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
 	message BattleFrontier_BattleTowerBattleRoom2_Text_242426
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 2
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	fadescreen 1
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
index 786f1fa3e..a53cac0c5 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
@@ -12,8 +12,8 @@ BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
 	end
 
 BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
-	setvar VAR_0x8004, 14
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
+	special CallBattleTowerFunc
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json
index 13bda5f22..32aa11636 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.json
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96",
+      "script": "BattleFrontier_BattleTowerLobby_EventScript_Reporter",
       "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
     },
     {
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index d64b82e92..791901b1f 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -10,7 +10,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
 	end
 
 BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
-	call BattleFrontier_BattleTowerLobby_EventScript_28CC84
+	call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
 	setvar VAR_0x8004, APPRENTICE_FUNC_10
 	special CallApprenticeFunction
 	compare VAR_0x8004, 0
@@ -56,14 +56,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
 	faceplayer
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT
 	closemessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
@@ -87,8 +87,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778
 	msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT
 
 BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
-	setvar VAR_0x8004, 5
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GIVE_RIBBONS
+	special CallBattleTowerFunc
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
 	message BattleFrontier_BattleTowerLobby_Text_23F844
@@ -101,11 +101,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
 	msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_11
 	special CallFrontierUtilFunc
-	msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9
+	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	call BattleFrontier_BattleTowerLobby_EventScript_23E84D
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	compare VAR_RESULT, 49
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2
 	msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT
@@ -121,17 +121,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
 	compare VAR_FRONTIER_BATTLE_MODE, 2
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
 
 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 
 BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
 	lock
@@ -152,9 +152,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	special HealPlayerParty
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
@@ -218,9 +218,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	waitmessage
 	message BattleFrontier_BattleTowerLobby_Text_23F754
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	playse SE_SAVE
 	waitse
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
@@ -287,12 +287,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
@@ -367,12 +367,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
@@ -448,12 +448,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
@@ -528,12 +528,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 0
-	special sub_8161F74
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
+	special CallBattleTowerFunc
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
@@ -541,9 +541,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
@@ -738,8 +738,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
 	setvar VAR_RESULT, 0
 
 BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
-	setvar VAR_0x8004, 12
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_12
+	special CallBattleTowerFunc
 	delay 1
 	compare VAR_RESULT, 6
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108
@@ -998,9 +998,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	special sub_80A08CC
 	waitstate
 	playse SE_SAVE
@@ -1061,9 +1061,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	special sub_80A08CC
 	waitstate
 	playse SE_SAVE
@@ -1529,13 +1529,7 @@ BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4
 	.string "In recognition of your infinite talent,\n"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_BattleArenaLobby_Text_241520: @ 8241520
-BattleFrontier_BattleDomeLobby_Text_241520: @ 8241520
-BattleFrontier_BattleFactoryLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePalaceLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePikeLobby_Text_241520: @ 8241520
-BattleFrontier_BattlePyramidLobby_Text_241520: @ 8241520
-BattleFrontier_BattleTowerLobby_Text_241520: @ 8241520
+BattleFrontier_Text_ObtainedXBattlePoints: @ 8241520
 	.string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$"
 
 BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index c26a8098e..9da5e6a14 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -20,8 +20,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
 	setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
 	setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
-	setvar VAR_0x8004, 10
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_10
+	special CallBattleTowerFunc
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
@@ -166,27 +166,27 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 0
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 1
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 2
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, 0
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 3
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
 	closemessage
@@ -202,9 +202,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3
-	setvar VAR_0x8004, 11
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_11
 	setvar VAR_0x8005, 4
-	special sub_8161F74
+	special CallBattleTowerFunc
 	waitmessage
 	waitbuttonpress
 	release
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
index 4c7bcad2a..055b6e56e 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
-  "name": "BattleFrontier_BattlePointExchangeServiceCorner",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+  "id": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
+  "name": "BattleFrontier_ExchangeServiceCorner",
+  "layout": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
   "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_Man",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1",
+      "script": "BattleFrontier_ExchangeServiceCorner_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
new file mode 100644
index 000000000..b343b0c97
--- /dev/null
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
@@ -0,0 +1,765 @@
+BattleFrontier_ExchangeServiceCorner_MapScripts:: @ 825F070
+	.byte 0
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome:: @ 825F071
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize, MSGBOX_DEFAULT
+	special ShowBattlePointsWindow
+	return
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye:: @ 825F07D
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints, MSGBOX_DEFAULT
+	special CloseBattlePointsWindow
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: @ 825F08A
+	specialvar VAR_TEMP_1, GetFrontierBattlePoints
+	compare VAR_TEMP_1, VAR_0x8008
+	goto_if_ge BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints, MSGBOX_DEFAULT
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: @ 825F0C9
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
+	checkdecorspace VAR_0x8009
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
+	copyvar VAR_0x8004, VAR_0x8008
+	special TakeFrontierBattlePoints
+	givedecoration VAR_0x8009
+	special UpdateBattlePointsWindow
+	playse SE_REGI
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT
+	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor:: @ 825F11D
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_PCIsFull, MSGBOX_DEFAULT
+	special CloseBattlePointsWindow
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
+	checkitemspace VAR_0x8009, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
+	copyvar VAR_0x8004, VAR_0x8008
+	special TakeFrontierBattlePoints
+	giveitem VAR_0x8009, 1
+	special UpdateBattlePointsWindow
+	playse SE_REGI
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT
+	compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_BagFull:: @ 825F166
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt, MSGBOX_DEFAULT
+	special CloseBattlePointsWindow
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1:: @ 825F173
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1:: @ 825F185
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll
+	case 6, BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll
+	case 7, BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll
+	case 8, BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll
+	case 9, BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll
+	case 10, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: @ 825F21E
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 16
+	setvar VAR_0x8009, DECOR_KISS_POSTER
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: @ 825F241
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 32
+	setvar VAR_0x8009, DECOR_KISS_CUSHION
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: @ 825F264
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 32
+	setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: @ 825F287
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_TOGEPI_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: @ 825F2AA
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_MEOWTH_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: @ 825F2CD
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: @ 825F2F0
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, DECOR_DITTO_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: @ 825F313
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 80
+	setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: @ 825F336
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 80
+	setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: @ 825F359
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
+	setvar VAR_0x8008, 80
+	setvar VAR_0x8009, DECOR_TOTODILE_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2:: @ 825F37C
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2:: @ 825F38E
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: @ 825F3F0
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 128
+	setvar VAR_0x8009, DECOR_LAPRAS_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: @ 825F413
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 128
+	setvar VAR_0x8009, DECOR_SNORLAX_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: @ 825F436
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 256
+	setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: @ 825F459
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 256
+	setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: @ 825F47C
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
+	setvar VAR_0x8008, 256
+	setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk:: @ 825F49F
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin:: @ 825F4B1
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_Protein
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_Calcium
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_Iron
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_Zinc
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_Carbos
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_HPUp
+	case 6, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: @ 825F51E
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_PROTEIN
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: @ 825F541
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_CALCIUM
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: @ 825F564
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_IRON
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: @ 825F587
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_ZINC
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: @ 825F5AA
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_CARBOS
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: @ 825F5CD
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, ITEM_HP_UP
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk:: @ 825F5F0
+	lock
+	faceplayer
+	setvar VAR_TEMP_2, EXCHANGE_CORNER_HOLD_ITEM_CLERK
+	call BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem:: @ 825F602
+	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
+	special ShowFrontierExchangeCornerItemIconWindow
+	special ShowScrollableMultichoice
+	waitstate
+	special CloseFrontierExchangeCornerItemIconWindow
+	switch VAR_RESULT
+	case 0, BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers
+	case 1, BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb
+	case 2, BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw
+	case 3, BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb
+	case 4, BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder
+	case 5, BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand
+	case 6, BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock
+	case 7, BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand
+	case 8, BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens
+	case 9, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: @ 825F690
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_LEFTOVERS
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: @ 825F6B3
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_WHITE_HERB
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: @ 825F6D6
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_QUICK_CLAW
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: @ 825F6F9
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 48
+	setvar VAR_0x8009, ITEM_MENTAL_HERB
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: @ 825F71C
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_BRIGHT_POWDER
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: @ 825F73F
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_CHOICE_BAND
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: @ 825F762
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_KINGS_ROCK
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: @ 825F785
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_FOCUS_BAND
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
+	setvar VAR_0x8008, 64
+	setvar VAR_0x8009, ITEM_SCOPE_LENS
+	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_260099, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_26002E, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
+	lock
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
+	release
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
+	msgbox BattleFrontier_ExchangeServiceCorner_Text_26012D, MSGBOX_NPC
+	end
+
+BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
+	.string "Hello, this is the EXCHANGE SERVICE\n"
+	.string "CORNER.\p"
+	.string "We exchange the Battle Points you\n"
+	.string "have collected for lovely prizes.\p"
+	.string "Please choose a prize from this list.$"
+
+@ Unused
+BattleFrontier_ExchangeServiceCorner_Text_PleaseChoosePrize: @ 825F890
+	.string "Please choose a prize from this list.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster: @ 825F8B6
+	.string "You've chosen the KISS POSTER.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion: @ 825F8E6
+	.string "You've chosen the KISS CUSHION.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll: @ 825F917
+	.string "You've chosen the SMOOCHUM DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll: @ 825F949
+	.string "You've chosen the TOGEPI DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll: @ 825F979
+	.string "You've chosen the MEOWTH DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll: @ 825F9A9
+	.string "You've chosen the CLEFAIRY DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll: @ 825F9DB
+	.string "You've chosen the DITTO DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll: @ 825FA0A
+	.string "You've chosen the CYNDAQUIL DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll: @ 825FA3D
+	.string "You've chosen the CHIKORITA DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll: @ 825FA70
+	.string "You've chosen the TOTODILE DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll: @ 825FAA2
+	.string "You've chosen the LAPRAS DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll: @ 825FAD2
+	.string "You've chosen the SNORLAX DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll: @ 825FB03
+	.string "You've chosen the VENUSAUR DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll: @ 825FB35
+	.string "You've chosen the CHARIZARD DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll: @ 825FB68
+	.string "You've chosen the BLASTOISE DOLL.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein: @ 825FB9B
+	.string "You've chosen the PROTEIN.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium: @ 825FBC7
+	.string "You've chosen the CALCIUM.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron: @ 825FBF3
+	.string "You've chosen the IRON.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc: @ 825FC1C
+	.string "You've chosen the ZINC.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos: @ 825FC45
+	.string "You've chosen the CARBOS.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp: @ 825FC70
+	.string "You've chosen the HP UP.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder: @ 825FC9A
+	.string "You've chosen the BRIGHTPOWDER.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb: @ 825FCCB
+	.string "You've chosen the WHITE HERB.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw: @ 825FCFA
+	.string "You've chosen the QUICK CLAW.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb: @ 825FD29
+	.string "You've chosen the MENTAL HERB.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand: @ 825FD59
+	.string "You've chosen the CHOICE BAND.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock: @ 825FD89
+	.string "You've chosen the KING'S ROCK.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand: @ 825FDB9
+	.string "You've chosen the FOCUS BAND.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens: @ 825FDE8
+	.string "You've chosen the SCOPE LENS.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers: @ 825FE17
+	.string "You've chosen the LEFTOVERS.\n"
+	.string "Is that correct?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC: @ 825FE45
+	.string "Thank you!\n"
+	.string "We'll send it to your PC at home.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize: @ 825FE72
+	.string "Here is your prize!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints: @ 825FE86
+	.string "I'm so sorry…\n"
+	.string "You don't have enough Battle Points…$"
+
+BattleFrontier_ExchangeServiceCorner_Text_PCIsFull: @ 825FEB9
+	.string "I'm so sorry…\n"
+	.string "Your PC appears to be full…$"
+
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt: @ 825FEE3
+	.string "I'm so sorry…\n"
+	.string "You don't have space to hold it…$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
+	.string "Thank you very much.\p"
+	.string "Please visit us when you have\n"
+	.string "saved up Battle Points.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
+	.string "Oh, they're so nice!\n"
+	.string "I wish I had them!\l"
+	.string "Cute cushions!\l"
+	.string "Big plush DOLLS!\l"
+	.string "Little plush DOLLS!\l"
+	.string "I wish I had them all!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_25FFD0: @ 825FFD0
+	.string "Leave it to your mommy!\p"
+	.string "If it's anything you want, I'll go\n"
+	.string "through anything to get it, honey!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_26002E: @ 826002E
+	.string "If I can get hold of the items here,\n"
+	.string "my POKéMON will get tougher.\p"
+	.string "You bet they will!\n"
+	.string "No question about it!$"
+
+BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
+	.string "Hah?\n"
+	.string "What are you gawking at?\p"
+	.string "I don't like you staring at my plush\n"
+	.string "doll like that.\p"
+	.string "If you want it, go get one yourself!\n"
+	.string "Isn't that right, SMOOCHUM?$"
+
+BattleFrontier_ExchangeServiceCorner_Text_26012D: @ 826012D
+	.string "Did you know?\p"
+	.string "If you stretch your record at any of\n"
+	.string "the BATTLE facilities, they start\l"
+	.string "giving you more and more Battle Points.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc:: @ 82601AA
+	.string "A large poster with a SMOOCHUM print.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc:: @ 82601D0
+	.string "A SMOOCHUM cushion.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc:: @ 8260201
+	.string "A SMOOCHUM DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc:: @ 826022F
+	.string "A TOGEPI DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc:: @ 826025B
+	.string "A MEOWTH DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc:: @ 8260287
+	.string "A CLEFAIRY DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc:: @ 82602B5
+	.string "A DITTO DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc:: @ 82602E0
+	.string "A CYNDAQUIL DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc:: @ 826030F
+	.string "A CHIKORITA DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc:: @ 826033E
+	.string "A TOTODILE DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc:: @ 826036C
+	.string "A large DOLL.\n"
+	.string "Place it on a mat or a desk.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc:: @ 8260397
+	.string "Raises the stat ATTACK of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc:: @ 82603BE
+	.string "Raises the stat SP. ATK of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_IronDesc:: @ 82603E6
+	.string "Raises the stat DEFENSE of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ZincDesc:: @ 826040E
+	.string "Raises the stat SP. DEF of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc:: @ 8260436
+	.string "Raises the stat SPEED of one\n"
+	.string "POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc:: @ 826045C
+	.string "Raises the HP of one POKéMON.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc:: @ 826047A
+	.string "A hold item that gradually restores\n"
+	.string "HP in battle.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc:: @ 82604AC
+	.string "A hold item that restores any\n"
+	.string "lowered stat.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc:: @ 82604D8
+	.string "A hold item that occasionally allows\n"
+	.string "the first strike.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc:: @ 826050F
+	.string "A hold item that snaps POKéMON out\n"
+	.string "of infatuation.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc:: @ 8260542
+	.string "A hold item that casts a glare to\n"
+	.string "reduce accuracy.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc:: @ 8260575
+	.string "Raises a move's power, but permits\n"
+	.string "only that move.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc:: @ 82605A8
+	.string "A hold item that may cause flinching\n"
+	.string "when the foe is hit.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc:: @ 82605E2
+	.string "A hold item that occasionally\n"
+	.string "prevents fainting.$"
+
+BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc:: @ 8260613
+	.string "A hold item that raises the\n"
+	.string "critical-hit rate.$"
diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json
index 8d4870f4f..d63190776 100644
--- a/data/maps/BattleFrontier_Lounge1/map.json
+++ b/data/maps/BattleFrontier_Lounge1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge1_EventScript_25E775",
+      "script": "BattleFrontier_Lounge1_EventScript_Breeder",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge1_EventScript_25E94D",
+      "script": "BattleFrontier_Lounge1_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge1_EventScript_25E956",
+      "script": "BattleFrontier_Lounge1_EventScript_Boy2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc
index ed9628e5e..0ded021b6 100644
--- a/data/maps/BattleFrontier_Lounge1/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge1/scripts.inc
@@ -1,166 +1,173 @@
 BattleFrontier_Lounge1_MapScripts:: @ 825E774
 	.byte 0
 
-BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775
+@ NPC that rates pokemon based on their IVs
+BattleFrontier_Lounge1_EventScript_Breeder:: @ 825E775
 	lock
 	faceplayer
-	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7AD
-	call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7B6
+	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_BreederIntro
+	call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder
 	setflag FLAG_MET_BATTLE_FRONTIER_BREEDER
-	goto BattleFrontier_Lounge1_EventScript_25E792
+	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
-BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792
+BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: @ 825E792
 	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, 255
-	goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF
+	goto_if_ne BattleFrontier_Lounge1_EventScript_ShowMonToBreeder
 	compare VAR_0x8004, 255
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E943
+	goto_if_eq BattleFrontier_Lounge1_EventScript_CancelMonSelect
 	end
 
-BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD
-	msgbox BattleFrontier_Lounge1_Text_25E95F, MSGBOX_DEFAULT
+BattleFrontier_Lounge1_EventScript_BreederIntro:: @ 825E7AD
+	msgbox BattleFrontier_Lounge1_Text_PokemonBreederIntro, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
-	msgbox BattleFrontier_Lounge1_Text_25EEF6, MSGBOX_DEFAULT
+BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder:: @ 825E7B6
+	msgbox BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
+@ BufferVarsForIVRater buffers the following values
+@ VAR_0x8005: Sum of the mons IVs
+@ VAR_0x8006: Stat id of highest IV stat
+@ VAR_0x8007: IV of the highest IV stat
+BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: @ 825E7BF
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF
+	goto_if_eq BattleFrontier_Lounge1_EventScript_ShowEggToBreeder
 	special BufferVarsForIVRater
-	compare VAR_0x8005, 90
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E87F
-	compare VAR_0x8005, 120
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E88D
-	compare VAR_0x8005, 150
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E89B
-	compare VAR_0x8005, 151
-	goto_if_ge BattleFrontier_Lounge1_EventScript_25E8A9
+	compare VAR_0x8005, 90   @ Average of 15
+	goto_if_le BattleFrontier_Lounge1_EventScript_AverageTotalIVs
+	compare VAR_0x8005, 120  @ Average of 20
+	goto_if_le BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs
+	compare VAR_0x8005, 150  @ Average of 25
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighTotalIVs
+	compare VAR_0x8005, 151  @ Average of > 25
+	goto_if_ge BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs
 	end
 
-BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF
-	msgbox BattleFrontier_Lounge1_Text_25EF5E, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E792
+BattleFrontier_Lounge1_EventScript_ShowEggToBreeder:: @ 825E7FF
+	msgbox BattleFrontier_Lounge1_Text_EvenICantTell, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
-BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D
-	compare VAR_0x8006, 0
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8B7
-	compare VAR_0x8006, 1
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8C5
-	compare VAR_0x8006, 2
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8D3
-	compare VAR_0x8006, 3
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8E1
-	compare VAR_0x8006, 4
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8EF
-	compare VAR_0x8006, 5
-	goto_if_eq BattleFrontier_Lounge1_EventScript_25E8FD
+@ Comment on the highest IV stat
+BattleFrontier_Lounge1_EventScript_HighestIVStat:: @ 825E80D
+	compare VAR_0x8006, STAT_HP
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVHP
+	compare VAR_0x8006, STAT_ATK
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVAtk
+	compare VAR_0x8006, STAT_DEF
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVDef
+	compare VAR_0x8006, STAT_SPEED
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpeed
+	compare VAR_0x8006, STAT_SPATK
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpAtk
+	compare VAR_0x8006, STAT_SPDEF
+	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpDef
 	end
 
-BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850
+@ Comment on the highest IV value
+BattleFrontier_Lounge1_EventScript_HighestIVValue:: @ 825E850
 	compare VAR_0x8007, 15
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E90B
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVLow
 	compare VAR_0x8007, 25
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E919
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVMid
 	compare VAR_0x8007, 30
-	goto_if_le BattleFrontier_Lounge1_EventScript_25E927
+	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVHigh
 	compare VAR_0x8007, 31
-	goto_if_ge BattleFrontier_Lounge1_EventScript_25E935
+	goto_if_ge BattleFrontier_Lounge1_EventScript_HighestIVMax
 	end
 
-BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D
+BattleFrontier_Lounge1_EventScript_EndBreederComments:: @ 825E87D
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F
-	msgbox BattleFrontier_Lounge1_Text_25EA92, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_AverageTotalIVs:: @ 825E87F
+	msgbox BattleFrontier_Lounge1_Text_AverageAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D
-	msgbox BattleFrontier_Lounge1_Text_25EAD9, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs:: @ 825E88D
+	msgbox BattleFrontier_Lounge1_Text_BetterThanAverageAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B
-	msgbox BattleFrontier_Lounge1_Text_25EB2A, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_HighTotalIVs:: @ 825E89B
+	msgbox BattleFrontier_Lounge1_Text_ImpressiveAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9
-	msgbox BattleFrontier_Lounge1_Text_25EB6F, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E80D
+BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs:: @ 825E8A9
+	msgbox BattleFrontier_Lounge1_Text_OutstandingAbility, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7
-	msgbox BattleFrontier_Lounge1_Text_25EBBB, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVHP:: @ 825E8B7
+	msgbox BattleFrontier_Lounge1_Text_BestAspectHP, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5
-	msgbox BattleFrontier_Lounge1_Text_25EBF8, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVAtk:: @ 825E8C5
+	msgbox BattleFrontier_Lounge1_Text_BestAspectAtk, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3
-	msgbox BattleFrontier_Lounge1_Text_25EC39, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVDef:: @ 825E8D3
+	msgbox BattleFrontier_Lounge1_Text_BestAspectDef, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1
-	msgbox BattleFrontier_Lounge1_Text_25ED0E, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVSpeed:: @ 825E8E1
+	msgbox BattleFrontier_Lounge1_Text_BestAspectSpeed, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF
-	msgbox BattleFrontier_Lounge1_Text_25EC7B, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVSpAtk:: @ 825E8EF
+	msgbox BattleFrontier_Lounge1_Text_BestAspectSpAtk, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD
-	msgbox BattleFrontier_Lounge1_Text_25ECC4, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E850
+BattleFrontier_Lounge1_EventScript_HighestIVSpDef:: @ 825E8FD
+	msgbox BattleFrontier_Lounge1_Text_BestAspectSpDef, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B
-	msgbox BattleFrontier_Lounge1_Text_25ED4E, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVLow:: @ 825E90B
+	msgbox BattleFrontier_Lounge1_Text_StatRelativelyGood, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919
-	msgbox BattleFrontier_Lounge1_Text_25ED87, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVMid:: @ 825E919
+	msgbox BattleFrontier_Lounge1_Text_StatImpressive, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927
-	msgbox BattleFrontier_Lounge1_Text_25EDC1, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVHigh:: @ 825E927
+	msgbox BattleFrontier_Lounge1_Text_StatOutstanding, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935
-	msgbox BattleFrontier_Lounge1_Text_25EDF6, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge1_EventScript_25E87D
+BattleFrontier_Lounge1_EventScript_HighestIVMax:: @ 825E935
+	msgbox BattleFrontier_Lounge1_Text_StatFlawless, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943
-	msgbox BattleFrontier_Lounge1_Text_25EE37, MSGBOX_DEFAULT
+BattleFrontier_Lounge1_EventScript_CancelMonSelect:: @ 825E943
+	msgbox BattleFrontier_Lounge1_Text_NoTimeForMyAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D
-	msgbox BattleFrontier_Lounge1_Text_25EFDD, MSGBOX_NPC
+BattleFrontier_Lounge1_EventScript_Boy1:: @ 825E94D
+	msgbox BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956
-	msgbox BattleFrontier_Lounge1_Text_25F020, MSGBOX_NPC
+BattleFrontier_Lounge1_EventScript_Boy2:: @ 825E956
+	msgbox BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_Text_25E95F: @ 825E95F
+BattleFrontier_Lounge1_Text_PokemonBreederIntro: @ 825E95F
 	.string "For 70 years I have raised POKéMON!\n"
 	.string "I am the man they revere as\l"
 	.string "the legendary top POKéMON BREEDER!\p"
@@ -173,94 +180,95 @@ BattleFrontier_Lounge1_Text_25E95F: @ 825E95F
 	.string "Here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_25EA92: @ 825EA92
+BattleFrontier_Lounge1_Text_AverageAbility: @ 825EA92
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe\n"
 	.string "as being of average ability.$"
 
-BattleFrontier_Lounge1_Text_25EAD9: @ 825EAD9
+BattleFrontier_Lounge1_Text_BetterThanAverageAbility: @ 825EAD9
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe as\n"
 	.string "having better-than-average ability.$"
 
-BattleFrontier_Lounge1_Text_25EB2A: @ 825EB2A
+BattleFrontier_Lounge1_Text_ImpressiveAbility: @ 825EB2A
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "quite impressive in ability!$"
 
-BattleFrontier_Lounge1_Text_25EB6F: @ 825EB6F
+BattleFrontier_Lounge1_Text_OutstandingAbility: @ 825EB6F
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "wonderfully outstanding in ability!$"
 
-BattleFrontier_Lounge1_Text_25EBBB: @ 825EBBB
+BattleFrontier_Lounge1_Text_BestAspectHP: @ 825EBBB
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its HP…$"
 
-BattleFrontier_Lounge1_Text_25EBF8: @ 825EBF8
+BattleFrontier_Lounge1_Text_BestAspectAtk: @ 825EBF8
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its ATTACK…$"
 
-BattleFrontier_Lounge1_Text_25EC39: @ 825EC39
+BattleFrontier_Lounge1_Text_BestAspectDef: @ 825EC39
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_25EC7B: @ 825EC7B
+BattleFrontier_Lounge1_Text_BestAspectSpAtk: @ 825EC7B
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL ATTACK…$"
 
-BattleFrontier_Lounge1_Text_25ECC4: @ 825ECC4
+BattleFrontier_Lounge1_Text_BestAspectSpDef: @ 825ECC4
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_25ED0E: @ 825ED0E
+BattleFrontier_Lounge1_Text_BestAspectSpeed: @ 825ED0E
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPEED…$"
 
-BattleFrontier_Lounge1_Text_25ED4E: @ 825ED4E
+BattleFrontier_Lounge1_Text_StatRelativelyGood: @ 825ED4E
 	.string "That stat is relatively good.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25ED87: @ 825ED87
+BattleFrontier_Lounge1_Text_StatImpressive: @ 825ED87
 	.string "That stat is quite impressive.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25EDC1: @ 825EDC1
+BattleFrontier_Lounge1_Text_StatOutstanding: @ 825EDC1
 	.string "That stat is outstanding!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25EDF6: @ 825EDF6
+BattleFrontier_Lounge1_Text_StatFlawless: @ 825EDF6
 	.string "It's flawless! A thing of perfection!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_25EE37: @ 825EE37
+BattleFrontier_Lounge1_Text_NoTimeForMyAdvice: @ 825EE37
 	.string "What?\n"
 	.string "You have no time for my advice?\p"
 	.string "You should always be eager to learn\n"
 	.string "from the experiences of your elders!$"
 
-BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6
+@ Unused
+BattleFrontier_Lounge1_Text_HaveBusinessNeedsTending: @ 825EEA6
 	.string "Yes, what is it now?\p"
 	.string "I have business that needs tending!\n"
 	.string "Save it for next time!$"
 
-BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6
+BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon: @ 825EEF6
 	.string "Ah, youngster! Do your POKéMON's\n"
 	.string "abilities intrigue you?\p"
 	.string "Here, here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_25EF5E: @ 825EF5E
+BattleFrontier_Lounge1_Text_EvenICantTell: @ 825EF5E
 	.string "An expert I am, but even I can't tell\n"
 	.string "anything about an unhatched POKéMON!\p"
 	.string "Show me a POKéMON!\n"
 	.string "A POKéMON is what I need to see!$"
 
-BattleFrontier_Lounge1_Text_25EFDD: @ 825EFDD
+BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding: @ 825EFDD
 	.string "He said my POKéMON is outstanding!\n"
 	.string "I'm glad I raised it carefully!$"
 
-BattleFrontier_Lounge1_Text_25F020: @ 825F020
+BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt: @ 825F020
 	.string "He said my POKéMON is outstanding!\n"
 	.string "But I didn't do anything special\l"
 	.string "raising it…$"
diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json
index e2ace0b93..575f2898e 100644
--- a/data/maps/BattleFrontier_Lounge2/map.json
+++ b/data/maps/BattleFrontier_Lounge2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_260643",
+      "script": "BattleFrontier_Lounge2_EventScript_FrontierManiac",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_26073C",
+      "script": "BattleFrontier_Lounge2_EventScript_Maniac1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_260747",
+      "script": "BattleFrontier_Lounge2_EventScript_Maniac2",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_26075D",
+      "script": "BattleFrontier_Lounge2_EventScript_TriathleteF",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge2_EventScript_260752",
+      "script": "BattleFrontier_Lounge2_EventScript_Maniac3",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc
index 02dd09a52..610a744b4 100644
--- a/data/maps/BattleFrontier_Lounge2/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
@@ -1,122 +1,128 @@
 BattleFrontier_Lounge2_MapScripts:: @ 8260642
 	.byte 0
 
-BattleFrontier_Lounge2_EventScript_260643:: @ 8260643
+@ This NPC gives hints about a random facility or battle mode.
+@ For battle modes he gives generic advice 
+@ For facilities, depending on how far the player has progressed he will say either
+@    The name of the Frontier Brain there
+@    The type and description of the 3 pokemon they use in their silver battle
+@    The type and description of the 3 pokemon they use in their gold battle
+BattleFrontier_Lounge2_EventScript_FrontierManiac:: @ 8260643
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_26065F
+	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_AlreadyMetManiac
 	setflag FLAG_MET_BATTLE_FRONTIER_MANIAC
-	msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge2_EventScript_26066D
+	msgbox BattleFrontier_Lounge2_Text_FrontierManiacIntro, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
-	msgbox BattleFrontier_Lounge2_Text_260857, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge2_EventScript_26066D
+BattleFrontier_Lounge2_EventScript_AlreadyMetManiac:: @ 826065F
+	msgbox BattleFrontier_Lounge2_Text_SwingByForTheLatestWord, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
+BattleFrontier_Lounge2_EventScript_GiveAdvice:: @ 826066D
 	compare VAR_FRONTIER_MANIAC_FACILITY, 0
-	call_if_eq BattleFrontier_Lounge2_EventScript_26070A
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferSingle
 	compare VAR_FRONTIER_MANIAC_FACILITY, 1
-	call_if_eq BattleFrontier_Lounge2_EventScript_26070F
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferDouble
 	compare VAR_FRONTIER_MANIAC_FACILITY, 2
-	call_if_eq BattleFrontier_Lounge2_EventScript_260714
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferMulti
 	compare VAR_FRONTIER_MANIAC_FACILITY, 3
-	call_if_eq BattleFrontier_Lounge2_EventScript_260719
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferMultiLink
 	compare VAR_FRONTIER_MANIAC_FACILITY, 4
-	call_if_eq BattleFrontier_Lounge2_EventScript_26071E
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleDome
 	compare VAR_FRONTIER_MANIAC_FACILITY, 5
-	call_if_eq BattleFrontier_Lounge2_EventScript_260723
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleFactory
 	compare VAR_FRONTIER_MANIAC_FACILITY, 6
-	call_if_eq BattleFrontier_Lounge2_EventScript_260728
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePalace
 	compare VAR_FRONTIER_MANIAC_FACILITY, 7
-	call_if_eq BattleFrontier_Lounge2_EventScript_26072D
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleArena
 	compare VAR_FRONTIER_MANIAC_FACILITY, 8
-	call_if_eq BattleFrontier_Lounge2_EventScript_260732
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePike
 	compare VAR_FRONTIER_MANIAC_FACILITY, 9
-	call_if_eq BattleFrontier_Lounge2_EventScript_260737
+	call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
 	compare VAR_FRONTIER_MANIAC_FACILITY, 3
-	call_if_le BattleFrontier_Lounge2_EventScript_2606F8
+	call_if_le BattleFrontier_Lounge2_EventScript_BattleTowerNews
 	compare VAR_FRONTIER_MANIAC_FACILITY, 4
-	call_if_ge BattleFrontier_Lounge2_EventScript_260701
+	call_if_ge BattleFrontier_Lounge2_EventScript_FacilityNews
 	special ShowFrontierManiacMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8
-	msgbox BattleFrontier_Lounge2_Text_260933, MSGBOX_DEFAULT
+BattleFrontier_Lounge2_EventScript_BattleTowerNews:: @ 82606F8
+	msgbox BattleFrontier_Lounge2_Text_BattleTowerIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_260701:: @ 8260701
-	msgbox BattleFrontier_Lounge2_Text_2608F2, MSGBOX_DEFAULT
+BattleFrontier_Lounge2_EventScript_FacilityNews:: @ 8260701
+	msgbox BattleFrontier_Lounge2_Text_FacilityIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A
+BattleFrontier_Lounge2_EventScript_BufferSingle:: @ 826070A
 	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
-BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F
+BattleFrontier_Lounge2_EventScript_BufferDouble:: @ 826070F
 	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
-BattleFrontier_Lounge2_EventScript_260714:: @ 8260714
+BattleFrontier_Lounge2_EventScript_BufferMulti:: @ 8260714
 	bufferstdstring 0, STDSTRING_MULTI
 	return
 
-BattleFrontier_Lounge2_EventScript_260719:: @ 8260719
+BattleFrontier_Lounge2_EventScript_BufferMultiLink:: @ 8260719
 	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
-BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E
+BattleFrontier_Lounge2_EventScript_BufferBattleDome:: @ 826071E
 	bufferstdstring 0, STDSTRING_BATTLE_DOME
 	return
 
-BattleFrontier_Lounge2_EventScript_260723:: @ 8260723
+BattleFrontier_Lounge2_EventScript_BufferBattleFactory:: @ 8260723
 	bufferstdstring 0, STDSTRING_BATTLE_FACTORY
 	return
 
-BattleFrontier_Lounge2_EventScript_260728:: @ 8260728
+BattleFrontier_Lounge2_EventScript_BufferBattlePalace:: @ 8260728
 	bufferstdstring 0, STDSTRING_BATTLE_PALACE
 	return
 
-BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D
+BattleFrontier_Lounge2_EventScript_BufferBattleArena:: @ 826072D
 	bufferstdstring 0, STDSTRING_BATTLE_ARENA
 	return
 
-BattleFrontier_Lounge2_EventScript_260732:: @ 8260732
+BattleFrontier_Lounge2_EventScript_BufferBattlePike:: @ 8260732
 	bufferstdstring 0, STDSTRING_BATTLE_PIKE
 	return
 
-BattleFrontier_Lounge2_EventScript_260737:: @ 8260737
+BattleFrontier_Lounge2_EventScript_BufferBattlePyramid:: @ 8260737
 	bufferstdstring 0, STDSTRING_BATTLE_PYRAMID
 	return
 
-BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C
+BattleFrontier_Lounge2_EventScript_Maniac1:: @ 826073C
 	lock
-	msgbox BattleFrontier_Lounge2_Text_261C9C, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge2_Text_NewsGatheringPower, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_260747:: @ 8260747
+BattleFrontier_Lounge2_EventScript_Maniac2:: @ 8260747
 	lock
-	msgbox BattleFrontier_Lounge2_Text_261CDC, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge2_Text_AmazingPowersOfObservation, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_260752:: @ 8260752
+BattleFrontier_Lounge2_EventScript_Maniac3:: @ 8260752
 	lock
-	msgbox BattleFrontier_Lounge2_Text_261D1D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D
-	msgbox BattleFrontier_Lounge2_Text_261D5C, MSGBOX_NPC
+BattleFrontier_Lounge2_EventScript_TriathleteF:: @ 826075D
+	msgbox BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge2_Text_260766:: @ 8260766
+BattleFrontier_Lounge2_Text_FrontierManiacIntro:: @ 8260766
 	.string "Howdy! When it comes to news about\n"
 	.string "the BATTLE FRONTIER, I'm no. 1.\p"
 	.string "You can think of me as\n"
@@ -126,33 +132,34 @@ BattleFrontier_Lounge2_Text_260766:: @ 8260766
 	.string "I'll happily share the hottest news\n"
 	.string "I gathered about the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_260857:: @ 8260857
+BattleFrontier_Lounge2_Text_SwingByForTheLatestWord:: @ 8260857
 	.string "Howdy! Did you swing by to grill me\n"
 	.string "about the latest word? Oh, all right!$"
 
-BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1
+@ Unused
+BattleFrontier_Lounge2_Text_MyInformationsBeenUsefulRight:: @ 82608A1
 	.string "Well? Well? Well?\p"
 	.string "I'm sure my information's been\n"
 	.string "seriously useful to you, right?$"
 
-BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2
+BattleFrontier_Lounge2_Text_FacilityIsHottest:: @ 82608F2
 	.string "Let's see now…\p"
 	.string "It sounds like the {STR_VAR_1}\n"
 	.string "is the hottest place going.$"
 
-BattleFrontier_Lounge2_Text_260933:: @ 8260933
+BattleFrontier_Lounge2_Text_BattleTowerIsHottest:: @ 8260933
 	.string "Let's see now…\p"
 	.string "It sounds like BATTLE TOWER\n"
 	.string "{STR_VAR_1} is the hottest.$"
 
-BattleFrontier_Lounge2_Text_260971:: @ 8260971
+BattleFrontier_Lounge2_Text_SalonMaidenIsThere:: @ 8260971
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this mysterious TRAINER called\n"
 	.string "the SALON MAIDEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E
+BattleFrontier_Lounge2_Text_SalonMaidenSilverMons:: @ 8260A1E
 	.string "Have you battled the SALON MAIDEN?\p"
 	.string "When she's measuring up her opponent,\n"
 	.string "she apparently uses these POKéMON:\p"
@@ -160,7 +167,7 @@ BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E
 	.string "a FIRE-type VOLCANO POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7
+BattleFrontier_Lounge2_Text_SalonMaidenGoldMons:: @ 8260AE7
 	.string "Have you battled the SALON MAIDEN\n"
 	.string "when she's serious?\p"
 	.string "When she's battling flat out,\n"
@@ -169,14 +176,14 @@ BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7
 	.string "an ELECTRIC-type THUNDER POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4
+BattleFrontier_Lounge2_Text_DomeAceIsThere:: @ 8260BC4
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this flamboyant TRAINER called\n"
 	.string "the DOME ACE that runs the place.$"
 
-BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D
+BattleFrontier_Lounge2_Text_DomeAceSilverMons:: @ 8260C6D
 	.string "Have you battled the DOME ACE?\p"
 	.string "When he's treating the opponent\n"
 	.string "lightly, he uses these three POKéMON:\p"
@@ -184,7 +191,7 @@ BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D
 	.string "a WATER & GROUND MUD FISH POKéMON,\l"
 	.string "and a FIRE & FLYING FLAME POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A
+BattleFrontier_Lounge2_Text_DomeAceGoldMons:: @ 8260D3A
 	.string "Have you battled the DOME ACE\n"
 	.string "when he's serious?\p"
 	.string "When he's demonstrating his strategy,\n"
@@ -194,14 +201,14 @@ BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A
 	.string "and a STEEL- & PSYCHIC-type IRON LEG\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E
+BattleFrontier_Lounge2_Text_FactoryHeadIsThere:: @ 8260E1E
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this freaky TRAINER called\n"
 	.string "the FACTORY HEAD that runs the place.$"
 
-BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7
+BattleFrontier_Lounge2_Text_FactoryHeadSilverMons:: @ 8260EC7
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "already?\p"
 	.string "Let me think… When he goes to battle,\n"
@@ -209,7 +216,7 @@ BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7
 	.string "He battles under pretty much the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_260F74:: @ 8260F74
+BattleFrontier_Lounge2_Text_FactoryHeadGoldMons:: @ 8260F74
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "when he's serious?\p"
 	.string "When he goes seriously to battle,\n"
@@ -217,14 +224,14 @@ BattleFrontier_Lounge2_Text_260F74:: @ 8260F74
 	.string "He battles under virtually the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_261026:: @ 8261026
+BattleFrontier_Lounge2_Text_PikeQueenIsThere:: @ 8261026
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this scary TRAINER called\n"
 	.string "the PIKE QUEEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC
+BattleFrontier_Lounge2_Text_PikeQueenSilverMons:: @ 82610CC
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "before?\p"
 	.string "When she's in a good mood, they say\n"
@@ -233,7 +240,7 @@ BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC
 	.string "a BUG & ROCK MOLD POKéMON,\l"
 	.string "and a WATER-type TENDER POKéMON.$"
 
-BattleFrontier_Lounge2_Text_261194:: @ 8261194
+BattleFrontier_Lounge2_Text_PikeQueenGoldMons:: @ 8261194
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "when she's serious?\p"
 	.string "When she's seriously annoyed, they say\n"
@@ -243,14 +250,14 @@ BattleFrontier_Lounge2_Text_261194:: @ 8261194
 	.string "and a WATER- & FLYING-type ATROCIOUS\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_261282:: @ 8261282
+BattleFrontier_Lounge2_Text_ArenaTycoonIsThere:: @ 8261282
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this cute TRAINER called\n"
 	.string "the ARENA TYCOON that runs the place.$"
 
-BattleFrontier_Lounge2_Text_261329:: @ 8261329
+BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons:: @ 8261329
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "before?\p"
 	.string "When she's assessing the foe's ability,\n"
@@ -259,7 +266,7 @@ BattleFrontier_Lounge2_Text_261329:: @ 8261329
 	.string "a DARK-type MOONLIGHT POKéMON,\l"
 	.string "and a BUG & GHOST SHED POKéMON.$"
 
-BattleFrontier_Lounge2_Text_261403:: @ 8261403
+BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons:: @ 8261403
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "when she's serious?\p"
 	.string "When she battles for keeps,\n"
@@ -269,14 +276,14 @@ BattleFrontier_Lounge2_Text_261403:: @ 8261403
 	.string "and a GRASS- & FIGHTING-type\l"
 	.string "MUSHROOM POKéMON.$"
 
-BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6
+BattleFrontier_Lounge2_Text_PalaceMavenIsThere:: @ 82614E6
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this sinister TRAINER called\n"
 	.string "the PALACE MAVEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_261591:: @ 8261591
+BattleFrontier_Lounge2_Text_PalaceMavenSilverMons:: @ 8261591
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "before?\p"
 	.string "When he's testing the opponent's\n"
@@ -285,7 +292,7 @@ BattleFrontier_Lounge2_Text_261591:: @ 8261591
 	.string "a NORMAL-type LAZY POKéMON, and a\l"
 	.string "WATER- & ICE-type TRANSPORT POKéMON.$"
 
-BattleFrontier_Lounge2_Text_26166F:: @ 826166F
+BattleFrontier_Lounge2_Text_PalaceMavenGoldMons:: @ 826166F
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "when he's serious?\p"
 	.string "When he throws his entire might into\n"
@@ -294,14 +301,14 @@ BattleFrontier_Lounge2_Text_26166F:: @ 826166F
 	.string "a NORMAL-type LAZY POKéMON,\l"
 	.string "and a WATER-type AURORA POKéMON.$"
 
-BattleFrontier_Lounge2_Text_26174D:: @ 826174D
+BattleFrontier_Lounge2_Text_PyramidKingIsThere:: @ 826174D
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this fiery-hot TRAINER called\n"
 	.string "the PYRAMID KING that runs the place.$"
 
-BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9
+BattleFrontier_Lounge2_Text_PyramidKingSilverMons:: @ 82617F9
 	.string "Have you battled the PYRAMID KING\n"
 	.string "before?\p"
 	.string "When he's checking the foe's power,\n"
@@ -310,7 +317,7 @@ BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9
 	.string "an ICE-type ICEBERG POKéMON,\l"
 	.string "and a STEEL-type IRON POKéMON.$"
 
-BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4
+BattleFrontier_Lounge2_Text_PyramidKingGoldMons:: @ 82618C4
 	.string "Have you battled the PYRAMID KING\n"
 	.string "when he's serious?\p"
 	.string "When he's pumped with hot power,\n"
@@ -320,7 +327,7 @@ BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4
 	.string "and a FIRE- & FLYING-type FLAME\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice1:: @ 82619AC
 	.string "Sure, there are several places where\n"
 	.string "you can enter DOUBLE BATTLES.\p"
 	.string "But the DOUBLE BATTLE ROOMS of\n"
@@ -329,44 +336,44 @@ BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC
 	.string "how DOUBLE BATTLES are played here\l"
 	.string "in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_261A91:: @ 8261A91
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice2:: @ 8261A91
 	.string "Watch yourself in the battles here.\p"
 	.string "I hear there are TRAINERS that have\n"
 	.string "strategies they developed just for\l"
 	.string "DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice3:: @ 8261B0C
 	.string "Once you're confident and comfortable\n"
 	.string "with DOUBLE BATTLES here, you should\l"
 	.string "think about challenging other places\l"
 	.string "offering DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_261B95:: @ 8261B95
+BattleFrontier_Lounge2_Text_MultiBattleAdvice:: @ 8261B95
 	.string "All sorts of TRAINERS gather in\n"
 	.string "the BATTLE SALON.\p"
 	.string "Just think--you may run into your\n"
 	.string "friends or followers!\l"
 	.string "You should look carefully!$"
 
-BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A
+BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice:: @ 8261C1A
 	.string "If you're with a friend, head for the\n"
 	.string "LINK MULTI BATTLE ROOM.\p"
 	.string "If you play with a strong friend,\n"
 	.string "you can expect to see tough foes!$"
 
-BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C
+BattleFrontier_Lounge2_Text_NewsGatheringPower:: @ 8261C9C
 	.string "What amazing news-gathering power!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC
+BattleFrontier_Lounge2_Text_AmazingPowersOfObservation:: @ 8261CDC
 	.string "What amazing powers of observation!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D
+BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion:: @ 8261D1D
 	.string "What amazing power of persuasion!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C
+BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe:: @ 8261D5C
 	.string "…What is this place?\n"
 	.string "It's scaring me…$"
 
diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json
index 5ff702a86..843fc6e10 100644
--- a/data/maps/BattleFrontier_Lounge3/map.json
+++ b/data/maps/BattleFrontier_Lounge3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261D83",
+      "script": "BattleFrontier_Lounge3_EventScript_Gambler",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FE1",
+      "script": "BattleFrontier_Lounge3_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FC1",
+      "script": "BattleFrontier_Lounge3_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FD1",
+      "script": "BattleFrontier_Lounge3_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge3_EventScript_261FB8",
+      "script": "BattleFrontier_Lounge3_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index 892c6ef81..e892ad3ea 100644
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -1,81 +1,85 @@
 BattleFrontier_Lounge3_MapScripts:: @ 8261D82
 	.byte 0
 
-BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
+	.set BET_AMOUNT_5,  5
+	.set BET_AMOUNT_10, 10
+	.set BET_AMOUNT_15, 15
+
+BattleFrontier_Lounge3_EventScript_Gambler:: @ 8261D83
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_BATTLE_FRONTIER_BETTOR, BattleFrontier_Lounge3_EventScript_261EF9
-	call BattleFrontier_Lounge3_EventScript_261EA0
+	goto_if_set FLAG_MET_BATTLE_FRONTIER_GAMBLER, BattleFrontier_Lounge3_EventScript_AlreadyMetGambler
+	call BattleFrontier_Lounge3_EventScript_CountSilverSymbols
 	compare VAR_0x8004, 2
-	goto_if_le BattleFrontier_Lounge3_EventScript_261EEB
-	setflag FLAG_MET_BATTLE_FRONTIER_BETTOR
-	msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261DAF
+	goto_if_le BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols
+	setflag FLAG_MET_BATTLE_FRONTIER_GAMBLER
+	msgbox BattleFrontier_Lounge3_Text_YouLookToughExplainGambling, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
+BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
 	special ShowFrontierGamblerLookingMessage
 	waitmessage
 	waitbuttonpress
-	msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO
+	msgbox BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
-	msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO
+	goto_if_eq BattleFrontier_Lounge3_EventScript_DeclineChallenge
+	msgbox BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
-	message BattleFrontier_Lounge3_Text_262B42
+	goto_if_eq BattleFrontier_Lounge3_EventScript_DeclineChallenge
+	message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot
 	waitmessage
 	special ShowBattlePointsWindow
-	goto BattleFrontier_Lounge3_EventScript_261DE9
+	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
+BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
 	multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, 0
 	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
-	case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_261E30
-	case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_261E3B
-	case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_261E46
-	case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_261FAF
-	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_261FAF
+	case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_Bet5
+	case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_Bet10
+	case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_Bet15
+	case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_CancelBet
+	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_CancelBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E30:: @ 8261E30
-	setvar VAR_0x8008, 5
-	goto BattleFrontier_Lounge3_EventScript_261E51
+BattleFrontier_Lounge3_EventScript_Bet5:: @ 8261E30
+	setvar VAR_0x8008, BET_AMOUNT_5
+	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E3B:: @ 8261E3B
-	setvar VAR_0x8008, 10
-	goto BattleFrontier_Lounge3_EventScript_261E51
+BattleFrontier_Lounge3_EventScript_Bet10:: @ 8261E3B
+	setvar VAR_0x8008, BET_AMOUNT_10
+	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
-	setvar VAR_0x8008, 15
-	goto BattleFrontier_Lounge3_EventScript_261E51
+BattleFrontier_Lounge3_EventScript_Bet15:: @ 8261E46
+	setvar VAR_0x8008, BET_AMOUNT_15
+	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
+BattleFrontier_Lounge3_EventScript_TryPlaceBet:: @ 8261E51
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
-	goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
-	msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
-	message BattleFrontier_Lounge3_Text_262B42
+	goto_if_ge BattleFrontier_Lounge3_EventScript_PlaceBet
+	msgbox BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints, MSGBOX_DEFAULT
+	message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot
 	waitmessage
-	goto BattleFrontier_Lounge3_EventScript_261DE9
+	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
+BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	special UpdateBattlePointsWindow
 	playse SE_REGI
-	msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261E96
+	msgbox BattleFrontier_Lounge3_Text_ThanksOffYouGo, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FinishBet
 	end
 
-BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
+BattleFrontier_Lounge3_EventScript_FinishBet:: @ 8261E96
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
@@ -83,132 +87,132 @@ BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0
+BattleFrontier_Lounge3_EventScript_CountSilverSymbols:: @ 8261EA0
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
-	call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
+	call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
+	call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
 	return
 
-BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5
+BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount:: @ 8261EE5
 	addvar VAR_0x8004, 1
 	return
 
-BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
-	msgbox BattleFrontier_Lounge3_Text_261FFE, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols:: @ 8261EEB
+	msgbox BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
-	msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_AlreadyMetGambler:: @ 8261EF9
+	msgbox BattleFrontier_Lounge3_Text_Oh, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
-	goto_if_ge BattleFrontier_Lounge3_EventScript_261F12
-	goto BattleFrontier_Lounge3_EventScript_261DAF
+	goto_if_ge BattleFrontier_Lounge3_EventScript_CheckBetResults
+	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
+BattleFrontier_Lounge3_EventScript_CheckBetResults:: @ 8261F12
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E
+	goto_if_eq BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
-	goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E
-	goto BattleFrontier_Lounge3_EventScript_261F71
+	goto_if_eq BattleFrontier_Lounge3_EventScript_WonChallenge
+	goto BattleFrontier_Lounge3_EventScript_LostChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
-	msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_WonChallenge:: @ 8261F2E
+	msgbox BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5
-	call_if_eq BattleFrontier_Lounge3_EventScript_261F80
+	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet5
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_10
-	call_if_eq BattleFrontier_Lounge3_EventScript_261F8A
+	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet10
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_15
-	call_if_eq BattleFrontier_Lounge3_EventScript_261F94
-	msgbox BattleFrontier_Lounge3_Text_2633D4, 9
+	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet15
+	msgbox BattleFrontier_Lounge3_Text_ObtainedBattlePoints, MSGBOX_GETPOINTS
 	special GiveFrontierBattlePoints
-	msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge, MSGBOX_DEFAULT
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
-	msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_LostChallenge:: @ 8261F71
+	msgbox BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints, MSGBOX_DEFAULT
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261F80:: @ 8261F80
-	buffernumberstring 0, 10
-	setvar VAR_0x8004, 10
+BattleFrontier_Lounge3_EventScript_RewardBet5:: @ 8261F80
+	buffernumberstring 0, (BET_AMOUNT_5 * 2)
+	setvar VAR_0x8004, (BET_AMOUNT_5 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_261F8A:: @ 8261F8A
-	buffernumberstring 0, 20
-	setvar VAR_0x8004, 20
+BattleFrontier_Lounge3_EventScript_RewardBet10:: @ 8261F8A
+	buffernumberstring 0, (BET_AMOUNT_10 * 2)
+	setvar VAR_0x8004, (BET_AMOUNT_10 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_261F94:: @ 8261F94
-	buffernumberstring 0, 30
-	setvar VAR_0x8004, 30
+BattleFrontier_Lounge3_EventScript_RewardBet15:: @ 8261F94
+	buffernumberstring 0, (BET_AMOUNT_15 * 2)
+	setvar VAR_0x8004, (BET_AMOUNT_15 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E
+BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted:: @ 8261F9E
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5
-	msgbox BattleFrontier_Lounge3_Text_26342D, MSGBOX_DEFAULT
+BattleFrontier_Lounge3_EventScript_DeclineChallenge:: @ 8261FA5
+	msgbox BattleFrontier_Lounge3_Text_NotInterested, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF
+BattleFrontier_Lounge3_EventScript_CancelBet:: @ 8261FAF
 	special CloseBattlePointsWindow
-	goto BattleFrontier_Lounge3_EventScript_261FA5
+	goto BattleFrontier_Lounge3_EventScript_DeclineChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8
-	msgbox BattleFrontier_Lounge3_Text_263545, MSGBOX_NPC
+BattleFrontier_Lounge3_EventScript_Man:: @ 8261FB8
+	msgbox BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1
+BattleFrontier_Lounge3_EventScript_Woman:: @ 8261FC1
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge3_Text_26346F, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+	msgbox BattleFrontier_Lounge3_Text_BackedWrongTrainer, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1
+BattleFrontier_Lounge3_EventScript_PokefanF:: @ 8261FD1
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge3_Text_26351D, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+	msgbox BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1
+BattleFrontier_Lounge3_EventScript_FatMan:: @ 8261FE1
 	lock
 	faceplayer
-	msgbox BattleFrontier_Lounge3_Text_2634C9, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge3_EventScript_261FF1
+	msgbox BattleFrontier_Lounge3_Text_TrainerGoodButRattled, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1
+BattleFrontier_Lounge3_EventScript_FaceOriginalDirection:: @ 8261FF1
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE
+BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere:: @ 8261FFE
 	.string "…What's that you want?\p"
 	.string "Can't you see we're kind of busy here?\n"
 	.string "Can't your business wait till later?$"
 
-BattleFrontier_Lounge3_Text_262061:: @ 8262061
+BattleFrontier_Lounge3_Text_YouLookToughExplainGambling:: @ 8262061
 	.string "…Huh?\n"
 	.string "You look to me like a tough TRAINER.\p"
 	.string "Heheh…\n"
@@ -228,201 +232,201 @@ BattleFrontier_Lounge3_Text_262061:: @ 8262061
 	.string "Sounds simple, huh?\n"
 	.string "So, anyway…$"
 
-BattleFrontier_Lounge3_Text_262261:: @ 8262261
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle:: @ 8262261
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's SINGLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26230D:: @ 826230D
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble:: @ 826230D
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's DOUBLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti:: @ 82623B9
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's MULTI BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_262464:: @ 8262464
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle:: @ 8262464
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's SINGLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26250E:: @ 826250E
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble:: @ 826250E
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's DOUBLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8
+BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle:: @ 82625B8
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Single Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26266A:: @ 826266A
+BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble:: @ 826266A
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Double Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26271C:: @ 826271C
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle:: @ 826271C
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's SINGLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble:: @ 82627C9
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's DOUBLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_262876:: @ 8262876
+BattleFrontier_Lounge3_Text_ChallengeBattleArena:: @ 8262876
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "ARENA's Set KO Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_26291A:: @ 826291A
+BattleFrontier_Lounge3_Text_ChallengeBattlePike:: @ 826291A
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE PIKE's\l"
 	.string "Battle Choice.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC
+BattleFrontier_Lounge3_Text_ChallengeBattlePyramid:: @ 82629BC
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "PYRAMID's Battle Quest.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_262A60:: @ 8262A60
+BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe:: @ 8262A60
 	.string "I'll see to it that you benefit, too.\n"
 	.string "So how about it?\l"
 	.string "How about entering that event for me?$"
 
-BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD
+BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints:: @ 8262ABD
 	.string "All right, that's perfect.\n"
 	.string "So, uh… How about spotting me some\l"
 	.string "of your Battle Points?\p"
 	.string "Trust me, I'll show you my gratitude\n"
 	.string "afterward.$"
 
-BattleFrontier_Lounge3_Text_262B42:: @ 8262B42
+BattleFrontier_Lounge3_Text_HowMuchCanYouSpot:: @ 8262B42
 	.string "Great, great!\n"
 	.string "So, how much can you spot me?$"
 
-BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E
+BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints:: @ 8262B6E
 	.string "Oh, no, no, no!\n"
 	.string "You don't have enough Battle Points!\p"
 	.string "I wish you wouldn't monkey around and\n"
 	.string "waste everyone's time!$"
 
-BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0
+BattleFrontier_Lounge3_Text_ThanksOffYouGo:: @ 8262BE0
 	.string "Heheh! Thanks much!\n"
 	.string "So, off you go!$"
 
-BattleFrontier_Lounge3_Text_262C04:: @ 8262C04
+BattleFrontier_Lounge3_Text_GetToBattleTowerSingle:: @ 8262C04
 	.string "Get to the BATTLE TOWER's\n"
 	.string "SINGLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262C90:: @ 8262C90
+BattleFrontier_Lounge3_Text_GetToBattleTowerDouble:: @ 8262C90
 	.string "Get to the BATTLE TOWER's\n"
 	.string "DOUBLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C
+BattleFrontier_Lounge3_Text_GetToBattleTowerMulti:: @ 8262D1C
 	.string "Get to the BATTLE TOWER's\n"
 	.string "MULTI BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7
+BattleFrontier_Lounge3_Text_GetToBattleDomeSingle:: @ 8262DA7
 	.string "Get to the BATTLE DOME's\n"
 	.string "SINGLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262E34:: @ 8262E34
+BattleFrontier_Lounge3_Text_GetToBattleDomeDouble:: @ 8262E34
 	.string "Get to the BATTLE DOME's\n"
 	.string "DOUBLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1
+BattleFrontier_Lounge3_Text_GetToBattleFactorySingle:: @ 8262EC1
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Single Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262F56:: @ 8262F56
+BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble:: @ 8262F56
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Double Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB
+BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle:: @ 8262FEB
 	.string "Get to the BATTLE PALACE's\n"
 	.string "SINGLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263078:: @ 8263078
+BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble:: @ 8263078
 	.string "Get to the BATTLE PALACE's\n"
 	.string "DOUBLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263105:: @ 8263105
+BattleFrontier_Lounge3_Text_GetToBattleArena:: @ 8263105
 	.string "Get to the BATTLE ARENA's\n"
 	.string "Set KO Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_26318C:: @ 826318C
+BattleFrontier_Lounge3_Text_GetToBattlePike:: @ 826318C
 	.string "Get to the BATTLE PIKE's\n"
 	.string "Battle Choice pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263211:: @ 8263211
+BattleFrontier_Lounge3_Text_GetToBattlePyramid:: @ 8263211
 	.string "Get to the BATTLE PYRAMID's\n"
 	.string "Battle Quest pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_263298:: @ 8263298
+BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints:: @ 8263298
 	.string "Oh, it's you…\n"
 	.string "Nice try…\p"
 	.string "I hate to break it to you, but I can't\n"
@@ -430,7 +434,7 @@ BattleFrontier_Lounge3_Text_263298:: @ 8263298
 	.string "I guess we'll have to let it motivate\n"
 	.string "us to try harder next time!$"
 
-BattleFrontier_Lounge3_Text_263334:: @ 8263334
+BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints:: @ 8263334
 	.string "Oh, yes!\n"
 	.string "Hello there, champ!\p"
 	.string "I knew you could!\n"
@@ -439,36 +443,36 @@ BattleFrontier_Lounge3_Text_263334:: @ 8263334
 	.string "I'll return your Battle Points and,\n"
 	.string "of course, a little extra from me!$"
 
-BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4
+BattleFrontier_Lounge3_Text_ObtainedBattlePoints:: @ 82633D4
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Points.$"
 
-BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2
+BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge:: @ 82633F2
 	.string "If you're up for another challenge,\n"
 	.string "please do think of me!$"
 
-BattleFrontier_Lounge3_Text_26342D:: @ 826342D
+BattleFrontier_Lounge3_Text_NotInterested:: @ 826342D
 	.string "Not interested?! You shouldn't be\n"
 	.string "so afraid to take a chance!$"
 
-BattleFrontier_Lounge3_Text_26346B:: @ 826346B
+BattleFrontier_Lounge3_Text_Oh:: @ 826346B
 	.string "Oh…$"
 
-BattleFrontier_Lounge3_Text_26346F:: @ 826346F
+BattleFrontier_Lounge3_Text_BackedWrongTrainer:: @ 826346F
 	.string "I backed the wrong TRAINER again!\p"
 	.string "Maybe I should be battling normally\n"
 	.string "like everyone else…$"
 
-BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9
+BattleFrontier_Lounge3_Text_TrainerGoodButRattled:: @ 82634C9
 	.string "That TRAINER…\p"
 	.string "He's good, but he gets rattled too\n"
 	.string "easily to survive the BATTLE DOME…$"
 
-BattleFrontier_Lounge3_Text_26351D:: @ 826351D
+BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne:: @ 826351D
 	.string "Giggle!\n"
 	.string "I know a winner when I see one!$"
 
-BattleFrontier_Lounge3_Text_263545:: @ 8263545
+BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges:: @ 8263545
 	.string "Those TRAINERS…\n"
 	.string "What are they doing?\l"
 	.string "They should be taking challenges.$"
diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json
index b67d3bb07..0c86ccf3c 100644
--- a/data/maps/BattleFrontier_Lounge4/map.json
+++ b/data/maps/BattleFrontier_Lounge4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge4_EventScript_26358D",
+      "script": "BattleFrontier_Lounge4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge4_EventScript_263596",
+      "script": "BattleFrontier_Lounge4_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge4_EventScript_26359F",
+      "script": "BattleFrontier_Lounge4_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc
index 407720915..6da60d30f 100644
--- a/data/maps/BattleFrontier_Lounge4/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge4/scripts.inc
@@ -1,27 +1,27 @@
 BattleFrontier_Lounge4_MapScripts:: @ 826358C
 	.byte 0
 
-BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D
-	msgbox BattleFrontier_Lounge4_Text_2635A8, MSGBOX_NPC
+BattleFrontier_Lounge4_EventScript_Woman:: @ 826358D
+	msgbox BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_263596:: @ 8263596
-	msgbox BattleFrontier_Lounge4_Text_2635EC, MSGBOX_NPC
+BattleFrontier_Lounge4_EventScript_Cook:: @ 8263596
+	msgbox BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F
-	msgbox BattleFrontier_Lounge4_Text_263625, MSGBOX_NPC
+BattleFrontier_Lounge4_EventScript_Man:: @ 826359F
+	msgbox BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_Text_2635A8: @ 82635A8
+BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring: @ 82635A8
 	.string "I wonder if they'll be airing interviews\n"
 	.string "with tough TRAINERS today?$"
 
-BattleFrontier_Lounge4_Text_2635EC: @ 82635EC
+BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere: @ 82635EC
 	.string "If I opened a restaurant here,\n"
 	.string "it'd make money for sure.$"
 
-BattleFrontier_Lounge4_Text_263625: @ 8263625
+BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles: @ 8263625
 	.string "Whew…\p"
 	.string "I need to take a breather after\n"
 	.string "some intense battles…\p"
diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json
index 3847e6691..6d9eab35f 100644
--- a/data/maps/BattleFrontier_Lounge5/map.json
+++ b/data/maps/BattleFrontier_Lounge5/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_264617",
+      "script": "BattleFrontier_Lounge5_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_264620",
+      "script": "BattleFrontier_Lounge5_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge5_EventScript_264629",
+      "script": "BattleFrontier_Lounge5_EventScript_LittleBoy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc
index a801cb107..3df294fb1 100644
--- a/data/maps/BattleFrontier_Lounge5/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge5/scripts.inc
@@ -32,16 +32,16 @@ BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown:: @ 826460D
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_264617:: @ 8264617
-	msgbox BattleFrontier_Lounge5_Text_264F22, MSGBOX_NPC
+BattleFrontier_Lounge5_EventScript_Gentleman:: @ 8264617
+	msgbox BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_264620:: @ 8264620
-	msgbox BattleFrontier_Lounge5_Text_264F64, MSGBOX_NPC
+BattleFrontier_Lounge5_EventScript_BlackBelt:: @ 8264620
+	msgbox BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_264629:: @ 8264629
-	msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC
+BattleFrontier_Lounge5_EventScript_LittleBoy:: @ 8264629
+	msgbox BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot, MSGBOX_NPC
 	end
 
 BattleFrontier_Lounge5_Text_NatureGirlGreeting:: @ 8264632
@@ -190,16 +190,16 @@ BattleFrontier_Lounge5_Text_NatureGirlEgg:: @ 8264EEE
 	.string "That's silly! An EGG is asleep!\n"
 	.string "I can't talk to it!$"
 
-BattleFrontier_Lounge5_Text_264F22:: @ 8264F22
+BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon:: @ 8264F22
 	.string "How charming!\n"
 	.string "That little lady claims she can\l"
 	.string "understand POKéMON!$"
 
-BattleFrontier_Lounge5_Text_264F64:: @ 8264F64
+BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound:: @ 8264F64
 	.string "I have this feeling that the little girl\n"
 	.string "is saying something profound.$"
 
-BattleFrontier_Lounge5_Text_264FAB:: @ 8264FAB
+BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot:: @ 8264FAB
 	.string "I know something!\p"
 	.string "That little girl plays at the red house\n"
 	.string "a lot!$"
diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json
index 1ecbec9f8..5888ea7c0 100644
--- a/data/maps/BattleFrontier_Lounge6/map.json
+++ b/data/maps/BattleFrontier_Lounge6/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge6_EventScript_264FED",
+      "script": "BattleFrontier_Lounge6_EventScript_Trader",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index 09690c8d3..34ca00073 100644
--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -1,54 +1,54 @@
 BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
 	.byte 0
 
-BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
+BattleFrontier_Lounge6_EventScript_Trader:: @ 8264FED
 	lock
 	faceplayer
-	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
+	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_TradeCompleted
 	setvar VAR_0x8008, INGAME_TRADE_MEOWTH
 	copyvar VAR_0x8004, VAR_0x8008
 	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
-	msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
+	msgbox BattleFrontier_Lounge6_Text_WouldYouLikeToTrade, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
+	goto_if_eq BattleFrontier_Lounge6_EventScript_DeclineTrade
 	special ChoosePartyMon
 	waitstate
 	copyvar VAR_0x800A, VAR_0x8004
 	compare VAR_0x8004, 255
-	goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
+	goto_if_eq BattleFrontier_Lounge6_EventScript_DeclineTrade
 	copyvar VAR_0x8005, VAR_0x800A
 	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne BattleFrontier_Lounge6_EventScript_265075
+	goto_if_ne BattleFrontier_Lounge6_EventScript_NotRequestedMon
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
 	special CreateInGameTradePokemon
 	special DoInGameTradeScene
 	waitstate
-	msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt, MSGBOX_DEFAULT
 	setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B
-	msgbox BattleFrontier_Lounge6_Text_2651CB, MSGBOX_DEFAULT
+BattleFrontier_Lounge6_EventScript_DeclineTrade:: @ 826506B
+	msgbox BattleFrontier_Lounge6_Text_WellThatsFineToo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_265075:: @ 8265075
+BattleFrontier_Lounge6_EventScript_NotRequestedMon:: @ 8265075
 	bufferspeciesname 0, VAR_0x8009
-	msgbox BattleFrontier_Lounge6_Text_26518D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_265083:: @ 8265083
-	msgbox BattleFrontier_Lounge6_Text_26520E, MSGBOX_DEFAULT
+BattleFrontier_Lounge6_EventScript_TradeCompleted:: @ 8265083
+	msgbox BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_Text_26508D: @ 826508D
+BattleFrontier_Lounge6_Text_WouldYouLikeToTrade: @ 826508D
 	.string "My POKéMON is a {STR_VAR_2}.\n"
 	.string "Do you know it?\l"
 	.string "It's quite cute and rather nice.\p"
@@ -57,24 +57,24 @@ BattleFrontier_Lounge6_Text_26508D: @ 826508D
 	.string "Would you like to trade me a {STR_VAR_1}\n"
 	.string "for my {STR_VAR_2}?$"
 
-BattleFrontier_Lounge6_Text_265128: @ 8265128
+BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt: @ 8265128
 	.string "Oh, it's adorable!\n"
 	.string "Thank you!\l"
 	.string "I promise I'll be good to it!\p"
 	.string "Oh! I hope you'll be good to\n"
 	.string "my {STR_VAR_2}, too!$"
 
-BattleFrontier_Lounge6_Text_26518D: @ 826518D
+BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon: @ 826518D
 	.string "Oh, I'm sorry!\n"
 	.string "I don't intend to trade for anything\l"
 	.string "but a {STR_VAR_1}.$"
 
-BattleFrontier_Lounge6_Text_2651CB: @ 82651CB
+BattleFrontier_Lounge6_Text_WellThatsFineToo: @ 82651CB
 	.string "Oh, you won't?\n"
 	.string "Well, that's fine, too.\l"
 	.string "Please come visit us again.$"
 
-BattleFrontier_Lounge6_Text_26520E: @ 826520E
+BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined: @ 826520E
 	.string "Giggle!\n"
 	.string "A SKITTY is so much cuter than I had\l"
 	.string "imagined. I'm delighted!$"
diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json
index da866ea72..5ebc789ba 100644
--- a/data/maps/BattleFrontier_Lounge7/map.json
+++ b/data/maps/BattleFrontier_Lounge7/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_2656DB",
+      "script": "BattleFrontier_Lounge7_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_265255",
+      "script": "BattleFrontier_Lounge7_EventScript_LeftMoveTutor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_265445",
+      "script": "BattleFrontier_Lounge7_EventScript_RightMoveTutor",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge7_EventScript_2656E4",
+      "script": "BattleFrontier_Lounge7_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 3605b9bf1..97e41cd96 100644
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -1,23 +1,23 @@
 BattleFrontier_Lounge7_MapScripts:: @ 8265254
 	.byte 0
 
-BattleFrontier_Lounge7_EventScript_265255:: @ 8265255
+BattleFrontier_Lounge7_EventScript_LeftMoveTutor:: @ 8265255
 	lock
 	faceplayer
-	setvar VAR_TEMP_C, 9
-	goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265276
-	msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT
+	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_1
+	goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor
+	msgbox BattleFrontier_Lounge7_Text_LeftTutorIntro, MSGBOX_DEFAULT
 	setflag FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR
-	goto BattleFrontier_Lounge7_EventScript_265284
+	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265276:: @ 8265276
-	msgbox BattleFrontier_Lounge7_Text_2658AB, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge7_EventScript_265284
+BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor:: @ 8265276
+	msgbox BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
-	message BattleFrontier_Lounge7_Text_2658EF
+BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove:: @ 8265284
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 0
@@ -27,22 +27,22 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2653D7
-	case 1, BattleFrontier_Lounge7_EventScript_2653E2
-	case 2, BattleFrontier_Lounge7_EventScript_2653ED
-	case 3, BattleFrontier_Lounge7_EventScript_2653F8
-	case 4, BattleFrontier_Lounge7_EventScript_265403
-	case 5, BattleFrontier_Lounge7_EventScript_26540E
-	case 6, BattleFrontier_Lounge7_EventScript_265419
-	case 7, BattleFrontier_Lounge7_EventScript_265424
-	case 8, BattleFrontier_Lounge7_EventScript_26542F
-	case 9, BattleFrontier_Lounge7_EventScript_26543A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
-	message BattleFrontier_Lounge7_Text_2658EF
+	case 0, BattleFrontier_Lounge7_EventScript_Softboiled
+	case 1, BattleFrontier_Lounge7_EventScript_SeismicToss
+	case 2, BattleFrontier_Lounge7_EventScript_DreamEater
+	case 3, BattleFrontier_Lounge7_EventScript_MegaPunch
+	case 4, BattleFrontier_Lounge7_EventScript_MegaKick
+	case 5, BattleFrontier_Lounge7_EventScript_BodySlam
+	case 6, BattleFrontier_Lounge7_EventScript_RockSlide
+	case 7, BattleFrontier_Lounge7_EventScript_Counter
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderWave
+	case 9, BattleFrontier_Lounge7_EventScript_SwordsDance
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove:: @ 826532F
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 0
 	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_1
@@ -51,87 +51,87 @@ BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2653D7
-	case 1, BattleFrontier_Lounge7_EventScript_2653E2
-	case 2, BattleFrontier_Lounge7_EventScript_2653ED
-	case 3, BattleFrontier_Lounge7_EventScript_2653F8
-	case 4, BattleFrontier_Lounge7_EventScript_265403
-	case 5, BattleFrontier_Lounge7_EventScript_26540E
-	case 6, BattleFrontier_Lounge7_EventScript_265419
-	case 7, BattleFrontier_Lounge7_EventScript_265424
-	case 8, BattleFrontier_Lounge7_EventScript_26542F
-	case 9, BattleFrontier_Lounge7_EventScript_26543A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_2653D7:: @ 82653D7
+	case 0, BattleFrontier_Lounge7_EventScript_Softboiled
+	case 1, BattleFrontier_Lounge7_EventScript_SeismicToss
+	case 2, BattleFrontier_Lounge7_EventScript_DreamEater
+	case 3, BattleFrontier_Lounge7_EventScript_MegaPunch
+	case 4, BattleFrontier_Lounge7_EventScript_MegaKick
+	case 5, BattleFrontier_Lounge7_EventScript_BodySlam
+	case 6, BattleFrontier_Lounge7_EventScript_RockSlide
+	case 7, BattleFrontier_Lounge7_EventScript_Counter
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderWave
+	case 9, BattleFrontier_Lounge7_EventScript_SwordsDance
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_Softboiled:: @ 82653D7
 	setvar VAR_0x8008, 16
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2653E2:: @ 82653E2
+BattleFrontier_Lounge7_EventScript_SeismicToss:: @ 82653E2
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2653ED:: @ 82653ED
+BattleFrontier_Lounge7_EventScript_DreamEater:: @ 82653ED
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2653F8:: @ 82653F8
+BattleFrontier_Lounge7_EventScript_MegaPunch:: @ 82653F8
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265403:: @ 8265403
+BattleFrontier_Lounge7_EventScript_MegaKick:: @ 8265403
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26540E:: @ 826540E
+BattleFrontier_Lounge7_EventScript_BodySlam:: @ 826540E
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265419:: @ 8265419
+BattleFrontier_Lounge7_EventScript_RockSlide:: @ 8265419
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265424:: @ 8265424
+BattleFrontier_Lounge7_EventScript_Counter:: @ 8265424
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26542F:: @ 826542F
+BattleFrontier_Lounge7_EventScript_ThunderWave:: @ 826542F
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26543A:: @ 826543A
+BattleFrontier_Lounge7_EventScript_SwordsDance:: @ 826543A
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265445:: @ 8265445
+BattleFrontier_Lounge7_EventScript_RightMoveTutor:: @ 8265445
 	lock
 	faceplayer
-	setvar VAR_TEMP_C, 10
-	goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265466
-	msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT
+	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_2
+	goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor
+	msgbox BattleFrontier_Lounge7_Text_RightTutorIntro, MSGBOX_DEFAULT
 	setflag FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR
-	goto BattleFrontier_Lounge7_EventScript_265474
+	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265466:: @ 8265466
-	msgbox BattleFrontier_Lounge7_Text_265C2C, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge7_EventScript_265474
+BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor:: @ 8265466
+	msgbox BattleFrontier_Lounge7_Text_RightTutorWelcomeBack, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
-	message BattleFrontier_Lounge7_Text_2658EF
+BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: @ 8265474
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 1
@@ -141,22 +141,22 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2655C7
-	case 1, BattleFrontier_Lounge7_EventScript_2655D2
-	case 2, BattleFrontier_Lounge7_EventScript_2655DD
-	case 3, BattleFrontier_Lounge7_EventScript_2655E8
-	case 4, BattleFrontier_Lounge7_EventScript_2655F3
-	case 5, BattleFrontier_Lounge7_EventScript_2655FE
-	case 6, BattleFrontier_Lounge7_EventScript_265609
-	case 7, BattleFrontier_Lounge7_EventScript_265614
-	case 8, BattleFrontier_Lounge7_EventScript_26561F
-	case 9, BattleFrontier_Lounge7_EventScript_26562A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
-	message BattleFrontier_Lounge7_Text_2658EF
+	case 0, BattleFrontier_Lounge7_EventScript_DefenseCurl
+	case 1, BattleFrontier_Lounge7_EventScript_Snore
+	case 2, BattleFrontier_Lounge7_EventScript_MudSlap
+	case 3, BattleFrontier_Lounge7_EventScript_Swift
+	case 4, BattleFrontier_Lounge7_EventScript_IcyWind
+	case 5, BattleFrontier_Lounge7_EventScript_Endure
+	case 6, BattleFrontier_Lounge7_EventScript_PsychUp
+	case 7, BattleFrontier_Lounge7_EventScript_IcePunch
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderPunch
+	case 9, BattleFrontier_Lounge7_EventScript_FirePunch
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: @ 826551F
+	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 1
 	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
@@ -165,131 +165,133 @@ BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F
 	waitstate
 	copyvar VAR_TEMP_D, VAR_RESULT
 	switch VAR_RESULT
-	case 0, BattleFrontier_Lounge7_EventScript_2655C7
-	case 1, BattleFrontier_Lounge7_EventScript_2655D2
-	case 2, BattleFrontier_Lounge7_EventScript_2655DD
-	case 3, BattleFrontier_Lounge7_EventScript_2655E8
-	case 4, BattleFrontier_Lounge7_EventScript_2655F3
-	case 5, BattleFrontier_Lounge7_EventScript_2655FE
-	case 6, BattleFrontier_Lounge7_EventScript_265609
-	case 7, BattleFrontier_Lounge7_EventScript_265614
-	case 8, BattleFrontier_Lounge7_EventScript_26561F
-	case 9, BattleFrontier_Lounge7_EventScript_26562A
-	case 10, BattleFrontier_Lounge7_EventScript_265635
-	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635
-	end
-
-BattleFrontier_Lounge7_EventScript_2655C7:: @ 82655C7
+	case 0, BattleFrontier_Lounge7_EventScript_DefenseCurl
+	case 1, BattleFrontier_Lounge7_EventScript_Snore
+	case 2, BattleFrontier_Lounge7_EventScript_MudSlap
+	case 3, BattleFrontier_Lounge7_EventScript_Swift
+	case 4, BattleFrontier_Lounge7_EventScript_IcyWind
+	case 5, BattleFrontier_Lounge7_EventScript_Endure
+	case 6, BattleFrontier_Lounge7_EventScript_PsychUp
+	case 7, BattleFrontier_Lounge7_EventScript_IcePunch
+	case 8, BattleFrontier_Lounge7_EventScript_ThunderPunch
+	case 9, BattleFrontier_Lounge7_EventScript_FirePunch
+	case 10, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
+	end
+
+BattleFrontier_Lounge7_EventScript_DefenseCurl:: @ 82655C7
 	setvar VAR_0x8008, 16
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655D2:: @ 82655D2
+BattleFrontier_Lounge7_EventScript_Snore:: @ 82655D2
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655DD:: @ 82655DD
+BattleFrontier_Lounge7_EventScript_MudSlap:: @ 82655DD
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655E8:: @ 82655E8
+BattleFrontier_Lounge7_EventScript_Swift:: @ 82655E8
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655F3:: @ 82655F3
+BattleFrontier_Lounge7_EventScript_IcyWind:: @ 82655F3
 	setvar VAR_0x8008, 24
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_2655FE:: @ 82655FE
+BattleFrontier_Lounge7_EventScript_Endure:: @ 82655FE
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265609:: @ 8265609
+BattleFrontier_Lounge7_EventScript_PsychUp:: @ 8265609
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265614:: @ 8265614
+BattleFrontier_Lounge7_EventScript_IcePunch:: @ 8265614
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26561F:: @ 826561F
+BattleFrontier_Lounge7_EventScript_ThunderPunch:: @ 826561F
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A
+BattleFrontier_Lounge7_EventScript_FirePunch:: @ 826562A
 	setvar VAR_0x8008, 48
-	goto BattleFrontier_Lounge7_EventScript_26564F
+	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_265635:: @ 8265635
+BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect:: @ 8265635
 	special CloseBattleFrontierTutorWindow
 	special CloseBattlePointsWindow
-	msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_265645:: @ 8265645
-	msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT
+BattleFrontier_Lounge7_EventScript_CancelChooseMon:: @ 8265645
+	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
 
-@ VAR_0x8004 here is used to determine which move name to buffer
-@ VAR_0x8005 here is used to determine which move tutor was spoken to
-BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
+@ VAR_0x8008 is the price
+@ VAR_TEMP_C is the scroll multichoice ID
+@ VAR_TEMP_D is the move selection
+@ VAR_TEMP_E is which move tutor was spoken to
+BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
 	copyvar VAR_0x8004, VAR_TEMP_D
 	copyvar VAR_0x8005, VAR_TEMP_E
 	special BufferBattleFrontierTutorMoveName
 	buffernumberstring 1, VAR_0x8008
 	copyvar VAR_0x8004, VAR_TEMP_C
-	msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO
+	msgbox BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA
+	goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
-	goto_if_ge BattleFrontier_Lounge7_EventScript_265696
-	msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT
-	goto BattleFrontier_Lounge7_EventScript_2656CA
+	goto_if_ge BattleFrontier_Lounge7_EventScript_TeachTutorMove
+	msgbox BattleFrontier_Lounge7_Text_HaventGotEnoughPoints, MSGBOX_DEFAULT
+	goto BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	end
 
-BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
-	msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT
+BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
+	msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
 	special GetBattleFrontierTutorMoveIndex
 	fadescreen 1
 	special CloseBattlePointsWindow
 	special CloseBattleFrontierTutorWindow
 	special ChooseMonForMoveTutor
 	waitstate
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_Lounge7_EventScript_265645
-	msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_Lounge7_EventScript_CancelChooseMon
+	msgbox BattleFrontier_Lounge7_Text_IllTakeBattlePoints, MSGBOX_DEFAULT
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA
+BattleFrontier_Lounge7_EventScript_ChooseNewMove:: @ 82656CA
 	compare VAR_TEMP_E, 0
-	goto_if_eq BattleFrontier_Lounge7_EventScript_26532F
-	goto BattleFrontier_Lounge7_EventScript_26551F
+	goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove
+	goto BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB
-	msgbox BattleFrontier_Lounge7_Text_265C6F, MSGBOX_NPC
+BattleFrontier_Lounge7_EventScript_Sailor:: @ 82656DB
+	msgbox BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4
-	msgbox BattleFrontier_Lounge7_Text_265D17, MSGBOX_NPC
+BattleFrontier_Lounge7_EventScript_Gentleman:: @ 82656E4
+	msgbox BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_Text_2656ED: @ 82656ED
+BattleFrontier_Lounge7_Text_LeftTutorIntro: @ 82656ED
 	.string "Buhahaha!\p"
 	.string "You couldn't tell it from looking now,\n"
 	.string "but I used to be one tough TRAINER.\p"
@@ -307,38 +309,38 @@ BattleFrontier_Lounge7_Text_2656ED: @ 82656ED
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_2658AB: @ 82658AB
+BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack: @ 82658AB
 	.string "Buhahaha!\p"
 	.string "Are you back to learn special and\n"
 	.string "yet cute POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_2658EF: @ 82658EF
+BattleFrontier_Lounge7_Text_TeachWhichMove: @ 82658EF
 	.string "Fine, fine, look here!\n"
 	.string "Which move should I teach?$"
 
-BattleFrontier_Lounge7_Text_265921: @ 8265921
+BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints: @ 8265921
 	.string "The move {STR_VAR_1}, is it?\n"
 	.string "That will be {STR_VAR_2} Battle Points, okay?$"
 
-BattleFrontier_Lounge7_Text_26595A: @ 826595A
+BattleFrontier_Lounge7_Text_TeachMoveToWhichMon: @ 826595A
 	.string "Fine, fine, now pick the POKéMON\n"
 	.string "I should teach the move to.$"
 
-BattleFrontier_Lounge7_Text_265997: @ 8265997
+BattleFrontier_Lounge7_Text_HaventGotEnoughPoints: @ 8265997
 	.string "What the…\n"
 	.string "You haven't got enough Battle Points!$"
 
-BattleFrontier_Lounge7_Text_2659C7: @ 82659C7
+BattleFrontier_Lounge7_Text_IllTakeBattlePoints: @ 82659C7
 	.string "Do you see how skilled I am now?\n"
 	.string "I'll take your Battle Points, thanks!$"
 
-BattleFrontier_Lounge7_Text_265A0E: @ 8265A0E
+BattleFrontier_Lounge7_Text_YouDontWantTo: @ 8265A0E
 	.string "What's that?\n"
 	.string "You don't want to…\p"
 	.string "If you want to see how skilled I am,\n"
 	.string "you come see me anytime!$"
 
-BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C
+BattleFrontier_Lounge7_Text_RightTutorIntro: @ 8265A6C
 	.string "Ihihihi!\p"
 	.string "I know it's hard to see now, but I used\n"
 	.string "to be one fantastic TRAINER.\p"
@@ -356,19 +358,19 @@ BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_265C2C: @ 8265C2C
+BattleFrontier_Lounge7_Text_RightTutorWelcomeBack: @ 8265C2C
 	.string "Ihihihi!\p"
 	.string "Have you come to learn hard and\n"
 	.string "yet pretty POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_265C6F: @ 8265C6F
+BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong: @ 8265C6F
 	.string "Those ladies, the way they bad-mouth\n"
 	.string "each other, you probably think that\l"
 	.string "they don't get along.\p"
 	.string "But if that were true, they wouldn't\n"
 	.string "stay out here together, would they?$"
 
-BattleFrontier_Lounge7_Text_265D17: @ 8265D17
+BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful: @ 8265D17
 	.string "When I was just a wee YOUNGSTER,\n"
 	.string "those ladies were strong and beautiful.\p"
 	.string "They were idols among us TRAINERS.\p"
@@ -380,102 +382,102 @@ BattleFrontier_Lounge7_Text_265D17: @ 8265D17
 	.string "but feel this…\p"
 	.string "Time is so cruel…$"
 
-BattleFrontier_Lounge7_Text_265E30:: @ 8265E30
+BattleFrontier_Lounge7_Text_SoftboiledDesc:: @ 8265E30
 	.string "Recovers up to\n"
 	.string "half the user's\n"
 	.string "maximum HP.$"
 
-BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B
+BattleFrontier_Lounge7_Text_SeismicTossDesc:: @ 8265E5B
 	.string "Inflicts damage\n"
 	.string "identical to the\n"
 	.string "user's level.$"
 
-BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A
+BattleFrontier_Lounge7_Text_DreamEaterDesc:: @ 8265E8A
 	.string "Recovers half the\n"
 	.string "damage inflicted\n"
 	.string "on a sleeping foe.$"
 
-BattleFrontier_Lounge7_Text_265EC0:: @ 8265EC0
+BattleFrontier_Lounge7_Text_MegaPunchDesc:: @ 8265EC0
 	.string "A strong punch\n"
 	.string "thrown with\n"
 	.string "incredible power.$"
 
-BattleFrontier_Lounge7_Text_265EED:: @ 8265EED
+BattleFrontier_Lounge7_Text_MegaKickDesc:: @ 8265EED
 	.string "An extremely\n"
 	.string "powerful kick with\n"
 	.string "intense force.$"
 
-BattleFrontier_Lounge7_Text_265F1C:: @ 8265F1C
+BattleFrontier_Lounge7_Text_BodySlamDesc:: @ 8265F1C
 	.string "A full-body slam\n"
 	.string "that may cause\n"
 	.string "paralysis.$"
 
-BattleFrontier_Lounge7_Text_265F47:: @ 8265F47
+BattleFrontier_Lounge7_Text_RockSlideDesc:: @ 8265F47
 	.string "Large boulders\n"
 	.string "are hurled. May\n"
 	.string "cause flinching.$"
 
-BattleFrontier_Lounge7_Text_265F77:: @ 8265F77
+BattleFrontier_Lounge7_Text_CounterDesc:: @ 8265F77
 	.string "Retaliates any\n"
 	.string "physical hit with\n"
 	.string "double the power.$"
 
-BattleFrontier_Lounge7_Text_265FAA:: @ 8265FAA
+BattleFrontier_Lounge7_Text_ThunderWaveDesc:: @ 8265FAA
 	.string "A weak jolt of\n"
 	.string "electricity that\n"
 	.string "paralyzes the foe.$"
 
-BattleFrontier_Lounge7_Text_265FDD:: @ 8265FDD
+BattleFrontier_Lounge7_Text_SwordsDanceDesc:: @ 8265FDD
 	.string "A fighting dance\n"
 	.string "that sharply\n"
 	.string "raises ATTACK.$"
 
-BattleFrontier_Lounge7_Text_26600A:: @ 826600A
+BattleFrontier_Lounge7_Text_DefenseCurlDesc:: @ 826600A
 	.string "Curls up to con-\n"
 	.string "ceal weak spots\n"
 	.string "and raise DEFENSE.$"
 
-BattleFrontier_Lounge7_Text_26603E:: @ 826603E
+BattleFrontier_Lounge7_Text_SnoreDesc:: @ 826603E
 	.string "A loud attack\n"
 	.string "that can be used\n"
 	.string "only while asleep.$"
 
-BattleFrontier_Lounge7_Text_266070:: @ 8266070
+BattleFrontier_Lounge7_Text_MudSlapDesc:: @ 8266070
 	.string "Hurls mud in the\n"
 	.string "foe's face to re-\n"
 	.string "duce its accuracy.$"
 
-BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6
+BattleFrontier_Lounge7_Text_SwiftDesc:: @ 82660A6
 	.string "Sprays star-\n"
 	.string "shaped rays\n"
 	.string "that never miss.$"
 
-BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0
+BattleFrontier_Lounge7_Text_IcyWindDesc:: @ 82660D0
 	.string "A chilling attack\n"
 	.string "that lowers the\n"
 	.string "foe's SPEED.$"
 
-BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF
+BattleFrontier_Lounge7_Text_EndureDesc:: @ 82660FF
 	.string "Endures any at-\n"
 	.string "tack for 1 turn,\n"
 	.string "leaving 1HP.$"
 
-BattleFrontier_Lounge7_Text_26612D:: @ 826612D
+BattleFrontier_Lounge7_Text_PsychUpDesc:: @ 826612D
 	.string "Copies the foe's\n"
 	.string "effect(s) and\n"
 	.string "gives to the user.$"
 
-BattleFrontier_Lounge7_Text_26615F:: @ 826615F
+BattleFrontier_Lounge7_Text_IcePunchDesc:: @ 826615F
 	.string "An icy punch\n"
 	.string "that may\n"
 	.string "freeze the foe.$"
 
-BattleFrontier_Lounge7_Text_266185:: @ 8266185
+BattleFrontier_Lounge7_Text_ThunderPunchDesc:: @ 8266185
 	.string "An electrified\n"
 	.string "punch that may\n"
 	.string "paralyze the foe.$"
 
-BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5
+BattleFrontier_Lounge7_Text_FirePunchDesc:: @ 82661B5
 	.string "A fiery punch\n"
 	.string "that may burn\n"
 	.string "the foe.$"
diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json
index ff2bd2361..519f008fc 100644
--- a/data/maps/BattleFrontier_Lounge8/map.json
+++ b/data/maps/BattleFrontier_Lounge8/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge8_EventScript_2676DC",
+      "script": "BattleFrontier_Lounge8_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge8_EventScript_2676CA",
+      "script": "BattleFrontier_Lounge8_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Lounge8_EventScript_2676D3",
+      "script": "BattleFrontier_Lounge8_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc
index 3a6f78fd7..2615af743 100644
--- a/data/maps/BattleFrontier_Lounge8/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge8/scripts.inc
@@ -1,19 +1,19 @@
 BattleFrontier_Lounge8_MapScripts:: @ 82676C9
 	.byte 0
 
-BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA
-	msgbox BattleFrontier_Lounge8_Text_2676E5, MSGBOX_NPC
+BattleFrontier_Lounge8_EventScript_Man:: @ 82676CA
+	msgbox BattleFrontier_Lounge8_Text_WhatATrainerNeeds, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3
-	msgbox BattleFrontier_Lounge8_Text_26779C, MSGBOX_NPC
+BattleFrontier_Lounge8_EventScript_Woman:: @ 82676D3
+	msgbox BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC
-	msgbox BattleFrontier_Lounge8_Text_26782C, MSGBOX_NPC
+BattleFrontier_Lounge8_EventScript_NinjaBoy:: @ 82676DC
+	msgbox BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_Text_2676E5: @ 82676E5
+BattleFrontier_Lounge8_Text_WhatATrainerNeeds: @ 82676E5
 	.string "What a TRAINER needs…\p"
 	.string "Knowledge…\n"
 	.string "Strategy…\l"
@@ -27,14 +27,14 @@ BattleFrontier_Lounge8_Text_2676E5: @ 82676E5
 	.string "Huh? POKéMON?\n"
 	.string "What's that?$"
 
-BattleFrontier_Lounge8_Text_26779C: @ 826779C
+BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains: @ 826779C
 	.string "Do you know about the FRONTIER\n"
 	.string "BRAINS?\p"
 	.string "That's what SCOTT calls the seven\n"
 	.string "special TRAINERS that run the seven\l"
 	.string "facilities in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge8_Text_26782C: @ 826782C
+BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling: @ 826782C
 	.string "At the BATTLE TOWER, an older girl\n"
 	.string "told me that I have a lot of talent\l"
 	.string "for battling!\p"
diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json
index e45e4f13b..cccf8fb8a 100644
--- a/data/maps/BattleFrontier_OutsideEast/map.json
+++ b/data/maps/BattleFrontier_OutsideEast/map.json
@@ -30,7 +30,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C67",
+      "script": "BattleFrontier_OutsideEast_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -43,7 +43,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C70",
+      "script": "BattleFrontier_OutsideEast_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -56,7 +56,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C79",
+      "script": "BattleFrontier_OutsideEast_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C82",
+      "script": "BattleFrontier_OutsideEast_EventScript_HexManiac",
       "flag": "0"
     },
     {
@@ -82,7 +82,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C8B",
+      "script": "BattleFrontier_OutsideEast_EventScript_BlackBelt1",
       "flag": "0"
     },
     {
@@ -95,7 +95,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C94",
+      "script": "BattleFrontier_OutsideEast_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -108,7 +108,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CBB",
+      "script": "BattleFrontier_OutsideEast_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -121,7 +121,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CE1",
+      "script": "BattleFrontier_OutsideEast_EventScript_TriathleteM",
       "flag": "0"
     },
     {
@@ -134,7 +134,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CB2",
+      "script": "BattleFrontier_OutsideEast_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -147,7 +147,7 @@
       "movement_range_y": 6,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CC4",
+      "script": "BattleFrontier_OutsideEast_EventScript_TriathleteF",
       "flag": "0"
     },
     {
@@ -160,7 +160,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CCD",
+      "script": "BattleFrontier_OutsideEast_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -173,7 +173,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242CD6",
+      "script": "BattleFrontier_OutsideEast_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -186,7 +186,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C9F",
+      "script": "BattleFrontier_OutsideEast_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -212,7 +212,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D79",
+      "script": "BattleFrontier_OutsideEast_EventScript_Maniac1",
       "flag": "0"
     },
     {
@@ -225,7 +225,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D82",
+      "script": "BattleFrontier_OutsideEast_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -238,7 +238,7 @@
       "movement_range_y": 6,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D8B",
+      "script": "BattleFrontier_OutsideEast_EventScript_PsychicM",
       "flag": "0"
     },
     {
@@ -251,7 +251,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D94",
+      "script": "BattleFrontier_OutsideEast_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -264,7 +264,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242D9D",
+      "script": "BattleFrontier_OutsideEast_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -277,7 +277,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DA6",
+      "script": "BattleFrontier_OutsideEast_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -290,7 +290,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DAF",
+      "script": "BattleFrontier_OutsideEast_EventScript_BlackBelt2",
       "flag": "0"
     },
     {
@@ -303,7 +303,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DB8",
+      "script": "BattleFrontier_OutsideEast_EventScript_Maniac2",
       "flag": "0"
     },
     {
@@ -316,7 +316,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DC3",
+      "script": "BattleFrontier_OutsideEast_EventScript_Woman3",
       "flag": "0"
     },
     {
@@ -329,7 +329,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DE9",
+      "script": "BattleFrontier_OutsideEast_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -342,7 +342,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DE0",
+      "script": "BattleFrontier_OutsideEast_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -355,7 +355,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideEast_EventScript_242E08",
+      "script": "BattleFrontier_OutsideEast_EventScript_Camper",
       "flag": "0"
     }
   ],
@@ -406,7 +406,7 @@
       "x": 10,
       "y": 28,
       "elevation": 0,
-      "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
+      "dest_map": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
       "dest_warp_id": 0
     },
     {
@@ -467,7 +467,7 @@
       "y": 17,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C43"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattleTowerSign"
     },
     {
       "type": "sign",
@@ -475,7 +475,7 @@
       "y": 56,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C4C"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattlePalaceSign"
     },
     {
       "type": "sign",
@@ -483,7 +483,7 @@
       "y": 34,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C55"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattleArenaSign"
     },
     {
       "type": "sign",
@@ -491,7 +491,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242C5E"
+      "script": "BattleFrontier_OutsideEast_EventScript_BattlePyramidSign"
     },
     {
       "type": "sign",
@@ -499,7 +499,7 @@
       "y": 29,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DD7"
+      "script": "BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign"
     },
     {
       "type": "sign",
@@ -507,7 +507,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_242DCE"
+      "script": "BattleFrontier_OutsideEast_EventScript_RankingHallSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index ab968b6dd..ebfdba916 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -1,105 +1,105 @@
 BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
-	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_242C19
+BattleFrontier_OutsideEast_OnResume: @ 8242C0F
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
+BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo:: @ 8242C19
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
+BattleFrontier_OutsideEast_OnTransition: @ 8242C2D
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
-	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
+	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_ShowSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
+BattleFrontier_OutsideEast_EventScript_ShowSudowoodo:: @ 8242C3F
 	clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
 	return
 
-BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43
-	msgbox BattleFrontier_OutsideEast_Text_242E11, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattleTowerSign:: @ 8242C43
+	msgbox BattleFrontier_OutsideEast_Text_BattleTowerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C
-	msgbox BattleFrontier_OutsideEast_Text_242E58, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattlePalaceSign:: @ 8242C4C
+	msgbox BattleFrontier_OutsideEast_Text_BattlePalaceSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55
-	msgbox BattleFrontier_OutsideEast_Text_242E96, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattleArenaSign:: @ 8242C55
+	msgbox BattleFrontier_OutsideEast_Text_BattleArenaSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E
-	msgbox BattleFrontier_OutsideEast_Text_242ECF, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_BattlePyramidSign:: @ 8242C5E
+	msgbox BattleFrontier_OutsideEast_Text_BattlePyramidSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67
-	msgbox BattleFrontier_OutsideEast_Text_242F8C, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_NinjaBoy:: @ 8242C67
+	msgbox BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70
-	msgbox BattleFrontier_OutsideEast_Text_242FDC, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Man1:: @ 8242C70
+	msgbox BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79
-	msgbox BattleFrontier_OutsideEast_Text_24308C, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Hiker:: @ 8242C79
+	msgbox BattleFrontier_OutsideEast_Text_PyramidTooHarsh, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82
-	msgbox BattleFrontier_OutsideEast_Text_243106, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_HexManiac:: @ 8242C82
+	msgbox BattleFrontier_OutsideEast_Text_ThriveInDarkness, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B
-	msgbox BattleFrontier_OutsideEast_Text_2431A5, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_BlackBelt1:: @ 8242C8B
+	msgbox BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94
+BattleFrontier_OutsideEast_EventScript_Cook:: @ 8242C94
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_2432DD, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_BelieveInYouBuddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F
+BattleFrontier_OutsideEast_EventScript_Zigzagoon:: @ 8242C9F
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox BattleFrontier_OutsideEast_Text_24334B, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2
-	msgbox BattleFrontier_OutsideEast_Text_243363, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_RichBoy:: @ 8242CB2
+	msgbox BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB
-	msgbox BattleFrontier_OutsideEast_Text_243425, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_ExpertF:: @ 8242CBB
+	msgbox BattleFrontier_OutsideEast_Text_OnceBeatGymLeader, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4
-	msgbox BattleFrontier_OutsideEast_Text_2434A0, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_TriathleteF:: @ 8242CC4
+	msgbox BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD
-	msgbox BattleFrontier_OutsideEast_Text_243504, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Twin:: @ 8242CCD
+	msgbox BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6
+BattleFrontier_OutsideEast_EventScript_Man2:: @ 8242CD6
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_243529, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1
-	msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_TriathleteM:: @ 8242CE1
+	msgbox BattleFrontier_OutsideEast_Text_DidScottBringYouHere, MSGBOX_NPC
 	end
 
 BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
@@ -134,16 +134,16 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
-	goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
+	goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
 	compare VAR_RESULT, B_OUTCOME_RAN
-	goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
+	goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
 	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
-	goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
+	goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
 	setflag FLAG_DEFEATED_SUDOWOODO
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo:: @ 8242D60
+BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo:: @ 8242D60
 	setflag FLAG_DEFEATED_SUDOWOODO
 	goto Common_EventScript_RemoveStaticPokemon
 	end
@@ -166,107 +166,107 @@ BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
 	face_down
 	step_end
 
-BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79
-	msgbox BattleFrontier_OutsideEast_Text_243598, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Maniac1:: @ 8242D79
+	msgbox BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82
-	msgbox BattleFrontier_OutsideEast_Text_243668, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Girl:: @ 8242D82
+	msgbox BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B
-	msgbox BattleFrontier_OutsideEast_Text_2436F2, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_PsychicM:: @ 8242D8B
+	msgbox BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94
-	msgbox BattleFrontier_OutsideEast_Text_243809, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Man3:: @ 8242D94
+	msgbox BattleFrontier_OutsideEast_Text_GotWipedOut, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D
-	msgbox BattleFrontier_OutsideEast_Text_243895, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Woman1:: @ 8242D9D
+	msgbox BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6
-	msgbox BattleFrontier_OutsideEast_Text_243943, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Woman2:: @ 8242DA6
+	msgbox BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF
-	msgbox BattleFrontier_OutsideEast_Text_2439A0, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_BlackBelt2:: @ 8242DAF
+	msgbox BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8
+BattleFrontier_OutsideEast_EventScript_Maniac2:: @ 8242DB8
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_243A2B, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3
+BattleFrontier_OutsideEast_EventScript_Woman3:: @ 8242DC3
 	lock
-	msgbox BattleFrontier_OutsideEast_Text_243A53, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE
-	msgbox BattleFrontier_OutsideEast_Text_242F0D, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_RankingHallSign:: @ 8242DCE
+	msgbox BattleFrontier_OutsideEast_Text_RankingHallSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7
-	msgbox BattleFrontier_OutsideEast_Text_242F4A, MSGBOX_SIGN
+BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign:: @ 8242DD7
+	msgbox BattleFrontier_OutsideEast_Text_ExchangeCornerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
-	msgbox BattleFrontier_OutsideEast_Text_243B68, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Gentleman:: @ 8242DE0
+	msgbox BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
+BattleFrontier_OutsideEast_EventScript_OldWoman:: @ 8242DE9
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242DFE
-	msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone
+	msgbox BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE
-	msgbox BattleFrontier_OutsideEast_Text_243CA3, MSGBOX_DEFAULT
+BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone:: @ 8242DFE
+	msgbox BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08
-	msgbox BattleFrontier_OutsideEast_Text_243D0B, MSGBOX_NPC
+BattleFrontier_OutsideEast_EventScript_Camper:: @ 8242E08
+	msgbox BattleFrontier_OutsideEast_Text_StickyMonWithLongTail, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_Text_242E11: @ 8242E11
+BattleFrontier_OutsideEast_Text_BattleTowerSign: @ 8242E11
 	.string "This is the BATTLE TOWER!\n"
 	.string "Keep the win streak as the toughest\l"
 	.string "TRAINER!$"
 
-BattleFrontier_OutsideEast_Text_242E58: @ 8242E58
+BattleFrontier_OutsideEast_Text_BattlePalaceSign: @ 8242E58
 	.string "This is the BATTLE PALACE!\n"
 	.string "Keep your eyes on POKéMON battles!$"
 
-BattleFrontier_OutsideEast_Text_242E96: @ 8242E96
+BattleFrontier_OutsideEast_Text_BattleArenaSign: @ 8242E96
 	.string "This is the BATTLE ARENA!\n"
 	.string "Let the toughest teams gather!$"
 
-BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF
+BattleFrontier_OutsideEast_Text_BattlePyramidSign: @ 8242ECF
 	.string "This is the BATTLE PYRAMID!\n"
 	.string "Advance through the Battle Quest!$"
 
-BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D
+BattleFrontier_OutsideEast_Text_RankingHallSign: @ 8242F0D
 	.string "BATTLE FRONTIER RANKING HALL\n"
 	.string "Set your sights on new records!$"
 
-BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A
+BattleFrontier_OutsideEast_Text_ExchangeCornerSign: @ 8242F4A
 	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
 	.string "Exchange your Battle Points!$"
 
-BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C
+BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial: @ 8242F8C
 	.string "Wow!\n"
 	.string "It's huge!\p"
 	.string "The BATTLE TOWER feels special.\n"
 	.string "It's different from the others.$"
 
-BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
+BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier: @ 8242FDC
 	.string "My grand ambition is to conquer both\n"
 	.string "the BATTLE FRONTIER and the POKéMON\l"
 	.string "LEAGUE.\p"
@@ -274,26 +274,26 @@ BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
 	.string "I… I'm going to ask MIMI next door\n"
 	.string "if she will be friends with me!$"
 
-BattleFrontier_OutsideEast_Text_24308C: @ 824308C
+BattleFrontier_OutsideEast_Text_PyramidTooHarsh: @ 824308C
 	.string "The BATTLE PYRAMID's too harsh!\n"
 	.string "I just can't make it to the top!\p"
 	.string "Since I'm out of options, maybe I can\n"
 	.string "climb the outside…$"
 
-BattleFrontier_OutsideEast_Text_243106: @ 8243106
+BattleFrontier_OutsideEast_Text_ThriveInDarkness: @ 8243106
 	.string "I thrive in darkness…\n"
 	.string "Yes… What is worthy of me?\l"
 	.string "None other than the BATTLE PYRAMID…\p"
 	.string "What say you to wandering in darkness\n"
 	.string "and in utter and total desperation?$"
 
-BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5
+BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam: @ 82431A5
 	.string "I didn't sleep for a week, but then\n"
 	.string "I put together the ultimate team!\p"
 	.string "I can't see myself losing, no joke.\n"
 	.string "We're storming the BATTLE ARENA!$"
 
-BattleFrontier_OutsideEast_Text_243230: @ 8243230
+BattleFrontier_OutsideEast_Text_DidScottBringYouHere: @ 8243230
 	.string "Did SCOTT bring you here, too?\n"
 	.string "What is it with that guy?\p"
 	.string "It sounds like he really does know\n"
@@ -301,16 +301,16 @@ BattleFrontier_OutsideEast_Text_243230: @ 8243230
 	.string "I've never seen him battling in person\n"
 	.string "ever.$"
 
-BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD
+BattleFrontier_OutsideEast_Text_BelieveInYouBuddy: @ 82432DD
 	.string "ZIGG!\n"
 	.string "I believe in you, little buddy!\p"
 	.string "I'll make my little ZIGG any favorite\n"
 	.string "tasty treats you like if you win!$"
 
-BattleFrontier_OutsideEast_Text_24334B: @ 824334B
+BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant: @ 824334B
 	.string "ZIGZAGOON looks vacant…$"
 
-BattleFrontier_OutsideEast_Text_243363: @ 8243363
+BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody: @ 8243363
 	.string "People call me a busybody,\n"
 	.string "but I can't help it.\p"
 	.string "Your hat's on crooked!\n"
@@ -319,29 +319,29 @@ BattleFrontier_OutsideEast_Text_243363: @ 8243363
 	.string "I don't know if I can stand to just\n"
 	.string "watch at the BATTLE PALACE…$"
 
-BattleFrontier_OutsideEast_Text_243425: @ 8243425
+BattleFrontier_OutsideEast_Text_OnceBeatGymLeader: @ 8243425
 	.string "I may not look that impressive now,\n"
 	.string "but I once beat a GYM LEADER.\p"
 	.string "Who knows, maybe I should give it\n"
 	.string "another shot at glory.$"
 
-BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0
+BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles: @ 82434A0
 	.string "I'm fast on my BIKE, and that goes for\n"
 	.string "the way I battle, too.\p"
 	.string "I win matches in the blink of\n"
 	.string "an eye!$"
 
-BattleFrontier_OutsideEast_Text_243504: @ 8243504
+BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon: @ 8243504
 	.string "I'm better than my daddy\n"
 	.string "at POKéMON.$"
 
-BattleFrontier_OutsideEast_Text_243529: @ 8243529
+BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy: @ 8243529
 	.string "Go on, my baby sweetie!\n"
 	.string "Go rack up some wins for Daddy!\p"
 	.string "You're just like your mother,\n"
 	.string "so you'll be dominating!$"
 
-BattleFrontier_OutsideEast_Text_243598: @ 8243598
+BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena: @ 8243598
 	.string "It wasn't easy getting here,\n"
 	.string "but I'd heard about this knockout\l"
 	.string "pretty girl at the BATTLE ARENA.\p"
@@ -350,13 +350,13 @@ BattleFrontier_OutsideEast_Text_243598: @ 8243598
 	.string "A whole teeming mob of sweaty,\n"
 	.string "stinky, and primitive martial artists!$"
 
-BattleFrontier_OutsideEast_Text_243668: @ 8243668
+BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere: @ 8243668
 	.string "I sometimes see this really important-\n"
 	.string "looking old man going in there.\p"
 	.string "He has these really awesome POKéMON.\n"
 	.string "He seems really nice, though.$"
 
-BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
+BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid: @ 82436F2
 	.string "Do you know it?\n"
 	.string "The legend of the BATTLE PYRAMID?\p"
 	.string "When there comes a confident TRAINER\n"
@@ -368,7 +368,7 @@ BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
 	.string "What's it supposed to mean?\n"
 	.string "That, my friend, I can't say!$"
 
-BattleFrontier_OutsideEast_Text_243809: @ 8243809
+BattleFrontier_OutsideEast_Text_GotWipedOut: @ 8243809
 	.string "Man! Oh man!\n"
 	.string "I've never lost once before!\p"
 	.string "But I got wiped out with no saving\n"
@@ -376,7 +376,7 @@ BattleFrontier_OutsideEast_Text_243809: @ 8243809
 	.string "And then I'm told I don't have any\n"
 	.string "talent?! Man!$"
 
-BattleFrontier_OutsideEast_Text_243895: @ 8243895
+BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower: @ 8243895
 	.string "This guy ran into a horribly tough\n"
 	.string "TRAINER while he was on the BATTLE\l"
 	.string "TOWER challenge.\p"
@@ -384,23 +384,23 @@ BattleFrontier_OutsideEast_Text_243895: @ 8243895
 	.string "You need to be cautious if you ever\n"
 	.string "decide to go to the BATTLE TOWER.$"
 
-BattleFrontier_OutsideEast_Text_243943: @ 8243943
+BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll: @ 8243943
 	.string "Yes!\n"
 	.string "I've finally got enough Battle Points!\p"
 	.string "I guess I'll trade for another giant\n"
 	.string "plush DOLL!$"
 
-BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0
+BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere: @ 82439A0
 	.string "Oh, yeah, okay!\n"
 	.string "So this is the RANKING HALL!\p"
 	.string "I'd like to go down in history as\n"
 	.string "a super champ and have my name\l"
 	.string "recorded here for posterity.$"
 
-BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B
+BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou: @ 8243A2B
 	.string "With you by my side, I can do anything.$"
 
-BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
+BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome: @ 8243A53
 	.string "Ooh, darling, you are so wonderful!\p"
 	.string "Ooh, I just can't wait anymore!\p"
 	.string "Let's go to a MULTI BATTLE ROOM\n"
@@ -411,7 +411,7 @@ BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
 	.string "Why, before us, darling, everything\n"
 	.string "will topple like dominoes!$"
 
-BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
+BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers: @ 8243B68
 	.string "The BATTLE FRONTIER isn't exclusively\n"
 	.string "for tough TRAINERS.\p"
 	.string "Many people with special abilities\n"
@@ -420,19 +420,19 @@ BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
 	.string "He may have built this place to serve\n"
 	.string "a bigger objective…$"
 
-BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C
+BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle: @ 8243C2C
 	.string "Excuse me, young one.\n"
 	.string "Have you good eyesight?\p"
 	.string "There is an odd tree past here, and to\n"
 	.string "my tired eyes it seems to wiggle.$"
 
-BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3
+BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere: @ 8243CA3
 	.string "Excuse me, young one.\n"
 	.string "Have you a good memory?\p"
 	.string "I have this feeling there once was\n"
 	.string "an odd tree past here.$"
 
-BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B
+BattleFrontier_OutsideEast_Text_StickyMonWithLongTail: @ 8243D0B
 	.string "I…\n"
 	.string "I saw it!\p"
 	.string "There was a sticky sort of a POKéMON\n"
diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json
index a2972e0b4..42b76323a 100644
--- a/data/maps/BattleFrontier_OutsideWest/map.json
+++ b/data/maps/BattleFrontier_OutsideWest/map.json
@@ -30,7 +30,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D50F",
+      "script": "BattleFrontier_OutsideWest_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -56,7 +56,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D3F0",
+      "script": "BattleFrontier_OutsideWest_EventScript_FerryAttendant",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D68B",
+      "script": "BattleFrontier_OutsideWest_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -82,7 +82,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D52D",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -95,7 +95,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D69D",
+      "script": "BattleFrontier_OutsideWest_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -108,7 +108,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6A6",
+      "script": "BattleFrontier_OutsideWest_EventScript_FatMan1",
       "flag": "0"
     },
     {
@@ -121,7 +121,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D679",
+      "script": "BattleFrontier_OutsideWest_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -134,7 +134,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D536",
+      "script": "BattleFrontier_OutsideWest_EventScript_Maniac1",
       "flag": "0"
     },
     {
@@ -147,7 +147,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D53D",
+      "script": "BattleFrontier_OutsideWest_EventScript_Maniac2",
       "flag": "0"
     },
     {
@@ -160,7 +160,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D694",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -173,7 +173,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D5C6",
+      "script": "BattleFrontier_OutsideWest_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -186,7 +186,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D635",
+      "script": "BattleFrontier_OutsideWest_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -199,7 +199,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D57F",
+      "script": "BattleFrontier_OutsideWest_EventScript_Camper",
       "flag": "0"
     },
     {
@@ -212,7 +212,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D682",
+      "script": "BattleFrontier_OutsideWest_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -225,7 +225,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_249E19",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -238,7 +238,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D667",
+      "script": "BattleFrontier_OutsideWest_EventScript_Fisherman1",
       "flag": "0"
     },
     {
@@ -251,7 +251,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D518",
+      "script": "BattleFrontier_OutsideWest_EventScript_Fisherman2",
       "flag": "0"
     },
     {
@@ -264,7 +264,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6AF",
+      "script": "BattleFrontier_OutsideWest_EventScript_FatMan2",
       "flag": "0"
     },
     {
@@ -277,7 +277,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6B8",
+      "script": "BattleFrontier_OutsideWest_EventScript_Woman3",
       "flag": "0"
     },
     {
@@ -290,7 +290,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6C3",
+      "script": "BattleFrontier_OutsideWest_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -303,7 +303,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6CE",
+      "script": "BattleFrontier_OutsideWest_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -316,7 +316,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6D7",
+      "script": "BattleFrontier_OutsideWest_EventScript_Man4",
       "flag": "0"
     },
     {
@@ -329,7 +329,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D6EE",
+      "script": "BattleFrontier_OutsideWest_EventScript_PokefanF",
       "flag": "0"
     }
   ],
@@ -420,7 +420,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D4E2"
+      "script": "BattleFrontier_OutsideWest_EventScript_BattleDomeSign"
     },
     {
       "type": "sign",
@@ -428,7 +428,7 @@
       "y": 30,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D4F4"
+      "script": "BattleFrontier_OutsideWest_EventScript_BattlePikeSign"
     },
     {
       "type": "sign",
@@ -436,7 +436,7 @@
       "y": 43,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_23D4EB"
+      "script": "BattleFrontier_OutsideWest_EventScript_BattleFactorySign"
     },
     {
       "type": "sign",
diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
index 41d52ba7c..4fb750023 100644
--- a/data/maps/BattleFrontier_OutsideWest/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -1,67 +1,67 @@
 BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
+BattleFrontier_OutsideWest_OnTransition: @ 823D3E7
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
+BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
 	lock
 	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_MayISeeYourTicket, MSGBOX_DEFAULT
 	checkitem ITEM_SS_TICKET, 1
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D44E
-	message BattleFrontier_OutsideWest_Text_23D89D
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_NoSSTicket
+	message BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo
 	waitmessage
-	goto BattleFrontier_OutsideWest_EventScript_23D416
+	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416
+BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
 	multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_OutsideWest_EventScript_23D458
-	case 1, BattleFrontier_OutsideWest_EventScript_23D483
-	case 2, BattleFrontier_OutsideWest_EventScript_23D4D8
-	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_23D4D8
+	case 0, BattleFrontier_OutsideWest_EventScript_FerryToSlateport
+	case 1, BattleFrontier_OutsideWest_EventScript_FerryToLilycove
+	case 2, BattleFrontier_OutsideWest_EventScript_CancelFerrySelect
+	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_CancelFerrySelect
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E
-	msgbox BattleFrontier_OutsideWest_Text_23D842, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_NoSSTicket:: @ 823D44E
+	msgbox BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458
-	msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO
+BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: @ 823D458
+	msgbox BattleFrontier_OutsideWest_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE
-	msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT
-	call BattleFrontier_OutsideWest_EventScript_23D4BA
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
+	msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
+	call BattleFrontier_OutsideWest_EventScript_BoardFerry
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483
-	msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO
+BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: @ 823D483
+	msgbox BattleFrontier_OutsideWest_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE
-	msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT
-	call BattleFrontier_OutsideWest_EventScript_23D4BA
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
+	msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
+	call BattleFrontier_OutsideWest_EventScript_BoardFerry
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
-	message BattleFrontier_OutsideWest_Text_23D97A
+BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination:: @ 823D4AE
+	message BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo
 	waitmessage
-	goto BattleFrontier_OutsideWest_EventScript_23D416
+	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
+BattleFrontier_OutsideWest_EventScript_BoardFerry:: @ 823D4BA
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -71,39 +71,41 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
 	call Common_EventScript_FerryDepartIsland
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8
-	msgbox BattleFrontier_OutsideWest_Text_23D929, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_CancelFerrySelect:: @ 823D4D8
+	msgbox BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2
-	msgbox BattleFrontier_OutsideWest_Text_23D6F7, MSGBOX_SIGN
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign:: @ 823D4E2
+	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB
-	msgbox BattleFrontier_OutsideWest_Text_23D737, MSGBOX_SIGN
+BattleFrontier_OutsideWest_EventScript_BattleFactorySign:: @ 823D4EB
+	msgbox BattleFrontier_OutsideWest_Text_BattleFactorySign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4
-	msgbox BattleFrontier_OutsideWest_Text_23D772, MSGBOX_SIGN
+BattleFrontier_OutsideWest_EventScript_BattlePikeSign:: @ 823D4F4
+	msgbox BattleFrontier_OutsideWest_Text_BattlePikeSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD
-	msgbox BattleFrontier_OutsideWest_Text_23D7A6, MSGBOX_NPC
+@ Unused. Of note, Battle Tower is in the East section in the final release
+BattleFrontier_OutsideWest_EventScript_UnusedNPC1:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_ThisIsBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD
-	msgbox BattleFrontier_OutsideWest_Text_23D9DD, MSGBOX_NPC
+@ Unused
+BattleFrontier_OutsideWest_EventScript_UnusedNPC2:: @ 823D4FD
+	msgbox BattleFrontier_OutsideWest_Text_CantFindBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F
-	msgbox BattleFrontier_OutsideWest_Text_23D99C, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Boy1:: @ 823D50F
+	msgbox BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
+BattleFrontier_OutsideWest_EventScript_Fisherman2:: @ 823D518
 	lock
 	faceplayer
-	message BattleFrontier_OutsideWest_Text_23DA60
+	message BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere
 	waitmessage
 	applymovement 18, Common_Movement_FaceAwayPlayer
 	waitmovement 0
@@ -111,27 +113,27 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D
-	msgbox BattleFrontier_OutsideWest_Text_23DABF, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Man1:: @ 823D52D
+	msgbox BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536
+BattleFrontier_OutsideWest_EventScript_Maniac1:: @ 823D536
 	lock
-	goto BattleFrontier_OutsideWest_EventScript_23D544
+	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
+BattleFrontier_OutsideWest_EventScript_Maniac2:: @ 823D53D
 	lock
-	goto BattleFrontier_OutsideWest_EventScript_23D544
+	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
+BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: @ 823D544
 	applymovement 9, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT
 	applymovement 10, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons, MSGBOX_DEFAULT
 	closemessage
 	delay 25
 	applymovement 9, Common_Movement_WalkInPlaceFastestUp
@@ -140,239 +142,240 @@ BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
+BattleFrontier_OutsideWest_EventScript_Camper:: @ 823D57F
 	lock
 	faceplayer
 	delay 20
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
 	compare VAR_FACING, DIR_EAST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
-	msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT
+	call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
+	msgbox BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
+BattleFrontier_OutsideWest_EventScript_CamperFaceFactory:: @ 823D5BA
 	applymovement 14, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D5C5:: @ 823D5C5
+BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory:: @ 823D5C5
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
+BattleFrontier_OutsideWest_EventScript_Girl:: @ 823D5C6
 	lock
 	faceplayer
-	message BattleFrontier_OutsideWest_Text_23DCB0
+	message BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper
 	waitmessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D608
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D613
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderWest
 	compare VAR_FACING, DIR_EAST
-	call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E
+	call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderEast
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D5FD:: @ 823D5FD
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D629
+BattleFrontier_OutsideWest_EventScript_GirlShudderNorth:: @ 823D5FD
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderNorth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D608:: @ 823D608
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62C
+BattleFrontier_OutsideWest_EventScript_GirlShudderSouth:: @ 823D608
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderSouth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D613:: @ 823D613
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D62F
+BattleFrontier_OutsideWest_EventScript_GirlShudderWest:: @ 823D613
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderWest
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E
-	applymovement 12, BattleFrontier_OutsideWest_Movement_23D632
+BattleFrontier_OutsideWest_EventScript_GirlShudderEast:: @ 823D61E
+	applymovement 12, BattleFrontier_OutsideWest_Movement_GirlShudderEast
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_Movement_23D629: @ 823D629
+BattleFrontier_OutsideWest_Movement_GirlShudderNorth: @ 823D629
 	walk_in_place_fastest_down
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C
+BattleFrontier_OutsideWest_Movement_GirlShudderSouth: @ 823D62C
 	walk_in_place_fastest_up
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F
+BattleFrontier_OutsideWest_Movement_GirlShudderWest: @ 823D62F
 	walk_in_place_fastest_right
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_OutsideWest_Movement_23D632: @ 823D632
+BattleFrontier_OutsideWest_Movement_GirlShudderEast: @ 823D632
 	walk_in_place_fastest_left
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635
+BattleFrontier_OutsideWest_EventScript_Woman2:: @ 823D635
 	lock
 	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors, MSGBOX_DEFAULT
 	random 2
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_OutsideWest_EventScript_23D653
-	goto BattleFrontier_OutsideWest_EventScript_23D65D
+	goto_if_eq BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors
+	goto BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653
-	msgbox BattleFrontier_OutsideWest_Text_23DD7A, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors:: @ 823D653
+	msgbox BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D
-	msgbox BattleFrontier_OutsideWest_Text_23DDAD, MSGBOX_DEFAULT
+BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors:: @ 823D65D
+	msgbox BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667
-	msgbox BattleFrontier_OutsideWest_Text_23DE15, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Fisherman1:: @ 823D667
+	msgbox BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670
-	msgbox BattleFrontier_OutsideWest_Text_23DF7D, MSGBOX_NPC
+@ Unused
+BattleFrontier_OutsideWest_EventScript_UnusedNPC3:: @ 823D670
+	msgbox BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679
-	msgbox BattleFrontier_OutsideWest_Text_23DEFD, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Gentleman:: @ 823D679
+	msgbox BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682
-	msgbox BattleFrontier_OutsideWest_Text_23DEB4, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Lass:: @ 823D682
+	msgbox BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B
-	msgbox BattleFrontier_OutsideWest_Text_23DFBF, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_ExpertM:: @ 823D68B
+	msgbox BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694
-	msgbox BattleFrontier_OutsideWest_Text_23E01E, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Man2:: @ 823D694
+	msgbox BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D
-	msgbox BattleFrontier_OutsideWest_Text_23E09F, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_Woman1:: @ 823D69D
+	msgbox BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6
-	msgbox BattleFrontier_OutsideWest_Text_23E102, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_FatMan1:: @ 823D6A6
+	msgbox BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF
-	msgbox BattleFrontier_OutsideWest_Text_23E154, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_FatMan2:: @ 823D6AF
+	msgbox BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8
+BattleFrontier_OutsideWest_EventScript_Woman3:: @ 823D6B8
 	lock
-	msgbox BattleFrontier_OutsideWest_Text_23E273, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3
+BattleFrontier_OutsideWest_EventScript_Boy2:: @ 823D6C3
 	lock
-	msgbox BattleFrontier_OutsideWest_Text_23E2E9, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE
-	msgbox BattleFrontier_OutsideWest_Text_23E37E, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_OldMan:: @ 823D6CE
+	msgbox BattleFrontier_OutsideWest_Text_DomeAceIsMine, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
+BattleFrontier_OutsideWest_EventScript_Man4:: @ 823D6D7
 	lock
 	faceplayer
-	msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT
+	msgbox BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers, MSGBOX_DEFAULT
 	closemessage
 	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE
-	msgbox BattleFrontier_OutsideWest_Text_23E5A5, MSGBOX_NPC
+BattleFrontier_OutsideWest_EventScript_PokefanF:: @ 823D6EE
+	msgbox BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7
+BattleFrontier_OutsideWest_Text_BattleDomeSign: @ 823D6F7
 	.string "This is the BATTLE DOME!\n"
 	.string "Your path to the invincible superstar!$"
 
-BattleFrontier_OutsideWest_Text_23D737: @ 823D737
+BattleFrontier_OutsideWest_Text_BattleFactorySign: @ 823D737
 	.string "This is the BATTLE FACTORY!\n"
 	.string "Seek out the toughest POKéMON!$"
 
-BattleFrontier_OutsideWest_Text_23D772: @ 823D772
+BattleFrontier_OutsideWest_Text_BattlePikeSign: @ 823D772
 	.string "This is the BATTLE PIKE!\n"
 	.string "Choose one of three paths!$"
 
-BattleFrontier_OutsideWest_Text_23D7A6: @ 823D7A6
+BattleFrontier_OutsideWest_Text_ThisIsBattleTower: @ 823D7A6
 	.string "This is the BATTLE TOWER.\p"
 	.string "TRAINERS bring their best-raised\n"
 	.string "POKéMON for elimination-style matches.$"
 
-BattleFrontier_OutsideWest_Text_23D808: @ 823D808
+BattleFrontier_OutsideWest_Text_MayISeeYourTicket: @ 823D808
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-BattleFrontier_OutsideWest_Text_23D842: @ 823D842
+BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard: @ 823D842
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D
+BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo: @ 823D89D
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2
+BattleFrontier_OutsideWest_Text_SlateportItIs: @ 823D8F2
 	.string "SLATEPORT CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_23D90E: @ 823D90E
+BattleFrontier_OutsideWest_Text_LilycoveItIs: @ 823D90E
 	.string "LILYCOVE CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_23D929: @ 823D929
+BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime: @ 823D929
 	.string "Please sail with us another time!$"
 
-BattleFrontier_OutsideWest_Text_23D94B: @ 823D94B
+BattleFrontier_OutsideWest_Text_PleaseBoardFerry: @ 823D94B
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A
+BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo: @ 823D97A
 	.string "Then, where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C
+BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends: @ 823D99C
 	.string "I'm the best out of all my friends.\n"
 	.string "But here…\l"
 	.string "I've been useless!$"
 
-BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD
+BattleFrontier_OutsideWest_Text_CantFindBattleTower: @ 823D9DD
 	.string "I want to go to the BATTLE TOWER,\n"
 	.string "but I can't find it even though I have\l"
 	.string "a map of the BATTLE FRONTIER.\p"
 	.string "This place is just too big!$"
 
-BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60
+BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere: @ 823DA60
 	.string "I wanted to take a challenge as soon\n"
 	.string "as I arrived here.\p"
 	.string "But on the way, I got seasick…\n"
 	.string "Urrrrp…$"
 
-BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF
+BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere: @ 823DABF
 	.string "It's not as if just anyone can come\n"
 	.string "here, you know?\p"
 	.string "Only those TRAINERS who've been\n"
@@ -380,94 +383,94 @@ BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF
 	.string "That's why many TRAINERS don't even\n"
 	.string "know about the BATTLE FRONTIER.$"
 
-BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D
+BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons: @ 823DB7D
 	.string "Hey, bro…\p"
 	.string "Are you sure we can make challenges\n"
 	.string "even if we don't have any POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE
+BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons: @ 823DBCE
 	.string "Uh…\n"
 	.string "I'm sure it'll be okay.\p"
 	.string "I think…\p"
 	.string "But remember that big scary guy?\n"
 	.string "He said, “I'll lend you POKéMON!”$"
 
-BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36
+BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons: @ 823DC36
 	.string "That's the BATTLE FACTORY.\n"
 	.string "You can rent strong POKéMON there.\p"
 	.string "But it makes me wonder.\n"
 	.string "Who's raising those rental POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0
+BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper: @ 823DCB0
 	.string "I'm scared of going into the BATTLE\n"
 	.string "PIKE because of SEVIPER…\p"
 	.string "B-but I came all the way here, so I will\n"
 	.string "try to conquer everything!\l"
 	.string "…Shudder…$"
 
-BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B
+BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors: @ 823DD3B
 	.string "Let's play rock, paper, scissors!\n"
 	.string "One, two, three!\p"
 	.string "… … … … … …$"
 
-BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A
+BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge: @ 823DD7A
 	.string "Yay! I won!\n"
 	.string "I will take the BATTLE PIKE challenge!$"
 
-BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD
+BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge: @ 823DDAD
 	.string "Oh, no…\n"
 	.string "I lost.\p"
 	.string "I guess I'm not very lucky today.\n"
 	.string "I'll put off my BATTLE PIKE challenge\l"
 	.string "until tomorrow.$"
 
-BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15
+BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling: @ 823DE15
 	.string "I believe I'm the only person here who,\n"
 	.string "for some unknown reason, would choose\l"
 	.string "fishing over battling.\p"
 	.string "Huh? You can't catch anything here?\n"
 	.string "That's disappointing…$"
 
-BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4
+BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol: @ 823DEB4
 	.string "Today, I'm going to keep battling, no\n"
 	.string "matter what, until I get a Symbol.$"
 
-BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD
+BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome: @ 823DEFD
 	.string "Oh? You're off to challenge\n"
 	.string "the BATTLE DOME?\p"
 	.string "I'll wish you the best of luck.\n"
 	.string "Let us both win our way up and meet\l"
 	.string "in challenges.$"
 
-BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D
+BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa: @ 823DF7D
 	.string "Grandpa, over here!\n"
 	.string "The BATTLE DOME is here!\l"
 	.string "Go get 'em, Grandpa!$"
 
-BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF
+BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe: @ 823DFBF
 	.string "Ah, so this here is the BATTLE DOME?\n"
 	.string "I won't let GENTLEMEN beat me!\p"
 	.string "But where is the entrance?$"
 
-BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E
+BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo: @ 823E01E
 	.string "There used to be nothing here not all\n"
 	.string "that long ago.\p"
 	.string "But, now look at this place! Amazing!\n"
 	.string "I'll bring my mother out to see this.$"
 
-BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F
+BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier: @ 823E09F
 	.string "I've finally arrived at the BATTLE\n"
 	.string "FRONTIER!\p"
 	.string "I'm sure to grab attention with\n"
 	.string "my looks and ability!$"
 
-BattleFrontier_OutsideWest_Text_23E102: @ 823E102
+BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople: @ 823E102
 	.string "Munch, munch…\p"
 	.string "It looks like this square's filled with\n"
 	.string "tough people.\p"
 	.string "Munch, munch…$"
 
-BattleFrontier_OutsideWest_Text_23E154: @ 823E154
+BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike: @ 823E154
 	.string "Crunch, munch…\p"
 	.string "A while back, I met this older girl\n"
 	.string "at the BATTLE PIKE.\p"
@@ -480,13 +483,13 @@ BattleFrontier_OutsideWest_Text_23E154: @ 823E154
 	.string "scary experience, sure enough.\p"
 	.string "Crunch, munch…$"
 
-BattleFrontier_OutsideWest_Text_23E273: @ 823E273
+BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet: @ 823E273
 	.string "Huh? Will you listen to yourself?\n"
 	.string "That's nothing!\p"
 	.string "Why, the last time I cheered for him,\n"
 	.string "our eyes met and sparks flew!$"
 
-BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9
+BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering: @ 823E2E9
 	.string "Whaaaaaat?!\n"
 	.string "Pfft!\p"
 	.string "That only happened because\n"
@@ -494,7 +497,7 @@ BattleFrontier_OutsideWest_Text_23E2E9: @ 823E2E9
 	.string "The DOME ACE only looked our way\n"
 	.string "because my cheering was so loud!$"
 
-BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E
+BattleFrontier_OutsideWest_Text_DomeAceIsMine: @ 823E37E
 	.string "Oh, shush!\n"
 	.string "Keep that racket down!\p"
 	.string "You fair-weather fans should stick\n"
@@ -502,7 +505,7 @@ BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E
 	.string "The DOME ACE is mine!\n"
 	.string "The only idol for me!$"
 
-BattleFrontier_OutsideWest_Text_23E410: @ 823E410
+BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers: @ 823E410
 	.string "Those people squabbling over there…\p"
 	.string "It's hard to believe, but they once\n"
 	.string "were TRAINERS, and good ones, too.\p"
@@ -516,7 +519,7 @@ BattleFrontier_OutsideWest_Text_23E410: @ 823E410
 	.string "They go cheer for their idol at the\l"
 	.string "BATTLE DOME every day now.$"
 
-BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5
+BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier: @ 823E5A5
 	.string "I heard a rumor that someone saw\n"
 	.string "a POKéMON with an unusually long tail\l"
 	.string "somewhere in the BATTLE FRONTIER.\p"
diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json
index af28ecea6..f26e03e41 100644
--- a/data/maps/BattleFrontier_RankingHall/map.json
+++ b/data/maps/BattleFrontier_RankingHall/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E52F",
+      "script": "BattleFrontier_RankingHall_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E54A",
+      "script": "BattleFrontier_RankingHall_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E573",
+      "script": "BattleFrontier_RankingHall_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -78,7 +78,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4AA"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerSinglesRecords"
     },
     {
       "type": "sign",
@@ -86,7 +86,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4B6"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerDoublesRecords"
     },
     {
       "type": "sign",
@@ -94,7 +94,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4C2"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerMultisRecords"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4CE"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerLinkRecords"
     },
     {
       "type": "sign",
@@ -110,7 +110,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4DA"
+      "script": "BattleFrontier_RankingHall_EventScript_ArenaRecords"
     },
     {
       "type": "sign",
@@ -118,7 +118,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4E6"
+      "script": "BattleFrontier_RankingHall_EventScript_PalaceRecords"
     },
     {
       "type": "sign",
@@ -126,7 +126,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4F2"
+      "script": "BattleFrontier_RankingHall_EventScript_FactoryRecords"
     },
     {
       "type": "sign",
@@ -134,7 +134,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4FE"
+      "script": "BattleFrontier_RankingHall_EventScript_DomeRecords"
     },
     {
       "type": "sign",
@@ -142,7 +142,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E50A"
+      "script": "BattleFrontier_RankingHall_EventScript_PikeRecords"
     },
     {
       "type": "sign",
@@ -150,7 +150,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E516"
+      "script": "BattleFrontier_RankingHall_EventScript_PyramidRecords"
     },
     {
       "type": "sign",
@@ -158,7 +158,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_RankingHall_EventScript_25E538"
+      "script": "BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign"
     },
     {
       "type": "sign",
@@ -166,7 +166,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_RankingHall_EventScript_25E541"
+      "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc
index 86682522c..e8415c828 100644
--- a/data/maps/BattleFrontier_RankingHall/scripts.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
@@ -1,67 +1,67 @@
 BattleFrontier_RankingHall_MapScripts:: @ 825E4A9
 	.byte 0
 
-BattleFrontier_RankingHall_EventScript_25E4AA:: @ 825E4AA
+BattleFrontier_RankingHall_EventScript_TowerSinglesRecords:: @ 825E4AA
 	lockall
-	setvar VAR_0x8005, 0
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4B6:: @ 825E4B6
+BattleFrontier_RankingHall_EventScript_TowerDoublesRecords:: @ 825E4B6
 	lockall
-	setvar VAR_0x8005, 1
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4C2:: @ 825E4C2
+BattleFrontier_RankingHall_EventScript_TowerMultisRecords:: @ 825E4C2
 	lockall
-	setvar VAR_0x8005, 2
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4CE:: @ 825E4CE
+BattleFrontier_RankingHall_EventScript_TowerLinkRecords:: @ 825E4CE
 	lockall
-	setvar VAR_0x8005, 9
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4DA:: @ 825E4DA
+BattleFrontier_RankingHall_EventScript_ArenaRecords:: @ 825E4DA
 	lockall
-	setvar VAR_0x8005, 5
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4E6:: @ 825E4E6
+BattleFrontier_RankingHall_EventScript_PalaceRecords:: @ 825E4E6
 	lockall
-	setvar VAR_0x8005, 4
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4F2:: @ 825E4F2
+BattleFrontier_RankingHall_EventScript_FactoryRecords:: @ 825E4F2
 	lockall
-	setvar VAR_0x8005, 6
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4FE:: @ 825E4FE
+BattleFrontier_RankingHall_EventScript_DomeRecords:: @ 825E4FE
 	lockall
-	setvar VAR_0x8005, 3
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E50A:: @ 825E50A
+BattleFrontier_RankingHall_EventScript_PikeRecords:: @ 825E50A
 	lockall
-	setvar VAR_0x8005, 7
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516
+BattleFrontier_RankingHall_EventScript_PyramidRecords:: @ 825E516
 	lockall
-	setvar VAR_0x8005, 8
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
+BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
 	special ShowRankingHallRecordsWindow
 	waitbuttonpress
 	special ScrollRankingHallRecordsWindow
@@ -70,64 +70,64 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
 	releaseall
 	end
 
-BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F
-	msgbox BattleFrontier_RankingHall_Text_25E57C, MSGBOX_NPC
+BattleFrontier_RankingHall_EventScript_Attendant:: @ 825E52F
+	msgbox BattleFrontier_RankingHall_Text_ExplainRankingHall, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538
-	msgbox BattleFrontier_RankingHall_Text_25E5F9, MSGBOX_SIGN
+BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign:: @ 825E538
+	msgbox BattleFrontier_RankingHall_Text_DomePikeFactoryRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541
-	msgbox BattleFrontier_RankingHall_Text_25E62E, MSGBOX_SIGN
+BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn:: @ 825E541
+	msgbox BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A
+BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
 	lock
 	faceplayer
-	msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO
+	msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq BattleFrontier_RankingHall_EventScript_25E569
-	msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList
+	msgbox BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569
-	msgbox BattleFrontier_RankingHall_Text_25E685, MSGBOX_DEFAULT
+BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList:: @ 825E569
+	msgbox BattleFrontier_RankingHall_Text_WowThatsSuper, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573
-	msgbox BattleFrontier_RankingHall_Text_25E715, MSGBOX_NPC
+BattleFrontier_RankingHall_EventScript_Boy:: @ 825E573
+	msgbox BattleFrontier_RankingHall_Text_MyNamesNotUpThere, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_Text_25E57C: @ 825E57C
+BattleFrontier_RankingHall_Text_ExplainRankingHall: @ 825E57C
 	.string "This is the RANKING HALL.\p"
 	.string "This is where we recognize the immortal\n"
 	.string "TRAINERS who left great records in\l"
 	.string "BATTLE FRONTIER events.$"
 
-BattleFrontier_RankingHall_Text_25E5F9: @ 825E5F9
+BattleFrontier_RankingHall_Text_DomePikeFactoryRecords: @ 825E5F9
 	.string "BATTLE DOME, BATTLE PIKE,\n"
 	.string "and BATTLE FACTORY Records$"
 
-BattleFrontier_RankingHall_Text_25E62E: @ 825E62E
+BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords: @ 825E62E
 	.string "BATTLE PALACE, BATTLE ARENA,\n"
 	.string "and BATTLE PYRAMID Records$"
 
-BattleFrontier_RankingHall_Text_25E666: @ 825E666
+BattleFrontier_RankingHall_Text_IsYourNameOnThisList: @ 825E666
 	.string "Hi, is your name on this list?$"
 
-BattleFrontier_RankingHall_Text_25E685: @ 825E685
+BattleFrontier_RankingHall_Text_WowThatsSuper: @ 825E685
 	.string "Wow, that's super!\n"
 	.string "I'll have to try harder, too!$"
 
-BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6
+BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName: @ 825E6B6
 	.string "Oh, is that right?\p"
 	.string "If you saw your friend's name up here,\n"
 	.string "I bet it would make you work harder!$"
 
-BattleFrontier_RankingHall_Text_25E715: @ 825E715
+BattleFrontier_RankingHall_Text_MyNamesNotUpThere: @ 825E715
 	.string "Hmm…\n"
 	.string "My name's not up there…\p"
 	.string "Well, it's only natural since I haven't\n"
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json
index db140442e..ff891ad5b 100644
--- a/data/maps/BattleFrontier_ReceptionGate/map.json
+++ b/data/maps/BattleFrontier_ReceptionGate/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_2662FC",
+      "script": "BattleFrontier_ReceptionGate_EventScript_Greeter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_266310",
+      "script": "BattleFrontier_ReceptionGate_EventScript_FacilityGuide",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_266436",
+      "script": "BattleFrontier_ReceptionGate_EventScript_RulesGuide",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ReceptionGate_EventScript_2664F4",
+      "script": "BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 640309975..cb01034ad 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -1,5 +1,5 @@
 BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
 	.byte 0
 
@@ -7,11 +7,11 @@ BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
 	setflag FLAG_LANDMARK_BATTLE_FRONTIER
 	end
 
-BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
-	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
+BattleFrontier_ReceptionGate_OnFrame: @ 82661E9
+	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering
 	.2byte 0
 
-BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
+BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
 	lockall
 	setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
 	playse SE_PIN
@@ -19,24 +19,24 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D2
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter
 	waitmovement 0
-	goto BattleFrontier_ReceptionGate_EventScript_266229
+	goto BattleFrontier_ReceptionGate_EventScript_ScottScene
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
-	msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT
-	msgbox BattleFrontier_ReceptionGate_Text_2665F7, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
+	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message BattleFrontier_ReceptionGate_Text_266676
+	message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass
 	waitfanfare
 	waitmessage
-	msgbox BattleFrontier_ReceptionGate_Text_266695, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass, MSGBOX_DEFAULT
 	setflag FLAG_SYS_FRONTIER_PASS
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
-	msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	applymovement 2, Common_Movement_WalkInPlaceFastestUp
@@ -47,29 +47,29 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
 	applymovement 2, Common_Movement_ExclamationMark
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D7
-	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_GreeterFaceScott
+	applymovement 2, BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott
+	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott
+	applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottEnter
 	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8
+	applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottExit
 	waitmovement 0
 	removeobject 4
 	releaseall
 	end
 
-BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2
+BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter: @ 82662D2
 	walk_up
 	walk_up
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
+BattleFrontier_ReceptionGate_Movement_PlayerFaceScott: @ 82662D7
 	delay_16
 	delay_16
 	delay_16
@@ -77,12 +77,13 @@ BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD
+@ Unused
+BattleFrontier_ReceptionGate_Movement_WalkDown: @ 82662DD
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
+BattleFrontier_ReceptionGate_Movement_ScottEnter: @ 82662E0
 	walk_down
 	walk_down
 	walk_down
@@ -92,7 +93,7 @@ BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
+BattleFrontier_ReceptionGate_Movement_ScottExit: @ 82662E8
 	walk_right
 	walk_up
 	walk_up
@@ -102,7 +103,7 @@ BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
 	walk_up
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
+BattleFrontier_ReceptionGate_Movement_GreeterFaceScott: @ 82662F0
 	delay_16
 	delay_16
 	delay_16
@@ -110,7 +111,7 @@ BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
+BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: @ 82662F6
 	delay_16
 	delay_16
 	delay_16
@@ -118,217 +119,217 @@ BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC
+BattleFrontier_ReceptionGate_EventScript_Greeter:: @ 82662FC
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
+BattleFrontier_ReceptionGate_EventScript_FacilityGuide:: @ 8266310
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_266857, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFacilities, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
-	message BattleFrontier_ReceptionGate_Text_26689D
+BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout:: @ 8266320
+	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich2
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
 	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
-	case 1, BattleFrontier_ReceptionGate_EventScript_2663BC
-	case 2, BattleFrontier_ReceptionGate_EventScript_2663CA
-	case 3, BattleFrontier_ReceptionGate_EventScript_2663D8
-	case 4, BattleFrontier_ReceptionGate_EventScript_2663E6
-	case 5, BattleFrontier_ReceptionGate_EventScript_2663F4
-	case 6, BattleFrontier_ReceptionGate_EventScript_266402
-	case 7, BattleFrontier_ReceptionGate_EventScript_266410
-	case 8, BattleFrontier_ReceptionGate_EventScript_26641E
-	case 9, BattleFrontier_ReceptionGate_EventScript_26642C
-	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_26642C
+	case 0, BattleFrontier_ReceptionGate_EventScript_BattleTower
+	case 1, BattleFrontier_ReceptionGate_EventScript_BattleDome
+	case 2, BattleFrontier_ReceptionGate_EventScript_BattlePalace
+	case 3, BattleFrontier_ReceptionGate_EventScript_BattleArena
+	case 4, BattleFrontier_ReceptionGate_EventScript_BattleFactory
+	case 5, BattleFrontier_ReceptionGate_EventScript_BattlePike
+	case 6, BattleFrontier_ReceptionGate_EventScript_BattlePyramid
+	case 7, BattleFrontier_ReceptionGate_EventScript_RankingHall
+	case 8, BattleFrontier_ReceptionGate_EventScript_ExchangeCorner
+	case 9, BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE
-	msgbox BattleFrontier_ReceptionGate_Text_2668C2, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleTower:: @ 82663AE
+	msgbox BattleFrontier_ReceptionGate_Text_BattleTowerInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC
-	msgbox BattleFrontier_ReceptionGate_Text_26696F, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleDome:: @ 82663BC
+	msgbox BattleFrontier_ReceptionGate_Text_BattleDomeInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA
-	msgbox BattleFrontier_ReceptionGate_Text_266A34, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattlePalace:: @ 82663CA
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePalaceInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8
-	msgbox BattleFrontier_ReceptionGate_Text_266AC2, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleArena:: @ 82663D8
+	msgbox BattleFrontier_ReceptionGate_Text_BattleArenaInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6
-	msgbox BattleFrontier_ReceptionGate_Text_266B5D, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattleFactory:: @ 82663E6
+	msgbox BattleFrontier_ReceptionGate_Text_BattleFactoryInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4
-	msgbox BattleFrontier_ReceptionGate_Text_266C24, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattlePike:: @ 82663F4
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePikeInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402
-	msgbox BattleFrontier_ReceptionGate_Text_266CBB, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_BattlePyramid:: @ 8266402
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePyramidInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410
-	msgbox BattleFrontier_ReceptionGate_Text_266D1C, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_RankingHall:: @ 8266410
+	msgbox BattleFrontier_ReceptionGate_Text_RankingHallInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E
-	msgbox BattleFrontier_ReceptionGate_Text_266DCB, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266320
+BattleFrontier_ReceptionGate_EventScript_ExchangeCorner:: @ 826641E
+	msgbox BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide:: @ 826642C
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436
+BattleFrontier_ReceptionGate_EventScript_RulesGuide:: @ 8266436
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_266E66, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToRules, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446
-	message BattleFrontier_ReceptionGate_Text_266EE0
+BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
+	message BattleFrontier_ReceptionGate_Text_LearnAboutWhat
 	waitmessage
 	multichoice 15, 0, MULTI_FRONTIER_RULES, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_2664A4
-	case 1, BattleFrontier_ReceptionGate_EventScript_2664B2
-	case 2, BattleFrontier_ReceptionGate_EventScript_2664C0
-	case 3, BattleFrontier_ReceptionGate_EventScript_2664CE
-	case 4, BattleFrontier_ReceptionGate_EventScript_2664DC
-	case 5, BattleFrontier_ReceptionGate_EventScript_2664EA
-	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_2664EA
+	case 0, BattleFrontier_ReceptionGate_EventScript_LevelMode
+	case 1, BattleFrontier_ReceptionGate_EventScript_Level50
+	case 2, BattleFrontier_ReceptionGate_EventScript_OpenLevel
+	case 3, BattleFrontier_ReceptionGate_EventScript_MonEntry
+	case 4, BattleFrontier_ReceptionGate_EventScript_HoldItems
+	case 5, BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4
-	msgbox BattleFrontier_ReceptionGate_Text_266F04, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_LevelMode:: @ 82664A4
+	msgbox BattleFrontier_ReceptionGate_Text_LevelModeInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2
-	msgbox BattleFrontier_ReceptionGate_Text_266F69, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_Level50:: @ 82664B2
+	msgbox BattleFrontier_ReceptionGate_Text_Level50Info, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0
-	msgbox BattleFrontier_ReceptionGate_Text_267080, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_OpenLevel:: @ 82664C0
+	msgbox BattleFrontier_ReceptionGate_Text_OpenLevelInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE
-	msgbox BattleFrontier_ReceptionGate_Text_26716A, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_MonEntry:: @ 82664CE
+	msgbox BattleFrontier_ReceptionGate_Text_MonEntryInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC
-	msgbox BattleFrontier_ReceptionGate_Text_267298, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266446
+BattleFrontier_ReceptionGate_EventScript_HoldItems:: @ 82664DC
+	msgbox BattleFrontier_ReceptionGate_Text_HoldItemsInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide:: @ 82664EA
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4
+BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide:: @ 82664F4
 	lock
 	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_267357, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504
-	message BattleFrontier_ReceptionGate_Text_26737C
+BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @ 8266504
+	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich1
 	waitmessage
 	multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, 0
 	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_26654C
-	case 1, BattleFrontier_ReceptionGate_EventScript_26655A
-	case 2, BattleFrontier_ReceptionGate_EventScript_266568
-	case 3, BattleFrontier_ReceptionGate_EventScript_266576
-	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_266576
+	case 0, BattleFrontier_ReceptionGate_EventScript_Symbols
+	case 1, BattleFrontier_ReceptionGate_EventScript_RecordBattle
+	case 2, BattleFrontier_ReceptionGate_EventScript_BattlePoints
+	case 3, BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide
+	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C
-	msgbox BattleFrontier_ReceptionGate_Text_2673A1, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+BattleFrontier_ReceptionGate_EventScript_Symbols:: @ 826654C
+	msgbox BattleFrontier_ReceptionGate_Text_SymbolsInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A
-	msgbox BattleFrontier_ReceptionGate_Text_2674F3, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+BattleFrontier_ReceptionGate_EventScript_RecordBattle:: @ 826655A
+	msgbox BattleFrontier_ReceptionGate_Text_RecordedBattleInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568
-	msgbox BattleFrontier_ReceptionGate_Text_26761C, MSGBOX_DEFAULT
-	goto BattleFrontier_ReceptionGate_EventScript_266504
+BattleFrontier_ReceptionGate_EventScript_BattlePoints:: @ 8266568
+	msgbox BattleFrontier_ReceptionGate_Text_BattlePointsInfo, MSGBOX_DEFAULT
+	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
+BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide:: @ 8266576
+	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_Text_266580: @ 8266580
+BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay: @ 8266580
 	.string "Is it your first time here?\n"
 	.string "Please step this way!$"
 
-BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2
+BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier: @ 82665B2
 	.string "The front lines of POKéMON battling!\n"
 	.string "Welcome to the BATTLE FRONTIER!$"
 
-BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7
+BattleFrontier_ReceptionGate_Text_IssueFrontierPass: @ 82665F7
 	.string "For a first-time visitor, we issue\n"
 	.string "the FRONTIER PASS.\p"
 	.string "It's for use at all the facilities\n"
 	.string "in the BATTLE FRONTIER.\p"
 	.string "Here you are!$"
 
-BattleFrontier_ReceptionGate_Text_266676: @ 8266676
+BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass: @ 8266676
 	.string "{PLAYER} obtained\n"
 	.string "the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_266695: @ 8266695
+BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass: @ 8266695
 	.string "{PLAYER} placed the TRAINER CARD\n"
 	.string "in the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6
+BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier: @ 82666C6
 	.string "We hope you enjoy all that the BATTLE\n"
 	.string "FRONTIER has to offer!$"
 
-BattleFrontier_ReceptionGate_Text_266703: @ 8266703
+BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame: @ 8266703
 	.string "???: Well, if it isn't {PLAYER}{KUN}!\n"
 	.string "You came out here!$"
 
-BattleFrontier_ReceptionGate_Text_266733: @ 8266733
+BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay: @ 8266733
 	.string "GUIDE: Oh! MR. SCOTT, sir!\n"
 	.string "Good day to you, sir!$"
 
-BattleFrontier_ReceptionGate_Text_266764: @ 8266764
+BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere: @ 8266764
 	.string "SCOTT: It's great to see you here,\n"
 	.string "it really is!\p"
 	.string "I hope you'll take your time and\n"
@@ -338,21 +339,21 @@ BattleFrontier_ReceptionGate_Text_266764: @ 8266764
 	.string "I also have my quarters here, so feel\n"
 	.string "free to visit if you have time.$"
 
-BattleFrontier_ReceptionGate_Text_266857: @ 8266857
+BattleFrontier_ReceptionGate_Text_YourGuideToFacilities: @ 8266857
 	.string "I'm your guide to the various facilities\n"
 	.string "here in the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_26689D: @ 826689D
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich2: @ 826689D
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2
+BattleFrontier_ReceptionGate_Text_BattleTowerInfo: @ 82668C2
 	.string "It is the gigantic tower considered\n"
 	.string "to be the BATTLE FRONTIER's symbol.\p"
 	.string "There are four kinds of BATTLE ROOMS\n"
 	.string "in the tower for SINGLE, DOUBLE, MULTI,\l"
 	.string "and LINK MULTI BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_26696F: @ 826696F
+BattleFrontier_ReceptionGate_Text_BattleDomeInfo: @ 826696F
 	.string "The BATTLE DOME is the large building\n"
 	.string "shaped like a huge egg.\p"
 	.string "Events named Battle Tourneys are held\n"
@@ -361,20 +362,20 @@ BattleFrontier_ReceptionGate_Text_26696F: @ 826696F
 	.string "two courses--for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_266A34: @ 8266A34
+BattleFrontier_ReceptionGate_Text_BattlePalaceInfo: @ 8266A34
 	.string "The BATTLE PALACE is the red building\n"
 	.string "on the right of the BATTLE FRONTIER.\p"
 	.string "There are two kinds of BATTLE HALLS\n"
 	.string "for SINGLE and DOUBLE BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_266AC2: @ 8266AC2
+BattleFrontier_ReceptionGate_Text_BattleArenaInfo: @ 8266AC2
 	.string "The BATTLE ARENA is the dojo-like\n"
 	.string "building at the center-right of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Set KO Tourney\n"
 	.string "takes place at the BATTLE ARENA.$"
 
-BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D
+BattleFrontier_ReceptionGate_Text_BattleFactoryInfo: @ 8266B5D
 	.string "The BATTLE FACTORY is the large\n"
 	.string "building that is the closest to us.\p"
 	.string "An event called the Battle Swap\n"
@@ -383,20 +384,20 @@ BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D
 	.string "two courses for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_266C24: @ 8266C24
+BattleFrontier_ReceptionGate_Text_BattlePikeInfo: @ 8266C24
 	.string "The BATTLE PIKE is the building shaped\n"
 	.string "like a POKéMON at the center-left of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Battle Choice\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_266CBB: @ 8266CBB
+BattleFrontier_ReceptionGate_Text_BattlePyramidInfo: @ 8266CBB
 	.string "The BATTLE PYRAMID is the enormous\n"
 	.string "pyramid.\p"
 	.string "An event called the Battle Quest\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C
+BattleFrontier_ReceptionGate_Text_RankingHallInfo: @ 8266D1C
 	.string "The RANKING HALL is located near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "There, you may see the most fantastic\n"
@@ -404,28 +405,28 @@ BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C
 	.string "took on the many challenges of\l"
 	.string "the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB
+BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo: @ 8266DCB
 	.string "The EXCHANGE SERVICE CORNER is near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "The Battle Points you have earned in\n"
 	.string "the BATTLE FRONTIER may be exchanged\l"
 	.string "for fabulous prizes there.$"
 
-BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66
+BattleFrontier_ReceptionGate_Text_YourGuideToRules: @ 8266E66
 	.string "I'm your guide to the basic rules that\n"
 	.string "are common to all the challenges\l"
 	.string "offered by the facilities in the BATTLE\l"
 	.string "FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0
+BattleFrontier_ReceptionGate_Text_LearnAboutWhat: @ 8266EE0
 	.string "What would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04
+BattleFrontier_ReceptionGate_Text_LevelModeInfo: @ 8266F04
 	.string "All the challenges at the BATTLE\n"
 	.string "FRONTIER's facilities come in\l"
 	.string "two courses--Level 50 and Open Level.$"
 
-BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69
+BattleFrontier_ReceptionGate_Text_Level50Info: @ 8266F69
 	.string "The Level 50 course is open to POKéMON\n"
 	.string "up to and including Level 50.\p"
 	.string "Please keep in mind, however, that\n"
@@ -436,7 +437,7 @@ BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69
 	.string "To begin, we hope you will challenge\n"
 	.string "this course.$"
 
-BattleFrontier_ReceptionGate_Text_267080: @ 8267080
+BattleFrontier_ReceptionGate_Text_OpenLevelInfo: @ 8267080
 	.string "The Open Level course places no limit\n"
 	.string "on the levels of POKéMON entering\l"
 	.string "challenges.\p"
@@ -446,7 +447,7 @@ BattleFrontier_ReceptionGate_Text_267080: @ 8267080
 	.string "However, no TRAINER you face will\n"
 	.string "have any POKéMON below Level 60.$"
 
-BattleFrontier_ReceptionGate_Text_26716A: @ 826716A
+BattleFrontier_ReceptionGate_Text_MonEntryInfo: @ 826716A
 	.string "Virtually any kind of POKéMON may take\n"
 	.string "on the challenges at all facilities.\p"
 	.string "EGGS and certain kinds of POKéMON,\n"
@@ -457,7 +458,7 @@ BattleFrontier_ReceptionGate_Text_26716A: @ 826716A
 	.string "of the same kind of POKéMON are not\l"
 	.string "permitted.$"
 
-BattleFrontier_ReceptionGate_Text_267298: @ 8267298
+BattleFrontier_ReceptionGate_Text_HoldItemsInfo: @ 8267298
 	.string "When entering a challenge at a BATTLE\n"
 	.string "FRONTIER facility, POKéMON may not\l"
 	.string "be holding the same kind of item.\p"
@@ -465,13 +466,13 @@ BattleFrontier_ReceptionGate_Text_267298: @ 8267298
 	.string "entering a challenge are holding\l"
 	.string "different items.$"
 
-BattleFrontier_ReceptionGate_Text_267357: @ 8267357
+BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass: @ 8267357
 	.string "I'm your guide to the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_26737C: @ 826737C
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich1: @ 826737C
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1
+BattleFrontier_ReceptionGate_Text_SymbolsInfo: @ 82673A1
 	.string "There are seven facilities at\n"
 	.string "the BATTLE FRONTIER.\p"
 	.string "TRAINERS who gain recognition for\n"
@@ -483,7 +484,7 @@ BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1
 	.string "It's certainly not easy to win symbols.\n"
 	.string "I wish you the best of luck!$"
 
-BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3
+BattleFrontier_ReceptionGate_Text_RecordedBattleInfo: @ 82674F3
 	.string "It is possible to record one battle\n"
 	.string "on your FRONTIER PASS.\p"
 	.string "You may record a battle you had with\n"
@@ -495,7 +496,7 @@ BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3
 	.string "You may choose to record your match\n"
 	.string "at the end of a battle.$"
 
-BattleFrontier_ReceptionGate_Text_26761C: @ 826761C
+BattleFrontier_ReceptionGate_Text_BattlePointsInfo: @ 826761C
 	.string "Battle Points are rewards given to\n"
 	.string "TRAINERS who battled outstandingly\l"
 	.string "at the BATTLE FRONTIER.\p"
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json
index bff7696b3..13cb13dd4 100644
--- a/data/maps/BattleFrontier_ScottsHouse/map.json
+++ b/data/maps/BattleFrontier_ScottsHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_ScottsHouse_EventScript_2636A8",
+      "script": "BattleFrontier_ScottsHouse_EventScript_Scott",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index 4f5ab96af..c2f7b3fbc 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -1,252 +1,232 @@
 BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
 	.byte 0
 
-BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
+BattleFrontier_ScottsHouse_EventScript_Scott:: @ 82636A8
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_2637DA
-	goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_2638AA
-	goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_263939
-	goto BattleFrontier_ScottsHouse_EventScript_2636CB
+	goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_GivenBerry
+	goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_GivenShield
+	goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints
+	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveItems
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB
-	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_263943
-	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_263704
-	goto_if_unset FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A
-	goto BattleFrontier_ScottsHouse_EventScript_2636EC
+BattleFrontier_ScottsHouse_EventScript_CheckGiveItems:: @ 82636CB
+	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier
+	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols
+	goto_if_unset FLAG_COLLECTED_ALL_GOLD_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols
+	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC
-	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_26381B
-	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_2638B4
-	goto BattleFrontier_ScottsHouse_EventScript_2637E4
+BattleFrontier_ScottsHouse_EventScript_CheckGiveShield:: @ 82636EC
+	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield
+	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield
+	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
-	goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
-	msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
+	goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT
 	giveitem_std ITEM_LANSAT_BERRY
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
 	setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS
 	setflag FLAG_TEMP_4
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
-	goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
-	msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
+	goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
+	msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT
 	giveitem_std ITEM_STARF_BERRY
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
-	setflag FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
+	setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS
 	setflag FLAG_TEMP_4
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0
-	msgbox BattleFrontier_ScottsHouse_Text_2643EB, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_BerryPocketFull:: @ 82637D0
+	msgbox BattleFrontier_ScottsHouse_Text_BerryPocketStuffed, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA
-	msgbox BattleFrontier_ScottsHouse_Text_264373, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GivenBerry:: @ 82637DA
+	msgbox BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4
+BattleFrontier_ScottsHouse_EventScript_RandomComment:: @ 82637E4
 	random 3
 	compare VAR_RESULT, 1
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_263807
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment
 	compare VAR_RESULT, 2
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_263811
-	msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment
+	msgbox BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807
-	msgbox BattleFrontier_ScottsHouse_Text_263F12, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment:: @ 8263807
+	msgbox BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811
-	msgbox BattleFrontier_ScottsHouse_Text_263FFE, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
+	msgbox BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
+BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	frontier_setlvlmode FRONTIER_LVL_50
+	battletower_getstreak
 	compare VAR_RESULT, 50
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
+	frontier_setlvlmode FRONTIER_LVL_OPEN
+	battletower_getstreak
 	compare VAR_RESULT, 50
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A
-	goto BattleFrontier_ScottsHouse_EventScript_2637E4
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
+	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
-	msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
+	msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT
 	givedecoration_std DECOR_SILVER_SHIELD
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
 	setflag FLAG_RECEIVED_SILVER_SHIELD
 	setflag FLAG_TEMP_3
-	goto BattleFrontier_ScottsHouse_EventScript_2638AA
+	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0
-	msgbox BattleFrontier_ScottsHouse_Text_264583, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_NoRoomForShield:: @ 82638A0
+	msgbox BattleFrontier_ScottsHouse_Text_ComeBackForThisLater, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA
-	msgbox BattleFrontier_ScottsHouse_Text_264546, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
+	msgbox BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
+BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
 	setvar VAR_FRONTIER_BATTLE_MODE, 0
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 0
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	frontier_setlvlmode FRONTIER_LVL_50
+	battletower_getstreak
 	compare VAR_RESULT, 100
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913
-	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 1
-	special CallFrontierUtilFunc
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_8161F74
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
+	frontier_setlvlmode FRONTIER_LVL_OPEN
+	battletower_getstreak
 	compare VAR_RESULT, 100
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913
-	goto BattleFrontier_ScottsHouse_EventScript_2637E4
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
+	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
-	msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
+	msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT
 	givedecoration_std DECOR_GOLD_SHIELD
-	compare VAR_RESULT, 0
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
+	compare VAR_RESULT, FALSE
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
 	setflag FLAG_RECEIVED_GOLD_SHIELD
 	setflag FLAG_TEMP_3
-	goto BattleFrontier_ScottsHouse_EventScript_2638AA
+	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939
-	msgbox BattleFrontier_ScottsHouse_Text_263DB8, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints:: @ 8263939
+	msgbox BattleFrontier_ScottsHouse_Text_ExpectingGreatThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
-	msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT
+BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: @ 8263943
+	msgbox BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
-	msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
+	call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest
+	msgbox BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing, MSGBOX_DEFAULT
 	compare VAR_SCOTT_STATE, 13
-	goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC
+	goto_if_eq BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints
 	compare VAR_SCOTT_STATE, 9
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints
 	compare VAR_SCOTT_STATE, 6
-	goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA
-	goto BattleFrontier_ScottsHouse_EventScript_2639E9
+	goto_if_ge BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints
+	goto BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639BC:: @ 82639BC
+BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints:: @ 82639BC
 	buffernumberstring 0, 4
 	setvar VAR_0x8004, 4
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639CB:: @ 82639CB
+BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints:: @ 82639CB
 	buffernumberstring 0, 3
 	setvar VAR_0x8004, 3
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639DA:: @ 82639DA
+BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints:: @ 82639DA
 	buffernumberstring 0, 2
 	setvar VAR_0x8004, 2
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9
+BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint:: @ 82639E9
 	buffernumberstring 0, 1
 	setvar VAR_0x8004, 1
-	goto BattleFrontier_ScottsHouse_EventScript_2639F8
+	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
+BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: @ 82639F8
 	special GiveFrontierBattlePoints
-	msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
-	msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
+	msgbox BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
+	msgbox BattleFrontier_ScottsHouse_Text_ExplainBattlePoints, MSGBOX_DEFAULT
 	setflag FLAG_SCOTT_GIVES_BATTLE_POINTS
 	setflag FLAG_TEMP_2
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: @ 8263A13
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: @ 8263A1E
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: @ 8263A29
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: @ 8263A34
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F
+BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: @ 8263A3F
 	.string "SCOTT: Well, hello and welcome!\n"
 	.string "Heheh… Sorry about the cramped space.\p"
 	.string "Anyway, {PLAYER}{KUN}, let me formally\n"
@@ -255,7 +235,7 @@ BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F
 	.string "It took me years and years, but I've\l"
 	.string "finally given shape to my dream.$"
 
-BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29
+BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal: @ 8263B29
 	.string "On reflection, it was a terribly long\n"
 	.string "journey…\p"
 	.string "I left home alone on a quest to find\n"
@@ -263,7 +243,7 @@ BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29
 	.string "No one can imagine how much effort\n"
 	.string "or time it took to make this real.$"
 
-BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4
+BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing: @ 8263BD4
 	.string "But that's all in the past.\n"
 	.string "No point dwelling on that!\p"
 	.string "All I want for you is to enjoy battling\n"
@@ -272,11 +252,11 @@ BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4
 	.string "as a memento for all the time our\l"
 	.string "paths crossed on our journeys.$"
 
-BattleFrontier_ScottsHouse_Text_263CB0: @ 8263CB0
+BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints: @ 8263CB0
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Point(s).$"
 
-BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0
+BattleFrontier_ScottsHouse_Text_ExplainBattlePoints: @ 8263CD0
 	.string "SCOTT: You can check your Battle\n"
 	.string "Points on your FRONTIER PASS.\p"
 	.string "The more success you have here at\n"
@@ -285,10 +265,10 @@ BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0
 	.string "Use your Battle Points the way you\n"
 	.string "see fit, like trading them for items.$"
 
-BattleFrontier_ScottsHouse_Text_263DB8: @ 8263DB8
+BattleFrontier_ScottsHouse_Text_ExpectingGreatThings: @ 8263DB8
 	.string "I'm expecting great things from you!$"
 
-BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD
+BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers: @ 8263DDD
 	.string "SCOTT: Every TRAINER is an individual.\n"
 	.string "They all lead lives of their own.\p"
 	.string "But when they're in a battle,\n"
@@ -300,7 +280,7 @@ BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD
 	.string "TRAINERS who are serious about\l"
 	.string "battling, and invite them here.$"
 
-BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12
+BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain: @ 8263F12
 	.string "SCOTT: Have you met any of\n"
 	.string "the FRONTIER BRAINS?\p"
 	.string "Better yet, have you obtained any\n"
@@ -310,7 +290,7 @@ BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12
 	.string "But I'm sure that seeing how tough\n"
 	.string "you are will startle even them!$"
 
-BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE
+BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier: @ 8263FFE
 	.string "SCOTT: You don't just train for battle,\n"
 	.string "right?\p"
 	.string "I think I remember you working on\n"
@@ -320,7 +300,7 @@ BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE
 	.string "the BATTLE FRONTIER somewhere…\l"
 	.string "Fufufu!$"
 
-BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols: @ 82640BC
 	.string "SCOTT: Are you enjoying things in\n"
 	.string "the BATTLE FRONTIER?\p"
 	.string "…Wait a second…\n"
@@ -335,7 +315,7 @@ BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC
 	.string "I want you to have this.\n"
 	.string "I'm sure you can put it to proper use.$"
 
-BattleFrontier_ScottsHouse_Text_264216: @ 8264216
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols: @ 8264216
 	.string "SCOTT: I hope you're enjoying\n"
 	.string "everything in the BATTLE FRONTIER.\p"
 	.string "…Wait a second…\n"
@@ -350,35 +330,35 @@ BattleFrontier_ScottsHouse_Text_264216: @ 8264216
 	.string "I think you will be able to\n"
 	.string "appreciate the value of my gift!$"
 
-BattleFrontier_ScottsHouse_Text_264373: @ 8264373
+BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere: @ 8264373
 	.string "I must say I have the gift of knowing\n"
 	.string "a good TRAINER when I see one.\p"
 	.string "I'm so glad I had the foresight to\n"
 	.string "bring you here!$"
 
-BattleFrontier_ScottsHouse_Text_2643EB: @ 82643EB
+BattleFrontier_ScottsHouse_Text_BerryPocketStuffed: @ 82643EB
 	.string "Your BERRY POCKET seems to\n"
 	.string "be stuffed.$"
 
-BattleFrontier_ScottsHouse_Text_264412: @ 8264412
+BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow: @ 8264412
 	.string "SCOTT: Oh, I heard about you!\n"
 	.string "How you ruled the BATTLE TOWER!\l"
 	.string "You beat over 50 TRAINERS in a row?\p"
 	.string "That's fantastic!\n"
 	.string "I want you to have this!$"
 
-BattleFrontier_ScottsHouse_Text_26449F: @ 826449F
+BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow: @ 826449F
 	.string "SCOTT: Oh, my! I heard about you!\n"
 	.string "How you overwhelmed the BATTLE TOWER!\l"
 	.string "You beat over 100 TRAINERS in a row?\p"
 	.string "That's ridiculously spectacular!\n"
 	.string "You've got to have this!$"
 
-BattleFrontier_ScottsHouse_Text_264546: @ 8264546
+BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings: @ 8264546
 	.string "I'll be expecting to hear even greater\n"
 	.string "things about you now!$"
 
-BattleFrontier_ScottsHouse_Text_264583: @ 8264583
+BattleFrontier_ScottsHouse_Text_ComeBackForThisLater: @ 8264583
 	.string "Oops, well, if you have too much\n"
 	.string "stuff, come back for this later.$"
 
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index efa3cc488..18f39ecd1 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -42,8 +42,8 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
 	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73
 
 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 3
 	applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
 	waitmovement 0
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 0b0008d53..f69ec8204 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -43,8 +43,8 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_WINONA_MATCH_CALL
-	setvar VAR_WINONA_CALL_STEP_COUNTER, 0
-	setflag FLAG_REGISTER_WINONA_POKENAV
+	setvar VAR_SCOTT_FORTREE_CALL_STEP_COUNTER, 0
+	setflag FLAG_SCOTT_CALL_FORTREE_GYM
 	release
 	end
 
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 3d087c914..cf273bcb8 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
-	setvar VAR_PORTHOLE_STATE, 5
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
@@ -392,7 +392,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
-	setvar VAR_PORTHOLE_STATE, 5
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
index 0591d3c8e..2f1de5b03 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B",
+      "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer",
       "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER"
     }
   ],
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 09da9a00e..3645d5cab 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -496,116 +496,117 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer:: @ 821CD7B
 	lock
 	faceplayer
-	goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
-	goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
+	goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed
+	goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_Interview
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
-	setvar VAR_0x8005, 11
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interview:: @ 821CD90
+	setvar VAR_0x8005, TVSHOW_FAN_CLUB_SPECIAL
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2
 	copyvar VAR_0x800A, VAR_0x8006
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
 	copyvar VAR_0x8005, VAR_0x800A
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT
-	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion:: @ 821CDE0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink, MSGBOX_DEFAULT
+	goto LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion:: @ 821CDEE
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
+LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion:: @ 821CE15
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
 	copyvar VAR_0x8005, VAR_0x800A
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer:: @ 821CE4D
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	message LilycoveCity_PokemonTrainerFanClub_Text_281C95
+	message LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
 	special ShowScrollableMultichoice
 	waitstate
 	setvar VAR_0x8004, 8
 	switch VAR_RESULT
-	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
-	case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
+	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
+	case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
 	copyvar VAR_0x8006, VAR_0x800A
 	copyvar VAR_0x8005, VAR_RESULT
 	special PutFanClubSpecialOnTheAir
-	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8
+	goto LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer:: @ 821CE9F
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
+LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer:: @ 821CEC6
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
+LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview:: @ 821CED8
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo, MSGBOX_DEFAULT
 	setflag FLAG_FAN_CLUB_STRENGTH_SHARED
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
 	setvar VAR_0x8004, 8
 	special BufferStreakTrainerText
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
+@ Shouldnt be reached
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 821CEFF
 	end
 
 LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index ce7ebf3b6..b27cb1f8a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -212,8 +212,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
-	setvar VAR_SCOTT_CALL_STEP_COUNTER, 0
-	setflag FLAG_SCOTT_CALL_NATIONAL_DEX
+	setvar VAR_SCOTT_BF_CALL_STEP_COUNTER, 0
+	setflag FLAG_SCOTT_CALL_BATTLE_FRONTIER
 	releaseall
 	end
 
@@ -703,7 +703,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6
 	lockall
 	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall
 	waitmessage
-	clearflag FLAG_SCOTT_CALL_NATIONAL_DEX
+	clearflag FLAG_SCOTT_CALL_BATTLE_FRONTIER
 	releaseall
 	end
 
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 44a135368..08b59e1f0 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -9,10 +9,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
 	delay 20
 	setvar VAR_RESULT, 1
 	playse SE_W197
-	setfieldeffectargument 0, 18
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 18, 42, 0
 	waitfieldeffect FLDEFF_SPARKLE
 	setvar VAR_RESULT, 1
 	playfanfare MUS_ME_TAMA
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index de28aa251..dca3dc47d 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,13 +1,13 @@
 Route101_MapScripts:: @ 81EBCBA
 	map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame
 	.byte 0
 
 Route101_OnTransition: @ 81EBCC5
 	call ProfBirch_EventScript_UpdateLocation
 	end
 
-Route101_MapScript2_1EBCCB: @ 81EBCCB
+Route101_OnFrame: @ 81EBCCB
 	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup
 	.2byte 0
 
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index a02a1e170..f31c512f7 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED00F",
+      "script": "Route104_EventScript_BugCatcher",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED006",
+      "script": "Route104_EventScript_Girl1",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route104_EventScript_1ED38D",
+      "script": "Route104_EventScript_Haley",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED045",
+      "script": "Route104_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED04E",
+      "script": "Route104_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED090",
+      "script": "Route104_EventScript_Girl2",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED35F",
+      "script": "Route104_EventScript_Ivan",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ECF8C",
+      "script": "Route104_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ECFCD",
+      "script": "Route104_EventScript_WhiteHerbFlorist",
       "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route104_EventScript_1ED597",
+      "script": "Route104_EventScript_Gina",
       "flag": "0"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route104_EventScript_1ED5B6",
+      "script": "Route104_EventScript_Mia",
       "flag": "0"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route104_EventScript_1ED43B",
+      "script": "Route104_EventScript_Winston",
       "flag": "0"
     },
     {
@@ -365,7 +365,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route104_EventScript_1ED4E9",
+      "script": "Route104_EventScript_Cindy",
       "flag": "0"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 6,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route104_EventScript_1ED376",
+      "script": "Route104_EventScript_Billy",
       "flag": "0"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED057",
+      "script": "Route104_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -456,7 +456,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ED5D5",
+      "script": "Route104_EventScript_Darian",
       "flag": "0"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_1ECC9E",
+      "script": "Route104_EventScript_Rival",
       "flag": "FLAG_HIDE_ROUTE_104_RIVAL"
     }
   ],
@@ -539,7 +539,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE104_STATE",
       "var_value": "1",
-      "script": "Route104_EventScript_1ECCB3"
+      "script": "Route104_EventScript_RivalTrigger"
     }
   ],
   "bg_events": [
@@ -549,7 +549,7 @@
       "y": 50,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED018"
+      "script": "Route104_EventScript_BrineysCottageSign"
     },
     {
       "type": "sign",
@@ -557,7 +557,7 @@
       "y": 66,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED021"
+      "script": "Route104_EventScript_RouteSignPetalburg"
     },
     {
       "type": "sign",
@@ -565,7 +565,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED02A"
+      "script": "Route104_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -573,7 +573,7 @@
       "y": 20,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED033"
+      "script": "Route104_EventScript_FlowerShopSign"
     },
     {
       "type": "sign",
@@ -581,7 +581,7 @@
       "y": 23,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route104_EventScript_1ED03C"
+      "script": "Route104_EventScript_TrainerTipsDoubleBattles"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 51528b6ef..46dd80119 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -14,39 +14,39 @@ Route104_EventScript_StartSailToDewford:: @ 81ECC47
 
 Route104_OnTransition: @ 81ECC4E
 	call Common_EventScript_SetupRivalGfxId
-	call Route104_EventScript_1ECC78
-	call Route104_EventScript_1ECC5E
+	call Route104_EventScript_TrySetRivalPos
+	call Route104_EventScript_ShowOrHideWhiteHerbFlorist
 	end
 
-Route104_EventScript_1ECC5E:: @ 81ECC5E
-	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_1ECC74
-	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_1ECC74
+Route104_EventScript_ShowOrHideWhiteHerbFlorist:: @ 81ECC5E
+	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_HideWhiteHerbFlorist
+	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_HideWhiteHerbFlorist
 	clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
-Route104_EventScript_1ECC74:: @ 81ECC74
+Route104_EventScript_HideWhiteHerbFlorist:: @ 81ECC74
 	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
-Route104_EventScript_1ECC78:: @ 81ECC78
+Route104_EventScript_TrySetRivalPos:: @ 81ECC78
 	compare VAR_BOARD_BRINEY_BOAT_STATE, 1
-	goto_if_ge Route104_EventScript_1ECC9D
-	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D
-	goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D
+	goto_if_ge Route104_EventScript_DontSetRivalPos
+	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_DontSetRivalPos
+	goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_DontSetRivalPos
 	setobjectxyperm 34, 17, 52
 	return
 
-Route104_EventScript_1ECC9D:: @ 81ECC9D
+Route104_EventScript_DontSetRivalPos:: @ 81ECC9D
 	return
 
-Route104_EventScript_1ECC9E:: @ 81ECC9E
+Route104_EventScript_Rival:: @ 81ECC9E
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement 34, Common_Movement_FacePlayer
 	waitmovement 0
-	goto Route104_EventScript_1ECD33
+	goto Route104_EventScript_RivalEncounter
 
-Route104_EventScript_1ECCB3:: @ 81ECCB3
+Route104_EventScript_RivalTrigger:: @ 81ECCB3
 	lockall
 	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setvar VAR_RUSTBORO_CITY_STATE, 8
@@ -56,9 +56,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
 	delay 10
 	addobject 34
 	clearflag FLAG_HIDE_ROUTE_104_RIVAL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECF86
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBackUp
 	waitmovement 0
-	applymovement 34, Route104_Movement_1ECF8A
+	applymovement 34, Route104_Movement_RivalExitBrineysCottage
 	waitmovement 0
 	delay 20
 	setvar VAR_0x8008, 0
@@ -68,291 +68,292 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
 	waitmovement 0
 	applymovement 34, Common_Movement_Delay48
 	waitmovement 0
-	goto Route104_EventScript_1ECD33
+	goto Route104_EventScript_RivalEncounter
 
-Route104_EventScript_1ECD11:: @ 81ECD11
+@ Unused, shares script with Rustboro encounter instead
+Route104_EventScript_PlayRivalMusic:: @ 81ECD11
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route104_EventScript_1ECD29
+	goto_if_eq Route104_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route104_EventScript_1ECD2E
+	goto_if_eq Route104_EventScript_PlayBrendanMusic
 	return
 
-Route104_EventScript_1ECD29:: @ 81ECD29
+Route104_EventScript_PlayMayMusic:: @ 81ECD29
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-Route104_EventScript_1ECD2E:: @ 81ECD2E
+Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E
 	playbgm MUS_BOY_SUP, 1
 	return
 
-Route104_EventScript_1ECD33:: @ 81ECD33
+Route104_EventScript_RivalEncounter:: @ 81ECD33
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route104_EventScript_1ECD4B
+	goto_if_eq Route104_EventScript_MayEncounter
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route104_EventScript_1ECE6F
+	goto_if_eq Route104_EventScript_BrendanEncounter
 	end
 
-Route104_EventScript_1ECD4B:: @ 81ECD4B
-	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECE1C
-	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECDD0
+Route104_EventScript_MayEncounter:: @ 81ECD4B
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_MayDefeated
+	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_MayAskToBattle
 	setflag FLAG_REGISTER_RIVAL_POKENAV
-	msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT
+	msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT
+	msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD
-	applymovement 34, Route104_Movement_1ECDC8
-	msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival
+	applymovement 34, Route104_Movement_RivalWalkSlowLeft
+	msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT
 	closemessage
 	waitmovement 0
-	applymovement 34, Route104_Movement_1ECDCA
+	applymovement 34, Route104_Movement_RivalApproachPlayer
 	waitmovement 0
 	copyobjectxytoperm 34
-	msgbox Route104_Text_1EDCED, MSGBOX_YESNO
+	msgbox Route104_Text_MayMinesDecentLetsBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route104_EventScript_1ECDED
-	msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT
-	call Route104_EventScript_1ECE31
+	goto_if_eq Route104_EventScript_BattleMay
+	msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT
+	call Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_Movement_1ECDC8: @ 81ECDC8
+Route104_Movement_RivalWalkSlowLeft: @ 81ECDC8
 	walk_slow_left
 	step_end
 
-Route104_Movement_1ECDCA: @ 81ECDCA
+Route104_Movement_RivalApproachPlayer: @ 81ECDCA
 	walk_down
 	face_right
 	step_end
 
-Route104_Movement_1ECDCD: @ 81ECDCD
+Route104_Movement_PlayerFaceRival: @ 81ECDCD
 	delay_4
 	walk_in_place_fastest_left
 	step_end
 
-Route104_EventScript_1ECDD0:: @ 81ECDD0
-	msgbox Route104_Text_1EDD9F, MSGBOX_YESNO
+Route104_EventScript_MayAskToBattle:: @ 81ECDD0
+	msgbox Route104_Text_MayLetsBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route104_EventScript_1ECDED
-	msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT
+	goto_if_eq Route104_EventScript_BattleMay
+	msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_EventScript_1ECDED:: @ 81ECDED
-	msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT
+Route104_EventScript_BattleMay:: @ 81ECDED
+	msgbox Route104_Text_MayIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route104_EventScript_1ECE36
-	case 1, Route104_EventScript_1ECE49
-	case 2, Route104_EventScript_1ECE5C
+	case 0, Route104_EventScript_BattleMayTreecko
+	case 1, Route104_EventScript_BattleMayTorchic
+	case 2, Route104_EventScript_BattleMayMudkip
 	end
 
-Route104_EventScript_1ECE1C:: @ 81ECE1C
-	msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT
+Route104_EventScript_MayDefeated:: @ 81ECE1C
+	msgbox Route104_Text_MayPostBattle, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
-	call_if_eq Route104_EventScript_1ECE31
+	call_if_eq Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_1ECE31:: @ 81ECE31
+Route104_EventScript_RestoreMusic:: @ 81ECE31
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-Route104_EventScript_1ECE36:: @ 81ECE36
-	trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18
+Route104_EventScript_BattleMayTreecko:: @ 81ECE36
+	trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECE1C
+	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_1ECE49:: @ 81ECE49
-	trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18
+Route104_EventScript_BattleMayTorchic:: @ 81ECE49
+	trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECE1C
+	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_1ECE5C:: @ 81ECE5C
-	trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18
+Route104_EventScript_BattleMayMudkip:: @ 81ECE5C
+	trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECE1C
+	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_1ECE6F:: @ 81ECE6F
-	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECF38
-	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECEEC
+Route104_EventScript_BrendanEncounter:: @ 81ECE6F
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_BrendanDefeated
+	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_BrendanAskToBattle
 	setflag FLAG_REGISTER_RIVAL_POKENAV
-	msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT
+	msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT
+	msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD
-	applymovement 34, Route104_Movement_1ECDC8
-	msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival
+	applymovement 34, Route104_Movement_RivalWalkSlowLeft
+	msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT
 	closemessage
 	waitmovement 0
-	applymovement 34, Route104_Movement_1ECDCA
+	applymovement 34, Route104_Movement_RivalApproachPlayer
 	waitmovement 0
 	copyobjectxytoperm 34
-	msgbox Route104_Text_1EE009, MSGBOX_YESNO
+	msgbox Route104_Text_BrendanDoingGreatLetsBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route104_EventScript_1ECF09
-	msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT
-	call Route104_EventScript_1ECE31
+	goto_if_eq Route104_EventScript_BattleBrendan
+	msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT
+	call Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_1ECEEC:: @ 81ECEEC
-	msgbox Route104_Text_1EE094, MSGBOX_YESNO
+Route104_EventScript_BrendanAskToBattle:: @ 81ECEEC
+	msgbox Route104_Text_BrendanLetsBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route104_EventScript_1ECF09
-	msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT
+	goto_if_eq Route104_EventScript_BattleBrendan
+	msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_EventScript_1ECF09:: @ 81ECF09
-	msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT
+Route104_EventScript_BattleBrendan:: @ 81ECF09
+	msgbox Route104_Text_BrendanIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route104_EventScript_1ECF4D
-	case 1, Route104_EventScript_1ECF60
-	case 2, Route104_EventScript_1ECF73
+	case 0, Route104_EventScript_BattleBrendanTreecko
+	case 1, Route104_EventScript_BattleBrendanTorchic
+	case 2, Route104_EventScript_BattleBrendanMudkip
 	end
 
-Route104_EventScript_1ECF38:: @ 81ECF38
-	msgbox Route104_Text_1EE120, MSGBOX_DEFAULT
+Route104_EventScript_BrendanDefeated:: @ 81ECF38
+	msgbox Route104_Text_BrendanPostBattle, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
-	call_if_eq Route104_EventScript_1ECE31
+	call_if_eq Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_1ECF4D:: @ 81ECF4D
-	trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107
+Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D
+	trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECF38
+	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_EventScript_1ECF60:: @ 81ECF60
-	trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107
+Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60
+	trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECF38
+	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_EventScript_1ECF73:: @ 81ECF73
-	trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107
+Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73
+	trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
-	goto Route104_EventScript_1ECF38
+	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_Movement_1ECF86: @ 81ECF86
+Route104_Movement_PlayerBackUp: @ 81ECF86
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-Route104_Movement_1ECF8A: @ 81ECF8A
+Route104_Movement_RivalExitBrineysCottage: @ 81ECF8A
 	walk_down
 	step_end
 
-Route104_EventScript_1ECF8C:: @ 81ECF8C
+Route104_EventScript_ExpertF:: @ 81ECF8C
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_1ECFC3
-	msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry
+	msgbox Route104_Text_PlantBerriesInSoilTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHESTO_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104
-	msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
+	msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ECFC3:: @ 81ECFC3
-	msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT
+Route104_EventScript_ReceivedBerry:: @ 81ECFC3
+	msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ECFCD:: @ 81ECFCD
+Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_1ECFFC
-	msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb
+	msgbox Route104_Text_DontNeedThisTakeIt, MSGBOX_DEFAULT
 	giveitem_std ITEM_WHITE_HERB
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WHITE_HERB
 	release
 	end
 
-Route104_EventScript_1ECFFC:: @ 81ECFFC
-	msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT
+Route104_EventScript_ReceivedWhiteHerb:: @ 81ECFFC
+	msgbox Route104_Text_FlowerShopSellingSaplings, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED006:: @ 81ED006
-	msgbox Route104_Text_1ED5EC, MSGBOX_NPC
+Route104_EventScript_Girl1:: @ 81ED006
+	msgbox Route104_Text_BrineyLivesInSeasideCottage, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED00F:: @ 81ED00F
-	msgbox Route104_Text_1ED662, MSGBOX_SIGN
+Route104_EventScript_BugCatcher:: @ 81ED00F
+	msgbox Route104_Text_WhatsItLikeAtBottomOfSea, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED018:: @ 81ED018
-	msgbox Route104_Text_1EDA8C, MSGBOX_SIGN
+Route104_EventScript_BrineysCottageSign:: @ 81ED018
+	msgbox Route104_Text_MrBrineysCottage, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED021:: @ 81ED021
-	msgbox Route104_Text_1EDAA1, MSGBOX_SIGN
+Route104_EventScript_RouteSignPetalburg:: @ 81ED021
+	msgbox Route104_Text_RouteSignPetalburg, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED02A:: @ 81ED02A
-	msgbox Route104_Text_1EDABC, MSGBOX_SIGN
+Route104_EventScript_RouteSignRustboro:: @ 81ED02A
+	msgbox Route104_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED033:: @ 81ED033
-	msgbox Route104_Text_1EDAD6, MSGBOX_SIGN
+Route104_EventScript_FlowerShopSign:: @ 81ED033
+	msgbox Route104_Text_PrettyPetalFlowShop, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED03C:: @ 81ED03C
-	msgbox Route104_Text_1EDAEF, MSGBOX_SIGN
+Route104_EventScript_TrainerTipsDoubleBattles:: @ 81ED03C
+	msgbox Route104_Text_TrainerTipsDoubleBattles, MSGBOX_SIGN
 	end
 
-Route104_EventScript_1ED045:: @ 81ED045
-	msgbox Route104_Text_1ED6A2, MSGBOX_NPC
+Route104_EventScript_Boy1:: @ 81ED045
+	msgbox Route104_Text_ThrowBallAtWeakenedPokemon, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED04E:: @ 81ED04E
-	msgbox Route104_Text_1ED735, MSGBOX_NPC
+Route104_EventScript_Woman:: @ 81ED04E
+	msgbox Route104_Text_OnlyThrowBallAtWildPokemon, MSGBOX_NPC
 	end
 
-Route104_EventScript_1ED057:: @ 81ED057
+Route104_EventScript_Boy2:: @ 81ED057
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_1ED086
-	msgbox Route104_Text_1ED838, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed
+	msgbox Route104_Text_LikeFillingMouthWithSeedsTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM09
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM09
 	release
 	end
 
-Route104_EventScript_1ED086:: @ 81ED086
-	msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT
+Route104_EventScript_ReceivedBulletSeed:: @ 81ED086
+	msgbox Route104_Text_TMsAreOneTimeUse, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED090:: @ 81ED090
-	msgbox Route104_Text_1ED7A2, MSGBOX_NPC
+Route104_EventScript_Girl2:: @ 81ED090
+	msgbox Route104_Text_ImNotATrainer, MSGBOX_NPC
 	end
 
 Route104_EventScript_SailToDewford:: @ 81ED099
@@ -365,19 +366,19 @@ Route104_EventScript_SailToDewford:: @ 81ED099
 	waitmovement 0
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
 	call Common_EventScript_PlayBrineysBoatMusic
-	goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9
-	goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF
+	goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall
+	goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls
 	end
 
-Route104_EventScript_1ED0D9:: @ 81ED0D9
-	applymovement 7, Route104_Movement_1ED28C
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED28C
+Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9
+	applymovement 7, Route104_Movement_SailToDewford
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewford
 	waitmovement 0
-	goto Route104_EventScript_1ED139
+	goto Route104_EventScript_ArriveInDewford
 
-Route104_EventScript_1ED0EF:: @ 81ED0EF
-	applymovement 7, Route104_Movement_1ED1C8
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8
+Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
+	applymovement 7, Route104_Movement_SailToDewfordBeforeDadCalls
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
 	waitmovement 0
 	pokenavcall Route104_Text_DadPokenavCall
 	waitmessage
@@ -388,25 +389,25 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_NORMAN_MATCH_CALL
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED22A
-	applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
+	applymovement 7, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104
 	waitmovement 7, MAP_ROUTE104
 	waitmovement 0
-	goto Route104_EventScript_1ED139
+	goto Route104_EventScript_ArriveInDewford
 
-Route104_EventScript_1ED139:: @ 81ED139
+Route104_EventScript_ArriveInDewford:: @ 81ED139
 	delay 50
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerExitBoat
 	waitmovement 0
 	call Common_EventScript_StopBrineysBoatMusic
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
-	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355
+	applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerMoveForBriney
 	waitmovement 0
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	applymovement 2, Route104_Movement_1ED35C
+	applymovement 2, Route104_Movement_BrineyExitBoat
 	waitmovement 0
 	addobject 4
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
@@ -432,7 +433,7 @@ Route104_EventScript_LandedInDewford:: @ 81ED1BE
 	releaseall
 	end
 
-Route104_Movement_1ED1C8: @ 81ED1C8
+Route104_Movement_SailToDewfordBeforeDadCalls: @ 81ED1C8
 	walk_down
 	walk_down
 	walk_down
@@ -532,7 +533,7 @@ Route104_Movement_1ED1C8: @ 81ED1C8
 	walk_fastest_down
 	step_end
 
-Route104_Movement_1ED22A: @ 81ED22A
+Route104_Movement_SailToDewfordAfterDadCalls: @ 81ED22A
 	walk_fastest_down
 	walk_fastest_down
 	walk_fastest_down
@@ -632,7 +633,7 @@ Route104_Movement_1ED22A: @ 81ED22A
 	walk_down
 	step_end
 
-Route104_Movement_1ED28C: @ 81ED28C
+Route104_Movement_SailToDewford: @ 81ED28C
 	walk_down
 	walk_down
 	walk_down
@@ -835,11 +836,11 @@ Route104_Movement_PlayerBoardBoat: @ 81ED34F
 	walk_down
 	step_end
 
-Route104_Movement_1ED353: @ 81ED353
+Route104_Movement_PlayerExitBoat: @ 81ED353
 	walk_down
 	step_end
 
-Route104_Movement_1ED355: @ 81ED355
+Route104_Movement_PlayerMoveForBriney: @ 81ED355
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
@@ -850,214 +851,214 @@ Route104_Movement_BrineyBoardBoat: @ 81ED359
 	walk_down
 	step_end
 
-Route104_Movement_1ED35C: @ 81ED35C
+Route104_Movement_BrineyExitBoat: @ 81ED35C
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-Route104_EventScript_1ED35F:: @ 81ED35F
-	trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509
-	msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE
+Route104_EventScript_Ivan:: @ 81ED35F
+	trainerbattle_single TRAINER_IVAN, Route104_Text_IvanIntro, Route104_Text_IvanDefeat
+	msgbox Route104_Text_IvanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED376:: @ 81ED376
-	trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4
-	msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE
+Route104_EventScript_Billy:: @ 81ED376
+	trainerbattle_single TRAINER_BILLY, Route104_Text_BillyIntro, Route104_Text_BillyDefeat
+	msgbox Route104_Text_BillyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED38D:: @ 81ED38D
-	trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
+Route104_EventScript_Haley:: @ 81ED38D
+	trainerbattle_single TRAINER_HALEY_1, Route104_Text_HaleyIntro, Route104_Text_HaleyDefeat, Route104_EventScript_TryRegisterHaleyAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ED424
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route104_EventScript_RematchHaley
 	setvar VAR_0x8004, TRAINER_HALEY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1ED3F8
-	msgbox Route104_Text_295689, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route104_EventScript_TryRegisterHaley
+	msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED3CE:: @ 81ED3CE
+Route104_EventScript_TryRegisterHaleyAfterBattle:: @ 81ED3CE
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaleyAfterBattle
 	release
 	end
 
-Route104_EventScript_1ED3DF:: @ 81ED3DF
-	msgbox Route104_Text_29576B, MSGBOX_DEFAULT
+Route104_EventScript_RegisterHaleyAfterBattle:: @ 81ED3DF
+	msgbox Route104_Text_HaleyRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_HALEY_1
 	release
 	end
 
-Route104_EventScript_1ED3F8:: @ 81ED3F8
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED40B
-	msgbox Route104_Text_295689, MSGBOX_DEFAULT
+Route104_EventScript_TryRegisterHaley:: @ 81ED3F8
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaley
+	msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED40B:: @ 81ED40B
-	msgbox Route104_Text_2956FF, MSGBOX_DEFAULT
+Route104_EventScript_RegisterHaley:: @ 81ED40B
+	msgbox Route104_Text_HaleyRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_HALEY_1
 	release
 	end
 
-Route104_EventScript_1ED424:: @ 81ED424
-	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0
-	msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE
+Route104_EventScript_RematchHaley:: @ 81ED424
+	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_HaleyRematchIntro, Route104_Text_HaleyRematchDefeat
+	msgbox Route104_Text_HaleyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED43B:: @ 81ED43B
-	trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
+Route104_EventScript_Winston:: @ 81ED43B
+	trainerbattle_single TRAINER_WINSTON_1, Route104_Text_WinstonIntro, Route104_Text_WinstonDefeat, Route104_EventScript_TryRegisterWinstonAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ED4D2
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route104_EventScript_RematchWinston
 	setvar VAR_0x8004, TRAINER_WINSTON_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1ED4A6
-	msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route104_EventScript_TryRegisterWinston
+	msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED47C:: @ 81ED47C
+Route104_EventScript_TryRegisterWinstonAfterBattle:: @ 81ED47C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinstonAfterBattle
 	release
 	end
 
-Route104_EventScript_1ED48D:: @ 81ED48D
-	msgbox Route104_Text_29595A, MSGBOX_DEFAULT
+Route104_EventScript_RegisterWinstonAfterBattle:: @ 81ED48D
+	msgbox Route104_Text_WinstonRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WINSTON_1
 	release
 	end
 
-Route104_EventScript_1ED4A6:: @ 81ED4A6
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED4B9
-	msgbox Route104_Text_2958C1, MSGBOX_DEFAULT
+Route104_EventScript_TryRegisterWinston:: @ 81ED4A6
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinston
+	msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED4B9:: @ 81ED4B9
-	msgbox Route104_Text_2958F8, MSGBOX_DEFAULT
+Route104_EventScript_RegisterWinston:: @ 81ED4B9
+	msgbox Route104_Text_WinstonRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WINSTON_1
 	release
 	end
 
-Route104_EventScript_1ED4D2:: @ 81ED4D2
-	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC
-	msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE
+Route104_EventScript_RematchWinston:: @ 81ED4D2
+	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_WinstonRematchIntro, Route104_Text_WinstonRematchDefeat
+	msgbox Route104_Text_WinstonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED4E9:: @ 81ED4E9
-	trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
+Route104_EventScript_Cindy:: @ 81ED4E9
+	trainerbattle_single TRAINER_CINDY_1, Route104_Text_CindyIntro, Route104_Text_CindyDefeat, Route104_EventScript_TryRegisterCindyAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route104_EventScript_1ED580
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route104_EventScript_RematchCindy
 	setvar VAR_0x8004, TRAINER_CINDY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1ED554
-	msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route104_EventScript_TryRegisterCindy
+	msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED52A:: @ 81ED52A
+Route104_EventScript_TryRegisterCindyAfterBattle:: @ 81ED52A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindyAfterBattle
 	release
 	end
 
-Route104_EventScript_1ED53B:: @ 81ED53B
-	msgbox Route104_Text_295B60, MSGBOX_DEFAULT
+Route104_EventScript_RegisterCindyAfterBattle:: @ 81ED53B
+	msgbox Route104_Text_CindyRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CINDY_1
 	release
 	end
 
-Route104_EventScript_1ED554:: @ 81ED554
-	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED567
-	msgbox Route104_Text_295AC3, MSGBOX_DEFAULT
+Route104_EventScript_TryRegisterCindy:: @ 81ED554
+	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindy
+	msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED567:: @ 81ED567
-	msgbox Route104_Text_295B01, MSGBOX_DEFAULT
+Route104_EventScript_RegisterCindy:: @ 81ED567
+	msgbox Route104_Text_CindyRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CINDY_1
 	release
 	end
 
-Route104_EventScript_1ED580:: @ 81ED580
-	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA
-	msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE
+Route104_EventScript_RematchCindy:: @ 81ED580
+	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_CindyRematchIntro, Route104_Text_CindyRematchDefeat
+	msgbox Route104_Text_CindyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_1ED597:: @ 81ED597
-	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
+Route104_EventScript_Gina:: @ 81ED597
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_GinaIntro, Route104_Text_GinaDefeat, Route104_Text_GinaNotEnoughMons
 	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_2952FE, MSGBOX_DEFAULT
+	msgbox Route104_Text_GinaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED5B6:: @ 81ED5B6
-	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
+Route104_EventScript_Mia:: @ 81ED5B6
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_MiaIntro, Route104_Text_MiaDefeat, Route104_Text_MiaNotEnoughMons
 	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_29540D, MSGBOX_DEFAULT
+	msgbox Route104_Text_MiaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_1ED5D5:: @ 81ED5D5
-	trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9
-	msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE
+Route104_EventScript_Darian:: @ 81ED5D5
+	trainerbattle_single TRAINER_DARIAN, Route104_Text_DarianIntro, Route104_Text_DarianDefeat
+	msgbox Route104_Text_DarianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_Text_1ED5EC: @ 81ED5EC
+Route104_Text_BrineyLivesInSeasideCottage: @ 81ED5EC
 	.string "That seaside cottage is where\n"
 	.string "MR. BRINEY lives.\p"
 	.string "He was once a mighty sailor who never\n"
 	.string "feared the sea, however stormy.$"
 
-Route104_Text_1ED662: @ 81ED662
+Route104_Text_WhatsItLikeAtBottomOfSea: @ 81ED662
 	.string "The sea, huh?\p"
 	.string "I wonder what it's like at the bottom\n"
 	.string "of the sea?$"
 
-Route104_Text_1ED6A2: @ 81ED6A2
+Route104_Text_ThrowBallAtWeakenedPokemon: @ 81ED6A2
 	.string "If you're going to throw a POKé BALL,\n"
 	.string "weaken the wild POKéMON first.\p"
 	.string "It will be easier to catch if it's been\n"
 	.string "poisoned, burned, or lulled to sleep.$"
 
-Route104_Text_1ED735: @ 81ED735
+Route104_Text_OnlyThrowBallAtWildPokemon: @ 81ED735
 	.string "You're a thief if you try to steal\n"
 	.string "someone else's POKéMON.\p"
 	.string "You should throw POKé BALLS only at\n"
 	.string "wild POKéMON.$"
 
-Route104_Text_1ED7A2: @ 81ED7A2
+Route104_Text_ImNotATrainer: @ 81ED7A2
 	.string "Oh, no, I'm not a TRAINER.\p"
 	.string "But that's right, if TRAINERS lock eyes,\n"
 	.string "it's a challenge to battle.\p"
 	.string "If you don't want to battle, stay out\n"
 	.string "of their sight.$"
 
-Route104_Text_1ED838: @ 81ED838
+Route104_Text_LikeFillingMouthWithSeedsTakeThis: @ 81ED838
 	.string "I like filling my mouth with seeds,\n"
 	.string "then spitting them out fast!\p"
 	.string "You can have this, so you try it out!\p"
 	.string "Use it on a POKéMON, and it will learn\n"
 	.string "a move for firing seeds rapidly.$"
 
-Route104_Text_1ED8E7: @ 81ED8E7
+Route104_Text_TMsAreOneTimeUse: @ 81ED8E7
 	.string "A word of advice!\p"
 	.string "A TM, TECHNICAL MACHINE, is good only\n"
 	.string "for one-time use.\p"
 	.string "Once you use it, it's gone.\n"
 	.string "Think twice before using it!$"
 
-Route104_Text_1ED96A: @ 81ED96A
+Route104_Text_DontNeedThisTakeIt: @ 81ED96A
 	.string "This FLOWER SHOP started selling\n"
 	.string "saplings recently.\p"
 	.string "It made me so happy, I went overboard\n"
@@ -1065,27 +1066,27 @@ Route104_Text_1ED96A: @ 81ED96A
 	.string "I don't need this WHITE HERB anymore.\n"
 	.string "Would you take it, please?$"
 
-Route104_Text_1EDA0F: @ 81EDA0F
+Route104_Text_FlowerShopSellingSaplings: @ 81EDA0F
 	.string "This FLOWER SHOP started selling\n"
 	.string "saplings recently.\p"
 	.string "It made me so happy, I went overboard\n"
 	.string "shopping. Where should I put them?$"
 
-Route104_Text_1EDA8C: @ 81EDA8C
+Route104_Text_MrBrineysCottage: @ 81EDA8C
 	.string "MR. BRINEY'S COTTAGE$"
 
-Route104_Text_1EDAA1: @ 81EDAA1
+Route104_Text_RouteSignPetalburg: @ 81EDAA1
 	.string "ROUTE 1O4\n"
 	.string "{RIGHT_ARROW} PETALBURG CITY$"
 
-Route104_Text_1EDABC: @ 81EDABC
+Route104_Text_RouteSignRustboro: @ 81EDABC
 	.string "ROUTE 1O4\n"
 	.string "{UP_ARROW} RUSTBORO CITY$"
 
-Route104_Text_1EDAD6: @ 81EDAD6
+Route104_Text_PrettyPetalFlowShop: @ 81EDAD6
 	.string "PRETTY PETAL FLOWER SHOP$"
 
-Route104_Text_1EDAEF: @ 81EDAEF
+Route104_Text_TrainerTipsDoubleBattles: @ 81EDAEF
 	.string "TRAINER TIPS\p"
 	.string "In the HOENN region there are pairs\n"
 	.string "of TRAINERS who challenge others\l"
@@ -1096,45 +1097,45 @@ Route104_Text_1EDAEF: @ 81EDAEF
 	.string "left of the list and the top one.\l"
 	.string "Watch how POKéMON are lined up.$"
 
-Route104_Text_1EDBFF: @ 81EDBFF
+Route104_Text_MayWeShouldRegister: @ 81EDBFF
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "DEVON upgraded your POKéNAV with\n"
 	.string "the MATCH CALL system, huh?\p"
 	.string "We should register each other so we\n"
 	.string "can get in contact anytime.$"
 
-Route104_Text_1EDC8F: @ 81EDC8F
+Route104_Text_RegisteredMay: @ 81EDC8F
 	.string "{PLAYER} registered MAY\n"
 	.string "in the POKéNAV.$"
 
-Route104_Text_1EDCB1: @ 81EDCB1
+Route104_Text_MayHowsYourPokedex: @ 81EDCB1
 	.string "MAY: Oh, by the way, {PLAYER}{KUN},\n"
 	.string "how's your POKéDEX coming along?$"
 
-Route104_Text_1EDCED: @ 81EDCED
+Route104_Text_MayMinesDecentLetsBattle: @ 81EDCED
 	.string "Mine's looking pretty decent.\n"
 	.string "So…\l"
 	.string "How about a little battle?$"
 
-Route104_Text_1EDD2A: @ 81EDD2A
+Route104_Text_MayHaventRaisedPokemon: @ 81EDD2A
 	.string "MAY: Oh, what's the matter?\p"
 	.string "Haven't you caught or raised your\n"
 	.string "POKéMON very much?\p"
 	.string "That's not very good for a TRAINER!$"
 
-Route104_Text_1EDD9F: @ 81EDD9F
+Route104_Text_MayLetsBattle: @ 81EDD9F
 	.string "MAY: So, what do you think?\n"
 	.string "How about a little battle here?$"
 
-Route104_Text_1EDDDB: @ 81EDDDB
+Route104_Text_MayIntro: @ 81EDDDB
 	.string "MAY: You just became a TRAINER,\n"
 	.string "{PLAYER}{KUN}. I'm not going to lose!$"
 
-Route104_Text_1EDE18: @ 81EDE18
+Route104_Text_MayDefeat: @ 81EDE18
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-Route104_Text_1EDE3E: @ 81EDE3E
+Route104_Text_MayPostBattle: @ 81EDE3E
 	.string "MAY: I can tell you've gotten pretty\n"
 	.string "good with the way you handle POKéMON.\p"
 	.string "But instead of only making them\n"
@@ -1142,43 +1143,43 @@ Route104_Text_1EDE3E: @ 81EDE3E
 	.string "It's important to become friends with\n"
 	.string "POKéMON, too.$"
 
-Route104_Text_1EDF04: @ 81EDF04
+Route104_Text_BrendanWeShouldRegister: @ 81EDF04
 	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
 	.string "Cool, you had DEVON install the MATCH\n"
 	.string "CALL system on your POKéNAV!\p"
 	.string "Let's register each other in our\n"
 	.string "POKéNAVS so we can keep in touch.$"
 
-Route104_Text_1EDFA0: @ 81EDFA0
+Route104_Text_RegisteredBrendan: @ 81EDFA0
 	.string "{PLAYER} registered BRENDAN\n"
 	.string "in the POKéNAV.$"
 
-Route104_Text_1EDFC6: @ 81EDFC6
+Route104_Text_BrendanHowsYourPokedex: @ 81EDFC6
 	.string "BRENDAN: {PLAYER}, how's your POKéDEX?\n"
 	.string "Have you filled in any pages yet?$"
 
-Route104_Text_1EE009: @ 81EE009
+Route104_Text_BrendanDoingGreatLetsBattle: @ 81EE009
 	.string "Me, I'm doing great!\p"
 	.string "Want to check out how good I am with\n"
 	.string "a battle?$"
 
-Route104_Text_1EE04D: @ 81EE04D
+Route104_Text_BrendanNoConfidence: @ 81EE04D
 	.string "BRENDAN: What's the matter? Don't have\n"
 	.string "any confidence in your POKéMON?$"
 
-Route104_Text_1EE094: @ 81EE094
+Route104_Text_BrendanLetsBattle: @ 81EE094
 	.string "BRENDAN: What's up?\n"
 	.string "Want to have a battle with me?$"
 
-Route104_Text_1EE0C7: @ 81EE0C7
+Route104_Text_BrendanIntro: @ 81EE0C7
 	.string "BRENDAN: I know you just became\n"
 	.string "a TRAINER, but I won't go easy!$"
 
-Route104_Text_1EE107: @ 81EE107
+Route104_Text_BrendanDefeat: @ 81EE107
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-Route104_Text_1EE120: @ 81EE120
+Route104_Text_BrendanPostBattle: @ 81EE120
 	.string "BRENDAN: You've gotten pretty decent\n"
 	.string "at handling POKéMON.\p"
 	.string "But, you know, you shouldn't just be\n"
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index 0a8b6eafc..bccc903f1 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -309,11 +309,11 @@ Route110_EventScript_CyclingChallengeEnd:: @ 81EF661
 	lockall
 	applymovement 21, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call Route110_EventScript_1EF673
+	call Route110_EventScript_CyclingChallengeResults
 	releaseall
 	end
 
-Route110_EventScript_1EF673:: @ 81EF673
+Route110_EventScript_CyclingChallengeResults:: @ 81EF673
 	special FinishCyclingRoadChallenge
 	msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT
 	switch VAR_RESULT
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 10102e956..0de4153cc 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -749,10 +749,7 @@ Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449
 
 Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459
 	setvar VAR_0x8006, 0
-	setfieldeffectargument 0, VAR_0x8004
-	setfieldeffectargument 1, VAR_0x8005
-	setfieldeffectargument 2, VAR_0x8006
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle VAR_0x8004, VAR_0x8005, VAR_0x8006
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	return
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index 37c70e351..5770ab0c0 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F0FC5",
+      "script": "Route111_EventScript_Victor",
       "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F121B",
+      "script": "Route111_EventScript_Heidi",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F1189",
+      "script": "Route111_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1204",
+      "script": "Route111_EventScript_Drew",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F1260",
+      "script": "Route111_EventScript_Dusty",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route111_EventScript_1F1232",
+      "script": "Route111_EventScript_Beau",
       "flag": "0"
     },
     {
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1249",
+      "script": "Route111_EventScript_Becky",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F0EB9",
+      "script": "Route111_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F12D9",
+      "script": "Route111_EventScript_Irene",
       "flag": "0"
     },
     {
@@ -404,7 +404,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F12C2",
+      "script": "Route111_EventScript_Travis",
       "flag": "0"
     },
     {
@@ -417,7 +417,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F12F0",
+      "script": "Route111_EventScript_Daisuke",
       "flag": "0"
     },
     {
@@ -430,7 +430,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route111_EventScript_1F1369",
+      "script": "Route111_EventScript_Brooke",
       "flag": "0"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1307",
+      "script": "Route111_EventScript_Wilton",
       "flag": "0"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F1192",
+      "script": "Route111_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -482,7 +482,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route111_EventScript_1F13F9",
+      "script": "Route111_EventScript_Tyron",
       "flag": "0"
     },
     {
@@ -495,7 +495,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route111_EventScript_1F1410",
+      "script": "Route111_EventScript_Celina",
       "flag": "0"
     },
     {
@@ -508,7 +508,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F13E2",
+      "script": "Route111_EventScript_Bianca",
       "flag": "0"
     },
     {
@@ -521,7 +521,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F13CB",
+      "script": "Route111_EventScript_Hayden",
       "flag": "0"
     },
     {
@@ -534,7 +534,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route111_EventScript_1F143E",
+      "script": "Route111_EventScript_Bryan",
       "flag": "0"
     },
     {
@@ -547,7 +547,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route111_EventScript_1F1427",
+      "script": "Route111_EventScript_Celia",
       "flag": "0"
     },
     {
@@ -560,7 +560,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route111_EventScript_1F1455",
+      "script": "Route111_EventScript_Branden",
       "flag": "0"
     },
     {
@@ -586,7 +586,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F119B",
+      "script": "Route111_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -625,7 +625,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F11E4",
+      "script": "Route111_EventScript_RockSmashTipFatMan",
       "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY"
     }
   ],
@@ -674,7 +674,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -683,7 +683,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -692,7 +692,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -701,7 +701,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -710,7 +710,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -719,7 +719,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -728,7 +728,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -737,7 +737,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -746,7 +746,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -755,7 +755,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -764,7 +764,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -773,7 +773,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -782,7 +782,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -791,7 +791,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -800,7 +800,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -809,7 +809,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -818,7 +818,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -827,7 +827,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -836,7 +836,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -845,7 +845,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -854,7 +854,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -863,7 +863,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -872,7 +872,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -881,7 +881,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -890,7 +890,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -899,7 +899,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -908,7 +908,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -917,7 +917,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -926,7 +926,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -935,7 +935,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -944,7 +944,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -953,7 +953,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -962,7 +962,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -971,7 +971,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     }
   ],
   "bg_events": [
@@ -981,7 +981,7 @@
       "y": 114,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F115C"
+      "script": "Route111_EventScript_WinstrateHouseSign"
     },
     {
       "type": "sign",
@@ -989,7 +989,7 @@
       "y": 126,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1153"
+      "script": "Route111_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -997,7 +997,7 @@
       "y": 66,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1165"
+      "script": "Route111_EventScript_RouteSign112"
     },
     {
       "type": "sign",
@@ -1005,7 +1005,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F116E"
+      "script": "Route111_EventScript_RouteSign113"
     },
     {
       "type": "secret_base",
@@ -1034,7 +1034,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1177"
+      "script": "Route111_EventScript_OldLadysRestStopSign"
     },
     {
       "type": "secret_base",
@@ -1071,7 +1071,7 @@
       "y": 84,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1180"
+      "script": "Route111_EventScript_TrainerTipsSpAtkSpDef"
     },
     {
       "type": "secret_base",
@@ -1109,7 +1109,7 @@
       "y": 116,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F146C"
+      "script": "Route111_EventScript_TrainerHillSign"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 91d13e88c..b80ef6b84 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -1,22 +1,23 @@
 Route111_MapScripts:: @ 81F0CA7
-	map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC
+	map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_OnFrame
 	.byte 0
 
-Route111_MapScript1_1F0CBC: @ 81F0CBC
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1
+Route111_OnLoad: @ 81F0CBC
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins
 	compare VAR_MIRAGE_TOWER_STATE, 1
-	call_if_eq Route111_EventScript_1F0CE4
+	call_if_eq Route111_EventScript_ShowTemporaryMirageTower
 	end
 
-Route111_EventScript_1F0CD1:: @ 81F0CD1
+Route111_EventScript_CloseDesertRuins:: @ 81F0CD1
 	setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
 	setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route111_EventScript_1F0CE4:: @ 81F0CE4
+@ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout
+Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4
 	setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
 	setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
 	setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
@@ -40,53 +41,51 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4
 Route111_OnTransition: @ 81F0D87
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special SetMirageTowerVisibility
-	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
+	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower
 	compare VAR_MIRAGE_TOWER_STATE, 1
-	call_if_eq Route111_EventScript_1F0DC2
+	call_if_eq Route111_EventScript_SetFallingPlayerGfx
 	compare VAR_MIRAGE_TOWER_STATE, 2
-	call_if_eq Route111_EventScript_1F0E40
-	call Route111_EventScript_1F0DE6
+	call_if_eq Route111_EventScript_SetMirageTowerGone
+	call Route111_EventScript_CheckSetSandstorm
 	call GabbyAndTy_EventScript_UpdateLocation
 	checktrainerflag TRAINER_VICKY
-	goto_if_lt Route111_EventScript_1F0E26
+	goto_if_lt Route111_EventScript_SetWinstratesNotDefeated
 	end
 
-Route111_EventScript_1F0DC2:: @ 81F0DC2
+Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route111_EventScript_1F0DDA
+	goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route111_EventScript_1F0DE0
+	goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale
 	return
 
-Route111_EventScript_1F0DDA:: @ 81F0DDA
+Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-Route111_EventScript_1F0DE0:: @ 81F0DE0
+Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-Route111_EventScript_1F0DE6:: @ 81F0DE6
+Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 34
-	goto_if_lt Route111_EventScript_1F0E25
+	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_1, 107
-	goto_if_gt Route111_EventScript_1F0E25
+	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_1, 72
-	goto_if_gt Route111_EventScript_1F0E22
+	goto_if_gt Route111_EventScript_SetSandstorm
 	compare VAR_TEMP_0, 2000
-	goto_if_gt Route111_EventScript_1F0E25
+	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_0, 8
-	goto_if_lt Route111_EventScript_1F0E25
-
-Route111_EventScript_1F0E22:: @ 81F0E22
+	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
+Route111_EventScript_SetSandstorm:: @ 81F0E22
 	setweather WEATHER_SANDSTORM
-
-Route111_EventScript_1F0E25:: @ 81F0E25
+Route111_EventScript_EndCheckSetSandstorm:: @ 81F0E25
 	return
 
-Route111_EventScript_1F0E26:: @ 81F0E26
+Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26
 	clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
@@ -96,27 +95,27 @@ Route111_EventScript_1F0E26:: @ 81F0E26
 	cleartrainerflag TRAINER_VIVI
 	end
 
-Route111_EventScript_1F0E3C:: @ 81F0E3C
+Route111_EventScript_SetLayoutNoMirageTower:: @ 81F0E3C
 	setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER
 	return
 
-Route111_EventScript_1F0E40:: @ 81F0E40
+Route111_EventScript_SetMirageTowerGone:: @ 81F0E40
 	setvar VAR_MIRAGE_TOWER_STATE, 3
 	return
 
-Route111_MapScript2_1F0E46: @ 81F0E46
-	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E50
+Route111_OnWarp: @ 81F0E46
+	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_HidePlayerForMirageTower
 	.2byte 0
 
-Route111_EventScript_1F0E50:: @ 81F0E50
+Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	end
 
-Route111_MapScript2_1F0E56: @ 81F0E56
-	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E60
+Route111_OnFrame: @ 81F0E56
+	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_MirageTowerDisappear
 	.2byte 0
 
-Route111_EventScript_1F0E60:: @ 81F0E60
+Route111_EventScript_MirageTowerDisappear:: @ 81F0E60
 	lockall
 	special StartMirageTowerShake
 	waitstate
@@ -136,17 +135,18 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	waitstate
 	setvar VAR_MIRAGE_TOWER_STATE, 2
 	clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
-	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7
-	msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
+	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_RootFossilDisappeared
+	msgbox Route111_Text_ClawFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_EventScript_1F0EA7:: @ 81F0EA7
-	msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT
+Route111_EventScript_RootFossilDisappeared:: @ 81F0EA7
+	msgbox Route111_Text_RootFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_Movement_1F0EB1:: @ 81F0EB1
+@ Unused
+Route111_Movement_PlayerFall:: @ 81F0EB1
 	store_lock_anim
 	walk_fast_down
 	walk_fast_down
@@ -156,498 +156,500 @@ Route111_Movement_1F0EB1:: @ 81F0EB1
 	walk_fast_down
 	step_end
 
-Route111_EventScript_1F0EB9:: @ 81F0EB9
+Route111_EventScript_Girl:: @ 81F0EB9
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4
-	msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT
+	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry
+	msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT
 	giveitem_std ITEM_RAZZ_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY
 	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT
+	msgbox Route111_Text_GoingToTryToMakeDifferentColorBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0EF4:: @ 81F0EF4
-	msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT
+Route111_EventScript_ReceivedBerry:: @ 81F0EF4
+	msgbox Route111_Text_WhatColorBerriesToLookForToday, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0EFE:: @ 81F0EFE
+@ Unused
+Route111_EventScript_ViciousSandstormTriggerUp:: @ 81F0EFE
 	lockall
 	setvar VAR_0x8004, 0
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F0A:: @ 81F0F0A
+Route111_EventScript_ViciousSandstormTriggerDown:: @ 81F0F0A
 	lockall
 	setvar VAR_0x8004, 1
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F16:: @ 81F0F16
+Route111_EventScript_ViciousSandstormTriggerLeft:: @ 81F0F16
 	lockall
 	setvar VAR_0x8004, 2
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F22:: @ 81F0F22
+@ Unused
+Route111_EventScript_ViciousSandstormTriggerRight:: @ 81F0F22
 	lockall
 	setvar VAR_0x8004, 3
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F2E:: @ 81F0F2E
+Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E
 	checkitem ITEM_GO_GOGGLES, 1
-	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_1F0F45
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route111_EventScript_PreventRouteAccess
 	setvar VAR_TEMP_3, 1
 	releaseall
 	end
 
-Route111_EventScript_1F0F45:: @ 81F0F45
+Route111_EventScript_PreventRouteAccess:: @ 81F0F45
 	msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8004, 0
-	call_if_eq Route111_EventScript_1F0F7C
+	call_if_eq Route111_EventScript_PushUpFromRoute
 	compare VAR_0x8004, 1
-	call_if_eq Route111_EventScript_1F0F87
+	call_if_eq Route111_EventScript_PushDownFromRoute
 	compare VAR_0x8004, 2
-	call_if_eq Route111_EventScript_1F0F92
+	call_if_eq Route111_EventScript_PushLeftFromRoute
 	compare VAR_0x8004, 3
-	call_if_eq Route111_EventScript_1F0F9D
+	call_if_eq Route111_EventScript_PushRightFromRoute
 	releaseall
 	end
 
-Route111_EventScript_1F0F7C:: @ 81F0F7C
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8
+Route111_EventScript_PushUpFromRoute:: @ 81F0F7C
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F87:: @ 81F0F87
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA
+Route111_EventScript_PushDownFromRoute:: @ 81F0F87
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F92:: @ 81F0F92
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC
+Route111_EventScript_PushLeftFromRoute:: @ 81F0F92
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F9D:: @ 81F0F9D
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE
+Route111_EventScript_PushRightFromRoute:: @ 81F0F9D
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute
 	waitmovement 0
 	return
 
-Route111_Movement_1F0FA8: @ 81F0FA8
+Route111_Movement_PushUpFromRoute: @ 81F0FA8
 	walk_up
 	step_end
 
-Route111_Movement_1F0FAA: @ 81F0FAA
+Route111_Movement_PushDownFromRoute: @ 81F0FAA
 	walk_down
 	step_end
 
-Route111_Movement_1F0FAC: @ 81F0FAC
+Route111_Movement_PushLeftFromRoute: @ 81F0FAC
 	walk_left
 	step_end
 
-Route111_Movement_1F0FAE: @ 81F0FAE
+Route111_Movement_PushRightFromRoute: @ 81F0FAE
 	walk_right
 	step_end
 
-Route111_EventScript_1F0FB0:: @ 81F0FB0
+Route111_EventScript_SunTrigger:: @ 81F0FB0
 	setweather WEATHER_SUNNY
 	fadenewbgm MUS_DOORO_X1
 	doweather
 	setvar VAR_TEMP_3, 0
 	end
 
-Route111_EventScript_1F0FBD:: @ 81F0FBD
+Route111_EventScript_SandstormTrigger:: @ 81F0FBD
 	setweather WEATHER_SANDSTORM
 	fadenewbgm MUS_ASHROAD
 	doweather
 	end
 
-Route111_EventScript_1F0FC5:: @ 81F0FC5
+Route111_EventScript_Victor:: @ 81F0FC5
 	lock
 	faceplayer
 	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
-	msgbox Route111_Text_1F1475, MSGBOX_YESNO
+	msgbox Route111_Text_BattleOurFamily, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route111_EventScript_1F0FE7
-	msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT
+	goto_if_eq Route111_EventScript_BattleWinstrates
+	msgbox Route111_Text_IsThatSo, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0FE7:: @ 81F0FE7
-	msgbox Route111_Text_1F1523, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542
+Route111_EventScript_BattleWinstrates:: @ 81F0FE7
+	msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F156F, MSGBOX_DEFAULT
+	call Route111_EventScript_OpenWinstrateDoor
+	msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route111_Movement_1F114A
+	applymovement 1, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 1
-	call Route111_EventScript_1F1143
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	call Route111_EventScript_CloseWinstrateDoor
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 2
-	applymovement 2, Route111_Movement_1F114D
+	applymovement 2, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F159D, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616
+	call Route111_EventScript_CloseWinstrateDoor
+	msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat
 	applymovement 2, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F1645, MSGBOX_DEFAULT
+	call Route111_EventScript_OpenWinstrateDoor
+	msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, Route111_Movement_1F114A
+	applymovement 2, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 2
-	call Route111_EventScript_1F1143
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	call Route111_EventScript_CloseWinstrateDoor
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 3
-	applymovement 3, Route111_Movement_1F114D
+	applymovement 3, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F167E, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6
+	call Route111_EventScript_CloseWinstrateDoor
+	msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat
 	applymovement 3, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT
+	call Route111_EventScript_OpenWinstrateDoor
+	msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route111_Movement_1F114A
+	applymovement 3, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 3
-	call Route111_EventScript_1F1143
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	call Route111_EventScript_CloseWinstrateDoor
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 4
-	applymovement 4, Route111_Movement_1F114D
+	applymovement 4, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
-	msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756
-	msgbox Route111_Text_1F1788, MSGBOX_DEFAULT
+	call Route111_EventScript_CloseWinstrateDoor
+	msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat
+	msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
-	applymovement 4, Route111_Movement_1F114A
+	call Route111_EventScript_OpenWinstrateDoor
+	applymovement 4, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 4
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
 	release
 	end
 
-Route111_EventScript_1F113C:: @ 81F113C
+Route111_EventScript_OpenWinstrateDoor:: @ 81F113C
 	opendoor 13, 113
 	waitdooranim
 	return
 
-Route111_EventScript_1F1143:: @ 81F1143
+Route111_EventScript_CloseWinstrateDoor:: @ 81F1143
 	closedoor 13, 113
 	waitdooranim
 	return
 
-Route111_Movement_1F114A: @ 81F114A
+Route111_Movement_WinstrateEnterHouse: @ 81F114A
 	walk_in_place_fastest_up
 	walk_up
 	step_end
 
-Route111_Movement_1F114D: @ 81F114D
+Route111_Movement_WinstrateExitHouse: @ 81F114D
 	walk_down
 	step_end
 
-Route111_Movement_1F114F: @ 81F114F
+Route111_Movement_WaitForNextWinstrate: @ 81F114F
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-Route111_EventScript_1F1153:: @ 81F1153
-	msgbox Route111_Text_1F18CE, MSGBOX_SIGN
+Route111_EventScript_RouteSignMauville:: @ 81F1153
+	msgbox Route111_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F115C:: @ 81F115C
-	msgbox Route111_Text_1F18E8, MSGBOX_SIGN
+Route111_EventScript_WinstrateHouseSign:: @ 81F115C
+	msgbox Route111_Text_WinstrateHouseSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1165:: @ 81F1165
-	msgbox Route111_Text_1F1921, MSGBOX_SIGN
+Route111_EventScript_RouteSign112:: @ 81F1165
+	msgbox Route111_Text_RouteSign112, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F116E:: @ 81F116E
-	msgbox Route111_Text_1F1937, MSGBOX_SIGN
+Route111_EventScript_RouteSign113:: @ 81F116E
+	msgbox Route111_Text_RouteSign113, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1177:: @ 81F1177
-	msgbox Route111_Text_1F194D, MSGBOX_SIGN
+Route111_EventScript_OldLadysRestStopSign:: @ 81F1177
+	msgbox Route111_Text_OldLadysRestStopSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1180:: @ 81F1180
-	msgbox Route111_Text_1F1987, MSGBOX_SIGN
+Route111_EventScript_TrainerTipsSpAtkSpDef:: @ 81F1180
+	msgbox Route111_Text_TrainerTipsSpAtkSpDef, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1189:: @ 81F1189
-	msgbox Route111_Text_1F17BA, MSGBOX_NPC
+Route111_EventScript_Man1:: @ 81F1189
+	msgbox Route111_Text_ToughToKeepWinningUpTheRanks, MSGBOX_NPC
 	end
 
-Route111_EventScript_1F1192:: @ 81F1192
-	msgbox Route111_Text_1F186E, MSGBOX_NPC
+Route111_EventScript_Man2:: @ 81F1192
+	msgbox Route111_Text_WinstrateFamilyDestroyedMe, MSGBOX_NPC
 	end
 
-Route111_EventScript_1F119B:: @ 81F119B
+Route111_EventScript_Hiker:: @ 81F119B
 	lock
 	faceplayer
 	compare VAR_MIRAGE_TOWER_STATE, 3
-	goto_if_eq Route111_EventScript_1F11C6
+	goto_if_eq Route111_EventScript_HikerMirageTowerGone
 	compare VAR_MIRAGE_TOWER_STATE, 2
-	goto_if_eq Route111_EventScript_1F11D0
-	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
-	msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
+	goto_if_eq Route111_EventScript_HikerMirageTowerDisintegrated
+	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_HikerMirageTowerVisible
+	msgbox Route111_Text_ShouldBeMirageTowerAroundHere, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11C6:: @ 81F11C6
-	msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT
+Route111_EventScript_HikerMirageTowerGone:: @ 81F11C6
+	msgbox Route111_Text_MirageTowerHasntBeenSeenSince, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11D0:: @ 81F11D0
-	msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT
+Route111_EventScript_HikerMirageTowerDisintegrated:: @ 81F11D0
+	msgbox Route111_Text_ThatWasShockingSandRainedDown, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11DA:: @ 81F11DA
-	msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT
+Route111_EventScript_HikerMirageTowerVisible:: @ 81F11DA
+	msgbox Route111_Text_MirageTowerClearlyVisible, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11E4:: @ 81F11E4
+Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4
 	lockall
 	applymovement 46, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT
+	msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT
 	closemessage
 	applymovement 46, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-Route111_EventScript_1F1204:: @ 81F1204
-	trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A
-	msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE
+Route111_EventScript_Drew:: @ 81F1204
+	trainerbattle_single TRAINER_DREW, Route111_Text_DrewIntro, Route111_Text_DrewDefeat
+	msgbox Route111_Text_DrewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F121B:: @ 81F121B
-	trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908
-	msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE
+Route111_EventScript_Heidi:: @ 81F121B
+	trainerbattle_single TRAINER_HEIDI, Route111_Text_HeidiIntro, Route111_Text_HeidiDefeat
+	msgbox Route111_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1232:: @ 81F1232
-	trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6
-	msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE
+Route111_EventScript_Beau:: @ 81F1232
+	trainerbattle_single TRAINER_BEAU, Route111_Text_BeauIntro, Route111_Text_BeauDefeat
+	msgbox Route111_Text_BeauPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1249:: @ 81F1249
-	trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF
-	msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE
+Route111_EventScript_Becky:: @ 81F1249
+	trainerbattle_single TRAINER_BECKY, Route111_Text_BeckyIntro, Route111_Text_BeckyDefeat
+	msgbox Route111_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1260:: @ 81F1260
-	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
+Route111_EventScript_Dusty:: @ 81F1260
+	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F12AB
-	msgbox Route111_Text_298B9A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route111_EventScript_RematchDusty
+	msgbox Route111_Text_DustyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F128C:: @ 81F128C
+Route111_EventScript_RegisterDusty:: @ 81F128C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_298C00, MSGBOX_DEFAULT
+	msgbox Route111_Text_DustyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DUSTY_1
 	release
 	end
 
-Route111_EventScript_1F12AB:: @ 81F12AB
-	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2
-	msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE
+Route111_EventScript_RematchDusty:: @ 81F12AB
+	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_DustyRematchIntro, Route111_Text_DustyRematchDefeat
+	msgbox Route111_Text_DustyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12C2:: @ 81F12C2
-	trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8
-	msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE
+Route111_EventScript_Travis:: @ 81F12C2
+	trainerbattle_single TRAINER_TRAVIS, Route111_Text_TravisIntro, Route111_Text_TravisDefeat
+	msgbox Route111_Text_TravisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12D9:: @ 81F12D9
-	trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E
-	msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE
+Route111_EventScript_Irene:: @ 81F12D9
+	trainerbattle_single TRAINER_IRENE, Route111_Text_IreneIntro, Route111_Text_IreneDefeat
+	msgbox Route111_Text_IrenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12F0:: @ 81F12F0
-	trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14
-	msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE
+Route111_EventScript_Daisuke:: @ 81F12F0
+	trainerbattle_single TRAINER_DAISUKE, Route111_Text_DaisukeIntro, Route111_Text_DaisukeDefeat
+	msgbox Route111_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1307:: @ 81F1307
-	trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
+Route111_EventScript_Wilton:: @ 81F1307
+	trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F1352
-	msgbox Route111_Text_298FD4, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route111_EventScript_RematchWilton
+	msgbox Route111_Text_WiltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F1333:: @ 81F1333
+Route111_EventScript_RegisterWilton:: @ 81F1333
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_29903D, MSGBOX_DEFAULT
+	msgbox Route111_Text_WiltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WILTON_1
 	release
 	end
 
-Route111_EventScript_1F1352:: @ 81F1352
-	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE
-	msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE
+Route111_EventScript_RematchWilton:: @ 81F1352
+	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_WiltonRematchIntro, Route111_Text_WiltonRematchDefeat
+	msgbox Route111_Text_WiltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1369:: @ 81F1369
-	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
+Route111_EventScript_Brooke:: @ 81F1369
+	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_1F13B4
-	msgbox Route111_Text_2991C2, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route111_EventScript_RematchBrooke
+	msgbox Route111_Text_BrookePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F1395:: @ 81F1395
+Route111_EventScript_RegisterBrooke:: @ 81F1395
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_29921D, MSGBOX_DEFAULT
+	msgbox Route111_Text_BrookeRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BROOKE_1
 	release
 	end
 
-Route111_EventScript_1F13B4:: @ 81F13B4
-	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6
-	msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE
+Route111_EventScript_RematchBrooke:: @ 81F13B4
+	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_BrookeRematchIntro, Route111_Text_BrookeRematchDefeat
+	msgbox Route111_Text_BrookePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13CB:: @ 81F13CB
-	trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE
-	msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE
+Route111_EventScript_Hayden:: @ 81F13CB
+	trainerbattle_single TRAINER_HAYDEN, Route111_Text_HaydenIntro, Route111_Text_HaydenDefeat
+	msgbox Route111_Text_HaydenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13E2:: @ 81F13E2
-	trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D
-	msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE
+Route111_EventScript_Bianca:: @ 81F13E2
+	trainerbattle_single TRAINER_BIANCA, Route111_Text_BiancaIntro, Route111_Text_BiancaDefeat
+	msgbox Route111_Text_BiancaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13F9:: @ 81F13F9
-	trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549
-	msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE
+Route111_EventScript_Tyron:: @ 81F13F9
+	trainerbattle_single TRAINER_TYRON, Route111_Text_TyronIntro, Route111_Text_TyronDefeat
+	msgbox Route111_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1410:: @ 81F1410
-	trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625
-	msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE
+Route111_EventScript_Celina:: @ 81F1410
+	trainerbattle_single TRAINER_CELINA, Route111_Text_CelinaIntro, Route111_Text_CelinaDefeat
+	msgbox Route111_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1427:: @ 81F1427
-	trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384
-	msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE
+Route111_EventScript_Celia:: @ 81F1427
+	trainerbattle_single TRAINER_CELIA, Route111_Text_CeliaIntro, Route111_Text_CeliaDefeat
+	msgbox Route111_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F143E:: @ 81F143E
-	trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431
-	msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE
+Route111_EventScript_Bryan:: @ 81F143E
+	trainerbattle_single TRAINER_BRYAN, Route111_Text_BryanIntro, Route111_Text_BryanDefeat
+	msgbox Route111_Text_BryanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1455:: @ 81F1455
-	trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5
-	msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE
+Route111_EventScript_Branden:: @ 81F1455
+	trainerbattle_single TRAINER_BRANDEN, Route111_Text_BrandenIntro, Route111_Text_BrandenDefeat
+	msgbox Route111_Text_BrandenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F146C:: @ 81F146C
-	msgbox Route111_Text_1F1D61, MSGBOX_SIGN
+Route111_EventScript_TrainerHillSign:: @ 81F146C
+	msgbox Route111_Text_TrainerHillSign, MSGBOX_SIGN
 	end
 
-Route111_Text_1F1475: @ 81F1475
+Route111_Text_BattleOurFamily: @ 81F1475
 	.string "Hello! I take it you're a traveler.\p"
 	.string "How's this? What do you say to taking\n"
 	.string "on our family of four in a series of\l"
 	.string "POKéMON battles?$"
 
-Route111_Text_1F14F5: @ 81F14F5
+Route111_Text_IsThatSo: @ 81F14F5
 	.string "Is that so?\n"
 	.string "Drop in, if you change your mind!$"
 
-Route111_Text_1F1523: @ 81F1523
+Route111_Text_VictorIntro: @ 81F1523
 	.string "That's the spirit! I like you!$"
 
-Route111_Text_1F1542: @ 81F1542
+Route111_Text_VictorDefeat: @ 81F1542
 	.string "Aiyah!\n"
 	.string "You're a lot tougher than I expected!$"
 
-Route111_Text_1F156F: @ 81F156F
+Route111_Text_VictorPostBattle: @ 81F156F
 	.string "Hey, all!\n"
 	.string "I've found a pretty strong TRAINER!$"
 
-Route111_Text_1F159D: @ 81F159D
+Route111_Text_VictoriaIntro: @ 81F159D
 	.string "Oh, my goodness! Aren't you young?\p"
 	.string "You must be quite the TRAINER to beat\n"
 	.string "my husband, though.\p"
 	.string "It's my turn to battle now!$"
 
-Route111_Text_1F1616: @ 81F1616
+Route111_Text_VictoriaDefeat: @ 81F1616
 	.string "Oh, gosh!\n"
 	.string "I can't get over how strong you are!$"
 
-Route111_Text_1F1645: @ 81F1645
+Route111_Text_VictoriaPostBattle: @ 81F1645
 	.string "There's a strong TRAINER here!\n"
 	.string "This one's really strong!$"
 
-Route111_Text_1F167E: @ 81F167E
+Route111_Text_ViviIntro: @ 81F167E
 	.string "You're stronger than Mommy? Wow!\p"
 	.string "But I'm strong, too!\n"
 	.string "Really! Honestly!$"
 
-Route111_Text_1F16C6: @ 81F16C6
+Route111_Text_ViviDefeat: @ 81F16C6
 	.string "Huh? Did I just lose?$"
 
-Route111_Text_1F16DC: @ 81F16DC
+Route111_Text_ViviPostBattle: @ 81F16DC
 	.string "This stinks…\p"
 	.string "…Snivel… Grandma!$"
 
-Route111_Text_1F16FB: @ 81F16FB
+Route111_Text_VickyIntro: @ 81F16FB
 	.string "How dare you make my granddaughter\n"
 	.string "cry!\p"
 	.string "For that, I'm going to smack you!\n"
 	.string "Prepare to lose!$"
 
-Route111_Text_1F1756: @ 81F1756
+Route111_Text_VickyDefeat: @ 81F1756
 	.string "Kwah! You are strong…\n"
 	.string "My granddaughter was right…$"
 
-Route111_Text_1F1788: @ 81F1788
+Route111_Text_VickyPostBattle: @ 81F1788
 	.string "If you're not in any hurry,\n"
 	.string "visit with us awhile.$"
 
-Route111_Text_1F17BA: @ 81F17BA
+Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA
 	.string "If you don't raise your POKéMON some\n"
 	.string "more, it could be tough to keep winning\l"
 	.string "up through the ranks.\p"
@@ -655,32 +657,32 @@ Route111_Text_1F17BA: @ 81F17BA
 	.string "ELITE FOUR are far stronger than\l"
 	.string "any GYM LEADER.$"
 
-Route111_Text_1F186E: @ 81F186E
+Route111_Text_WinstrateFamilyDestroyedMe: @ 81F186E
 	.string "I challenged the WINSTRATE family,\n"
 	.string "but four matches in a row is tough\l"
 	.string "going… They destroyed me.$"
 
-Route111_Text_1F18CE: @ 81F18CE
+Route111_Text_RouteSignMauville: @ 81F18CE
 	.string "ROUTE 111\n"
 	.string "{DOWN_ARROW} MAUVILLE CITY$"
 
-Route111_Text_1F18E8: @ 81F18E8
+Route111_Text_WinstrateHouseSign: @ 81F18E8
 	.string "“Our family's hearts beat as one!”\n"
 	.string "THE WINSTRATE'S HOUSE$"
 
-Route111_Text_1F1921: @ 81F1921
+Route111_Text_RouteSign112: @ 81F1921
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 112$"
 
-Route111_Text_1F1937: @ 81F1937
+Route111_Text_RouteSign113: @ 81F1937
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 113$"
 
-Route111_Text_1F194D: @ 81F194D
+Route111_Text_OldLadysRestStopSign: @ 81F194D
 	.string "OLD LADY'S REST STOP\n"
 	.string "“Come in and rest your tired bones.”$"
 
-Route111_Text_1F1987: @ 81F1987
+Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987
 	.string "TRAINER TIPS\p"
 	.string "One of the indicators of a POKéMON's\n"
 	.string "powerfulness is SP. ATK. It stands for\l"
@@ -688,14 +690,14 @@ Route111_Text_1F1987: @ 81F1987
 	.string "Likewise, SP. DEF stands for “SPECIAL\n"
 	.string "DEFENSE.”$"
 
-Route111_Text_1F1A22: @ 81F1A22
+Route111_Text_ShouldBeMirageTowerAroundHere: @ 81F1A22
 	.string "There should be a tower made of sand\n"
 	.string "around here somewhere.\p"
 	.string "But for some reason, it can be seen\n"
 	.string "sometimes, and sometimes not.\p"
 	.string "That's why I call it the MIRAGE TOWER.$"
 
-Route111_Text_1F1AC7: @ 81F1AC7
+Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7
 	.string "I see it!\n"
 	.string "The tower of sand!\p"
 	.string "The sand tower they called a mirage\n"
@@ -705,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7
 	.string "I want to go inside it, but I can't\n"
 	.string "get my courage up for it…$"
 
-Route111_Text_1F1B92: @ 81F1B92
+Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92
 	.string "Whoa…\n"
 	.string "That was shocking.\p"
 	.string "Sand rained down in chunks all of\n"
@@ -713,21 +715,21 @@ Route111_Text_1F1B92: @ 81F1B92
 	.string "What was it like inside?\n"
 	.string "Were there sandy ghosts and such?$"
 
-Route111_Text_1F1C12: @ 81F1C12
+Route111_Text_MirageTowerHasntBeenSeenSince: @ 81F1C12
 	.string "Since I spoke to you, the tower of sand\n"
 	.string "hasn't been seen.\p"
 	.string "Perhaps it really was\n"
 	.string "the MIRAGE TOWER…$"
 
-Route111_Text_1F1C74: @ 81F1C74
+Route111_Text_ClawFossilDisappeared: @ 81F1C74
 	.string "The CLAW FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_1F1C9F: @ 81F1C9F
+Route111_Text_RootFossilDisappeared: @ 81F1C9F
 	.string "The ROOT FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_1F1CCA: @ 81F1CCA
+Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA
 	.string "Oh, no!\p"
 	.string "My uncle in MAUVILLE told me to take\n"
 	.string "ROCK SMASH with me if I was going to\l"
@@ -735,7 +737,7 @@ Route111_Text_1F1CCA: @ 81F1CCA
 	.string "My uncle? He lives across from\n"
 	.string "the bike shop in MAUVILLE.$"
 
-Route111_Text_1F1D61: @ 81F1D61
+Route111_Text_TrainerHillSign: @ 81F1D61
 	.string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
 	.string "“Scale the heights, you hot-blooded\n"
 	.string "TRAINERS!”$"
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index b963c6c48..e52468f32 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1DB7",
+      "script": "Route112_EventScript_MagmaGrunts",
       "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route112_EventScript_1F1E6A",
+      "script": "Route112_EventScript_Brice",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1EE3",
+      "script": "Route112_EventScript_Larry",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1EFA",
+      "script": "Route112_EventScript_Carol",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1E81",
+      "script": "Route112_EventScript_Trent",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1DB7",
+      "script": "Route112_EventScript_MagmaGrunts",
       "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1E61",
+      "script": "Route112_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1F11",
+      "script": "Route112_EventScript_Bryant",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1F28",
+      "script": "Route112_EventScript_Shayla",
       "flag": "0"
     }
   ],
@@ -265,7 +265,7 @@
       "y": 44,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E4F"
+      "script": "Route112_EventScript_MtChimneySign"
     },
     {
       "type": "sign",
@@ -273,7 +273,7 @@
       "y": 37,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E46"
+      "script": "Route112_EventScript_MtChimneyCableCarSign"
     },
     {
       "type": "sign",
@@ -281,7 +281,7 @@
       "y": 49,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E58"
+      "script": "Route112_EventScript_RouteSignLavaridge"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index beb572f08..4dd4fe112 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -7,13 +7,13 @@ Route112_OnTransition: @ 81F1DAE
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-Route112_EventScript_1F1DB7:: @ 81F1DB7
+Route112_EventScript_MagmaGrunts:: @ 81F1DB7
 	lockall
 	delay 40
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT
+	msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT
+	msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT
+	msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -37,107 +37,107 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F2003, MSGBOX_DEFAULT
+	msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-Route112_EventScript_1F1E46:: @ 81F1E46
-	msgbox Route112_Text_1F20C1, MSGBOX_SIGN
+Route112_EventScript_MtChimneyCableCarSign:: @ 81F1E46
+	msgbox Route112_Text_MtChimneyCableCarSign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E4F:: @ 81F1E4F
-	msgbox Route112_Text_1F20ED, MSGBOX_SIGN
+Route112_EventScript_MtChimneySign:: @ 81F1E4F
+	msgbox Route112_Text_MtChimneySign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E58:: @ 81F1E58
-	msgbox Route112_Text_1F2138, MSGBOX_SIGN
+Route112_EventScript_RouteSignLavaridge:: @ 81F1E58
+	msgbox Route112_Text_RouteSignLavaridge, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E61:: @ 81F1E61
-	msgbox Route112_Text_1F204E, MSGBOX_NPC
+Route112_EventScript_Hiker:: @ 81F1E61
+	msgbox Route112_Text_NotEasyToGetBackToLavaridge, MSGBOX_NPC
 	end
 
-Route112_EventScript_1F1E6A:: @ 81F1E6A
-	trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA
-	msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE
+Route112_EventScript_Brice:: @ 81F1E6A
+	trainerbattle_single TRAINER_BRICE, Route112_Text_BriceIntro, Route112_Text_BriceDefeat
+	msgbox Route112_Text_BricePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1E81:: @ 81F1E81
-	trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
+Route112_EventScript_Trent:: @ 81F1E81
+	trainerbattle_single TRAINER_TRENT_1, Route112_Text_TrentIntro, Route112_Text_TrentDefeat, Route112_EventScript_RegisterTrent
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route112_EventScript_1F1ECC
-	msgbox Route112_Text_299896, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route112_EventScript_RematchTrent
+	msgbox Route112_Text_TrentPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route112_EventScript_1F1EAD:: @ 81F1EAD
+Route112_EventScript_RegisterTrent:: @ 81F1EAD
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route112_Text_29993C, MSGBOX_DEFAULT
+	msgbox Route112_Text_TrentRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TRENT_1
 	release
 	end
 
-Route112_EventScript_1F1ECC:: @ 81F1ECC
-	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7
-	msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE
+Route112_EventScript_RematchTrent:: @ 81F1ECC
+	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_TrentRematchIntro, Route112_Text_TrentRematchDefeat
+	msgbox Route112_Text_TrentRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1EE3:: @ 81F1EE3
-	trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC
-	msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE
+Route112_EventScript_Larry:: @ 81F1EE3
+	trainerbattle_single TRAINER_LARRY, Route112_Text_LarryIntro, Route112_Text_LarryDefeat
+	msgbox Route112_Text_LarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1EFA:: @ 81F1EFA
-	trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36
-	msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE
+Route112_EventScript_Carol:: @ 81F1EFA
+	trainerbattle_single TRAINER_CAROL, Route112_Text_CarolIntro, Route112_Text_CarolDefeat
+	msgbox Route112_Text_CarolPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1F11:: @ 81F1F11
-	trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF
-	msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE
+Route112_EventScript_Bryant:: @ 81F1F11
+	trainerbattle_single TRAINER_BRYANT, Route112_Text_BryantIntro, Route112_Text_BryantDefeat
+	msgbox Route112_Text_BryantPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1F28:: @ 81F1F28
-	trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F
-	msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE
+Route112_EventScript_Shayla:: @ 81F1F28
+	trainerbattle_single TRAINER_SHAYLA, Route112_Text_ShaylaIntro, Route112_Text_ShaylaDefeat
+	msgbox Route112_Text_ShaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_Text_1F1F3F: @ 81F1F3F
+Route112_Text_LeaderGoingToAwakenThing: @ 81F1F3F
 	.string "Hey, man, is our leader really going\n"
 	.string "to awaken that thing?$"
 
-Route112_Text_1F1F7A: @ 81F1F7A
+Route112_Text_YeahWeNeedMeteorite: @ 81F1F7A
 	.string "Sounds like it, yeah. But I heard\n"
 	.string "we need a METEORITE to do it.$"
 
-Route112_Text_1F1FBA: @ 81F1FBA
+Route112_Text_OhThatsWhyCrewWentToFallarbor: @ 81F1FBA
 	.string "Oh, I get it now. That's why the rest\n"
 	.string "of the crew went out to FALLARBOR.$"
 
-Route112_Text_1F2003: @ 81F2003
+Route112_Text_CantLetAnyonePassUntilTheyreBack: @ 81F2003
 	.string "You got it. And until they come back,\n"
 	.string "we're not to let anyone pass, right.$"
 
-Route112_Text_1F204E: @ 81F204E
+Route112_Text_NotEasyToGetBackToLavaridge: @ 81F204E
 	.string "Eh, I'd like to get to MAUVILLE, but if\n"
 	.string "I went down these ledges, it'd be no\l"
 	.string "easy matter to get back to LAVARIDGE.$"
 
-Route112_Text_1F20C1: @ 81F20C1
+Route112_Text_MtChimneyCableCarSign: @ 81F20C1
 	.string "MT. CHIMNEY CABLE CAR\n"
 	.string "“A short walk {UP_ARROW} way!”$"
 
-Route112_Text_1F20ED: @ 81F20ED
+Route112_Text_MtChimneySign: @ 81F20ED
 	.string "MT. CHIMNEY\p"
 	.string "“For LAVARIDGE TOWN or the summit,\n"
 	.string "please take the CABLE CAR.”$"
 
-Route112_Text_1F2138: @ 81F2138
+Route112_Text_RouteSignLavaridge: @ 81F2138
 	.string "ROUTE 112\n"
 	.string "{LEFT_ARROW} LAVARIDGE TOWN$"
 
diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
index bcff99de4..ba3cf2452 100644
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F2193",
+      "script": "Route113_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F218A",
+      "script": "Route113_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21C0",
+      "script": "Route113_EventScript_Jaylen",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21D7",
+      "script": "Route113_EventScript_Dillon",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route113_EventScript_1F21EE",
+      "script": "Route113_EventScript_Madeline",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F2250",
+      "script": "Route113_EventScript_Lao",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22B2",
+      "script": "Route113_EventScript_Lung",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22C9",
+      "script": "Route113_EventScript_Tori",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22E4",
+      "script": "Route113_EventScript_Tia",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route113_EventScript_1F2344",
+      "script": "Route113_EventScript_Wyatt",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F232D",
+      "script": "Route113_EventScript_Lawrence",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F22FF",
+      "script": "Route113_EventScript_Sophie",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F2316",
+      "script": "Route113_EventScript_Coby",
       "flag": "0"
     }
   ],
@@ -404,7 +404,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F219C"
+      "script": "Route113_EventScript_RouteSign111"
     },
     {
       "type": "sign",
@@ -412,7 +412,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21A5"
+      "script": "Route113_EventScript_RouteSignFallarbor"
     },
     {
       "type": "sign",
@@ -420,7 +420,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21B7"
+      "script": "Route113_EventScript_TrainerTipsRegisterKeyItems"
     },
     {
       "type": "sign",
@@ -428,7 +428,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21AE"
+      "script": "Route113_EventScript_GlassWorkshopSign"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 89bf97373..612e4a864 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -1,170 +1,170 @@
 Route113_MapScripts:: @ 81F2153
-	map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E
+	map_script MAP_SCRIPT_ON_RESUME, Route113_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition
 	.byte 0
 
-Route113_MapScript1_1F215E: @ 81F215E
+Route113_OnResume: @ 81F215E
 	setstepcallback STEP_CB_ASH
 	end
 
 Route113_OnTransition: @ 81F2161
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
-	call Route113_EventScript_1F216A
+	call Route113_EventScript_CheckSetAshWeather
 	end
 
-Route113_EventScript_1F216A:: @ 81F216A
+Route113_EventScript_CheckSetAshWeather:: @ 81F216A
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 19
-	goto_if_lt Route113_EventScript_1F2189
+	goto_if_lt Route113_EventScript_DontSetAshWeather
 	compare VAR_TEMP_0, 84
-	goto_if_gt Route113_EventScript_1F2189
+	goto_if_gt Route113_EventScript_DontSetAshWeather
 	setweather WEATHER_ASH
 	return
 
-Route113_EventScript_1F2189:: @ 81F2189
+Route113_EventScript_DontSetAshWeather:: @ 81F2189
 	return
 
-Route113_EventScript_1F218A:: @ 81F218A
-	msgbox Route113_Text_1F235B, MSGBOX_NPC
+Route113_EventScript_Gentleman:: @ 81F218A
+	msgbox Route113_Text_AshCanBeFashionedIntoGlass, MSGBOX_NPC
 	end
 
-Route113_EventScript_1F2193:: @ 81F2193
-	msgbox Route113_Text_1F23CA, MSGBOX_NPC
+Route113_EventScript_NinjaBoy:: @ 81F2193
+	msgbox Route113_Text_FunWalkingThroughAsh, MSGBOX_NPC
 	end
 
-Route113_EventScript_1F219C:: @ 81F219C
-	msgbox Route113_Text_1F2440, MSGBOX_SIGN
+Route113_EventScript_RouteSign111:: @ 81F219C
+	msgbox Route113_Text_RouteSign111, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21A5:: @ 81F21A5
-	msgbox Route113_Text_1F2456, MSGBOX_SIGN
+Route113_EventScript_RouteSignFallarbor:: @ 81F21A5
+	msgbox Route113_Text_RouteSignFallarbor, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21AE:: @ 81F21AE
-	msgbox Route113_Text_1F24F8, MSGBOX_SIGN
+Route113_EventScript_GlassWorkshopSign:: @ 81F21AE
+	msgbox Route113_Text_GlassWorkshopSign, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21B7:: @ 81F21B7
-	msgbox Route113_Text_1F2471, MSGBOX_SIGN
+Route113_EventScript_TrainerTipsRegisterKeyItems:: @ 81F21B7
+	msgbox Route113_Text_TrainerTipsRegisterKeyItems, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21C0:: @ 81F21C0
-	trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68
-	msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
+Route113_EventScript_Jaylen:: @ 81F21C0
+	trainerbattle_single TRAINER_JAYLEN, Route113_Text_JaylenIntro, Route113_Text_JaylenDefeat
+	msgbox Route113_Text_JaylenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F21D7:: @ 81F21D7
-	trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C
-	msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
+Route113_EventScript_Dillon:: @ 81F21D7
+	trainerbattle_single TRAINER_DILLON, Route113_Text_DillonIntro, Route113_Text_DillonDefeat
+	msgbox Route113_Text_DillonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F21EE:: @ 81F21EE
-	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
+Route113_EventScript_Madeline:: @ 81F21EE
+	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_MadelineIntro, Route113_Text_MadelineDefeat, Route113_EventScript_RegisterMadeline
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route113_EventScript_1F2239
-	msgbox Route113_Text_299F15, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route113_EventScript_RematchMadeline
+	msgbox Route113_Text_MadelinePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_EventScript_1F221A:: @ 81F221A
+Route113_EventScript_RegisterMadeline:: @ 81F221A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route113_Text_299F49, MSGBOX_DEFAULT
+	msgbox Route113_Text_MadelineRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MADELINE_1
 	release
 	end
 
-Route113_EventScript_1F2239:: @ 81F2239
-	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9
-	msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
+Route113_EventScript_RematchMadeline:: @ 81F2239
+	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_MadelineRematchIntro, Route113_Text_MadelineRematchDefeat
+	msgbox Route113_Text_MadelinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2250:: @ 81F2250
-	trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
+Route113_EventScript_Lao:: @ 81F2250
+	trainerbattle_single TRAINER_LAO_1, Route113_Text_LaoIntro, Route113_Text_LaoDefeat, Route113_EventScript_RegisterLao
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route113_EventScript_1F229B
-	msgbox Route113_Text_29A067, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route113_EventScript_RematchLao
+	msgbox Route113_Text_LaoPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_EventScript_1F227C:: @ 81F227C
+Route113_EventScript_RegisterLao:: @ 81F227C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT
+	msgbox Route113_Text_LaoRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LAO_1
 	release
 	end
 
-Route113_EventScript_1F229B:: @ 81F229B
-	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F
-	msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
+Route113_EventScript_RematchLao:: @ 81F229B
+	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_LaoRematchIntro, Route113_Text_LaoRematchDefeat
+	msgbox Route113_Text_LaoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22B2:: @ 81F22B2
-	trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6
-	msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
+Route113_EventScript_Lung:: @ 81F22B2
+	trainerbattle_single TRAINER_LUNG, Route113_Text_LungIntro, Route113_Text_LungDefeat
+	msgbox Route113_Text_LungPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22C9:: @ 81F22C9
-	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
-	msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
+Route113_EventScript_Tori:: @ 81F22C9
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_ToriIntro, Route113_Text_ToriDefeat, Route113_Text_ToriNotEnoughMons
+	msgbox Route113_Text_ToriPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22E4:: @ 81F22E4
-	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
-	msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
+Route113_EventScript_Tia:: @ 81F22E4
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_TiaIntro, Route113_Text_TiaDefeat, Route113_Text_TiaNotEnoughMons
+	msgbox Route113_Text_TiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22FF:: @ 81F22FF
-	trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508
-	msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
+Route113_EventScript_Sophie:: @ 81F22FF
+	trainerbattle_single TRAINER_SOPHIE, Route113_Text_SophieIntro, Route113_Text_SophieDefeat
+	msgbox Route113_Text_SophiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2316:: @ 81F2316
-	trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480
-	msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
+Route113_EventScript_Coby:: @ 81F2316
+	trainerbattle_single TRAINER_COBY, Route113_Text_CobyIntro, Route113_Text_CobyDefeat
+	msgbox Route113_Text_CobyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F232D:: @ 81F232D
-	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0
-	msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
+Route113_EventScript_Lawrence:: @ 81F232D
+	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_LawrenceIntro, Route113_Text_LawrenceDefeat
+	msgbox Route113_Text_LawrencePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2344:: @ 81F2344
-	trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628
-	msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
+Route113_EventScript_Wyatt:: @ 81F2344
+	trainerbattle_single TRAINER_WYATT, Route113_Text_WyattIntro, Route113_Text_WyattDefeat
+	msgbox Route113_Text_WyattPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_Text_1F235B: @ 81F235B
+Route113_Text_AshCanBeFashionedIntoGlass: @ 81F235B
 	.string "Wahahaha! Today's technology is a\n"
 	.string "wondrous thing!\p"
 	.string "Take this volcanic ash here.\n"
 	.string "It can be fashioned into glass.$"
 
-Route113_Text_1F23CA: @ 81F23CA
+Route113_Text_FunWalkingThroughAsh: @ 81F23CA
 	.string "It's fun walking through the volcano's\n"
 	.string "ashes on the ground and grass.\p"
 	.string "You can see where you walked--it's\n"
 	.string "really neat!$"
 
-Route113_Text_1F2440: @ 81F2440
+Route113_Text_RouteSign111: @ 81F2440
 	.string "ROUTE 113\n"
 	.string "{RIGHT_ARROW} ROUTE 111$"
 
-Route113_Text_1F2456: @ 81F2456
+Route113_Text_RouteSignFallarbor: @ 81F2456
 	.string "ROUTE 113\n"
 	.string "{LEFT_ARROW} FALLARBOR TOWN$"
 
-Route113_Text_1F2471: @ 81F2471
+Route113_Text_TrainerTipsRegisterKeyItems: @ 81F2471
 	.string "TRAINER TIPS\p"
 	.string "You may register one of the KEY ITEMS\n"
 	.string "in your BAG as SELECT.\p"
 	.string "Simply press SELECT to use\n"
 	.string "the registered item conveniently.$"
 
-Route113_Text_1F24F8: @ 81F24F8
+Route113_Text_GlassWorkshopSign: @ 81F24F8
 	.string "GLASS WORKSHOP\n"
 	.string "“Turning Volcanic Ash into Glass Items”$"
 
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 1aee2d422..76a9083f4 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route114_EventScript_1F2640",
+      "script": "Route114_EventScript_Lenny",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route114_EventScript_1F2657",
+      "script": "Route114_EventScript_Lucas",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F266E",
+      "script": "Route114_EventScript_Shane",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F2685",
+      "script": "Route114_EventScript_Nancy",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F269C",
+      "script": "Route114_EventScript_Steve",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F25D1",
+      "script": "Route114_EventScript_RoarGentleman",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2612",
+      "script": "Route114_EventScript_Poochyena",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2582",
+      "script": "Route114_EventScript_Man",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2777",
+      "script": "Route114_EventScript_Nolan",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2760",
+      "script": "Route114_EventScript_Claude",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F26FE",
+      "script": "Route114_EventScript_Bernie",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route114_EventScript_1F27A9",
+      "script": "Route114_EventScript_Ivy",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route114_EventScript_1F278E",
+      "script": "Route114_EventScript_Tyra",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F27DB",
+      "script": "Route114_EventScript_Charlotte",
       "flag": "0"
     },
     {
@@ -347,7 +347,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route114_EventScript_1F27C4",
+      "script": "Route114_EventScript_Angelina",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F27F2",
+      "script": "Route114_EventScript_Kai",
       "flag": "0"
     }
   ],
@@ -422,7 +422,7 @@
       "y": 64,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F2625"
+      "script": "Route114_EventScript_MeteorFallsSign"
     },
     {
       "type": "sign",
@@ -430,7 +430,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F262E"
+      "script": "Route114_EventScript_FossilManiacsHouseSign"
     },
     {
       "type": "secret_base",
@@ -480,7 +480,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F2637"
+      "script": "Route114_EventScript_LanettesHouseSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index caf6e1496..1873f6f7a 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -1,7 +1,7 @@
 Route114_MapScripts:: @ 81F252F
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578
+	map_script MAP_SCRIPT_ON_LOAD, Route114_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_OnFrame
 	.byte 0
 
 Route114_OnTransition: @ 81F253F
@@ -13,199 +13,199 @@ Route114_OnTransition: @ 81F253F
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route114_MapScript1_1F2561: @ 81F2561
+Route114_OnLoad: @ 81F2561
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South
 	end
 
-Route114_MapScript2_1F2578: @ 81F2578
+Route114_OnFrame: @ 81F2578
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route114_EventScript_1F2582:: @ 81F2582
+Route114_EventScript_Man:: @ 81F2582
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7
-	msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
-	random 5
-	addvar VAR_RESULT, 15
+	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_ReceivedBerry
+	msgbox Route114_Text_LoveUsingBerryCrushShareBerry, MSGBOX_DEFAULT
+	random NUM_ROUTE_114_MAN_BERRIES
+	addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY
-	msgbox Route114_Text_2A7034, MSGBOX_DEFAULT
+	msgbox Route114_Text_TryBerryCrushWithFriends, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F25C7:: @ 81F25C7
-	msgbox Route114_Text_2A706E, MSGBOX_DEFAULT
+Route114_EventScript_ReceivedBerry:: @ 81F25C7
+	msgbox Route114_Text_FunToThinkAboutBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F25D1:: @ 81F25D1
+Route114_EventScript_RoarGentleman:: @ 81F25D1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608
-	msgbox Route114_Text_1F2809, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar
+	msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM05
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM05
-	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
+	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F2608:: @ 81F2608
-	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
+Route114_EventScript_ReceivedRoar:: @ 81F2608
+	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F2612:: @ 81F2612
+Route114_EventScript_Poochyena:: @ 81F2612
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_POOCHYENA, 2
-	msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT
+	msgbox Route114_Text_Poochyena, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-Route114_EventScript_1F2625:: @ 81F2625
-	msgbox Route114_Text_1F28B3, MSGBOX_SIGN
+Route114_EventScript_MeteorFallsSign:: @ 81F2625
+	msgbox Route114_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F262E:: @ 81F262E
-	msgbox Route114_Text_1F28DB, MSGBOX_SIGN
+Route114_EventScript_FossilManiacsHouseSign:: @ 81F262E
+	msgbox Route114_Text_FossilManiacsHouseSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F2637:: @ 81F2637
-	msgbox Route114_Text_1F2910, MSGBOX_SIGN
+Route114_EventScript_LanettesHouseSign:: @ 81F2637
+	msgbox Route114_Text_LanettesHouse, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F2640:: @ 81F2640
-	trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707
-	msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE
+Route114_EventScript_Lenny:: @ 81F2640
+	trainerbattle_single TRAINER_LENNY, Route114_Text_LennyIntro, Route114_Text_LennyDefeat
+	msgbox Route114_Text_LennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2657:: @ 81F2657
-	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5
-	msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE
+Route114_EventScript_Lucas:: @ 81F2657
+	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_LucasIntro, Route114_Text_LucasDefeat
+	msgbox Route114_Text_LucasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F266E:: @ 81F266E
-	trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F
-	msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE
+Route114_EventScript_Shane:: @ 81F266E
+	trainerbattle_single TRAINER_SHANE, Route114_Text_ShaneIntro, Route114_Text_ShaneDefeat
+	msgbox Route114_Text_ShanePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2685:: @ 81F2685
-	trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E
-	msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE
+Route114_EventScript_Nancy:: @ 81F2685
+	trainerbattle_single TRAINER_NANCY, Route114_Text_NancyIntro, Route114_Text_NancyDefeat
+	msgbox Route114_Text_NancyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F269C:: @ 81F269C
-	trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
+Route114_EventScript_Steve:: @ 81F269C
+	trainerbattle_single TRAINER_STEVE_1, Route114_Text_SteveIntro, Route114_Text_SteveDefeat, Route114_EventScript_RegisterSteve
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_EventScript_1F26E7
-	msgbox Route114_Text_29A981, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route114_EventScript_RematchSteve
+	msgbox Route114_Text_StevePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F26C8:: @ 81F26C8
+Route114_EventScript_RegisterSteve:: @ 81F26C8
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT
+	msgbox Route114_Text_SteveRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_STEVE_1
 	release
 	end
 
-Route114_EventScript_1F26E7:: @ 81F26E7
-	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67
-	msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE
+Route114_EventScript_RematchSteve:: @ 81F26E7
+	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_SteveRematchIntro, Route114_Text_SteveRematchDefeat
+	msgbox Route114_Text_StevePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F26FE:: @ 81F26FE
-	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
+Route114_EventScript_Bernie:: @ 81F26FE
+	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_BernieIntro, Route114_Text_BernieDefeat, Route114_EventScript_RegisterBernie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route114_EventScript_1F2749
-	msgbox Route114_Text_29AB36, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route114_EventScript_RematchBernie
+	msgbox Route114_Text_BerniePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F272A:: @ 81F272A
+Route114_EventScript_RegisterBernie:: @ 81F272A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT
+	msgbox Route114_Text_BernieRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BERNIE_1
 	release
 	end
 
-Route114_EventScript_1F2749:: @ 81F2749
-	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10
-	msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE
+Route114_EventScript_RematchBernie:: @ 81F2749
+	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_BernieRematchIntro, Route114_Text_BernieRematchDefeat
+	msgbox Route114_Text_BerniePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2760:: @ 81F2760
-	trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A
-	msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE
+Route114_EventScript_Claude:: @ 81F2760
+	trainerbattle_single TRAINER_CLAUDE, Route114_Text_ClaudeIntro, Route114_Text_ClaudeDefeat
+	msgbox Route114_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2777:: @ 81F2777
-	trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05
-	msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE
+Route114_EventScript_Nolan:: @ 81F2777
+	trainerbattle_single TRAINER_NOLAN, Route114_Text_NolanIntro, Route114_Text_NolanDefeat
+	msgbox Route114_Text_NolanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F278E:: @ 81F278E
-	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
-	msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE
+Route114_EventScript_Tyra:: @ 81F278E
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_TyraIntro, Route114_Text_TyraDefeat, Route114_Text_TyraNotEnoughMons
+	msgbox Route114_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27A9:: @ 81F27A9
-	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
-	msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE
+Route114_EventScript_Ivy:: @ 81F27A9
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_IvyIntro, Route114_Text_IvyDefeat, Route114_Text_IvyNotEnoughMons
+	msgbox Route114_Text_IvyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27C4:: @ 81F27C4
-	trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C
-	msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE
+Route114_EventScript_Angelina:: @ 81F27C4
+	trainerbattle_single TRAINER_ANGELINA, Route114_Text_AngelinaIntro, Route114_Text_AngelinaDefeat
+	msgbox Route114_Text_AngelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27DB:: @ 81F27DB
-	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB
-	msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE
+Route114_EventScript_Charlotte:: @ 81F27DB
+	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_CharlotteIntro, Route114_Text_CharlotteDefeat
+	msgbox Route114_Text_CharlottePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27F2:: @ 81F27F2
-	trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089
-	msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE
+Route114_EventScript_Kai:: @ 81F27F2
+	trainerbattle_single TRAINER_KAI, Route114_Text_KaiIntro, Route114_Text_KaiDefeat
+	msgbox Route114_Text_KaiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_Text_1F2809: @ 81F2809
+Route114_Text_AllMyMonDoesIsRoarTakeThis: @ 81F2809
 	.string "All my POKéMON does is ROAR…\n"
 	.string "No one dares to come near me…\p"
 	.string "Sigh… If you would, please take\n"
 	.string "this TM away…$"
 
-Route114_Text_1F2872: @ 81F2872
+Route114_Text_ExplainRoar: @ 81F2872
 	.string "TM05 contains ROAR.\n"
 	.string "A ROAR sends POKéMON scurrying.$"
 
-Route114_Text_1F28A6: @ 81F28A6
+Route114_Text_Poochyena: @ 81F28A6
 	.string "Bow! Bowwow!$"
 
-Route114_Text_1F28B3: @ 81F28B3
+Route114_Text_MeteorFallsSign: @ 81F28B3
 	.string "METEOR FALLS\n"
 	.string "RUSTBORO CITY THROUGH HERE$"
 
-Route114_Text_1F28DB: @ 81F28DB
+Route114_Text_FossilManiacsHouseSign: @ 81F28DB
 	.string "FOSSIL MANIAC'S HOUSE\n"
 	.string "“Fossils gratefully accepted!”$"
 
-Route114_Text_1F2910: @ 81F2910
+Route114_Text_LanettesHouse: @ 81F2910
 	.string "LANETTE'S HOUSE$"
 
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 53ce80ce7..c9f1d8833 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_1F2973",
+      "script": "Route115_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route115_EventScript_1F298E",
+      "script": "Route115_EventScript_Timothy",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2A07",
+      "script": "Route115_EventScript_Nob",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route115_EventScript_1F2A69",
+      "script": "Route115_EventScript_Cyndy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route115_EventScript_1F29F0",
+      "script": "Route115_EventScript_Koichi",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2ACB",
+      "script": "Route115_EventScript_Hector",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route115_EventScript_1F2AE2",
+      "script": "Route115_EventScript_Kyra",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route115_EventScript_1F2AF9",
+      "script": "Route115_EventScript_Jaiden",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B27",
+      "script": "Route115_EventScript_Helene",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B10",
+      "script": "Route115_EventScript_Alix",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B3E",
+      "script": "Route115_EventScript_Marlene",
       "flag": "0"
     },
     {
@@ -370,7 +370,7 @@
       "y": 64,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route115_EventScript_1F297C"
+      "script": "Route115_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -378,7 +378,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route115_EventScript_1F2985"
+      "script": "Route115_EventScript_MeteorFallsSign"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 8877f31bd..74d0c6519 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -1,10 +1,10 @@
 Route115_MapScripts:: @ 81F2920
-	map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930
+	map_script MAP_SCRIPT_ON_LOAD, Route115_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_OnFrame
 	.byte 0
 
-Route115_MapScript1_1F2930: @ 81F2930
+Route115_OnLoad: @ 81F2930
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
@@ -20,134 +20,134 @@ Route115_OnTransition: @ 81F2947
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route115_MapScript2_1F2969: @ 81F2969
+Route115_OnFrame: @ 81F2969
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route115_EventScript_1F2973:: @ 81F2973
-	msgbox Route115_Text_1F2B55, MSGBOX_NPC
+Route115_EventScript_Woman:: @ 81F2973
+	msgbox Route115_Text_NeverKnowWhenCavePokemonWillAppear, MSGBOX_NPC
 	end
 
-Route115_EventScript_1F297C:: @ 81F297C
-	msgbox Route115_Text_1F2BC9, MSGBOX_SIGN
+Route115_EventScript_RouteSignRustboro:: @ 81F297C
+	msgbox Route115_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route115_EventScript_1F2985:: @ 81F2985
-	msgbox Route115_Text_1F2BE3, MSGBOX_SIGN
+Route115_EventScript_MeteorFallsSign:: @ 81F2985
+	msgbox Route115_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route115_EventScript_1F298E:: @ 81F298E
-	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
+Route115_EventScript_Timothy:: @ 81F298E
+	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route115_EventScript_1F29D9
-	msgbox Route115_Text_29B258, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route115_EventScript_RematchTimothy
+	msgbox Route115_Text_TimothyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F29BA:: @ 81F29BA
+Route115_EventScript_RegisterTimothy:: @ 81F29BA
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT
+	msgbox Route115_Text_TimothyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TIMOTHY_1
 	release
 	end
 
-Route115_EventScript_1F29D9:: @ 81F29D9
-	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372
-	msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE
+Route115_EventScript_RematchTimothy:: @ 81F29D9
+	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_TimothyRematchIntro, Route115_Text_TimothyRematchDefeat
+	msgbox Route115_Text_TimothyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F29F0:: @ 81F29F0
-	trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED
-	msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE
+Route115_EventScript_Koichi:: @ 81F29F0
+	trainerbattle_single TRAINER_KOICHI, Route115_Text_KoichiIntro, Route115_Text_KoichiDefeat
+	msgbox Route115_Text_KoichiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2A07:: @ 81F2A07
-	trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
+Route115_EventScript_Nob:: @ 81F2A07
+	trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route115_EventScript_1F2A52
-	msgbox Route115_Text_29B49D, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route115_EventScript_RematchNob
+	msgbox Route115_Text_NobPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F2A33:: @ 81F2A33
+Route115_EventScript_RegisterNob:: @ 81F2A33
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B50B, MSGBOX_DEFAULT
+	msgbox Route115_Text_NobRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_NOB_1
 	release
 	end
 
-Route115_EventScript_1F2A52:: @ 81F2A52
-	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D
-	msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE
+Route115_EventScript_RematchNob:: @ 81F2A52
+	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_NobRematchIntro, Route115_Text_NobRematchDefeat
+	msgbox Route115_Text_NobPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2A69:: @ 81F2A69
-	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
+Route115_EventScript_Cyndy:: @ 81F2A69
+	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route115_EventScript_1F2AB4
-	msgbox Route115_Text_29B647, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route115_EventScript_RematchCyndy
+	msgbox Route115_Text_CyndyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F2A95:: @ 81F2A95
+Route115_EventScript_RegisterCyndy:: @ 81F2A95
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT
+	msgbox Route115_Text_CyndyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CYNDY_1
 	release
 	end
 
-Route115_EventScript_1F2AB4:: @ 81F2AB4
-	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A
-	msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE
+Route115_EventScript_RematchCyndy:: @ 81F2AB4
+	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_CyndyRematchIntro, Route115_Text_CyndyRematchDefeat
+	msgbox Route115_Text_CyndyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2ACB:: @ 81F2ACB
-	trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5
-	msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE
+Route115_EventScript_Hector:: @ 81F2ACB
+	trainerbattle_single TRAINER_HECTOR, Route115_Text_HectorIntro, Route115_Text_HectorDefeat
+	msgbox Route115_Text_HectorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2AE2:: @ 81F2AE2
-	trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D
-	msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE
+Route115_EventScript_Kyra:: @ 81F2AE2
+	trainerbattle_single TRAINER_KYRA, Route115_Text_KyraIntro, Route115_Text_KyraDefeat
+	msgbox Route115_Text_KyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2AF9:: @ 81F2AF9
-	trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8
-	msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE
+Route115_EventScript_Jaiden:: @ 81F2AF9
+	trainerbattle_single TRAINER_JAIDEN, Route115_Text_JaidenIntro, Route115_Text_JaidenDefeat
+	msgbox Route115_Text_JaidenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B10:: @ 81F2B10
-	trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6
-	msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE
+Route115_EventScript_Alix:: @ 81F2B10
+	trainerbattle_single TRAINER_ALIX, Route115_Text_AlixIntro, Route115_Text_AlixDefeat
+	msgbox Route115_Text_AlixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B27:: @ 81F2B27
-	trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958
-	msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE
+Route115_EventScript_Helene:: @ 81F2B27
+	trainerbattle_single TRAINER_HELENE, Route115_Text_HeleneIntro, Route115_Text_HeleneDefeat
+	msgbox Route115_Text_HelenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B3E:: @ 81F2B3E
-	trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67
-	msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE
+Route115_EventScript_Marlene:: @ 81F2B3E
+	trainerbattle_single TRAINER_MARLENE, Route115_Text_MarleneIntro, Route115_Text_MarleneDefeat
+	msgbox Route115_Text_MarlenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_Text_1F2B55: @ 81F2B55
+Route115_Text_NeverKnowWhenCavePokemonWillAppear: @ 81F2B55
 	.string "Exploring a cave isn't like walking\n"
 	.string "on a road.\p"
 	.string "You never know when wild POKéMON will\n"
 	.string "appear. It's full of suspense.$"
 
-Route115_Text_1F2BC9: @ 81F2BC9
+Route115_Text_RouteSignRustboro: @ 81F2BC9
 	.string "ROUTE 115\n"
 	.string "{DOWN_ARROW} RUSTBORO CITY$"
 
-Route115_Text_1F2BE3: @ 81F2BE3
+Route115_Text_MeteorFallsSign: @ 81F2BE3
 	.string "METEOR FALLS\n"
 	.string "FALLARBOR TOWN THROUGH HERE$"
 
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 8a369e407..366fe1ed5 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2E89",
+      "script": "Route116_EventScript_Joey",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F2EA0",
+      "script": "Route116_EventScript_Jose",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2D84",
+      "script": "Route116_EventScript_Briney",
       "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2F65",
+      "script": "Route116_EventScript_Clark",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F2F7C",
+      "script": "Route116_EventScript_Janice",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2F93",
+      "script": "Route116_EventScript_Karen",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route116_EventScript_1F2EB7",
+      "script": "Route116_EventScript_Jerry",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2CA2",
+      "script": "Route116_EventScript_DevonEmployee",
       "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE"
     },
     {
@@ -295,8 +295,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2C70",
-      "flag": "FLAG_HIDE_ROUTE_116_TUNNELER"
+      "script": "Route116_EventScript_WandasBoyfriend",
+      "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_MANIAC",
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2DB6",
+      "script": "Route116_EventScript_GlassesMan",
       "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route116_EventScript_1F3041",
+      "script": "Route116_EventScript_Sarah",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F3058",
+      "script": "Route116_EventScript_Dawson",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route116_EventScript_1F3086",
+      "script": "Route116_EventScript_Johnson",
       "flag": "0"
     },
     {
@@ -386,7 +386,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route116_EventScript_1F306F",
+      "script": "Route116_EventScript_Devan",
       "flag": "0"
     }
   ],
@@ -435,7 +435,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE116_STATE",
       "var_value": "1",
-      "script": "Route116_EventScript_1F2D95"
+      "script": "Route116_EventScript_BrineyTrigger"
     }
   ],
   "bg_events": [
@@ -445,7 +445,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D57"
+      "script": "Route116_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -453,7 +453,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D60"
+      "script": "Route116_EventScript_RusturfTunnelSign"
     },
     {
       "type": "sign",
@@ -461,7 +461,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D69"
+      "script": "Route116_EventScript_TunnelersRestHouseSign"
     },
     {
       "type": "secret_base",
@@ -483,7 +483,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D72"
+      "script": "Route116_EventScript_TrainerTipsBToStopEvolution"
     },
     {
       "type": "sign",
@@ -491,7 +491,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D7B"
+      "script": "Route116_EventScript_TrainerTipsBagHasPockets"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index f52c8a05f..1b69b312a 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,11 +1,11 @@
 Route116_MapScripts:: @ 81F2C0C
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66
+	map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame
 	.byte 0
 
 Route116_OnTransition: @ 81F2C1C
-	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
+	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
@@ -14,90 +14,90 @@ Route116_OnTransition: @ 81F2C1C
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route116_EventScript_1F2C47:: @ 81F2C47
+Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
 	setobjectxyperm 21, 38, 10
 	return
 
-Route116_MapScript1_1F2C4F: @ 81F2C4F
+Route116_OnLoad: @ 81F2C4F
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
 	end
 
-Route116_MapScript2_1F2C66: @ 81F2C66
+Route116_OnFrame: @ 81F2C66
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route116_EventScript_1F2C70:: @ 81F2C70
+Route116_EventScript_WandasBoyfriend:: @ 81F2C70
 	lock
 	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98
-	msgbox Route116_Text_1F3140, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_BoyfriendGruntInTunnel
+	msgbox Route116_Text_WantToDigTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C8E:: @ 81F2C8E
-	msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT
+Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E
+	msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C98:: @ 81F2C98
-	msgbox Route116_Text_1F3166, MSGBOX_DEFAULT
+Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98
+	msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2CA2:: @ 81F2CA2
+Route116_EventScript_DevonEmployee:: @ 81F2CA2
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B
-	msgbox Route116_Text_1F3317, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain
+	msgbox Route116_Text_ThankYouTokenOfAppreciation, MSGBOX_DEFAULT
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2CBB:: @ 81F2CBB
+Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	setflag FLAG_MET_DEVON_EMPLOYEE
 	giveitem_std ITEM_REPEAT_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2D39
-	msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_NoRoomForRepeatBall
+	msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route116_EventScript_1F2D20
+	call_if_eq Route116_EventScript_DevonEmployeeExitEast
 	removeobject VAR_LAST_TALKED
 	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
 
-Route116_EventScript_1F2D15:: @ 81F2D15
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43
+Route116_EventScript_DevonEmployeeExit:: @ 81F2D15
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D20:: @ 81F2D20
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C
+Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D2B:: @ 81F2D2B
-	msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B
+	msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2D39:: @ 81F2D39
-	msgbox Route116_Text_1F3593, MSGBOX_DEFAULT
+Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39
+	msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_Movement_1F2D43: @ 81F2D43
+Route116_Movement_DevonEmployeeExit: @ 81F2D43
 	walk_left
 	walk_left
 	walk_left
@@ -108,7 +108,7 @@ Route116_Movement_1F2D43: @ 81F2D43
 	walk_left
 	step_end
 
-Route116_Movement_1F2D4C: @ 81F2D4C
+Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
 	walk_down
 	walk_left
 	walk_left
@@ -121,104 +121,104 @@ Route116_Movement_1F2D4C: @ 81F2D4C
 	walk_left
 	step_end
 
-Route116_EventScript_1F2D57:: @ 81F2D57
-	msgbox Route116_Text_1F379D, MSGBOX_SIGN
+Route116_EventScript_RouteSignRustboro:: @ 81F2D57
+	msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D60:: @ 81F2D60
-	msgbox Route116_Text_1F37B7, MSGBOX_SIGN
+Route116_EventScript_RusturfTunnelSign:: @ 81F2D60
+	msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D69:: @ 81F2D69
-	msgbox Route116_Text_1F380F, MSGBOX_SIGN
+Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69
+	msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D72:: @ 81F2D72
-	msgbox Route116_Text_1F3825, MSGBOX_SIGN
+Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72
+	msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D7B:: @ 81F2D7B
-	msgbox Route116_Text_1F38D4, MSGBOX_SIGN
+Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B
+	msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D84:: @ 81F2D84
+Route116_EventScript_Briney:: @ 81F2D84
 	lock
 	faceplayer
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	release
 	end
 
-Route116_EventScript_1F2D95:: @ 81F2D95
+Route116_EventScript_BrineyTrigger:: @ 81F2D95
 	lockall
 	applymovement 11, Common_Movement_WalkInPlaceFastestRight
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	releaseall
 	end
 
-Route116_EventScript_1F2DB6:: @ 81F2DB6
+Route116_EventScript_GlassesMan:: @ 81F2DB6
 	lock
 	faceplayer
 	checkitem ITEM_BLACK_GLASSES, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2DF1
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_PlayerHasGlasses
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2DE2
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_FoundGlassesNotOnPlayer
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2DE2:: @ 81F2DE2
-	msgbox Route116_Text_1F3718, MSGBOX_DEFAULT
+Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2
+	msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2DF1:: @ 81F2DF1
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
-	msgbox Route116_Text_1F3688, MSGBOX_DEFAULT
+Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
+	msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2E1B
-	msgbox Route116_Text_1F375E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_FoundGlassesOnPlayer
+	msgbox Route116_Text_NotWhatImLookingFor, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2E1B:: @ 81F2E1B
-	msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT
+Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B
+	msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2E2A:: @ 81F2E2A
+Route116_EventScript_GlassesManExit:: @ 81F2E2A
 	delay 20
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route116_EventScript_1F2E69
+	call_if_eq Route116_EventScript_GlassesManExitEast
 	removeobject VAR_LAST_TALKED
 	release
 	end
 
-Route116_EventScript_1F2E5E:: @ 81F2E5E
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74
+Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2E69:: @ 81F2E69
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E
+Route116_EventScript_GlassesManExitEast:: @ 81F2E69
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast
 	waitmovement 0
 	return
 
-Route116_Movement_1F2E74: @ 81F2E74
+Route116_Movement_GlassesManExit: @ 81F2E74
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ Route116_Movement_1F2E74: @ 81F2E74
 	walk_left
 	step_end
 
-Route116_Movement_1F2E7E: @ 81F2E7E
+Route116_Movement_GlassesManExitEast: @ 81F2E7E
 	walk_up
 	walk_left
 	walk_left
@@ -243,133 +243,133 @@ Route116_Movement_1F2E7E: @ 81F2E7E
 	walk_left
 	step_end
 
-Route116_EventScript_1F2E89:: @ 81F2E89
-	trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
-	msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
+Route116_EventScript_Joey:: @ 81F2E89
+	trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat
+	msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EA0:: @ 81F2EA0
-	trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
-	msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
+Route116_EventScript_Jose:: @ 81F2EA0
+	trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat
+	msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EB7:: @ 81F2EB7
-	trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+Route116_EventScript_Jerry:: @ 81F2EB7
+	trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2F4E
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_RematchJerry
 	setvar VAR_0x8004, TRAINER_JERRY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2F22
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_TryRegisterJerry
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2EF8:: @ 81F2EF8
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03
+Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2F03:: @ 81F2F03
+Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29BE71, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F22:: @ 81F2F22
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+Route116_EventScript_TryRegisterJerry:: @ 81F2F22
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2F35:: @ 81F2F35
-	msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT
+Route116_EventScript_RegisterJerry:: @ 81F2F35
+	msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F4E:: @ 81F2F4E
-	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
-	msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
+Route116_EventScript_RematchJerry:: @ 81F2F4E
+	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat
+	msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F65:: @ 81F2F65
-	trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
-	msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
+Route116_EventScript_Clark:: @ 81F2F65
+	trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat
+	msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F7C:: @ 81F2F7C
-	trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
-	msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
+Route116_EventScript_Janice:: @ 81F2F7C
+	trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat
+	msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F93:: @ 81F2F93
-	trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+Route116_EventScript_Karen:: @ 81F2F93
+	trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F302A
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_RematchKaren
 	setvar VAR_0x8004, TRAINER_KAREN_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2FFE
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_TryRegisterKaren
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2FD4:: @ 81F2FD4
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF
+Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2FDF:: @ 81F2FDF
+Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29C096, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F2FFE:: @ 81F2FFE
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+Route116_EventScript_TryRegisterKaren:: @ 81F2FFE
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F3011:: @ 81F3011
-	msgbox Route116_Text_29C052, MSGBOX_DEFAULT
+Route116_EventScript_RegisterKaren:: @ 81F3011
+	msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F302A:: @ 81F302A
-	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
-	msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
+Route116_EventScript_RematchKaren:: @ 81F302A
+	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat
+	msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3041:: @ 81F3041
-	trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
-	msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
+Route116_EventScript_Sarah:: @ 81F3041
+	trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat
+	msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3058:: @ 81F3058
-	trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
-	msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
+Route116_EventScript_Dawson:: @ 81F3058
+	trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat
+	msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F306F:: @ 81F306F
-	trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
-	msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
+Route116_EventScript_Devan:: @ 81F306F
+	trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat
+	msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3086:: @ 81F3086
-	trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
-	msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
+Route116_EventScript_Johnson:: @ 81F3086
+	trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat
+	msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_Text_1F309D: @ 81F309D
+Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
 	.string "Ohhh, what am I to do?\p"
 	.string "We were on our walk, PEEKO and I, when\n"
 	.string "we were jumped by an odd thug…\p"
@@ -377,11 +377,11 @@ Route116_Text_1F309D: @ 81F309D
 	.string "darling PEEKO!\p"
 	.string "Wrrrooooooaaaar! PEEKO!$"
 
-Route116_Text_1F3140: @ 81F3140
+Route116_Text_WantToDigTunnel: @ 81F3140
 	.string "Nnn… Roar!\p"
 	.string "I want to dig that tunnel!$"
 
-Route116_Text_1F3166: @ 81F3166
+Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
 	.string "Nnn… Roar!\n"
 	.string "What's going on?\p"
 	.string "I was digging the tunnel without any\n"
@@ -395,12 +395,12 @@ Route116_Text_1F3166: @ 81F3166
 	.string "something stupid and startle the\l"
 	.string "POKéMON into an uproar.$"
 
-Route116_Text_1F32C1: @ 81F32C1
+Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1
 	.string "Nnn… Roar!\p"
 	.string "That goofy goon hightailed it out of\n"
 	.string "the tunnel! I can go back to digging!$"
 
-Route116_Text_1F3317: @ 81F3317
+Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
 	.string "Oh! It's you!\p"
 	.string "You're that person who not only helped\n"
 	.string "me in PETALBURG WOODS, but also got\l"
@@ -419,61 +419,61 @@ Route116_Text_1F3317: @ 81F3317
 	.string "As a token of our appreciation, this\n"
 	.string "is our gift to our wonderful TRAINER!$"
 
-Route116_Text_1F3521: @ 81F3521
+Route116_Text_NewBallAvailableAtMart: @ 81F3521
 	.string "Our new POKé BALL will be available\n"
 	.string "at the POKéMON MART in RUSTBORO.\p"
 	.string "Please do try it out!\n"
 	.string "Thank you and bye-bye!$"
 
-Route116_Text_1F3593: @ 81F3593
+Route116_Text_BagIsJamPacked: @ 81F3593
 	.string "Your BAG is jam-packed.\n"
 	.string "I can't give you this REPEAT BALL.$"
 
-Route116_Text_1F35CE: @ 81F35CE
+Route116_Text_TokenOfAppreciation: @ 81F35CE
 	.string "As a token of our appreciation for\n"
 	.string "your delivering our package, I have\l"
 	.string "a gift of a new kind of POKé BALL\l"
 	.string "for our most wonderful TRAINER!$"
 
-Route116_Text_1F3657: @ 81F3657
+Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657
 	.string "I dropped my glasses…\n"
 	.string "Can you help me find them?$"
 
-Route116_Text_1F3688: @ 81F3688
+Route116_Text_MayISeeThoseGlasses: @ 81F3688
 	.string "Those glasses!\n"
 	.string "May I see them for a second?$"
 
-Route116_Text_1F36B4: @ 81F36B4
+Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…\p"
 	.string "Maybe my glasses aren't around\n"
 	.string "here…$"
 
-Route116_Text_1F3718: @ 81F3718
+Route116_Text_CantFindGlassesNotHere: @ 81F3718
 	.string "Hmm…\n"
 	.string "I can't find my glasses anywhere…\l"
 	.string "Maybe they're not around here…$"
 
-Route116_Text_1F375E: @ 81F375E
+Route116_Text_NotWhatImLookingFor: @ 81F375E
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…$"
 
-Route116_Text_1F379D: @ 81F379D
+Route116_Text_RouteSignRustboro: @ 81F379D
 	.string "ROUTE 116\n"
 	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
-Route116_Text_1F37B7: @ 81F37B7
+Route116_Text_RusturfTunnelSign: @ 81F37B7
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
 	.string "canceled.”$"
 
-Route116_Text_1F380F: @ 81F380F
+Route116_Text_TunnelersRestHouse: @ 81F380F
 	.string "TUNNELER'S REST HOUSE$"
 
-Route116_Text_1F3825: @ 81F3825
+Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
 	.string "TRAINER TIPS\p"
 	.string "If you want to stop a POKéMON from\n"
 	.string "evolving, press the B Button while it\l"
@@ -481,7 +481,7 @@ Route116_Text_1F3825: @ 81F3825
 	.string "The startled POKéMON will stop.\p"
 	.string "This is called an evolution cancel.$"
 
-Route116_Text_1F38D4: @ 81F38D4
+Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4
 	.string "TRAINER TIPS\p"
 	.string "Your BAG has several POCKETS.\p"
 	.string "Items you obtain are automatically\n"
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index 12420784c..4bb513cdf 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F399A",
+      "script": "Route117_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F39A3",
+      "script": "Route117_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3A94",
+      "script": "Route117_EventScript_Dylan",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route117_EventScript_1F3A32",
+      "script": "Route117_EventScript_Lydia",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F39D0",
+      "script": "Route117_EventScript_Isaac",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route117_EventScript_1F3AF6",
+      "script": "Route117_EventScript_Maria",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3B58",
+      "script": "Route117_EventScript_Derek",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route117_EventScript_1F3BD3",
+      "script": "Route117_EventScript_Meg",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route117_EventScript_1F3B6F",
+      "script": "Route117_EventScript_Anna",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F39AC",
+      "script": "Route117_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C4E",
+      "script": "Route117_EventScript_Brandi",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C65",
+      "script": "Route117_EventScript_Aisha",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C37",
+      "script": "Route117_EventScript_Melina",
       "flag": "0"
     }
   ],
@@ -355,7 +355,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39B5"
+      "script": "Route117_EventScript_RouteSignVerdanturf"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39BE"
+      "script": "Route117_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39C7"
+      "script": "Route117_EventScript_DayCareSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index 40d121fc7..47d8eced9 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -3,211 +3,210 @@ Route117_MapScripts:: @ 81F397D
 	.byte 0
 
 Route117_OnTransition: @ 81F3983
-	call Route117_EventScript_1F3989
+	call Route117_EventScript_TryMoveDayCareMan
 	end
 
-Route117_EventScript_1F3989:: @ 81F3989
-	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999
+Route117_EventScript_TryMoveDayCareMan:: @ 81F3989
+	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan
 	setobjectxyperm 3, 47, 6
-
-Route117_EventScript_1F3999:: @ 81F3999
+Route117_EventScript_StopMoveDayCareMan:: @ 81F3999
 	return
 
-Route117_EventScript_1F399A:: @ 81F399A
-	msgbox Route117_Text_1F3CFD, MSGBOX_NPC
+Route117_EventScript_Woman:: @ 81F399A
+	msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39A3:: @ 81F39A3
-	msgbox Route117_Text_1F3D41, MSGBOX_NPC
+Route117_EventScript_LittleBoy:: @ 81F39A3
+	msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39AC:: @ 81F39AC
-	msgbox Route117_Text_1F3C7C, MSGBOX_NPC
+Route117_EventScript_Girl:: @ 81F39AC
+	msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39B5:: @ 81F39B5
-	msgbox Route117_Text_1F3D58, MSGBOX_SIGN
+Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5
+	msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39BE:: @ 81F39BE
-	msgbox Route117_Text_1F3D74, MSGBOX_SIGN
+Route117_EventScript_RouteSignMauville:: @ 81F39BE
+	msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39C7:: @ 81F39C7
-	msgbox Route117_Text_1F3D8E, MSGBOX_SIGN
+Route117_EventScript_DayCareSign:: @ 81F39C7
+	msgbox Route117_Text_DayCareSign, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39D0:: @ 81F39D0
-	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC
+Route117_EventScript_Isaac:: @ 81F39D0
+	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3A1B
-	msgbox Route117_Text_29C498, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchIsaac
+	msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F39FC:: @ 81F39FC
+Route117_EventScript_RegisterIsaac:: @ 81F39FC
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C508, MSGBOX_DEFAULT
+	msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ISAAC_1
 	release
 	end
 
-Route117_EventScript_1F3A1B:: @ 81F3A1B
-	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B
-	msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchIsaac:: @ 81F3A1B
+	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat
+	msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3A32:: @ 81F3A32
-	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E
+Route117_EventScript_Lydia:: @ 81F3A32
+	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3A7D
-	msgbox Route117_Text_29C679, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchLydia
+	msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3A5E:: @ 81F3A5E
+Route117_EventScript_RegisterLydia:: @ 81F3A5E
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT
+	msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LYDIA_1
 	release
 	end
 
-Route117_EventScript_1F3A7D:: @ 81F3A7D
-	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E
-	msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchLydia:: @ 81F3A7D
+	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat
+	msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3A94:: @ 81F3A94
-	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0
+Route117_EventScript_Dylan:: @ 81F3A94
+	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3ADF
-	msgbox Route117_Text_29C800, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchDylan
+	msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3AC0:: @ 81F3AC0
+Route117_EventScript_RegisterDylan:: @ 81F3AC0
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C846, MSGBOX_DEFAULT
+	msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DYLAN_1
 	release
 	end
 
-Route117_EventScript_1F3ADF:: @ 81F3ADF
-	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3
-	msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchDylan:: @ 81F3ADF
+	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat
+	msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3AF6:: @ 81F3AF6
-	trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22
+Route117_EventScript_Maria:: @ 81F3AF6
+	trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3B41
-	msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchMaria
+	msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3B22:: @ 81F3B22
+Route117_EventScript_RegisterMaria:: @ 81F3B22
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29CA32, MSGBOX_DEFAULT
+	msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MARIA_1
 	release
 	end
 
-Route117_EventScript_1F3B41:: @ 81F3B41
-	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC
-	msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchMaria:: @ 81F3B41
+	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat
+	msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3B58:: @ 81F3B58
-	trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87
-	msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE
+Route117_EventScript_Derek:: @ 81F3B58
+	trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat
+	msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3B6F:: @ 81F3B6F
-	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F
+Route117_EventScript_Anna:: @ 81F3B6F
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3BB8
-	msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchAnna
+	msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3B9F:: @ 81F3B9F
-	msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT
+Route117_EventScript_RegisterAnna:: @ 81F3B9F
+	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_1F3BB8:: @ 81F3BB8
-	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E
-	msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchAnna:: @ 81F3BB8
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons
+	msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3BD3:: @ 81F3BD3
-	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03
+Route117_EventScript_Meg:: @ 81F3BD3
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route117_EventScript_1F3C1C
-	msgbox Route117_Text_29CE17, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route117_EventScript_RematchMeg
+	msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3C03:: @ 81F3C03
-	msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT
+Route117_EventScript_RegisterMeg:: @ 81F3C03
+	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_1F3C1C:: @ 81F3C1C
-	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053
-	msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE
+Route117_EventScript_RematchMeg:: @ 81F3C1C
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons
+	msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C37:: @ 81F3C37
-	trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1
-	msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE
+Route117_EventScript_Melina:: @ 81F3C37
+	trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat
+	msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C4E:: @ 81F3C4E
-	trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189
-	msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE
+Route117_EventScript_Brandi:: @ 81F3C4E
+	trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat
+	msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C65:: @ 81F3C65
-	trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206
-	msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE
+Route117_EventScript_Aisha:: @ 81F3C65
+	trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat
+	msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_Text_1F3C7C: @ 81F3C7C
+Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C
 	.string "I left my POKéMON at the DAY CARE.\p"
 	.string "When I got it back, it had a new move\n"
 	.string "that I didn't teach it.\l"
 	.string "I was really, really surprised.$"
 
-Route117_Text_1F3CFD: @ 81F3CFD
+Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD
 	.string "What do you think?\n"
 	.string "Aren't these flowers pretty?\p"
 	.string "I planted them all!$"
 
-Route117_Text_1F3D41: @ 81F3D41
+Route117_Text_AirIsTastyHere: @ 81F3D41
 	.string "The air is tasty here!$"
 
-Route117_Text_1F3D58: @ 81F3D58
+Route117_Text_RouteSignVerdanturf: @ 81F3D58
 	.string "ROUTE 117\n"
 	.string "{LEFT_ARROW} VERDANTURF TOWN$"
 
-Route117_Text_1F3D74: @ 81F3D74
+Route117_Text_RouteSignMauville: @ 81F3D74
 	.string "ROUTE 117\n"
 	.string "{RIGHT_ARROW} MAUVILLE CITY$"
 
-Route117_Text_1F3D8E: @ 81F3D8E
+Route117_Text_DayCareSign: @ 81F3D8E
 	.string "POKéMON DAY CARE\n"
 	.string "“Let us raise your POKéMON.”$"
 
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 40a988bad..d64adbb86 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4079",
+      "script": "Route118_EventScript_Perry",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F3E73",
+      "script": "Route118_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_GabbyBattle5",
+      "script": "GabbyAndTy_EventScript_GabbyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_TyBattle5",
+      "script": "GabbyAndTy_EventScript_TyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F3E14",
+      "script": "Route118_EventScript_GoodRodFisherman",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route118_EventScript_1F3F87",
+      "script": "Route118_EventScript_Rose",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F4000",
+      "script": "Route118_EventScript_Wade",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4090",
+      "script": "Route118_EventScript_Chester",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route118_EventScript_1F3FE9",
+      "script": "Route118_EventScript_Barny",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4017",
+      "script": "Route118_EventScript_Dalton",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route118_EventScript_1F40A7",
+      "script": "Route118_EventScript_Deandre",
       "flag": "0"
     }
   ],
@@ -328,7 +328,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3E8E"
+      "script": "Route118_EventScript_StevenTrigger0"
     },
     {
       "type": "trigger",
@@ -337,7 +337,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3EAE"
+      "script": "Route118_EventScript_StevenTrigger1"
     },
     {
       "type": "trigger",
@@ -346,7 +346,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3EC4"
+      "script": "Route118_EventScript_StevenTrigger2"
     }
   ],
   "bg_events": [
@@ -363,7 +363,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route118_EventScript_1F3E7C"
+      "script": "Route118_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route118_EventScript_1F3E85"
+      "script": "Route118_EventScript_RouteSign119"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index fe9c4137d..7b2326b13 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,7 +1,7 @@
 Route118_MapScripts:: @ 81F3DBC
 	map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A
+	map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame
 	.byte 0
 
 Route118_OnTransition: @ 81F3DCC
@@ -14,142 +14,142 @@ Route118_OnTransition: @ 81F3DCC
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route118_MapScript1_1F3DF3: @ 81F3DF3
+Route118_OnLoad: @ 81F3DF3
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
 	end
 
-Route118_MapScript2_1F3E0A: @ 81F3E0A
+Route118_OnFrame: @ 81F3E0A
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route118_EventScript_1F3E14:: @ 81F3E14
+Route118_EventScript_GoodRodFisherman:: @ 81F3E14
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69
-	msgbox Route118_Text_1F427B, MSGBOX_YESNO
+	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
+	msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route118_EventScript_1F3E3E
+	goto_if_eq Route118_EventScript_ReceiveGoodRod
 	compare VAR_RESULT, NO
-	goto_if_eq Route118_EventScript_1F3E5F
+	goto_if_eq Route118_EventScript_DeclineGoodRod
 	end
 
-Route118_EventScript_1F3E3E:: @ 81F3E3E
-	msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT
+Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
+	msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
-	msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT
+	msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E5F:: @ 81F3E5F
-	msgbox Route118_Text_1F4319, MSGBOX_DEFAULT
+Route118_EventScript_DeclineGoodRod:: @ 81F3E5F
+	msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E69:: @ 81F3E69
-	msgbox Route118_Text_1F4331, MSGBOX_DEFAULT
+Route118_EventScript_ReceivedGoodRod:: @ 81F3E69
+	msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E73:: @ 81F3E73
-	msgbox Route118_Text_1F4367, MSGBOX_NPC
+Route118_EventScript_Girl:: @ 81F3E73
+	msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC
 	end
 
-Route118_EventScript_1F3E7C:: @ 81F3E7C
-	msgbox Route118_Text_1F43F4, MSGBOX_SIGN
+Route118_EventScript_RouteSignMauville:: @ 81F3E7C
+	msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E85:: @ 81F3E85
-	msgbox Route118_Text_1F440E, MSGBOX_SIGN
+Route118_EventScript_RouteSign119:: @ 81F3E85
+	msgbox Route118_Text_RouteSign119, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E8E:: @ 81F3E8E
+Route118_EventScript_StevenTrigger0:: @ 81F3E8E
 	lockall
 	setvar VAR_0x8008, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F61
+	applymovement 19, Route118_Movement_StevenApproachLedge0
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EAE:: @ 81F3EAE
+Route118_EventScript_StevenTrigger1:: @ 81F3EAE
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EC4:: @ 81F3EC4
+Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	lockall
 	setvar VAR_0x8008, 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F63
+	applymovement 19, Route118_Movement_StevenApproachLedge2
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EE4:: @ 81F3EE4
+Route118_EventScript_StevenTrigger:: @ 81F3EE4
 	playse SE_DANSA
-	applymovement 19, Route118_Movement_1F3F65
+	applymovement 19, Route118_Movement_StevenJumpLedge
 	waitmovement 0
 	delay 30
-	msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT
+	msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq Route118_EventScript_1F3F28
+	call_if_eq Route118_EventScript_StevenExit0
 	compare VAR_0x8008, 1
-	call_if_eq Route118_EventScript_1F3F3A
+	call_if_eq Route118_EventScript_StevenExit1
 	compare VAR_0x8008, 2
-	call_if_eq Route118_EventScript_1F3F4C
+	call_if_eq Route118_EventScript_StevenExit2
 	setvar VAR_ROUTE118_STATE, 1
 	removeobject 19
 	releaseall
 	end
 
-Route118_EventScript_1F3F28:: @ 81F3F28
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F69
+Route118_EventScript_StevenExit0:: @ 81F3F28
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit0
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F3A:: @ 81F3F3A
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F74
+Route118_EventScript_StevenExit1:: @ 81F3F3A
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit1
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F4C:: @ 81F3F4C
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F7E
+Route118_EventScript_StevenExit2:: @ 81F3F4C
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit2
 	waitmovement 0
 	return
 
-Route118_Movement_1F3F5E: @ 81F3F5E
+Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-Route118_Movement_1F3F61: @ 81F3F61
+Route118_Movement_StevenApproachLedge0: @ 81F3F61
 	walk_left
 	step_end
 
-Route118_Movement_1F3F63: @ 81F3F63
+Route118_Movement_StevenApproachLedge2: @ 81F3F63
 	walk_right
 	step_end
 
-Route118_Movement_1F3F65: @ 81F3F65
+Route118_Movement_StevenJumpLedge: @ 81F3F65
 	jump_2_down
 	delay_16
 	walk_down
 	step_end
 
-Route118_Movement_1F3F69: @ 81F3F69
+Route118_Movement_StevenExit0: @ 81F3F69
 	walk_right
 	walk_right
 	walk_right
@@ -162,7 +162,7 @@ Route118_Movement_1F3F69: @ 81F3F69
 	walk_right
 	step_end
 
-Route118_Movement_1F3F74: @ 81F3F74
+Route118_Movement_StevenExit1: @ 81F3F74
 	walk_right
 	walk_right
 	walk_right
@@ -174,7 +174,7 @@ Route118_Movement_1F3F74: @ 81F3F74
 	walk_right
 	step_end
 
-Route118_Movement_1F3F7E: @ 81F3F7E
+Route118_Movement_StevenExit2: @ 81F3F7E
 	walk_right
 	walk_right
 	walk_right
@@ -185,76 +185,76 @@ Route118_Movement_1F3F7E: @ 81F3F7E
 	walk_right
 	step_end
 
-Route118_EventScript_1F3F87:: @ 81F3F87
-	trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+Route118_EventScript_Rose:: @ 81F3F87
+	trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F3FD2
-	msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route118_EventScript_RematchRose
+	msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3FB3:: @ 81F3FB3
+Route118_EventScript_RegisterRose:: @ 81F3FB3
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D343, MSGBOX_DEFAULT
+	msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ROSE_1
 	release
 	end
 
-Route118_EventScript_1F3FD2:: @ 81F3FD2
-	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA
-	msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE
+Route118_EventScript_RematchRose:: @ 81F3FD2
+	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat
+	msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F3FE9:: @ 81F3FE9
-	trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
-	msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
+Route118_EventScript_Barny:: @ 81F3FE9
+	trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat
+	msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4000:: @ 81F4000
-	trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
-	msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
+Route118_EventScript_Wade:: @ 81F4000
+	trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat
+	msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4017:: @ 81F4017
-	trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+Route118_EventScript_Dalton:: @ 81F4017
+	trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F4062
-	msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route118_EventScript_RematchDalton
+	msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F4043:: @ 81F4043
+Route118_EventScript_RegisterDalton:: @ 81F4043
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D74A, MSGBOX_DEFAULT
+	msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DALTON_1
 	release
 	end
 
-Route118_EventScript_1F4062:: @ 81F4062
-	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA
-	msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE
+Route118_EventScript_RematchDalton:: @ 81F4062
+	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat
+	msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4079:: @ 81F4079
-	trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
-	msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
+Route118_EventScript_Perry:: @ 81F4079
+	trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat
+	msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4090:: @ 81F4090
-	trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
-	msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
+Route118_EventScript_Chester:: @ 81F4090
+	trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat
+	msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F40A7:: @ 81F40A7
-	trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
-	msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
+Route118_EventScript_Deandre:: @ 81F40A7
+	trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat
+	msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_Text_1F40BE: @ 81F40BE
+Route118_Text_StevenQuestions: @ 81F40BE
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "It's me, STEVEN!\n"
 	.string "We met in the cave near DEWFORD.\p"
@@ -272,40 +272,40 @@ Route118_Text_1F40BE: @ 81F40BE
 	.string "It would be nice if we were to meet\n"
 	.string "again somewhere.$"
 
-Route118_Text_1F427B: @ 81F427B
+Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B
 	.string "Hmm!\n"
 	.string "A GOOD ROD is really good!\p"
 	.string "Wouldn't you agree?$"
 
-Route118_Text_1F42AF: @ 81F42AF
+Route118_Text_IdenticalMindsTakeThis: @ 81F42AF
 	.string "Hmm!\n"
 	.string "We're of identical minds!\p"
 	.string "Hmm!\n"
 	.string "Take this GOOD ROD!$"
 
-Route118_Text_1F42E7: @ 81F42E7
+Route118_Text_TryYourLuckFishing: @ 81F42E7
 	.string "Wherever there's water, try your luck\n"
 	.string "at fishing.$"
 
-Route118_Text_1F4319: @ 81F4319
+Route118_Text_DontYouLikeToFish: @ 81F4319
 	.string "Don't you like to fish?$"
 
-Route118_Text_1F4331: @ 81F4331
+Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331
 	.string "Try catching all sorts of POKéMON\n"
 	.string "with your GOOD ROD.$"
 
-Route118_Text_1F4367: @ 81F4367
+Route118_Text_CanCrossRiversWithSurf: @ 81F4367
 	.string "Even if there isn't a boat, you can\n"
 	.string "cross rivers and the sea if you have\l"
 	.string "a POKéMON that knows SURF.\p"
 	.string "POKéMON can be counted on to do so\n"
 	.string "much!$"
 
-Route118_Text_1F43F4: @ 81F43F4
+Route118_Text_RouteSignMauville: @ 81F43F4
 	.string "ROUTE 118\n"
 	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
-Route118_Text_1F440E: @ 81F440E
+Route118_Text_RouteSign119: @ 81F440E
 	.string "ROUTE 118\n"
 	.string "{UP_ARROW} ROUTE 119$"
 
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index badd5d14e..2d1be0635 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47E2",
+      "script": "Route119_EventScript_Greg",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47B4",
+      "script": "Route119_EventScript_Taylor",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F479D",
+      "script": "Route119_EventScript_Donald",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4810",
+      "script": "Route119_EventScript_Jackson",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F4786",
+      "script": "Route119_EventScript_Brent",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route119_EventScript_1F4872",
+      "script": "Route119_EventScript_Catherine",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47CB",
+      "script": "Route119_EventScript_Doug",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F47F9",
+      "script": "Route119_EventScript_Kent",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route119_EventScript_1F4902",
+      "script": "Route119_EventScript_Yasu",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4919",
+      "script": "Route119_EventScript_Takashi",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F48D4",
+      "script": "Route119_EventScript_Hugh",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route119_EventScript_1F48EB",
+      "script": "Route119_EventScript_Phil",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49A3",
+      "script": "Route119_EventScript_BridgeAquaGrunt1",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49BA",
+      "script": "Route119_EventScript_BridgeAquaGrunt2",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49D1",
+      "script": "Route119_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -425,7 +425,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F476B",
+      "script": "Route119_EventScript_CyclingTriathleteM",
       "flag": "0"
     },
     {
@@ -451,7 +451,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F49DA",
+      "script": "Route119_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -464,7 +464,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4930",
+      "script": "Route119_EventScript_Hideo",
       "flag": "0"
     },
     {
@@ -503,7 +503,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1F4947",
+      "script": "Route119_EventScript_Chris",
       "flag": "0"
     },
     {
@@ -516,7 +516,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route119_EventScript_1F498C",
+      "script": "Route119_EventScript_Rachel",
       "flag": "0"
     },
     {
@@ -529,7 +529,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_EventScript_1F4975",
+      "script": "Route119_EventScript_Dayton",
       "flag": "0"
     },
     {
@@ -542,7 +542,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route119_EventScript_1F495E",
+      "script": "Route119_EventScript_Fabian",
       "flag": "0"
     },
     {
@@ -609,7 +609,7 @@
       "elevation": 0,
       "var": "VAR_ROUTE119_STATE",
       "var_value": "0",
-      "script": "Route119_EventScript_1F4472"
+      "script": "Route119_EventScript_RivalTrigger1"
     },
     {
       "type": "trigger",
@@ -618,7 +618,7 @@
       "elevation": 0,
       "var": "VAR_ROUTE119_STATE",
       "var_value": "0",
-      "script": "Route119_EventScript_1F447D"
+      "script": "Route119_EventScript_RivalTrigger2"
     },
     {
       "type": "weather",
@@ -775,7 +775,7 @@
       "y": 33,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_EventScript_1F477D"
+      "script": "Route119_EventScript_WeatherInstituteSign"
     },
     {
       "type": "sign",
@@ -783,7 +783,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_EventScript_1F4774"
+      "script": "Route119_EventScript_RouteSignFortree"
     },
     {
       "type": "secret_base",
@@ -914,7 +914,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route119_EventScript_1F49E3"
+      "script": "Route119_EventScript_TrainerTipsDecoration"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index 4658c2407..36647e931 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -1,13 +1,13 @@
 Route119_MapScripts:: @ 81F4424
-	map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F
+	map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition
 	.byte 0
 
-Route119_MapScript1_1F442F: @ 81F442F
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_1F4439
+Route119_OnResume: @ 81F442F
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_TryRemoveKecleon
 	end
 
-Route119_EventScript_1F4439:: @ 81F4439
+Route119_EventScript_TryRemoveKecleon:: @ 81F4439
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -18,231 +18,231 @@ Route119_OnTransition: @ 81F444D
 	call Common_EventScript_SetupRivalGfxId
 	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_EventScript_1F4466
+	call_if_eq Route119_EventScript_MoveInstituteWorkersDownstairs
 	special SetRoute119Weather
 	end
 
-Route119_EventScript_1F4466:: @ 81F4466
+Route119_EventScript_MoveInstituteWorkersDownstairs:: @ 81F4466
 	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
 	clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
 	setvar VAR_WEATHER_INSTITUTE_STATE, 2
 	return
 
-Route119_EventScript_1F4472:: @ 81F4472
+Route119_EventScript_RivalTrigger1:: @ 81F4472
 	setvar VAR_TEMP_1, 1
-	goto Route119_EventScript_1F4488
+	goto Route119_EventScript_RivalEncounter
 	end
 
-Route119_EventScript_1F447D:: @ 81F447D
+Route119_EventScript_RivalTrigger2:: @ 81F447D
 	setvar VAR_TEMP_1, 2
-	goto Route119_EventScript_1F4488
+	goto Route119_EventScript_RivalEncounter
 	end
 
-Route119_EventScript_1F4488:: @ 81F4488
+Route119_EventScript_RivalEncounter:: @ 81F4488
 	lockall
-	addobject 25
+	addobject 25  @ Rival on bike
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq Route119_EventScript_1F4501
+	call_if_eq Route119_EventScript_PlayMayMusic
 	compare VAR_RESULT, FEMALE
-	call_if_eq Route119_EventScript_1F4506
+	call_if_eq Route119_EventScript_PlayBrendanMusic
 	delay 65
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46C6
+	call_if_eq Route119_EventScript_RivalEnter1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46D1
+	call_if_eq Route119_EventScript_RivalEnter2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F4700
+	call_if_eq Route119_EventScript_SetRivalPos1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F470F
+	call_if_eq Route119_EventScript_SetRivalPos2
 	removeobject 25
-	addobject 16
+	addobject 16  @ Rival on foot
 	delay 30
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route119_EventScript_1F450B
+	goto_if_eq Route119_EventScript_BattleMay
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route119_EventScript_1F4585
+	goto_if_eq Route119_EventScript_BattleBrendan
 	releaseall
 	end
 
-Route119_EventScript_1F4501:: @ 81F4501
+Route119_EventScript_PlayMayMusic:: @ 81F4501
 	playbgm MUS_GIRL_SUP, 1
 	return
 
-Route119_EventScript_1F4506:: @ 81F4506
+Route119_EventScript_PlayBrendanMusic:: @ 81F4506
 	playbgm MUS_BOY_SUP, 1
 	return
 
-Route119_EventScript_1F450B:: @ 81F450B
-	msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT
+Route119_EventScript_BattleMay:: @ 81F450B
+	msgbox Route119_Text_MayIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_1F453A
-	case 1, Route119_EventScript_1F454A
-	case 2, Route119_EventScript_1F455A
+	case 0, Route119_EventScript_BattleMayTreecko
+	case 1, Route119_EventScript_BattleMayTorchic
+	case 2, Route119_EventScript_BattleMayMudkip
 	end
 
-Route119_EventScript_1F453A:: @ 81F453A
-	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
+Route119_EventScript_BattleMayTreecko:: @ 81F453A
+	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat
+	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_1F454A:: @ 81F454A
-	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
+Route119_EventScript_BattleMayTorchic:: @ 81F454A
+	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat
+	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_1F455A:: @ 81F455A
-	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
+Route119_EventScript_BattleMayMudkip:: @ 81F455A
+	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat
+	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_1F456A:: @ 81F456A
-	msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT
-	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT
-	goto Route119_EventScript_1F460F
+Route119_EventScript_DefeatedMay:: @ 81F456A
+	msgbox Route119_Text_MayPresentForYou, MSGBOX_DEFAULT
+	call Route119_EventScript_GiveFlyHM
+	msgbox Route119_Text_MayExplainFly, MSGBOX_DEFAULT
+	goto Route119_EventScript_RivalExitScottArrive
 	end
 
-Route119_EventScript_1F4585:: @ 81F4585
-	msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT
+Route119_EventScript_BattleBrendan:: @ 81F4585
+	msgbox Route119_Text_BrendanIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_1F45B4
-	case 1, Route119_EventScript_1F45C4
-	case 2, Route119_EventScript_1F45D4
+	case 0, Route119_EventScript_BattleBrendanTreecko
+	case 1, Route119_EventScript_BattleBrendanTorchic
+	case 2, Route119_EventScript_BattleBrendanMudkip
 	end
 
-Route119_EventScript_1F45B4:: @ 81F45B4
-	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
+Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4
+	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat
+	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_1F45C4:: @ 81F45C4
-	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
+Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4
+	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat
+	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_1F45D4:: @ 81F45D4
-	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
+Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4
+	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat
+	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_1F45E4:: @ 81F45E4
-	msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT
-	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT
-	goto Route119_EventScript_1F460F
+Route119_EventScript_DefeatedBrendan:: @ 81F45E4
+	msgbox Route119_Text_BrendanIllGiveYouThis, MSGBOX_DEFAULT
+	call Route119_EventScript_GiveFlyHM
+	msgbox Route119_Text_BrendanExplainFly, MSGBOX_DEFAULT
+	goto Route119_EventScript_RivalExitScottArrive
 	end
 
-Route119_EventScript_1F45FF:: @ 81F45FF
+Route119_EventScript_GiveFlyHM:: @ 81F45FF
 	giveitem_std ITEM_HM02
 	setflag FLAG_RECEIVED_HM02
 	return
 
-Route119_EventScript_1F460F:: @ 81F460F
+Route119_EventScript_RivalExitScottArrive:: @ 81F460F
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F4700
+	call_if_eq Route119_EventScript_SetRivalPos1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F470F
-	removeobject 16
-	addobject 25
+	call_if_eq Route119_EventScript_SetRivalPos2
+	removeobject 16  @ Rival on foot
+	addobject 25     @ Rival on bike
 	delay 30
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46DC
+	call_if_eq Route119_EventScript_RivalExit1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46EE
+	call_if_eq Route119_EventScript_RivalExit2
 	removeobject 25
 	setvar VAR_ROUTE119_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	delay 60
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46A0
+	call_if_eq Route119_EventScript_SetScottPos1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46A8
-	addobject 43
-	applymovement 43, Route119_Movement_1F4752
+	call_if_eq Route119_EventScript_SetScottPos2
+	addobject 43  @ Scott
+	applymovement 43, Route119_Movement_ScottEnter
 	waitmovement 0
 	addvar VAR_SCOTT_STATE, 1
-	msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT
+	msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1F46B0
+	call_if_eq Route119_EventScript_ScottExit1
 	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1F46BB
+	call_if_eq Route119_EventScript_ScottExit2
 	removeobject 43
 	releaseall
 	end
 
-Route119_EventScript_1F46A0:: @ 81F46A0
+Route119_EventScript_SetScottPos1:: @ 81F46A0
 	setobjectxyperm 43, 27, 25
 	return
 
-Route119_EventScript_1F46A8:: @ 81F46A8
+Route119_EventScript_SetScottPos2:: @ 81F46A8
 	setobjectxyperm 43, 28, 25
 	return
 
-Route119_EventScript_1F46B0:: @ 81F46B0
-	applymovement 43, Route119_Movement_1F475A
+Route119_EventScript_ScottExit1:: @ 81F46B0
+	applymovement 43, Route119_Movement_ScottExit1
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46BB:: @ 81F46BB
-	applymovement 43, Route119_Movement_1F4763
+Route119_EventScript_ScottExit2:: @ 81F46BB
+	applymovement 43, Route119_Movement_ScottExit2
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46C6:: @ 81F46C6
-	applymovement 25, Route119_Movement_1F4728
+Route119_EventScript_RivalEnter1:: @ 81F46C6
+	applymovement 25, Route119_Movement_RivalEnter1
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46D1:: @ 81F46D1
-	applymovement 25, Route119_Movement_1F4732
+Route119_EventScript_RivalEnter2:: @ 81F46D1
+	applymovement 25, Route119_Movement_RivalEnter2
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46DC:: @ 81F46DC
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F471E
-	applymovement 25, Route119_Movement_1F473D
+Route119_EventScript_RivalExit1:: @ 81F46DC
+	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1
+	applymovement 25, Route119_Movement_RivalExit1
 	waitmovement 0
 	return
 
-Route119_EventScript_1F46EE:: @ 81F46EE
-	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F4723
-	applymovement 25, Route119_Movement_1F4747
+Route119_EventScript_RivalExit2:: @ 81F46EE
+	applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2
+	applymovement 25, Route119_Movement_RivalExit2
 	waitmovement 0
 	return
 
-Route119_EventScript_1F4700:: @ 81F4700
+Route119_EventScript_SetRivalPos1:: @ 81F4700
 	setobjectxyperm 16, 25, 32
 	setobjectxyperm 25, 25, 32
 	return
 
-Route119_EventScript_1F470F:: @ 81F470F
+Route119_EventScript_SetRivalPos2:: @ 81F470F
 	setobjectxyperm 16, 26, 32
 	setobjectxyperm 25, 26, 32
 	return
 
-Route119_Movement_1F471E: @ 81F471E
+Route119_Movement_PlayerWatchRivalExit1: @ 81F471E
 	delay_16
 	walk_in_place_fastest_right
 	delay_8
 	walk_in_place_fastest_up
 	step_end
 
-Route119_Movement_1F4723: @ 81F4723
+Route119_Movement_PlayerWatchRivalExit2: @ 81F4723
 	delay_16
 	walk_in_place_fastest_left
 	delay_8
 	walk_in_place_fastest_up
 	step_end
 
-Route119_Movement_1F4728: @ 81F4728
+Route119_Movement_RivalEnter1: @ 81F4728
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -254,7 +254,7 @@ Route119_Movement_1F4728: @ 81F4728
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F4732: @ 81F4732
+Route119_Movement_RivalEnter2: @ 81F4732
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -267,7 +267,7 @@ Route119_Movement_1F4732: @ 81F4732
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F473D: @ 81F473D
+Route119_Movement_RivalExit1: @ 81F473D
 	walk_fast_right
 	walk_fast_up
 	walk_fast_up
@@ -279,7 +279,7 @@ Route119_Movement_1F473D: @ 81F473D
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F4747: @ 81F4747
+Route119_Movement_RivalExit2: @ 81F4747
 	walk_fast_left
 	walk_fast_up
 	walk_fast_up
@@ -292,7 +292,7 @@ Route119_Movement_1F4747: @ 81F4747
 	walk_fast_up
 	step_end
 
-Route119_Movement_1F4752: @ 81F4752
+Route119_Movement_ScottEnter: @ 81F4752
 	walk_down
 	walk_down
 	walk_down
@@ -302,7 +302,7 @@ Route119_Movement_1F4752: @ 81F4752
 	walk_down
 	step_end
 
-Route119_Movement_1F475A: @ 81F475A
+Route119_Movement_ScottExit1: @ 81F475A
 	walk_up
 	walk_right
 	walk_right
@@ -313,7 +313,7 @@ Route119_Movement_1F475A: @ 81F475A
 	walk_up
 	step_end
 
-Route119_Movement_1F4763: @ 81F4763
+Route119_Movement_ScottExit2: @ 81F4763
 	walk_up
 	walk_right
 	walk_up
@@ -323,179 +323,179 @@ Route119_Movement_1F4763: @ 81F4763
 	walk_up
 	step_end
 
-Route119_EventScript_1F476B:: @ 81F476B
-	msgbox Route119_Text_1F5261, MSGBOX_NPC
+Route119_EventScript_CyclingTriathleteM:: @ 81F476B
+	msgbox Route119_Text_TallGrassSnaresBikeTires, MSGBOX_NPC
 	end
 
-Route119_EventScript_1F4774:: @ 81F4774
-	msgbox Route119_Text_1F530E, MSGBOX_SIGN
+Route119_EventScript_RouteSignFortree:: @ 81F4774
+	msgbox Route119_Text_RouteSignFortree, MSGBOX_SIGN
 	end
 
-Route119_EventScript_1F477D:: @ 81F477D
-	msgbox Route119_Text_1F5327, MSGBOX_SIGN
+Route119_EventScript_WeatherInstituteSign:: @ 81F477D
+	msgbox Route119_Text_WeatherInstitute, MSGBOX_SIGN
 	end
 
-Route119_EventScript_1F4786:: @ 81F4786
-	trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0
-	msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE
+Route119_EventScript_Brent:: @ 81F4786
+	trainerbattle_single TRAINER_BRENT, Route119_Text_BrentIntro, Route119_Text_BrentDefeat
+	msgbox Route119_Text_BrentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F479D:: @ 81F479D
-	trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C
-	msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE
+Route119_EventScript_Donald:: @ 81F479D
+	trainerbattle_single TRAINER_DONALD, Route119_Text_DonaldIntro, Route119_Text_DonaldDefeat
+	msgbox Route119_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47B4:: @ 81F47B4
-	trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14
-	msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE
+Route119_EventScript_Taylor:: @ 81F47B4
+	trainerbattle_single TRAINER_TAYLOR, Route119_Text_TaylorIntro, Route119_Text_TaylorDefeat
+	msgbox Route119_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47CB:: @ 81F47CB
-	trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC
-	msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE
+Route119_EventScript_Doug:: @ 81F47CB
+	trainerbattle_single TRAINER_DOUG, Route119_Text_DougIntro, Route119_Text_DougDefeat
+	msgbox Route119_Text_DougPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47E2:: @ 81F47E2
-	trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66
-	msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE
+Route119_EventScript_Greg:: @ 81F47E2
+	trainerbattle_single TRAINER_GREG, Route119_Text_GregIntro, Route119_Text_GregDefeat
+	msgbox Route119_Text_GregPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F47F9:: @ 81F47F9
-	trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20
-	msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE
+Route119_EventScript_Kent:: @ 81F47F9
+	trainerbattle_single TRAINER_KENT, Route119_Text_KentIntro, Route119_Text_KentDefeat
+	msgbox Route119_Text_KentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4810:: @ 81F4810
-	trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
+Route119_EventScript_Jackson:: @ 81F4810
+	trainerbattle_single TRAINER_JACKSON_1, Route119_Text_JacksonIntro, Route119_Text_JacksonDefeat, Route119_EventScript_RegisterJackson
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route119_EventScript_1F485B
-	msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route119_EventScript_RematchJackson
+	msgbox Route119_Text_JacksonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_EventScript_1F483C:: @ 81F483C
+Route119_EventScript_RegisterJackson:: @ 81F483C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT
+	msgbox Route119_Text_JacksonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JACKSON_1
 	release
 	end
 
-Route119_EventScript_1F485B:: @ 81F485B
-	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5
-	msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE
+Route119_EventScript_RematchJackson:: @ 81F485B
+	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_JacksonRematchIntro, Route119_Text_JacksonRematchDefeat
+	msgbox Route119_Text_JacksonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4872:: @ 81F4872
-	trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
+Route119_EventScript_Catherine:: @ 81F4872
+	trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_CatherineIntro, Route119_Text_CatherineDefeat, Route119_EventScript_RegisterCatherine
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route119_EventScript_1F48BD
-	msgbox Route119_Text_29DE88, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route119_EventScript_RematchCatherine
+	msgbox Route119_Text_CatherinePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_EventScript_1F489E:: @ 81F489E
+Route119_EventScript_RegisterCatherine:: @ 81F489E
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT
+	msgbox Route119_Text_CatherineRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CATHERINE_1
 	release
 	end
 
-Route119_EventScript_1F48BD:: @ 81F48BD
-	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92
-	msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE
+Route119_EventScript_RematchCatherine:: @ 81F48BD
+	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_CatherineRematchIntro, Route119_Text_CatherineRematchDefeat
+	msgbox Route119_Text_CatherinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F48D4:: @ 81F48D4
-	trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063
-	msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE
+Route119_EventScript_Hugh:: @ 81F48D4
+	trainerbattle_single TRAINER_HUGH, Route119_Text_HughIntro, Route119_Text_HughDefeat
+	msgbox Route119_Text_HughPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F48EB:: @ 81F48EB
-	trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1
-	msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE
+Route119_EventScript_Phil:: @ 81F48EB
+	trainerbattle_single TRAINER_PHIL, Route119_Text_PhilIntro, Route119_Text_PhilDefeat
+	msgbox Route119_Text_PhilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4902:: @ 81F4902
-	trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D
-	msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE
+Route119_EventScript_Yasu:: @ 81F4902
+	trainerbattle_single TRAINER_YASU, Route119_Text_YasuIntro, Route119_Text_YasuDefeat
+	msgbox Route119_Text_YasuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4919:: @ 81F4919
-	trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B
-	msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE
+Route119_EventScript_Takashi:: @ 81F4919
+	trainerbattle_single TRAINER_TAKASHI, Route119_Text_TakashiIntro, Route119_Text_TakashiDefeat
+	msgbox Route119_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4930:: @ 81F4930
-	trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288
-	msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE
+Route119_EventScript_Hideo:: @ 81F4930
+	trainerbattle_single TRAINER_HIDEO, Route119_Text_HideoIntro, Route119_Text_HideoDefeat
+	msgbox Route119_Text_HideoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4947:: @ 81F4947
-	trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372
-	msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE
+Route119_EventScript_Chris:: @ 81F4947
+	trainerbattle_single TRAINER_CHRIS, Route119_Text_ChrisIntro, Route119_Text_ChrisDefeat
+	msgbox Route119_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F495E:: @ 81F495E
-	trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F
-	msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE
+Route119_EventScript_Fabian:: @ 81F495E
+	trainerbattle_single TRAINER_FABIAN, Route119_Text_FabianIntro, Route119_Text_FabianDefeat
+	msgbox Route119_Text_FabianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F4975:: @ 81F4975
-	trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513
-	msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE
+Route119_EventScript_Dayton:: @ 81F4975
+	trainerbattle_single TRAINER_DAYTON, Route119_Text_DaytonIntro, Route119_Text_DaytonDefeat
+	msgbox Route119_Text_DaytonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F498C:: @ 81F498C
-	trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1
-	msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE
+Route119_EventScript_Rachel:: @ 81F498C
+	trainerbattle_single TRAINER_RACHEL, Route119_Text_RachelIntro, Route119_Text_RachelDefeat
+	msgbox Route119_Text_RachelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_1F49A3:: @ 81F49A3
+Route119_EventScript_BridgeAquaGrunt1:: @ 81F49A3
 	lock
 	faceplayer
-	msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT
+	msgbox Route119_Text_StayAwayFromWeatherInstitute, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route119_EventScript_1F49BA:: @ 81F49BA
+Route119_EventScript_BridgeAquaGrunt2:: @ 81F49BA
 	lock
 	faceplayer
-	msgbox Route119_Text_1F5147, MSGBOX_DEFAULT
+	msgbox Route119_Text_DontGoNearWeatherInstitute, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route119_EventScript_1F49D1:: @ 81F49D1
-	msgbox Route119_Text_1F51A2, MSGBOX_NPC
+Route119_EventScript_Boy1:: @ 81F49D1
+	msgbox Route119_Text_ThoughtFlyByCatchingBirdMons, MSGBOX_NPC
 	end
 
-Route119_EventScript_1F49DA:: @ 81F49DA
-	msgbox Route119_Text_1F52B9, MSGBOX_NPC
+Route119_EventScript_Boy2:: @ 81F49DA
+	msgbox Route119_Text_CanYourMonMakeSecretBase, MSGBOX_NPC
 	end
 
-Route119_EventScript_1F49E3:: @ 81F49E3
-	msgbox Route119_Text_1F5339, MSGBOX_SIGN
+Route119_EventScript_TrainerTipsDecoration:: @ 81F49E3
+	msgbox Route119_Text_TrainerTipsDecoration, MSGBOX_SIGN
 	end
 
-Route119_EventScript_1F49EC:: @ 81F49EC
+Route119_EventScript_ScottWonAtFortreeGymCall:: @ 81F49EC
 	lockall
-	pokenavcall Route119_Text_1F4FBA
+	pokenavcall Route119_Text_ScottYouWonAtFortreeGym
 	waitmessage
-	clearflag FLAG_REGISTER_WINONA_POKENAV
+	clearflag FLAG_SCOTT_CALL_FORTREE_GYM
 	addvar VAR_SCOTT_STATE, 1
 	releaseall
 	end
 
-Route119_Text_1F49FD: @ 81F49FD
+Route119_Text_MayIntro: @ 81F49FD
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "Where were you? I was looking for you!\p"
 	.string "How much stronger have you gotten?\n"
@@ -503,18 +503,18 @@ Route119_Text_1F49FD: @ 81F49FD
 	.string "Ready with your POKéMON?\n"
 	.string "Of course you are! Go!$"
 
-Route119_Text_1F4A98: @ 81F4A98
+Route119_Text_MayDefeat: @ 81F4A98
 	.string "Achah!\n"
 	.string "{PLAYER}{KUN}, you're strong!\p"
 	.string "I was worried that you might be\n"
 	.string "struggling with your training.$"
 
-Route119_Text_1F4AF3: @ 81F4AF3
+Route119_Text_MayPresentForYou: @ 81F4AF3
 	.string "MAY: But I had absolutely nothing to\n"
 	.string "worry about! Keep it up!\p"
 	.string "And, here! I have a present for you.$"
 
-Route119_Text_1F4B56: @ 81F4B56
+Route119_Text_MayExplainFly: @ 81F4B56
 	.string "MAY: Use FLY, and your POKéMON will\n"
 	.string "instantly carry you to any town you've\l"
 	.string "already visited.\p"
@@ -527,7 +527,7 @@ Route119_Text_1F4B56: @ 81F4B56
 	.string "{PLAYER}{KUN}.\p"
 	.string "Well, let's meet again somewhere!$"
 
-Route119_Text_1F4C9A: @ 81F4C9A
+Route119_Text_BrendanIntro: @ 81F4C9A
 	.string "BRENDAN: {PLAYER}! So this is where\n"
 	.string "you've been looking for POKéMON?\p"
 	.string "Let me see how good you got.\n"
@@ -535,17 +535,17 @@ Route119_Text_1F4C9A: @ 81F4C9A
 	.string "Now!\n"
 	.string "It's a battle, so battle!$"
 
-Route119_Text_1F4D24: @ 81F4D24
+Route119_Text_BrendanDefeat: @ 81F4D24
 	.string "Hmm…\n"
 	.string "You've gotten pretty darn decent.$"
 
-Route119_Text_1F4D4B: @ 81F4D4B
+Route119_Text_BrendanIllGiveYouThis: @ 81F4D4B
 	.string "BRENDAN: I'd say you're good enough\n"
 	.string "to search for POKéMON anywhere.\p"
 	.string "Here, I'll give you this.\n"
 	.string "Try it out.$"
 
-Route119_Text_1F4DB5: @ 81F4DB5
+Route119_Text_BrendanExplainFly: @ 81F4DB5
 	.string "BRENDAN: Use FLY, and your POKéMON\n"
 	.string "instantly carries you to any town\l"
 	.string "you've already visited.\p"
@@ -553,7 +553,7 @@ Route119_Text_1F4DB5: @ 81F4DB5
 	.string "to do that.\p"
 	.string "Anyway, I have to move along.$"
 
-Route119_Text_1F4E60: @ 81F4E60
+Route119_Text_ScottWayToGoBeSeeingYou: @ 81F4E60
 	.string "SCOTT: Hahahah!\n"
 	.string "Way to go, {PLAYER}{KUN}!\p"
 	.string "I just passed by a TRAINER riding\n"
@@ -568,7 +568,7 @@ Route119_Text_1F4E60: @ 81F4E60
 	.string "Well, I'll be seeing you!$"
 
 
-Route119_Text_1F4FBA: @ 81F4FBA
+Route119_Text_ScottYouWonAtFortreeGym: @ 81F4FBA
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "SCOTT: Hiya, {PLAYER}{KUN}, it's me!\p"
@@ -583,17 +583,17 @@ Route119_Text_1F4FBA: @ 81F4FBA
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-Route119_Text_1F50EB: @ 81F50EB
+Route119_Text_StayAwayFromWeatherInstitute: @ 81F50EB
 	.string "We're standing lookout here.\p"
 	.string "Hey, you! Stay away from the WEATHER\n"
 	.string "INSTITUTE. It's not safe.$"
 
-Route119_Text_1F5147: @ 81F5147
+Route119_Text_DontGoNearWeatherInstitute: @ 81F5147
 	.string "Lookout duty is surprisingly boring.\p"
 	.string "Hey, you! Please don't go near the\n"
 	.string "WEATHER INSTITUTE.$"
 
-Route119_Text_1F51A2: @ 81F51A2
+Route119_Text_ThoughtFlyByCatchingBirdMons: @ 81F51A2
 	.string "I thought you FLY by catching a whole\n"
 	.string "flock of BIRD POKéMON, and then\l"
 	.string "hanging on to them somehow.\p"
@@ -602,25 +602,25 @@ Route119_Text_1F51A2: @ 81F51A2
 	.string "I wish I'd known about that a long\n"
 	.string "time ago…$"
 
-Route119_Text_1F5261: @ 81F5261
+Route119_Text_TallGrassSnaresBikeTires: @ 81F5261
 	.string "Tch…\n"
 	.string "It's a no-go…\p"
 	.string "The tall grass snares BIKE tires.\n"
 	.string "There's no way you can cycle here.$"
 
-Route119_Text_1F52B9: @ 81F52B9
+Route119_Text_CanYourMonMakeSecretBase: @ 81F52B9
 	.string "Can your POKéMON use its SECRET POWER\n"
 	.string "on a big pile of grass and make a\l"
 	.string "SECRET BASE?$"
 
-Route119_Text_1F530E: @ 81F530E
+Route119_Text_RouteSignFortree: @ 81F530E
 	.string "ROUTE 119\n"
 	.string "{RIGHT_ARROW} FORTREE CITY$"
 
-Route119_Text_1F5327: @ 81F5327
+Route119_Text_WeatherInstitute: @ 81F5327
 	.string "WEATHER INSTITUTE$"
 
-Route119_Text_1F5339: @ 81F5339
+Route119_Text_TrainerTipsDecoration: @ 81F5339
 	.string "TRAINER TIPS\p"
 	.string "Up to sixteen decorations and\n"
 	.string "furniture items can be placed in\l"
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 8bcfafc72..61e7d2892 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F57D7",
+      "script": "Route120_EventScript_Colin",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F57EE",
+      "script": "Route120_EventScript_Robert",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route120_EventScript_1F5850",
+      "script": "Route120_EventScript_Lorenzo",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route120_EventScript_1F5867",
+      "script": "Route120_EventScript_Jenna",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F587E",
+      "script": "Route120_EventScript_Jeffrey",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1F5527",
+      "script": "Route120_EventScript_BerryBeauty",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route120_EventScript_1F58E0",
+      "script": "Route120_EventScript_Jennifer",
       "flag": "0"
     },
     {
@@ -347,7 +347,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route120_EventScript_1F58F7",
+      "script": "Route120_EventScript_Chip",
       "flag": "0"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route120_EventScript_1F590E",
+      "script": "Route120_EventScript_Clarissa",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F5925",
+      "script": "Route120_EventScript_Angelica",
       "flag": "0"
     },
     {
@@ -464,7 +464,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F593C",
+      "script": "Route120_EventScript_Keigo",
       "flag": "0"
     },
     {
@@ -477,7 +477,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F5953",
+      "script": "Route120_EventScript_Riley",
       "flag": "0"
     },
     {
@@ -568,7 +568,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F5981",
+      "script": "Route120_EventScript_Callie",
       "flag": "0"
     },
     {
@@ -581,7 +581,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route120_EventScript_1F596A",
+      "script": "Route120_EventScript_Leonel",
       "flag": "0"
     },
     {
@@ -756,7 +756,7 @@
       "y": 3,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route120_EventScript_1F57C5"
+      "script": "Route120_EventScript_RouteSignFortree"
     },
     {
       "type": "sign",
@@ -764,7 +764,7 @@
       "y": 88,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route120_EventScript_1F57CE"
+      "script": "Route120_EventScript_RouteSign121"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 9ef80e893..f4ef4da87 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -39,137 +39,137 @@ Route120_EventScript_RemoveKecleon:: @ 81F5460
 	return
 
 Route120_OnLoad: @ 81F5474
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490
-	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3
-	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_CloseAncientTomb
+	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeClearMetatiles
+	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeKecleonMovement
 	end
 
-Route120_EventScript_1F5490:: @ 81F5490
+Route120_EventScript_CloseAncientTomb:: @ 81F5490
 	setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1
 	setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route120_EventScript_1F54A3:: @ 81F54A3
-	setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
-	setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
+Route120_EventScript_SetBridgeClearMetatiles:: @ 81F54A3
+	setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
+	setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
 	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
 	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	return
 
-Route120_EventScript_1F54C8:: @ 81F54C8
+Route120_EventScript_SetBridgeKecleonMovement:: @ 81F54C8
 	setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route120_OnTransition: @ 81F54CD
 	call GabbyAndTy_EventScript_UpdateLocation
-	call Route120_EventScript_1F54D8
+	call Route120_EventScript_SetWeather
 	end
 
-Route120_EventScript_1F54D8:: @ 81F54D8
+Route120_EventScript_SetWeather:: @ 81F54D8
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 14
-	goto_if_le Route120_EventScript_1F5503
+	goto_if_le Route120_EventScript_SetSunnyWeather
 	compare VAR_TEMP_1, 60
-	goto_if_le Route120_EventScript_1F5507
+	goto_if_le Route120_EventScript_TrySetRainyWeather
 	compare VAR_TEMP_1, 61
-	goto_if_ge Route120_EventScript_1F54FF
+	goto_if_ge Route120_EventScript_SetCloudyWeather
 	return
 
-Route120_EventScript_1F54FF:: @ 81F54FF
+Route120_EventScript_SetCloudyWeather:: @ 81F54FF
 	setweather WEATHER_CLOUDS
 	return
 
-Route120_EventScript_1F5503:: @ 81F5503
+Route120_EventScript_SetSunnyWeather:: @ 81F5503
 	setweather WEATHER_SUNNY
 	return
 
-Route120_EventScript_1F5507:: @ 81F5507
+Route120_EventScript_TrySetRainyWeather:: @ 81F5507
 	compare VAR_TEMP_0, 7
-	goto_if_le Route120_EventScript_1F5523
+	goto_if_le Route120_EventScript_SetRainyWeather
 	compare VAR_TEMP_0, 19
-	goto_if_le Route120_EventScript_1F5503
-	goto Route120_EventScript_1F5523
+	goto_if_le Route120_EventScript_SetSunnyWeather
+	goto Route120_EventScript_SetRainyWeather
 	end
 
-Route120_EventScript_1F5523:: @ 81F5523
+Route120_EventScript_SetRainyWeather:: @ 81F5523
 	setweather WEATHER_RAIN_LIGHT
 	return
 
-Route120_EventScript_1F5527:: @ 81F5527
+Route120_EventScript_BerryBeauty:: @ 81F5527
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625
-	msgbox Route120_Text_2A70C7, MSGBOX_YESNO
+	goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_ReceivedBerry
+	msgbox Route120_Text_BerriesExpressionOfLoveIsntIt, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq Route120_EventScript_1F562F
+	call_if_eq Route120_EventScript_BerryLove
 	compare VAR_RESULT, NO
-	call_if_eq Route120_EventScript_1F5638
+	call_if_eq Route120_EventScript_BerryNotLove
 	specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit
 	switch VAR_RESULT
-	case 0, Route120_EventScript_1F55CA
-	case 5, Route120_EventScript_1F55CA
-	case 1, Route120_EventScript_1F55D5
-	case 6, Route120_EventScript_1F55D5
-	case 2, Route120_EventScript_1F55E0
-	case 7, Route120_EventScript_1F55E0
-	case 3, Route120_EventScript_1F55EB
-	case 8, Route120_EventScript_1F55EB
-	case 4, Route120_EventScript_1F55F6
-	case 9, Route120_EventScript_1F55F6
-	end
-
-Route120_EventScript_1F55CA:: @ 81F55CA
+	case 0, Route120_EventScript_GiveFigyBerry
+	case 5, Route120_EventScript_GiveFigyBerry
+	case 1, Route120_EventScript_GiveWikiBerry
+	case 6, Route120_EventScript_GiveWikiBerry
+	case 2, Route120_EventScript_GiveMagoBerry
+	case 7, Route120_EventScript_GiveMagoBerry
+	case 3, Route120_EventScript_GiveAguavBerry
+	case 8, Route120_EventScript_GiveAguavBerry
+	case 4, Route120_EventScript_GiveIapapaBerry
+	case 9, Route120_EventScript_GiveIapapaBerry
+	end
+
+Route120_EventScript_GiveFigyBerry:: @ 81F55CA
 	setvar VAR_0x8004, ITEM_FIGY_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55D5:: @ 81F55D5
+Route120_EventScript_GiveWikiBerry:: @ 81F55D5
 	setvar VAR_0x8004, ITEM_WIKI_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55E0:: @ 81F55E0
+Route120_EventScript_GiveMagoBerry:: @ 81F55E0
 	setvar VAR_0x8004, ITEM_MAGO_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55EB:: @ 81F55EB
+Route120_EventScript_GiveAguavBerry:: @ 81F55EB
 	setvar VAR_0x8004, ITEM_AGUAV_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F55F6:: @ 81F55F6
+Route120_EventScript_GiveIapapaBerry:: @ 81F55F6
 	setvar VAR_0x8004, ITEM_IAPAPA_BERRY
-	goto Route120_EventScript_1F5601
+	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_1F5601:: @ 81F5601
+Route120_EventScript_GiveBerry:: @ 81F5601
 	giveitem_std VAR_0x8004
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY
-	msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
+	msgbox Route120_Text_BerryIsRareRaiseItWithCare, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F5625:: @ 81F5625
-	msgbox Route120_Text_2A7217, MSGBOX_DEFAULT
+Route120_EventScript_ReceivedBerry:: @ 81F5625
+	msgbox Route120_Text_IllGetMoreBerriesFromBerryMaster, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F562F:: @ 81F562F
-	msgbox Route120_Text_2A7147, MSGBOX_DEFAULT
+Route120_EventScript_BerryLove:: @ 81F562F
+	msgbox Route120_Text_YesYouUnderstand, MSGBOX_DEFAULT
 	return
 
-Route120_EventScript_1F5638:: @ 81F5638
-	msgbox Route120_Text_2A7183, MSGBOX_DEFAULT
+Route120_EventScript_BerryNotLove:: @ 81F5638
+	msgbox Route120_Text_MakeYourOwnImpressions, MSGBOX_DEFAULT
 	return
 
 Route120_EventScript_Steven:: @ 81F5641
 	lock
 	faceplayer
-	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672
+	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_StevenAskReadyForBattle
 	msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route120_EventScript_StevenNotReady
@@ -177,12 +177,12 @@ Route120_EventScript_Steven:: @ 81F5641
 	end
 
 Route120_EventScript_StevenNotReady:: @ 81F5665
-	msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT
+	msgbox Route120_Text_StevenIllWaitHere, MSGBOX_DEFAULT
 	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120
 	release
 	end
 
-Route120_EventScript_1F5672:: @ 81F5672
+Route120_EventScript_StevenAskReadyForBattle:: @ 81F5672
 	msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route120_EventScript_StevenNotReady
@@ -249,8 +249,8 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C
 	delay 15
 	removeobject 31
 	waitfieldeffect FLDEFF_NPCFLY_OUT
-	setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
-	setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
+	setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
+	setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
 	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
 	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	special DrawWholeMapView
@@ -276,111 +276,111 @@ Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC
 	msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
 	end
 
-Route120_EventScript_1F57C5:: @ 81F57C5
-	msgbox Route120_Text_1F5DCB, MSGBOX_SIGN
+Route120_EventScript_RouteSignFortree:: @ 81F57C5
+	msgbox Route120_Text_RouteSignFortree, MSGBOX_SIGN
 	end
 
-Route120_EventScript_1F57CE:: @ 81F57CE
-	msgbox Route120_Text_1F5DE4, MSGBOX_SIGN
+Route120_EventScript_RouteSign121:: @ 81F57CE
+	msgbox Route120_Text_RouteSign121, MSGBOX_SIGN
 	end
 
-Route120_EventScript_1F57D7:: @ 81F57D7
-	trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665
-	msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE
+Route120_EventScript_Colin:: @ 81F57D7
+	trainerbattle_single TRAINER_COLIN, Route120_Text_ColinIntro, Route120_Text_ColinDefeat
+	msgbox Route120_Text_ColinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F57EE:: @ 81F57EE
-	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
+Route120_EventScript_Robert:: @ 81F57EE
+	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_RobertIntro, Route120_Text_RobertDefeat, Route120_EventScript_RegisterRobert
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route120_EventScript_1F5839
-	msgbox Route120_Text_29E726, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route120_EventScript_RematchRobert
+	msgbox Route120_Text_RobertPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F581A:: @ 81F581A
+Route120_EventScript_RegisterRobert:: @ 81F581A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route120_Text_29E75D, MSGBOX_DEFAULT
+	msgbox Route120_Text_RobertRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ROBERT_1
 	release
 	end
 
-Route120_EventScript_1F5839:: @ 81F5839
-	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1
-	msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE
+Route120_EventScript_RematchRobert:: @ 81F5839
+	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_RobertRematchIntro, Route120_Text_RobertRematchDefeat
+	msgbox Route120_Text_RobertPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5850:: @ 81F5850
-	trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884
-	msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE
+Route120_EventScript_Lorenzo:: @ 81F5850
+	trainerbattle_single TRAINER_LORENZO, Route120_Text_LorenzoIntro, Route120_Text_LorenzoDefeat
+	msgbox Route120_Text_LorenzoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5867:: @ 81F5867
-	trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980
-	msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE
+Route120_EventScript_Jenna:: @ 81F5867
+	trainerbattle_single TRAINER_JENNA, Route120_Text_JennaIntro, Route120_Text_JennaDefeat
+	msgbox Route120_Text_JennaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F587E:: @ 81F587E
-	trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
+Route120_EventScript_Jeffrey:: @ 81F587E
+	trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_JeffreyIntro, Route120_Text_JeffreyDefeat, Route120_EventScript_RegisterJeffrey
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route120_EventScript_1F58C9
-	msgbox Route120_Text_29EA08, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route120_EventScript_RematchJeffrey
+	msgbox Route120_Text_JeffreyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_1F58AA:: @ 81F58AA
+Route120_EventScript_RegisterJeffrey:: @ 81F58AA
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route120_Text_29EA31, MSGBOX_DEFAULT
+	msgbox Route120_Text_JeffreyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JEFFREY_1
 	release
 	end
 
-Route120_EventScript_1F58C9:: @ 81F58C9
-	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F
-	msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE
+Route120_EventScript_RematchJeffrey:: @ 81F58C9
+	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_JeffreyRematchIntro, Route120_Text_JeffreyRematchDefeat
+	msgbox Route120_Text_JeffreyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F58E0:: @ 81F58E0
-	trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53
-	msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE
+Route120_EventScript_Jennifer:: @ 81F58E0
+	trainerbattle_single TRAINER_JENNIFER, Route120_Text_JenniferIntro, Route120_Text_JenniferDefeat
+	msgbox Route120_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F58F7:: @ 81F58F7
-	trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25
-	msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE
+Route120_EventScript_Chip:: @ 81F58F7
+	trainerbattle_single TRAINER_CHIP, Route120_Text_ChipIntro, Route120_Text_ChipDefeat
+	msgbox Route120_Text_ChipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F590E:: @ 81F590E
-	trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF
-	msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE
+Route120_EventScript_Clarissa:: @ 81F590E
+	trainerbattle_single TRAINER_CLARISSA, Route120_Text_ClarissaIntro, Route120_Text_ClarissaDefeat
+	msgbox Route120_Text_ClarissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5925:: @ 81F5925
-	trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3
-	msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE
+Route120_EventScript_Angelica:: @ 81F5925
+	trainerbattle_single TRAINER_ANGELICA, Route120_Text_AngelicaIntro, Route120_Text_AngelicaDefeat
+	msgbox Route120_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F593C:: @ 81F593C
-	trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97
-	msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE
+Route120_EventScript_Keigo:: @ 81F593C
+	trainerbattle_single TRAINER_KEIGO, Route120_Text_KeigoIntro, Route120_Text_KeigoDefeat
+	msgbox Route120_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5953:: @ 81F5953
-	trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63
-	msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE
+Route120_EventScript_Riley:: @ 81F5953
+	trainerbattle_single TRAINER_RILEY, Route120_Text_RileyIntro, Route120_Text_RileyDefeat
+	msgbox Route120_Text_RileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F596A:: @ 81F596A
-	trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080
-	msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE
+Route120_EventScript_Leonel:: @ 81F596A
+	trainerbattle_single TRAINER_LEONEL, Route120_Text_LeonelIntro, Route120_Text_LeonelDefeat
+	msgbox Route120_Text_LeonelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_1F5981:: @ 81F5981
-	trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1
-	msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
+Route120_EventScript_Callie:: @ 81F5981
+	trainerbattle_single TRAINER_CALLIE, Route120_Text_CallieIntro, Route120_Text_CallieDefeat
+	msgbox Route120_Text_CalliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
 Route120_Text_StevenGreeting: @ 81F5998
@@ -396,7 +396,7 @@ Route120_Text_StevenGreeting: @ 81F5998
 	.string "{PLAYER}{KUN}, are your POKéMON ready for\n"
 	.string "battle?$"
 
-Route120_Text_1F5AAC: @ 81F5AAC
+Route120_Text_StevenIllWaitHere: @ 81F5AAC
 	.string "STEVEN: No?\p"
 	.string "I'll wait here, so you can get ready.$"
 
@@ -444,10 +444,10 @@ Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63
 	.string "visible!\p"
 	.string "The startled POKéMON attacked!$"
 
-Route120_Text_1F5DCB: @ 81F5DCB
+Route120_Text_RouteSignFortree: @ 81F5DCB
 	.string "ROUTE 120\n"
 	.string "{LEFT_ARROW} FORTREE CITY$"
 
-Route120_Text_1F5DE4: @ 81F5DE4
+Route120_Text_RouteSign121: @ 81F5DE4
 	.string "{RIGHT_ARROW} ROUTE 121\n"
 	.string "{LEFT_ARROW} ROUTE 120$"
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index 9382ab375..9d91c47d1 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_1F5DFD",
+      "script": "Route121_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route121_EventScript_1F5F04",
+      "script": "Route121_EventScript_Kate",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route121_EventScript_1F5F1F",
+      "script": "Route121_EventScript_Joy",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5E74",
+      "script": "Route121_EventScript_Vanessa",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route121_EventScript_1F5E8B",
+      "script": "Route121_EventScript_Walter",
       "flag": "0"
     },
     {
@@ -274,7 +274,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5EED",
+      "script": "Route121_EventScript_Tammy",
       "flag": "0"
     },
     {
@@ -287,7 +287,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5F3A",
+      "script": "Route121_EventScript_Jessica",
       "flag": "0"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route121_EventScript_1F5F9C",
+      "script": "Route121_EventScript_Cale",
       "flag": "0"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5FB3",
+      "script": "Route121_EventScript_Myles",
       "flag": "0"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route121_EventScript_1F5FCA",
+      "script": "Route121_EventScript_Pat",
       "flag": "0"
     },
     {
@@ -365,7 +365,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route121_EventScript_1F5FE1",
+      "script": "Route121_EventScript_Marcel",
       "flag": "0"
     },
     {
@@ -378,7 +378,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route121_EventScript_1F5FF8",
+      "script": "Route121_EventScript_Cristin",
       "flag": "0"
     },
     {
@@ -425,7 +425,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     },
     {
       "type": "trigger",
@@ -434,7 +434,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     },
     {
       "type": "trigger",
@@ -443,7 +443,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     },
     {
       "type": "trigger",
@@ -452,7 +452,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE121_STATE",
       "var_value": "0",
-      "script": "Route121_EventScript_1F5E18"
+      "script": "Route121_EventScript_AquaGruntsMoveOut"
     }
   ],
   "bg_events": [
@@ -462,7 +462,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route121_EventScript_1F5E06"
+      "script": "Route121_EventScript_MtPyrePierSign"
     },
     {
       "type": "secret_base",
@@ -498,7 +498,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route121_EventScript_1F5E0F"
+      "script": "Route121_EventScript_SafariZoneSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
index 06862972c..81330b6e8 100644
--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -1,28 +1,28 @@
 Route121_MapScripts:: @ 81F5DFC
 	.byte 0
 
-Route121_EventScript_1F5DFD:: @ 81F5DFD
-	msgbox Route121_Text_1F607F, MSGBOX_NPC
+Route121_EventScript_Woman:: @ 81F5DFD
+	msgbox Route121_Text_AheadLoomsMtPyre, MSGBOX_NPC
 	end
 
-Route121_EventScript_1F5E06:: @ 81F5E06
-	msgbox Route121_Text_1F60D3, MSGBOX_SIGN
+Route121_EventScript_MtPyrePierSign:: @ 81F5E06
+	msgbox Route121_Text_MtPyrePierSign, MSGBOX_SIGN
 	end
 
-Route121_EventScript_1F5E0F:: @ 81F5E0F
-	msgbox Route121_Text_1F611E, MSGBOX_SIGN
+Route121_EventScript_SafariZoneSign:: @ 81F5E0F
+	msgbox Route121_Text_SafariZoneSign, MSGBOX_SIGN
 	end
 
-Route121_EventScript_1F5E18:: @ 81F5E18
+Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18
 	lockall
 	playbgm MUS_AQA_0, 0
 	applymovement 13, Common_Movement_WalkInPlaceRight
 	waitmovement 0
-	msgbox Route121_Text_1F605A, MSGBOX_DEFAULT
+	msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT
 	closemessage
-	applymovement 12, Route121_Movement_1F5E59
-	applymovement 13, Route121_Movement_1F5E62
-	applymovement 14, Route121_Movement_1F5E6B
+	applymovement 12, Route121_Movement_Grunt1Exit
+	applymovement 13, Route121_Movement_Grunt2Exit
+	applymovement 14, Route121_Movement_Grunt3Exit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 12
@@ -32,7 +32,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18
 	releaseall
 	end
 
-Route121_Movement_1F5E59: @ 81F5E59
+Route121_Movement_Grunt1Exit: @ 81F5E59
 	walk_down
 	walk_down
 	walk_down
@@ -43,7 +43,7 @@ Route121_Movement_1F5E59: @ 81F5E59
 	walk_down
 	step_end
 
-Route121_Movement_1F5E62: @ 81F5E62
+Route121_Movement_Grunt2Exit: @ 81F5E62
 	walk_down
 	walk_down
 	walk_down
@@ -54,7 +54,7 @@ Route121_Movement_1F5E62: @ 81F5E62
 	walk_down
 	step_end
 
-Route121_Movement_1F5E6B: @ 81F5E6B
+Route121_Movement_Grunt3Exit: @ 81F5E6B
 	walk_down
 	walk_down
 	walk_down
@@ -65,127 +65,127 @@ Route121_Movement_1F5E6B: @ 81F5E6B
 	walk_down
 	step_end
 
-Route121_EventScript_1F5E74:: @ 81F5E74
-	trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F
-	msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE
+Route121_EventScript_Vanessa:: @ 81F5E74
+	trainerbattle_single TRAINER_VANESSA, Route121_Text_VanessaIntro, Route121_Text_VanessaDefeat
+	msgbox Route121_Text_VanessaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5E8B:: @ 81F5E8B
-	trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
+Route121_EventScript_Walter:: @ 81F5E8B
+	trainerbattle_single TRAINER_WALTER_1, Route121_Text_WalterIntro, Route121_Text_WalterDefeat, Route121_EventScript_RegisterWalter
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route121_EventScript_1F5ED6
-	msgbox Route121_Text_29F21E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route121_EventScript_RematchWalter
+	msgbox Route121_Text_WalterPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_EventScript_1F5EB7:: @ 81F5EB7
+Route121_EventScript_RegisterWalter:: @ 81F5EB7
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route121_Text_29F25B, MSGBOX_DEFAULT
+	msgbox Route121_Text_WalterRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WALTER_1
 	release
 	end
 
-Route121_EventScript_1F5ED6:: @ 81F5ED6
-	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A
-	msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE
+Route121_EventScript_RematchWalter:: @ 81F5ED6
+	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_WalterRematchIntro, Route121_Text_WalterRematchDefeat
+	msgbox Route121_Text_WalterPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5EED:: @ 81F5EED
-	trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9
-	msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE
+Route121_EventScript_Tammy:: @ 81F5EED
+	trainerbattle_single TRAINER_TAMMY, Route121_Text_TammyIntro, Route121_Text_TammyDefeat
+	msgbox Route121_Text_TammyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F04:: @ 81F5F04
-	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
-	msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE
+Route121_EventScript_Kate:: @ 81F5F04
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_KateIntro, Route121_Text_KateDefeat, Route121_Text_KateNotEnoughMons
+	msgbox Route121_Text_KatePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F1F:: @ 81F5F1F
-	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
-	msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE
+Route121_EventScript_Joy:: @ 81F5F1F
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_JoyIntro, Route121_Text_JoyDefeat, Route121_Text_JoyNotEnoughMons
+	msgbox Route121_Text_JoyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F3A:: @ 81F5F3A
-	trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
+Route121_EventScript_Jessica:: @ 81F5F3A
+	trainerbattle_single TRAINER_JESSICA_1, Route121_Text_JessicaIntro, Route121_Text_JessicaDefeat, Route121_EventScript_RegisterJessica
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route121_EventScript_1F5F85
-	msgbox Route121_Text_29F66F, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route121_EventScript_RematchJessica
+	msgbox Route121_Text_JessicaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_EventScript_1F5F66:: @ 81F5F66
+Route121_EventScript_RegisterJessica:: @ 81F5F66
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route121_Text_29F69F, MSGBOX_DEFAULT
+	msgbox Route121_Text_JessicaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JESSICA_1
 	release
 	end
 
-Route121_EventScript_1F5F85:: @ 81F5F85
-	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710
-	msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE
+Route121_EventScript_RematchJessica:: @ 81F5F85
+	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_JessicaRematchIntro, Route121_Text_JessicaRematchDefeat
+	msgbox Route121_Text_JessicaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5F9C:: @ 81F5F9C
-	trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B
-	msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE
+Route121_EventScript_Cale:: @ 81F5F9C
+	trainerbattle_single TRAINER_CALE, Route121_Text_CaleIntro, Route121_Text_CaleDefeat
+	msgbox Route121_Text_CalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FB3:: @ 81F5FB3
-	trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64
-	msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE
+Route121_EventScript_Myles:: @ 81F5FB3
+	trainerbattle_single TRAINER_MYLES, Route121_Text_MylesIntro, Route121_Text_MylesDefeat
+	msgbox Route121_Text_MylesPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FCA:: @ 81F5FCA
-	trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8
-	msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE
+Route121_EventScript_Pat:: @ 81F5FCA
+	trainerbattle_single TRAINER_PAT, Route121_Text_PatIntro, Route121_Text_PatDefeat
+	msgbox Route121_Text_PatPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FE1:: @ 81F5FE1
-	trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C
-	msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE
+Route121_EventScript_Marcel:: @ 81F5FE1
+	trainerbattle_single TRAINER_MARCEL, Route121_Text_MarcelIntro, Route121_Text_MarcelDefeat
+	msgbox Route121_Text_MarcelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_1F5FF8:: @ 81F5FF8
-	trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
+Route121_EventScript_Cristin:: @ 81F5FF8
+	trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_CristinIntro, Route121_Text_CristinDefeat, Route121_EventScript_RegisterCristin
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route121_EventScript_1F6043
-	msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route121_EventScript_RematchCristin
+	msgbox Route121_Text_CristinPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_EventScript_1F6024:: @ 81F6024
+Route121_EventScript_RegisterCristin:: @ 81F6024
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route121_Text_29F80D, MSGBOX_DEFAULT
+	msgbox Route121_Text_CristinRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CRISTIN_1
 	release
 	end
 
-Route121_EventScript_1F6043:: @ 81F6043
-	trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8
-	msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE
+Route121_EventScript_RematchCristin:: @ 81F6043
+	trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_CristinRematchIntro, Route121_Text_CristinRematchDefeat
+	msgbox Route121_Text_CristinPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_Text_1F605A: @ 81F605A
+Route121_Text_OkayMoveOutToMtPyre: @ 81F605A
 	.string "Okay!\n"
 	.string "We're to move out to MT. PYRE!$"
 
-Route121_Text_1F607F: @ 81F607F
+Route121_Text_AheadLoomsMtPyre: @ 81F607F
 	.string "Ahead looms MT. PYRE…\p"
 	.string "It is a natural monument to the spirits \n"
 	.string "of departed POKéMON…$"
 
-Route121_Text_1F60D3: @ 81F60D3
+Route121_Text_MtPyrePierSign: @ 81F60D3
 	.string "MT. PYRE PIER\p"
 	.string "…The sign is old and worn out.\n"
 	.string "The words are barely legible…$"
 
-Route121_Text_1F611E: @ 81F611E
+Route121_Text_SafariZoneSign: @ 81F611E
 	.string "“Filled with rare POKéMON!”\n"
 	.string "SAFARI ZONE$"
 
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index c13d17a0c..fc4af6b3c 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F61C5",
+      "script": "Route123_EventScript_Wendy",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F61DC",
+      "script": "Route123_EventScript_Braxton",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_1F6151",
+      "script": "Route123_EventScript_GigaDrainGirl",
       "flag": "0"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F61F3",
+      "script": "Route123_EventScript_Violet",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F62E9",
+      "script": "Route123_EventScript_Yuki",
       "flag": "0"
     },
     {
@@ -386,7 +386,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F62CE",
+      "script": "Route123_EventScript_Miu",
       "flag": "0"
     },
     {
@@ -399,7 +399,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route123_EventScript_1F620A",
+      "script": "Route123_EventScript_Cameron",
       "flag": "0"
     },
     {
@@ -412,7 +412,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F626C",
+      "script": "Route123_EventScript_Jacki",
       "flag": "0"
     },
     {
@@ -425,7 +425,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route123_EventScript_1F6304",
+      "script": "Route123_EventScript_Kindra",
       "flag": "0"
     },
     {
@@ -464,7 +464,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F6377",
+      "script": "Route123_EventScript_Jonas",
       "flag": "0"
     },
     {
@@ -477,7 +477,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route123_EventScript_1F6360",
+      "script": "Route123_EventScript_Kayley",
       "flag": "0"
     },
     {
@@ -490,7 +490,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route123_EventScript_1F6349",
+      "script": "Route123_EventScript_Ed",
       "flag": "0"
     },
     {
@@ -503,7 +503,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F63BC",
+      "script": "Route123_EventScript_Fernando",
       "flag": "0"
     },
     {
@@ -516,7 +516,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F6332",
+      "script": "Route123_EventScript_Alberto",
       "flag": "0"
     },
     {
@@ -529,7 +529,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route123_EventScript_1F631B",
+      "script": "Route123_EventScript_Frederick",
       "flag": "0"
     },
     {
@@ -555,7 +555,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route123_EventScript_1F638E",
+      "script": "Route123_EventScript_Jazmyn",
       "flag": "0"
     },
     {
@@ -568,7 +568,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route123_EventScript_1F63A5",
+      "script": "Route123_EventScript_Davis",
       "flag": "0"
     },
     {
@@ -757,7 +757,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route123_EventScript_1F61B3"
+      "script": "Route123_EventScript_RouteSignMtPyre"
     },
     {
       "type": "secret_base",
@@ -779,7 +779,7 @@
       "y": 12,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route123_EventScript_1F61AA"
+      "script": "Route123_EventScript_RouteSign"
     },
     {
       "type": "hidden_item",
@@ -795,7 +795,7 @@
       "y": 7,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route123_EventScript_1F61BC"
+      "script": "Route123_EventScript_BerryMastersHouseSign"
     },
     {
       "type": "secret_base",
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index b5b3e6179..b74b16865 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -6,198 +6,198 @@ Route123_OnTransition: @ 81F614D
 	special SetRoute123Weather
 	end
 
-Route123_EventScript_1F6151:: @ 81F6151
+Route123_EventScript_GigaDrainGirl:: @ 81F6151
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_1F61A0
-	msgbox Route123_Text_1F641E, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_ReceivedGigaDrain
+	msgbox Route123_Text_LoveGrassMonsHaveAny, MSGBOX_DEFAULT
 	special IsGrassTypeInParty
-	compare VAR_RESULT, 0
-	goto_if_eq Route123_EventScript_1F619E
-	msgbox Route123_Text_1F645D, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route123_EventScript_NoGrassMons
+	msgbox Route123_Text_YouLikeGrassMonsTooHaveThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM19
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM19
-	msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT
+	msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F619E:: @ 81F619E
+Route123_EventScript_NoGrassMons:: @ 81F619E
 	release
 	end
 
-Route123_EventScript_1F61A0:: @ 81F61A0
-	msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT
+Route123_EventScript_ReceivedGigaDrain:: @ 81F61A0
+	msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F61AA:: @ 81F61AA
-	msgbox Route123_Text_1F6511, MSGBOX_SIGN
+Route123_EventScript_RouteSign:: @ 81F61AA
+	msgbox Route123_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route123_EventScript_1F61B3:: @ 81F61B3
-	msgbox Route123_Text_1F6529, MSGBOX_SIGN
+Route123_EventScript_RouteSignMtPyre:: @ 81F61B3
+	msgbox Route123_Text_RouteSignMtPyre, MSGBOX_SIGN
 	end
 
-Route123_EventScript_1F61BC:: @ 81F61BC
-	msgbox Route123_Text_1F6557, MSGBOX_SIGN
+Route123_EventScript_BerryMastersHouseSign:: @ 81F61BC
+	msgbox Route123_Text_BerryMastersHouse, MSGBOX_SIGN
 	end
 
-Route123_EventScript_1F61C5:: @ 81F61C5
-	trainerbattle_single TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23
-	msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE
+Route123_EventScript_Wendy:: @ 81F61C5
+	trainerbattle_single TRAINER_WENDY, Route123_Text_WendyIntro, Route123_Text_WendyDefeat
+	msgbox Route123_Text_WendyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F61DC:: @ 81F61DC
-	trainerbattle_single TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6
-	msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE
+Route123_EventScript_Braxton:: @ 81F61DC
+	trainerbattle_single TRAINER_BRAXTON, Route123_Text_BraxtonIntro, Route123_Text_BraxtonDefeat
+	msgbox Route123_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F61F3:: @ 81F61F3
-	trainerbattle_single TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53
-	msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE
+Route123_EventScript_Violet:: @ 81F61F3
+	trainerbattle_single TRAINER_VIOLET, Route123_Text_VioletIntro, Route123_Text_VioletDefeat
+	msgbox Route123_Text_VioletPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F620A:: @ 81F620A
-	trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236
+Route123_EventScript_Cameron:: @ 81F620A
+	trainerbattle_single TRAINER_CAMERON_1, Route123_Text_CameronIntro, Route123_Text_CameronDefeat, Route123_EventScript_RegisterCameron
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_EventScript_1F6255
-	msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_EventScript_RematchCameron
+	msgbox Route123_Text_CameronPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F6236:: @ 81F6236
+Route123_EventScript_RegisterCameron:: @ 81F6236
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route123_Text_29FE70, MSGBOX_DEFAULT
+	msgbox Route123_Text_CameronRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CAMERON_1
 	release
 	end
 
-Route123_EventScript_1F6255:: @ 81F6255
-	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B
-	msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE
+Route123_EventScript_RematchCameron:: @ 81F6255
+	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_CameronRematchIntro, Route123_Text_CameronRematchDefeat
+	msgbox Route123_Text_CameronPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F626C:: @ 81F626C
-	trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298
+Route123_EventScript_Jacki:: @ 81F626C
+	trainerbattle_single TRAINER_JACKI_1, Route123_Text_JackiIntro, Route123_Text_JackiDefeat, Route123_EventScript_RegisterJacki
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_EventScript_1F62B7
-	msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_EventScript_RematchJacki
+	msgbox Route123_Text_JackiPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F6298:: @ 81F6298
+Route123_EventScript_RegisterJacki:: @ 81F6298
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route123_Text_2A0027, MSGBOX_DEFAULT
+	msgbox Route123_Text_JackiRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JACKI_1
 	release
 	end
 
-Route123_EventScript_1F62B7:: @ 81F62B7
-	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D
-	msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE
+Route123_EventScript_RematchJacki:: @ 81F62B7
+	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_JackiRematchIntro, Route123_Text_JackiRematchDefeat
+	msgbox Route123_Text_JackiPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F62CE:: @ 81F62CE
-	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D
-	msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE
+Route123_EventScript_Miu:: @ 81F62CE
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_MiuIntro, Route123_Text_MiuDefeat, Route123_Text_MiuNotEnoughMons
+	msgbox Route123_Text_MiuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F62E9:: @ 81F62E9
-	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224
-	msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE
+Route123_EventScript_Yuki:: @ 81F62E9
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_YukiIntro, Route123_Text_YukiDefeat, Route123_Text_YukiNotEnoughMons
+	msgbox Route123_Text_YukiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6304:: @ 81F6304
-	trainerbattle_single TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6
-	msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE
+Route123_EventScript_Kindra:: @ 81F6304
+	trainerbattle_single TRAINER_KINDRA, Route123_Text_KindraIntro, Route123_Text_KindraDefeat
+	msgbox Route123_Text_KindraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F631B:: @ 81F631B
-	trainerbattle_single TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631
-	msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE
+Route123_EventScript_Frederick:: @ 81F631B
+	trainerbattle_single TRAINER_FREDRICK, Route123_Text_FrederickIntro, Route123_Text_FrederickDefeat
+	msgbox Route123_Text_FrederickPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6332:: @ 81F6332
-	trainerbattle_single TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704
-	msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE
+Route123_EventScript_Alberto:: @ 81F6332
+	trainerbattle_single TRAINER_ALBERTO, Route123_Text_AlbertoIntro, Route123_Text_AlbertoDefeat
+	msgbox Route123_Text_AlbertoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6349:: @ 81F6349
-	trainerbattle_single TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0
-	msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE
+Route123_EventScript_Ed:: @ 81F6349
+	trainerbattle_single TRAINER_ED, Route123_Text_EdIntro, Route123_Text_EdDefeat
+	msgbox Route123_Text_EdPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6360:: @ 81F6360
-	trainerbattle_single TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943
-	msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE
+Route123_EventScript_Kayley:: @ 81F6360
+	trainerbattle_single TRAINER_KAYLEY, Route123_Text_KayleyIntro, Route123_Text_KayleyDefeat
+	msgbox Route123_Text_KayleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F6377:: @ 81F6377
-	trainerbattle_single TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A
-	msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE
+Route123_EventScript_Jonas:: @ 81F6377
+	trainerbattle_single TRAINER_JONAS, Route123_Text_JonasIntro, Route123_Text_JonasDefeat
+	msgbox Route123_Text_JonasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F638E:: @ 81F638E
-	trainerbattle_single TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592
-	msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE
+Route123_EventScript_Jazmyn:: @ 81F638E
+	trainerbattle_single TRAINER_JAZMYN, Route123_Text_JazmynIntro, Route123_Text_JazmynDefeat
+	msgbox Route123_Text_JazmynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F63A5:: @ 81F63A5
-	trainerbattle_single TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE
-	msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE
+Route123_EventScript_Davis:: @ 81F63A5
+	trainerbattle_single TRAINER_DAVIS, Route123_Text_DavisIntro, Route123_Text_DavisDefeat
+	msgbox Route123_Text_DavisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_1F63BC:: @ 81F63BC
-	trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8
+Route123_EventScript_Fernando:: @ 81F63BC
+	trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_FernandoIntro, Route123_Text_FernandoDefeat, Route123_EventScript_RegisterFernando
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route123_EventScript_1F6407
-	msgbox Route123_Text_2A0389, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route123_EventScript_RematchFernando
+	msgbox Route123_Text_FernandoPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_1F63E8:: @ 81F63E8
+Route123_EventScript_RegisterFernando:: @ 81F63E8
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT
+	msgbox Route123_Text_FernandoRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_FERNANDO_1
 	release
 	end
 
-Route123_EventScript_1F6407:: @ 81F6407
-	trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A
-	msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE
+Route123_EventScript_RematchFernando:: @ 81F6407
+	trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_FernandoRematchIntro, Route123_Text_FernandoRematchDefeat
+	msgbox Route123_Text_FernandoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_Text_1F641E: @ 81F641E
+Route123_Text_LoveGrassMonsHaveAny: @ 81F641E
 	.string "I love GRASS-type POKéMON!\p"
 	.string "Do you have any GRASS-type POKéMON?$"
 
-Route123_Text_1F645D: @ 81F645D
+Route123_Text_YouLikeGrassMonsTooHaveThis: @ 81F645D
 	.string "Oh?\p"
 	.string "You like GRASS-type POKéMON, too,\n"
 	.string "don't you?\p"
 	.string "I'm so happy, you can have this!\n"
 	.string "It's a token of our friendship.$"
 
-Route123_Text_1F64CF: @ 81F64CF
+Route123_Text_CheckTreesWithMyGrassMon: @ 81F64CF
 	.string "I check trees with my GRASS-type\n"
 	.string "POKéMON. I'm like a tree doctor.$"
 
-Route123_Text_1F6511: @ 81F6511
+Route123_Text_RouteSign: @ 81F6511
 	.string "{RIGHT_ARROW} ROUTE 123\n"
 	.string "{LEFT_ARROW} ROUTE 118$"
 
-Route123_Text_1F6529: @ 81F6529
+Route123_Text_RouteSignMtPyre: @ 81F6529
 	.string "{UP_ARROW} MT. PYRE\n"
 	.string "“Forbidden to the faint of heart.”$"
 
-Route123_Text_1F6557: @ 81F6557
+Route123_Text_BerryMastersHouse: @ 81F6557
 	.string "BERRY MASTER'S HOUSE$"
 
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 913208954..01bc84377 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route124_EventScript_1F6585",
+      "script": "Route124_EventScript_Spencer",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route124_EventScript_1F659C",
+      "script": "Route124_EventScript_Roland",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route124_EventScript_1F65B3",
+      "script": "Route124_EventScript_Jenny",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 8,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route124_EventScript_1F6615",
+      "script": "Route124_EventScript_Grace",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route124_EventScript_1F662C",
+      "script": "Route124_EventScript_Chad",
       "flag": "0"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route124_EventScript_1F6643",
+      "script": "Route124_EventScript_Lila",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route124_EventScript_1F66A7",
+      "script": "Route124_EventScript_Roy",
       "flag": "0"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route124_EventScript_1F670B",
+      "script": "Route124_EventScript_Declan",
       "flag": "0"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route124_EventScript_1F6722",
+      "script": "Route124_EventScript_Isabella",
       "flag": "0"
     }
   ],
@@ -214,7 +214,7 @@
       "y": 48,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route124_EventScript_1F657C"
+      "script": "Route124_EventScript_HuntersHouseSign"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 23dd174f6..8d0837320 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -6,102 +6,102 @@ Route124_OnTransition: @ 81F6572
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-Route124_EventScript_1F657C:: @ 81F657C
-	msgbox Route124_Text_1F6739, MSGBOX_SIGN
+Route124_EventScript_HuntersHouseSign:: @ 81F657C
+	msgbox Route124_Text_HuntersHouse, MSGBOX_SIGN
 	end
 
-Route124_EventScript_1F6585:: @ 81F6585
-	trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02
-	msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE
+Route124_EventScript_Spencer:: @ 81F6585
+	trainerbattle_single TRAINER_SPENCER, Route124_Text_SpencerIntro, Route124_Text_SpencerDefeat
+	msgbox Route124_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F659C:: @ 81F659C
-	trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC
-	msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE
+Route124_EventScript_Roland:: @ 81F659C
+	trainerbattle_single TRAINER_ROLAND, Route124_Text_RolandIntro, Route124_Text_RolandDefeat
+	msgbox Route124_Text_RolandPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F65B3:: @ 81F65B3
-	trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
+Route124_EventScript_Jenny:: @ 81F65B3
+	trainerbattle_single TRAINER_JENNY_1, Route124_Text_JennyIntro, Route124_Text_JennyDefeat, Route124_EventScript_RegisterJenny
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_EventScript_1F65FE
-	msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_EventScript_RematchJenny
+	msgbox Route124_Text_JennyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_EventScript_1F65DF:: @ 81F65DF
+Route124_EventScript_RegisterJenny:: @ 81F65DF
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT
+	msgbox Route124_Text_JennyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JENNY_1
 	release
 	end
 
-Route124_EventScript_1F65FE:: @ 81F65FE
-	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0
-	msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchJenny:: @ 81F65FE
+	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_JennyRematchIntro, Route124_Text_JennyRematchDefeat
+	msgbox Route124_Text_JennyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F6615:: @ 81F6615
-	trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D
-	msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE
+Route124_EventScript_Grace:: @ 81F6615
+	trainerbattle_single TRAINER_GRACE, Route124_Text_GraceIntro, Route124_Text_GraceDefeat
+	msgbox Route124_Text_GracePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F662C:: @ 81F662C
-	trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF
-	msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE
+Route124_EventScript_Chad:: @ 81F662C
+	trainerbattle_single TRAINER_CHAD, Route124_Text_ChadIntro, Route124_Text_ChadDefeat
+	msgbox Route124_Text_ChadPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F6643:: @ 81F6643
-	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
+Route124_EventScript_Lila:: @ 81F6643
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaIntro, Route124_Text_LilaDefeat, Route124_Text_LilaNotEnoughMons, Route124_EventScript_RegisterLila
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_EventScript_1F668C
-	msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_EventScript_RematchLila
+	msgbox Route124_Text_LilaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_EventScript_1F6673:: @ 81F6673
-	msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+Route124_EventScript_RegisterLila:: @ 81F6673
+	msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
-Route124_EventScript_1F668C:: @ 81F668C
-	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
-	msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchLila:: @ 81F668C
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaRematchIntro, Route124_Text_LilaRematchDefeat, Route124_Text_LilaRematchNotEnoughMons
+	msgbox Route124_Text_LilaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F66A7:: @ 81F66A7
-	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
+Route124_EventScript_Roy:: @ 81F66A7
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyIntro, Route124_Text_RoyDefeat, Route124_Text_RoyNotEnoughMons, Route124_EventScript_RegisterRoy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route124_EventScript_1F66F0
-	msgbox Route124_Text_2A103E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route124_EventScript_RematchRoy
+	msgbox Route124_Text_RoyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_EventScript_1F66D7:: @ 81F66D7
-	msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+Route124_EventScript_RegisterRoy:: @ 81F66D7
+	msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
-Route124_EventScript_1F66F0:: @ 81F66F0
-	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
-	msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchRoy:: @ 81F66F0
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyRematchIntro, Route124_Text_RoyRematchDefeat, Route124_Text_RoyRematchNotEnoughMons
+	msgbox Route124_Text_RoyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F670B:: @ 81F670B
-	trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C
-	msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE
+Route124_EventScript_Declan:: @ 81F670B
+	trainerbattle_single TRAINER_DECLAN, Route124_Text_DeclanIntro, Route124_Text_DeclanDefeat
+	msgbox Route124_Text_DeclanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_1F6722:: @ 81F6722
-	trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC
-	msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE
+Route124_EventScript_Isabella:: @ 81F6722
+	trainerbattle_single TRAINER_ISABELLA, Route124_Text_IsabellaIntro, Route124_Text_IsabellaDefeat
+	msgbox Route124_Text_IsabellaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_Text_1F6739: @ 81F6739
+Route124_Text_HuntersHouse: @ 81F6739
 	.string "HUNTER'S HOUSE$"
 
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index 27615a521..402c42932 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route125_EventScript_1F67A4",
+      "script": "Route125_EventScript_Nolen",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route125_EventScript_1F67BB",
+      "script": "Route125_EventScript_Stan",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F67D2",
+      "script": "Route125_EventScript_Tanya",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 9,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F67E9",
+      "script": "Route125_EventScript_Sharon",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route125_EventScript_1F6800",
+      "script": "Route125_EventScript_Ernest",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route125_EventScript_1F6862",
+      "script": "Route125_EventScript_Kim",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route125_EventScript_1F687D",
+      "script": "Route125_EventScript_Iris",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F6898",
+      "script": "Route125_EventScript_Presley",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route125_EventScript_1F68AF",
+      "script": "Route125_EventScript_Auron",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index bf845c152..5489c929e 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,7 +1,7 @@
 Route125_MapScripts:: @ 81F6748
 	map_script MAP_SCRIPT_ON_TRANSITION, Route125_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A
+	map_script MAP_SCRIPT_ON_LOAD, Route125_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_OnFrame
 	.byte 0
 
 Route125_OnTransition: @ 81F6758
@@ -14,76 +14,76 @@ Route125_OnTransition: @ 81F6758
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route125_MapScript1_1F6783: @ 81F6783
+Route125_OnLoad: @ 81F6783
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
 	end
 
-Route125_MapScript2_1F679A: @ 81F679A
+Route125_OnFrame: @ 81F679A
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route125_EventScript_1F67A4:: @ 81F67A4
-	trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A
-	msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE
+Route125_EventScript_Nolen:: @ 81F67A4
+	trainerbattle_single TRAINER_NOLEN, Route125_Text_NolenIntro, Route125_Text_NolenDefeat
+	msgbox Route125_Text_NolenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F67BB:: @ 81F67BB
-	trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7
-	msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE
+Route125_EventScript_Stan:: @ 81F67BB
+	trainerbattle_single TRAINER_STAN, Route125_Text_StanIntro, Route125_Text_StanDefeat
+	msgbox Route125_Text_StanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F67D2:: @ 81F67D2
-	trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D
-	msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE
+Route125_EventScript_Tanya:: @ 81F67D2
+	trainerbattle_single TRAINER_TANYA, Route125_Text_TanyaIntro, Route125_Text_TanyaDefeat
+	msgbox Route125_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F67E9:: @ 81F67E9
-	trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5
-	msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE
+Route125_EventScript_Sharon:: @ 81F67E9
+	trainerbattle_single TRAINER_SHARON, Route125_Text_SharonIntro, Route125_Text_SharonDefeat
+	msgbox Route125_Text_SharonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F6800:: @ 81F6800
-	trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
+Route125_EventScript_Ernest:: @ 81F6800
+	trainerbattle_single TRAINER_ERNEST_1, Route125_Text_ErnestIntro, Route125_Text_ErnestDefeat, Route125_EventScript_RegisterErnest
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route125_EventScript_1F684B
-	msgbox Route125_Text_2A1755, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route125_EventScript_RematchErnest
+	msgbox Route125_Text_ErnestPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route125_EventScript_1F682C:: @ 81F682C
+Route125_EventScript_RegisterErnest:: @ 81F682C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT
+	msgbox Route125_Text_ErnestRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ERNEST_1
 	release
 	end
 
-Route125_EventScript_1F684B:: @ 81F684B
-	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851
-	msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE
+Route125_EventScript_RematchErnest:: @ 81F684B
+	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_ErnestRematchIntro, Route125_Text_ErnestRematchDefeat
+	msgbox Route125_Text_ErnestRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F6862:: @ 81F6862
-	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8
-	msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE
+Route125_EventScript_Kim:: @ 81F6862
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_KimIntro, Route125_Text_KimDefeat, Route125_Text_KimNotEnoughMons
+	msgbox Route125_Text_KimPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F687D:: @ 81F687D
-	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9
-	msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE
+Route125_EventScript_Iris:: @ 81F687D
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_IrisIntro, Route125_Text_IrisDefeat, Route125_Text_IrisNotEnoughMons
+	msgbox Route125_Text_IrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F6898:: @ 81F6898
-	trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E
-	msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE
+Route125_EventScript_Presley:: @ 81F6898
+	trainerbattle_single TRAINER_PRESLEY, Route125_Text_PresleyIntro, Route125_Text_PresleyDefeat
+	msgbox Route125_Text_PresleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_1F68AF:: @ 81F68AF
-	trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD
-	msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE
+Route125_EventScript_Auron:: @ 81F68AF
+	trainerbattle_single TRAINER_AURON, Route125_Text_AuronIntro, Route125_Text_AuronDefeat
+	msgbox Route125_Text_AuronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index b8359bd84..db01091ac 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F68D6",
+      "script": "Route126_EventScript_Barry",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F68ED",
+      "script": "Route126_EventScript_Dean",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F6904",
+      "script": "Route126_EventScript_Nikki",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route126_EventScript_1F691B",
+      "script": "Route126_EventScript_Brenda",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6960",
+      "script": "Route126_EventScript_Sienna",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6977",
+      "script": "Route126_EventScript_Pablo",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6949",
+      "script": "Route126_EventScript_Isobel",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route126_EventScript_1F6932",
+      "script": "Route126_EventScript_Leonardo",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index d1a2ff0f3..3624cc8a5 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -6,60 +6,60 @@ Route126_OnTransition: @ 81F68CC
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-Route126_EventScript_1F68D6:: @ 81F68D6
-	trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8
-	msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
+Route126_EventScript_Barry:: @ 81F68D6
+	trainerbattle_single TRAINER_BARRY, Route126_Text_BarryIntro, Route126_Text_BarryDefeat
+	msgbox Route126_Text_BarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F68ED:: @ 81F68ED
-	trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63
-	msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
+Route126_EventScript_Dean:: @ 81F68ED
+	trainerbattle_single TRAINER_DEAN, Route126_Text_DeanIntro, Route126_Text_DeanDefeat
+	msgbox Route126_Text_DeanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6904:: @ 81F6904
-	trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8
-	msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
+Route126_EventScript_Nikki:: @ 81F6904
+	trainerbattle_single TRAINER_NIKKI, Route126_Text_NikkiIntro, Route126_Text_NikkiDefeat
+	msgbox Route126_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F691B:: @ 81F691B
-	trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63
-	msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
+Route126_EventScript_Brenda:: @ 81F691B
+	trainerbattle_single TRAINER_BRENDA, Route126_Text_BrendaIntro, Route126_Text_BrendaDefeat
+	msgbox Route126_Text_BrendaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6932:: @ 81F6932
-	trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6
-	msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
+Route126_EventScript_Leonardo:: @ 81F6932
+	trainerbattle_single TRAINER_LEONARDO, Route126_Text_LeonardoIntro, Route126_Text_LeonardoDefeat
+	msgbox Route126_Text_LeonardoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6949:: @ 81F6949
-	trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3
-	msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
+Route126_EventScript_Isobel:: @ 81F6949
+	trainerbattle_single TRAINER_ISOBEL, Route126_Text_IsobelIntro, Route126_Text_IsobelDefeat
+	msgbox Route126_Text_IsobelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6960:: @ 81F6960
-	trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216
-	msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
+Route126_EventScript_Sienna:: @ 81F6960
+	trainerbattle_single TRAINER_SIENNA, Route126_Text_SiennaIntro, Route126_Text_SiennaDefeat
+	msgbox Route126_Text_SiennaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_1F6977:: @ 81F6977
-	trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
+Route126_EventScript_Pablo:: @ 81F6977
+	trainerbattle_single TRAINER_PABLO_1, Route126_Text_PabloIntro, Route126_Text_PabloDefeat, Route126_EventScript_RegisterPablo
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route126_EventScript_1F69C2
-	msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route126_EventScript_RematchPablo
+	msgbox Route126_Text_PabloPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route126_EventScript_1F69A3:: @ 81F69A3
+Route126_EventScript_RegisterPablo:: @ 81F69A3
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT
+	msgbox Route126_Text_PabloRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_PABLO_1
 	release
 	end
 
-Route126_EventScript_1F69C2:: @ 81F69C2
-	trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8
-	msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
+Route126_EventScript_RematchPablo:: @ 81F69C2
+	trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_PabloRematchIntro, Route126_Text_PabloRematchDefeat
+	msgbox Route126_Text_PabloPostRematch, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 08d39d971..626982ca2 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route127_EventScript_1F6A35",
+      "script": "Route127_EventScript_Camden",
       "flag": "0"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route127_EventScript_1F6A4C",
+      "script": "Route127_EventScript_Donny",
       "flag": "0"
     },
     {
@@ -97,7 +97,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_1F6A63",
+      "script": "Route127_EventScript_Jonah",
       "flag": "0"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_1F6A91",
+      "script": "Route127_EventScript_Roger",
       "flag": "0"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route127_EventScript_1F6A7A",
+      "script": "Route127_EventScript_Henry",
       "flag": "0"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route127_EventScript_1F6AA8",
+      "script": "Route127_EventScript_Aidan",
       "flag": "0"
     },
     {
@@ -149,7 +149,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route127_EventScript_1F6AD6",
+      "script": "Route127_EventScript_Koji",
       "flag": "0"
     },
     {
@@ -162,7 +162,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route127_EventScript_1F6ABF",
+      "script": "Route127_EventScript_Athena",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index db0fd0644..09d37dd7c 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,7 +1,7 @@
 Route127_MapScripts:: @ 81F69D9
 	map_script MAP_SCRIPT_ON_TRANSITION, Route127_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B
+	map_script MAP_SCRIPT_ON_LOAD, Route127_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_OnFrame
 	.byte 0
 
 Route127_OnTransition: @ 81F69E9
@@ -14,71 +14,71 @@ Route127_OnTransition: @ 81F69E9
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route127_MapScript1_1F6A14: @ 81F6A14
+Route127_OnLoad: @ 81F6A14
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
 	end
 
-Route127_MapScript2_1F6A2B: @ 81F6A2B
+Route127_OnFrame: @ 81F6A2B
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route127_EventScript_1F6A35:: @ 81F6A35
-	trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294
-	msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
+Route127_EventScript_Camden:: @ 81F6A35
+	trainerbattle_single TRAINER_CAMDEN, Route127_Text_CamdenIntro, Route127_Text_CamdenDefeat
+	msgbox Route127_Text_CamdenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A4C:: @ 81F6A4C
-	trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315
-	msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
+Route127_EventScript_Donny:: @ 81F6A4C
+	trainerbattle_single TRAINER_DONNY, Route127_Text_DonnyIntro, Route127_Text_DonnyDefeat
+	msgbox Route127_Text_DonnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A63:: @ 81F6A63
-	trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1
-	msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
+Route127_EventScript_Jonah:: @ 81F6A63
+	trainerbattle_single TRAINER_JONAH, Route127_Text_JonahIntro, Route127_Text_JonahDefeat
+	msgbox Route127_Text_JonahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A7A:: @ 81F6A7A
-	trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483
-	msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
+Route127_EventScript_Henry:: @ 81F6A7A
+	trainerbattle_single TRAINER_HENRY, Route127_Text_HenryIntro, Route127_Text_HenryDefeat
+	msgbox Route127_Text_HenryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6A91:: @ 81F6A91
-	trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B
-	msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
+Route127_EventScript_Roger:: @ 81F6A91
+	trainerbattle_single TRAINER_ROGER, Route127_Text_RogerIntro, Route127_Text_RogerDefeat
+	msgbox Route127_Text_RogerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6AA8:: @ 81F6AA8
-	trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1
-	msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
+Route127_EventScript_Aidan:: @ 81F6AA8
+	trainerbattle_single TRAINER_AIDAN, Route127_Text_AidanIntro, Route127_Text_AidanDefeat
+	msgbox Route127_Text_AidanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6ABF:: @ 81F6ABF
-	trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC
-	msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
+Route127_EventScript_Athena:: @ 81F6ABF
+	trainerbattle_single TRAINER_ATHENA, Route127_Text_AthenaIntro, Route127_Text_AthenaDefeat
+	msgbox Route127_Text_AthenaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_1F6AD6:: @ 81F6AD6
-	trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
+Route127_EventScript_Koji:: @ 81F6AD6
+	trainerbattle_single TRAINER_KOJI_1, Route127_Text_KojiIntro, Route127_Text_KojiDefeat, Route127_EventScript_RegisterKoji
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route127_EventScript_1F6B21
-	msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route127_EventScript_RematchKoji
+	msgbox Route127_Text_KojiPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route127_EventScript_1F6B02:: @ 81F6B02
+Route127_EventScript_RegisterKoji:: @ 81F6B02
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT
+	msgbox Route127_Text_KojiRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KOJI_1
 	release
 	end
 
-Route127_EventScript_1F6B21:: @ 81F6B21
-	trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B
-	msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
+Route127_EventScript_RematchKoji:: @ 81F6B21
+	trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_KojiRematchIntro, Route127_Text_KojiRematchDefeat
+	msgbox Route127_Text_KojiPostRematch, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 58246c247..a7de8ed19 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route128_EventScript_1F6CBE",
+      "script": "Route128_EventScript_Isaiah",
       "flag": "0"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route128_EventScript_1F6D20",
+      "script": "Route128_EventScript_Katelyn",
       "flag": "0"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route128_EventScript_1F6DB0",
+      "script": "Route128_EventScript_Wayne",
       "flag": "0"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route128_EventScript_1F6D99",
+      "script": "Route128_EventScript_Ruben",
       "flag": "0"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route128_EventScript_1F6D82",
+      "script": "Route128_EventScript_Alexa",
       "flag": "0"
     },
     {
@@ -149,7 +149,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route128_EventScript_1F6DDE",
+      "script": "Route128_EventScript_Carlee",
       "flag": "0"
     },
     {
@@ -162,7 +162,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route128_EventScript_1F6DC7",
+      "script": "Route128_EventScript_Harrison",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 10397be89..16b1294fc 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -1,48 +1,48 @@
 Route128_MapScripts:: @ 81F6B38
 	map_script MAP_SCRIPT_ON_TRANSITION, Route128_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_OnFrame
 	.byte 0
 
 Route128_OnTransition: @ 81F6B43
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-Route128_MapScript2_1F6B4D: @ 81F6B4D
-	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57
+Route128_OnFrame: @ 81F6B4D
+	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_KyogreAwakenedScene
 	.2byte 0
 
-Route128_EventScript_1F6B57:: @ 81F6B57
+Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
 	lockall
 	delay 20
-	applymovement 4, Route128_Movement_1F6C89
+	applymovement 4, Route128_Movement_ArchieLookAround
 	waitmovement 0
-	msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT
+	msgbox Route128_Text_ArchieWhatHappened, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Route128_Movement_1F6C91
+	applymovement 4, Route128_Movement_ArchieBackUp
 	waitmovement 0
-	msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT
+	msgbox Route128_Text_ArchieIOnlyWanted, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, Route128_Movement_1F6CAD
+	applymovement 5, Route128_Movement_MaxieApproachArchie
 	waitmovement 0
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT
+	msgbox Route128_Text_MaxieDoYouUnderstandNow, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, Route128_Movement_1F6CBB
+	applymovement 5, Route128_Movement_MaxieApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT
+	msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Route128_Movement_1F6C96
+	applymovement 4, Route128_Movement_ArchieRunLeft
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
-	applymovement 5, Route128_Movement_1F6CA8
+	applymovement 5, Route128_Movement_MaxieWalkLeft
 	waitmovement 0
-	msgbox Route128_Text_1F704F, MSGBOX_DEFAULT
+	msgbox Route128_Text_MaxieThisDefiesBelief, MSGBOX_DEFAULT
 	closemessage
 	delay 40
-	applymovement 5, Route128_Movement_1F6CB0
-	applymovement 4, Route128_Movement_1F6C9B
+	applymovement 5, Route128_Movement_MaxieExit
+	applymovement 4, Route128_Movement_ArchieExit
 	waitmovement 0
 	removeobject 5
 	removeobject 4
@@ -51,19 +51,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	dofieldeffect FLDEFF_NPCFLY_OUT
 	waitfieldeffect FLDEFF_NPCFLY_OUT
 	addobject 3
-	applymovement 3, Route128_Movement_1F6C87
+	applymovement 3, Route128_Movement_StevenApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT
+	msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route128_Movement_1F6C85
+	applymovement 3, Route128_Movement_StevenWalkUp
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT
+	msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route128_Text_1F721B, MSGBOX_DEFAULT
+	msgbox Route128_Text_StevenImGoingToSootopolis, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -78,10 +78,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	releaseall
 	end
 
+@ Unused
 Route128_Movement_1F6C76: @ 81F6C76
 	walk_fast_left
 	step_end
 
+@ Unused
 Route128_Movement_1F6C78: @ 81F6C78
 	walk_left
 	walk_left
@@ -97,15 +99,15 @@ Route128_Movement_1F6C78: @ 81F6C78
 	walk_up
 	step_end
 
-Route128_Movement_1F6C85: @ 81F6C85
+Route128_Movement_StevenWalkUp: @ 81F6C85
 	walk_up
 	step_end
 
-Route128_Movement_1F6C87: @ 81F6C87
+Route128_Movement_StevenApproachPlayer: @ 81F6C87
 	walk_fast_left
 	step_end
 
-Route128_Movement_1F6C89: @ 81F6C89
+Route128_Movement_ArchieLookAround: @ 81F6C89
 	walk_fast_down
 	walk_in_place_fastest_left
 	delay_16
@@ -115,21 +117,21 @@ Route128_Movement_1F6C89: @ 81F6C89
 	walk_in_place_fastest_down
 	step_end
 
-Route128_Movement_1F6C91: @ 81F6C91
+Route128_Movement_ArchieBackUp: @ 81F6C91
 	lock_facing_direction
 	walk_slow_up
 	delay_16
 	unlock_facing_direction
 	step_end
 
-Route128_Movement_1F6C96: @ 81F6C96
+Route128_Movement_ArchieRunLeft: @ 81F6C96
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
 	walk_in_place_fastest_right
 	step_end
 
-Route128_Movement_1F6C9B: @ 81F6C9B
+Route128_Movement_ArchieExit: @ 81F6C9B
 	delay_16
 	delay_16
 	walk_fast_up
@@ -144,19 +146,19 @@ Route128_Movement_1F6C9B: @ 81F6C9B
 	walk_fast_up
 	step_end
 
-Route128_Movement_1F6CA8: @ 81F6CA8
+Route128_Movement_MaxieWalkLeft: @ 81F6CA8
 	walk_left
 	walk_left
 	delay_8
 	delay_4
 	step_end
 
-Route128_Movement_1F6CAD: @ 81F6CAD
+Route128_Movement_MaxieApproachArchie: @ 81F6CAD
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-Route128_Movement_1F6CB0: @ 81F6CB0
+Route128_Movement_MaxieExit: @ 81F6CB0
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -169,90 +171,90 @@ Route128_Movement_1F6CB0: @ 81F6CB0
 	walk_fast_up
 	step_end
 
-Route128_Movement_1F6CBB: @ 81F6CBB
+Route128_Movement_MaxieApproachPlayer: @ 81F6CBB
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-Route128_EventScript_1F6CBE:: @ 81F6CBE
-	trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
+Route128_EventScript_Isaiah:: @ 81F6CBE
+	trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_IsaiahIntro, Route128_Text_IsaiahDefeat, Route128_EventScript_RegisterIsaiah
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route128_EventScript_1F6D09
-	msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route128_EventScript_RematchIsaiah
+	msgbox Route128_Text_IsaiahPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route128_EventScript_1F6CEA:: @ 81F6CEA
+Route128_EventScript_RegisterIsaiah:: @ 81F6CEA
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route128_Text_2A2916, MSGBOX_DEFAULT
+	msgbox Route128_Text_IsaiahRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ISAIAH_1
 	release
 	end
 
-Route128_EventScript_1F6D09:: @ 81F6D09
-	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8
-	msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE
+Route128_EventScript_RematchIsaiah:: @ 81F6D09
+	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_IsaiahRematchIntro, Route128_Text_IsaiahRematchDefeat
+	msgbox Route128_Text_IsaiahPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6D20:: @ 81F6D20
-	trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
+Route128_EventScript_Katelyn:: @ 81F6D20
+	trainerbattle_single TRAINER_KATELYN_1, Route128_Text_KatelynIntro, Route128_Text_KatelynDefeat, Route128_EventScript_RegisterKatelyn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route128_EventScript_1F6D6B
-	msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route128_EventScript_RematchKatelyn
+	msgbox Route128_Text_KatelynPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route128_EventScript_1F6D4C:: @ 81F6D4C
+Route128_EventScript_RegisterKatelyn:: @ 81F6D4C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT
+	msgbox Route128_Text_KatelynRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KATELYN_1
 	release
 	end
 
-Route128_EventScript_1F6D6B:: @ 81F6D6B
-	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB
-	msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE
+Route128_EventScript_RematchKatelyn:: @ 81F6D6B
+	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_KatelynRematchIntro, Route128_Text_KatelynRematchDefeat
+	msgbox Route128_Text_KatelynPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6D82:: @ 81F6D82
-	trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79
-	msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE
+Route128_EventScript_Alexa:: @ 81F6D82
+	trainerbattle_single TRAINER_ALEXA, Route128_Text_AlexaIntro, Route128_Text_AlexaDefeat
+	msgbox Route128_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6D99:: @ 81F6D99
-	trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE
-	msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE
+Route128_EventScript_Ruben:: @ 81F6D99
+	trainerbattle_single TRAINER_RUBEN, Route128_Text_RubenIntro, Route128_Text_RubenDefeat
+	msgbox Route128_Text_RubenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6DB0:: @ 81F6DB0
-	trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9
-	msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE
+Route128_EventScript_Wayne:: @ 81F6DB0
+	trainerbattle_single TRAINER_WAYNE, Route128_Text_WayneIntro, Route128_Text_WayneDefeat
+	msgbox Route128_Text_WaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6DC7:: @ 81F6DC7
-	trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44
-	msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE
+Route128_EventScript_Harrison:: @ 81F6DC7
+	trainerbattle_single TRAINER_HARRISON, Route128_Text_HarrisonIntro, Route128_Text_HarrisonDefeat
+	msgbox Route128_Text_HarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_1F6DDE:: @ 81F6DDE
-	trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA
-	msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE
+Route128_EventScript_Carlee:: @ 81F6DDE
+	trainerbattle_single TRAINER_CARLEE, Route128_Text_CarleeIntro, Route128_Text_CarleeDefeat
+	msgbox Route128_Text_CarleePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_Text_1F6DF5: @ 81F6DF5
+Route128_Text_ArchieWhatHappened: @ 81F6DF5
 	.string "ARCHIE: What happened…\n"
 	.string "What is this wretched scene…\p"
 	.string "Did I…make a horrible mistake?$"
 
-Route128_Text_1F6E48: @ 81F6E48
+Route128_Text_ArchieIOnlyWanted: @ 81F6E48
 	.string "I…\n"
 	.string "I only wanted…$"
 
-Route128_Text_1F6E5A: @ 81F6E5A
+Route128_Text_MaxieDoYouUnderstandNow: @ 81F6E5A
 	.string "MAXIE: Do you understand now,\n"
 	.string "ARCHIE?\p"
 	.string "Do you finally see how disastrous\n"
@@ -261,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A
 	.string "something before the situation goes\l"
 	.string "completely out of control!$"
 
-Route128_Text_1F6F1E: @ 81F6F1E
+Route128_Text_MaxieResposibilityFallsToArchieAndMe: @ 81F6F1E
 	.string "MAXIE: {PLAYER}, don't say anything.\p"
 	.string "I know that I have no right to be\n"
 	.string "critical of ARCHIE…\p"
@@ -273,17 +275,17 @@ Route128_Text_1F6F1E: @ 81F6F1E
 	.string "The responsibility for putting an end\n"
 	.string "to this falls to ARCHIE and me…$"
 
-Route128_Text_1F704F: @ 81F704F
+Route128_Text_MaxieThisDefiesBelief: @ 81F704F
 	.string "MAXIE: This defies belief…\p"
 	.string "Those super-ancient POKéMON…\p"
 	.string "Their power is unbelievable.\n"
 	.string "They've upset the balance of nature…$"
 
-Route128_Text_1F70C9: @ 81F70C9
+Route128_Text_StevenWhatIsHappening: @ 81F70C9
 	.string "STEVEN: {PLAYER}{KUN}!\n"
 	.string "What is happening?$"
 
-Route128_Text_1F70EA: @ 81F70EA
+Route128_Text_StevenWholeWorldWillDrown: @ 81F70EA
 	.string "This is terrible…\p"
 	.string "After the scorching heat wave ended,\n"
 	.string "this deluge began.\p"
@@ -295,7 +297,7 @@ Route128_Text_1F70EA: @ 81F70EA
 	.string "There's no point arguing here…\n"
 	.string "SOOTOPOLIS might provide answers…$"
 
-Route128_Text_1F721B: @ 81F721B
+Route128_Text_StevenImGoingToSootopolis: @ 81F721B
 	.string "{PLAYER}{KUN}…\n"
 	.string "I don't know what you intend to do,\l"
 	.string "but don't do anything reckless.\p"
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index 3183f9821..6b19cc320 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route129_EventScript_1F72EC",
+      "script": "Route129_EventScript_Chase",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route129_EventScript_1F7303",
+      "script": "Route129_EventScript_Allison",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route129_EventScript_1F7331",
+      "script": "Route129_EventScript_Tisha",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route129_EventScript_1F731A",
+      "script": "Route129_EventScript_Reed",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route129_EventScript_1F7348",
+      "script": "Route129_EventScript_Clarence",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 0245db703..ae6c67e87 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,10 +1,10 @@
 Route129_MapScripts:: @ 81F7284
 	map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
+	map_script MAP_SCRIPT_ON_LOAD, Route129_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_OnFrame
 	.byte 0
 
-Route129_MapScript1_1F7294: @ 81F7294
+Route129_OnLoad: @ 81F7294
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
@@ -15,43 +15,43 @@ Route129_OnTransition: @ 81F72AB
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route129_EventScript_1F72D8
+	call_if_ge Route129_EventScript_CheckSetAlternatingWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
 	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
 	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
-Route129_EventScript_1F72D8:: @ 81F72D8
+Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-Route129_MapScript2_1F72E2: @ 81F72E2
+Route129_OnFrame: @ 81F72E2
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route129_EventScript_1F72EC:: @ 81F72EC
-	trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
-	msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
+Route129_EventScript_Chase:: @ 81F72EC
+	trainerbattle_single TRAINER_CHASE, Route129_Text_ChaseIntro, Route129_Text_ChaseDefeat
+	msgbox Route129_Text_ChasePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F7303:: @ 81F7303
-	trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
-	msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
+Route129_EventScript_Allison:: @ 81F7303
+	trainerbattle_single TRAINER_ALLISON, Route129_Text_AllisonIntro, Route129_Text_AllisonDefeat
+	msgbox Route129_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F731A:: @ 81F731A
-	trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
-	msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
+Route129_EventScript_Reed:: @ 81F731A
+	trainerbattle_single TRAINER_REED, Route129_Text_ReedIntro, Route129_Text_ReedDefeat
+	msgbox Route129_Text_ReedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F7331:: @ 81F7331
-	trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
-	msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
+Route129_EventScript_Tisha:: @ 81F7331
+	trainerbattle_single TRAINER_TISHA, Route129_Text_TishaIntro, Route129_Text_TishaDefeat
+	msgbox Route129_Text_TishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_1F7348:: @ 81F7348
-	trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
-	msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
+Route129_EventScript_Clarence:: @ 81F7348
+	trainerbattle_single TRAINER_CLARENCE, Route129_Text_ClarenceIntro, Route129_Text_ClarenceDefeat
+	msgbox Route129_Text_ClarencePostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 18d168b17..c0b92a1a5 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 6,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route130_EventScript_1F73BF",
+      "script": "Route130_EventScript_Rodney",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route130_EventScript_1F73D6",
+      "script": "Route130_EventScript_Katie",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route130_EventScript_1F73ED",
+      "script": "Route130_EventScript_Santiago",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 9362e1d5d..f5bd7e051 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -4,10 +4,10 @@ Route130_MapScripts:: @ 81F735F
 
 Route130_OnTransition: @ 81F7365
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route130_EventScript_1F73B5
+	call_if_ge Route130_EventScript_CheckSetAlternatingWeather
 	specialvar VAR_RESULT, IsMirageIslandPresent
-	compare VAR_RESULT, 1
-	goto_if_eq Route130_EventScript_1F73B1
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route130_EventScript_SetMirageIslandLayout
 	setflag FLAG_TEMP_11
 	setflag FLAG_TEMP_12
 	setflag FLAG_TEMP_13
@@ -26,26 +26,26 @@ Route130_OnTransition: @ 81F7365
 	setmaplayoutindex LAYOUT_ROUTE130
 	end
 
-Route130_EventScript_1F73B1:: @ 81F73B1
+Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
 	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
-Route130_EventScript_1F73B5:: @ 81F73B5
+Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-Route130_EventScript_1F73BF:: @ 81F73BF
-	trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6
-	msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE
+Route130_EventScript_Rodney:: @ 81F73BF
+	trainerbattle_single TRAINER_RODNEY, Route130_Text_RodneyIntro, Route130_Text_RodneyDefeat
+	msgbox Route130_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route130_EventScript_1F73D6:: @ 81F73D6
-	trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC
-	msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE
+Route130_EventScript_Katie:: @ 81F73D6
+	trainerbattle_single TRAINER_KATIE, Route130_Text_KatieIntro, Route130_Text_KatieDefeat
+	msgbox Route130_Text_KatiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route130_EventScript_1F73ED:: @ 81F73ED
-	trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D
-	msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE
+Route130_EventScript_Santiago:: @ 81F73ED
+	trainerbattle_single TRAINER_SANTIAGO, Route130_Text_SantiagoIntro, Route130_Text_SantiagoDefeat
+	msgbox Route130_Text_SantiagoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
index 379b15b3d..af73808b6 100644
--- a/data/maps/Route131/map.json
+++ b/data/maps/Route131/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route131_EventScript_1F7429",
+      "script": "Route131_EventScript_Richard",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 7,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route131_EventScript_1F7440",
+      "script": "Route131_EventScript_Herman",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route131_EventScript_1F7457",
+      "script": "Route131_EventScript_Susie",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route131_EventScript_1F746E",
+      "script": "Route131_EventScript_Kara",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route131_EventScript_1F7485",
+      "script": "Route131_EventScript_Reli",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route131_EventScript_1F74A0",
+      "script": "Route131_EventScript_Ian",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route131_EventScript_1F74D2",
+      "script": "Route131_EventScript_Kevin",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route131_EventScript_1F74BB",
+      "script": "Route131_EventScript_Talia",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index 1bb8cfdbc..d26100a10 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -4,55 +4,55 @@ Route131_MapScripts:: @ 81F7404
 
 Route131_OnTransition: @ 81F740A
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge Route131_EventScript_1F741F
-	call Route131_EventScript_1F741B
+	call_if_ge Route131_EventScript_CheckSetAlternatingWeather
+	call Route131_EventScript_SetLayout
 	end
 
-Route131_EventScript_1F741B:: @ 81F741B
+Route131_EventScript_SetLayout:: @ 81F741B
 	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
 
-Route131_EventScript_1F741F:: @ 81F741F
+Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-Route131_EventScript_1F7429:: @ 81F7429
-	trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D
-	msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE
+Route131_EventScript_Richard:: @ 81F7429
+	trainerbattle_single TRAINER_RICHARD, Route131_Text_RichardIntro, Route131_Text_RichardDefeat
+	msgbox Route131_Text_RichardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F7440:: @ 81F7440
-	trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626
-	msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE
+Route131_EventScript_Herman:: @ 81F7440
+	trainerbattle_single TRAINER_HERMAN, Route131_Text_HermanIntro, Route131_Text_HermanDefeat
+	msgbox Route131_Text_HermanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F7457:: @ 81F7457
-	trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB
-	msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE
+Route131_EventScript_Susie:: @ 81F7457
+	trainerbattle_single TRAINER_SUSIE, Route131_Text_SusieIntro, Route131_Text_SusieDefeat
+	msgbox Route131_Text_SusiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F746E:: @ 81F746E
-	trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A
-	msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE
+Route131_EventScript_Kara:: @ 81F746E
+	trainerbattle_single TRAINER_KARA, Route131_Text_KaraIntro, Route131_Text_KaraDefeat
+	msgbox Route131_Text_KaraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F7485:: @ 81F7485
-	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
-	msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE
+Route131_EventScript_Reli:: @ 81F7485
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_ReliIntro, Route131_Text_ReliDefeat, Route131_Text_ReliNotEnoughMons
+	msgbox Route131_Text_ReliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F74A0:: @ 81F74A0
-	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
-	msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE
+Route131_EventScript_Ian:: @ 81F74A0
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_IanIntro, Route131_Text_IanDefeat, Route131_Text_IanNotEnoughMons
+	msgbox Route131_Text_IanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F74BB:: @ 81F74BB
-	trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38
-	msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE
+Route131_EventScript_Talia:: @ 81F74BB
+	trainerbattle_single TRAINER_TALIA, Route131_Text_TaliaIntro, Route131_Text_TaliaDefeat
+	msgbox Route131_Text_TaliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_1F74D2:: @ 81F74D2
-	trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC
-	msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE
+Route131_EventScript_Kevin:: @ 81F74D2
+	trainerbattle_single TRAINER_KEVIN, Route131_Text_KevinIntro, Route131_Text_KevinDefeat
+	msgbox Route131_Text_KevinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 8a7597826..947f8d9cf 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route132_EventScript_1F74EA",
+      "script": "Route132_EventScript_Gilbert",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route132_EventScript_1F7501",
+      "script": "Route132_EventScript_Dana",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F752F",
+      "script": "Route132_EventScript_Kiyo",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route132_EventScript_1F7518",
+      "script": "Route132_EventScript_Ronald",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F7546",
+      "script": "Route132_EventScript_Paxton",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F755D",
+      "script": "Route132_EventScript_Darcy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F758B",
+      "script": "Route132_EventScript_Makayla",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route132_EventScript_1F7574",
+      "script": "Route132_EventScript_Jonathan",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index aed4d0673..6b82102be 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -1,43 +1,43 @@
 Route132_MapScripts:: @ 81F74E9
 	.byte 0
 
-Route132_EventScript_1F74EA:: @ 81F74EA
-	trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
-	msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
+Route132_EventScript_Gilbert:: @ 81F74EA
+	trainerbattle_single TRAINER_GILBERT, Route132_Text_GilbertIntro, Route132_Text_GilbertDefeat
+	msgbox Route132_Text_GilbertPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7501:: @ 81F7501
-	trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
-	msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
+Route132_EventScript_Dana:: @ 81F7501
+	trainerbattle_single TRAINER_DANA, Route132_Text_DanaIntro, Route132_Text_DanaDefeat
+	msgbox Route132_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7518:: @ 81F7518
-	trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
-	msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Ronald:: @ 81F7518
+	trainerbattle_single TRAINER_RONALD, Route132_Text_RonaldIntro, Route132_Text_RonaldDefeat
+	msgbox Route132_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F752F:: @ 81F752F
-	trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
-	msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
+Route132_EventScript_Kiyo:: @ 81F752F
+	trainerbattle_single TRAINER_KIYO, Route132_Text_KiyoIntro, Route132_Text_KiyoDefeat
+	msgbox Route132_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7546:: @ 81F7546
-	trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
-	msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Paxton:: @ 81F7546
+	trainerbattle_single TRAINER_PAXTON, Route132_Text_PaxtonIntro, Route132_Text_PaxtonDefeat
+	msgbox Route132_Text_PaxtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F755D:: @ 81F755D
-	trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
-	msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
+Route132_EventScript_Darcy:: @ 81F755D
+	trainerbattle_single TRAINER_DARCY, Route132_Text_DarcyIntro, Route132_Text_DarcyDefeat
+	msgbox Route132_Text_DarcyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F7574:: @ 81F7574
-	trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
-	msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
+Route132_EventScript_Jonathan:: @ 81F7574
+	trainerbattle_single TRAINER_JONATHAN, Route132_Text_JonathanIntro, Route132_Text_JonathanDefeat
+	msgbox Route132_Text_JonathanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_1F758B:: @ 81F758B
-	trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
-	msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
+Route132_EventScript_Makayla:: @ 81F758B
+	trainerbattle_single TRAINER_MAKAYLA, Route132_Text_MakaylaIntro, Route132_Text_MakaylaDefeat
+	msgbox Route132_Text_MakaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index 8622515f0..fe492458a 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75A3",
+      "script": "Route133_EventScript_Franklin",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75D1",
+      "script": "Route133_EventScript_Linda",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75BA",
+      "script": "Route133_EventScript_Debra",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route133_EventScript_1F75FF",
+      "script": "Route133_EventScript_Beck",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route133_EventScript_1F75E8",
+      "script": "Route133_EventScript_Warren",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F7616",
+      "script": "Route133_EventScript_Mollie",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F762D",
+      "script": "Route133_EventScript_Conor",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc
index a91eeead3..ebe28f5db 100644
--- a/data/maps/Route133/scripts.inc
+++ b/data/maps/Route133/scripts.inc
@@ -1,38 +1,38 @@
 Route133_MapScripts:: @ 81F75A2
 	.byte 0
 
-Route133_EventScript_1F75A3:: @ 81F75A3
-	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F
-	msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE
+Route133_EventScript_Franklin:: @ 81F75A3
+	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_FranklinIntro, Route133_Text_FranklinDefeat
+	msgbox Route133_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75BA:: @ 81F75BA
-	trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200
-	msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE
+Route133_EventScript_Debra:: @ 81F75BA
+	trainerbattle_single TRAINER_DEBRA, Route133_Text_DebraIntro, Route133_Text_DebraDefeat
+	msgbox Route133_Text_DebraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75D1:: @ 81F75D1
-	trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258
-	msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE
+Route133_EventScript_Linda:: @ 81F75D1
+	trainerbattle_single TRAINER_LINDA, Route133_Text_LindaIntro, Route133_Text_LindaDefeat
+	msgbox Route133_Text_LindaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75E8:: @ 81F75E8
-	trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0
-	msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE
+Route133_EventScript_Warren:: @ 81F75E8
+	trainerbattle_single TRAINER_WARREN, Route133_Text_WarrenIntro, Route133_Text_WarrenDefeat
+	msgbox Route133_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75FF:: @ 81F75FF
-	trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C
-	msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE
+Route133_EventScript_Beck:: @ 81F75FF
+	trainerbattle_single TRAINER_BECK, Route133_Text_BeckIntro, Route133_Text_BeckDefeat
+	msgbox Route133_Text_BeckPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F7616:: @ 81F7616
-	trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A
-	msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE
+Route133_EventScript_Mollie:: @ 81F7616
+	trainerbattle_single TRAINER_MOLLIE, Route133_Text_MollieIntro, Route133_Text_MollieDefeat
+	msgbox Route133_Text_MolliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F762D:: @ 81F762D
-	trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505
-	msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE
+Route133_EventScript_Conor:: @ 81F762D
+	trainerbattle_single TRAINER_CONOR, Route133_Text_ConorIntro, Route133_Text_ConorDefeat
+	msgbox Route133_Text_ConorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index e45920576..fb4da1f92 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 5,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route134_EventScript_1F7653",
+      "script": "Route134_EventScript_Jack",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route134_EventScript_1F766A",
+      "script": "Route134_EventScript_Laurel",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route134_EventScript_1F7698",
+      "script": "Route134_EventScript_Aaron",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route134_EventScript_1F7681",
+      "script": "Route134_EventScript_Alex",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route134_EventScript_1F76AF",
+      "script": "Route134_EventScript_Hitoshi",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route134_EventScript_1F76F4",
+      "script": "Route134_EventScript_Marley",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route134_EventScript_1F770B",
+      "script": "Route134_EventScript_Kelvin",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route134_EventScript_1F76DD",
+      "script": "Route134_EventScript_Reyna",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route134_EventScript_1F76C6",
+      "script": "Route134_EventScript_Hudson",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index a941e19b5..3da2781b9 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,53 +1,53 @@
 Route134_MapScripts:: @ 81F7644
-	map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A
+	map_script MAP_SCRIPT_ON_RESUME, Route134_OnResume
 	.byte 0
 
-Route134_MapScript1_1F764A: @ 81F764A
+Route134_OnResume: @ 81F764A
 	setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6
 	end
 
-Route134_EventScript_1F7653:: @ 81F7653
-	trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB
-	msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE
+Route134_EventScript_Jack:: @ 81F7653
+	trainerbattle_single TRAINER_JACK, Route134_Text_JackIntro, Route134_Text_JackDefeat
+	msgbox Route134_Text_JackPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F766A:: @ 81F766A
-	trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643
-	msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE
+Route134_EventScript_Laurel:: @ 81F766A
+	trainerbattle_single TRAINER_LAUREL, Route134_Text_LaurelIntro, Route134_Text_LaurelDefeat
+	msgbox Route134_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F7681:: @ 81F7681
-	trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE
-	msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE
+Route134_EventScript_Alex:: @ 81F7681
+	trainerbattle_single TRAINER_ALEX, Route134_Text_AlexIntro, Route134_Text_AlexDefeat
+	msgbox Route134_Text_AlexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F7698:: @ 81F7698
-	trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1
-	msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE
+Route134_EventScript_Aaron:: @ 81F7698
+	trainerbattle_single TRAINER_AARON, Route134_Text_AaronIntro, Route134_Text_AaronDefeat
+	msgbox Route134_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76AF:: @ 81F76AF
-	trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745
-	msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE
+Route134_EventScript_Hitoshi:: @ 81F76AF
+	trainerbattle_single TRAINER_HITOSHI, Route134_Text_HitoshiIntro, Route134_Text_HitoshiDefeat
+	msgbox Route134_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76C6:: @ 81F76C6
-	trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1
-	msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE
+Route134_EventScript_Hudson:: @ 81F76C6
+	trainerbattle_single TRAINER_HUDSON, Route134_Text_HudsonIntro, Route134_Text_HudsonDefeat
+	msgbox Route134_Text_HudsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76DD:: @ 81F76DD
-	trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10
-	msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE
+Route134_EventScript_Reyna:: @ 81F76DD
+	trainerbattle_single TRAINER_REYNA, Route134_Text_ReynaIntro, Route134_Text_ReynaDefeat
+	msgbox Route134_Text_ReynaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F76F4:: @ 81F76F4
-	trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B
-	msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE
+Route134_EventScript_Marley:: @ 81F76F4
+	trainerbattle_single TRAINER_MARLEY, Route134_Text_MarleyIntro, Route134_Text_MarleyDefeat
+	msgbox Route134_Text_MarleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_1F770B:: @ 81F770B
-	trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B
-	msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE
+Route134_EventScript_Kelvin:: @ 81F770B
+	trainerbattle_single TRAINER_KELVIN, Route134_Text_KelvinIntro, Route134_Text_KelvinDefeat
+	msgbox Route134_Text_KelvinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 349ec616e..143ff4543 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -60,7 +60,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
 	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT
-	setflag FLAG_HIDE_ROUTE_116_TUNNELER
+	setflag FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json
index ce6c3d2d0..3cf4b2cd0 100644
--- a/data/maps/SSTidalCorridor/map.json
+++ b/data/maps/SSTidalCorridor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C119",
+      "script": "SSTidalCorridor_EventScript_ExitSailor",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C1A3",
+      "script": "SSTidalCorridor_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C0D9",
+      "script": "SSTidalCorridor_EventScript_Briney",
       "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C0E2",
+      "script": "SSTidalCorridor_EventScript_Peeko",
       "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
     },
     {
@@ -153,7 +153,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -161,7 +161,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -169,7 +169,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -177,7 +177,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -185,7 +185,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -193,7 +193,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -201,7 +201,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -209,7 +209,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -217,7 +217,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C0F5"
+      "script": "SSTidalCorridor_EventScript_Cabin1Sign"
     },
     {
       "type": "sign",
@@ -225,7 +225,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C0FE"
+      "script": "SSTidalCorridor_EventScript_Cabin2Sign"
     },
     {
       "type": "sign",
@@ -233,7 +233,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C107"
+      "script": "SSTidalCorridor_EventScript_Cabin3Sign"
     },
     {
       "type": "sign",
@@ -241,7 +241,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C110"
+      "script": "SSTidalCorridor_EventScript_Cabin4Sign"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index f91cc6a3b..6b88b7ae1 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,218 +1,218 @@
 SSTidalCorridor_MapScripts:: @ 823BFCF
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
 	.byte 0
 
-SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
-	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219
-	map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
-	map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
-	map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
-	map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D
+SSTidalCorridor_OnFrame: @ 823BFD5
+	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_RIGHT, SSTidalCorridor_EventScript_HalfwayToLilycove
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport
 	.2byte 0
 
-SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
+SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 2
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C015:: @ 823C015
-	setvar VAR_PORTHOLE_STATE, 6
+SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23C028:: @ 823C028
+SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 7
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_23C03C:: @ 823C03C
+SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 4
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
 	return
 
-SSTidalCorridor_EventScript_23C050:: @ 823C050
-	compare VAR_PORTHOLE_STATE, 2
-	goto_if_eq SSTidalCorridor_EventScript_23C067
-	compare VAR_PORTHOLE_STATE, 7
-	goto_if_eq SSTidalCorridor_EventScript_23C07D
+SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
 	end
 
-SSTidalCorridor_EventScript_23C067:: @ 823C067
+SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 3
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C07D:: @ 823C07D
+SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 8
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23C093:: @ 823C093
+SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 8
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
-	switch VAR_PORTHOLE_STATE
-	case 2, SSTidalRooms_EventScript_23C03C
-	case 3, SSTidalRooms_EventScript_23C03C
-	case 6, SSTidalRooms_EventScript_23C028
-	case 7, SSTidalRooms_EventScript_23C093
+SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
+	switch VAR_SS_TIDAL_STATE
+	case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove
+	case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove
+	case SS_TIDAL_DEPART_LILYCOVE, SSTidalRooms_EventScript_HalfwayToSlateport
+	case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport
 	return
 
-SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9
-	msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC
+SSTidalCorridor_EventScript_Briney:: @ 823C0D9
+	msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC
 	end
 
-SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2
+SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT
+	msgbox SSTidalCorridor_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5
-	msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5
+	msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE
-	msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE
+	msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C107:: @ 823C107
-	msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107
+	msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C110:: @ 823C110
-	msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110
+	msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C119:: @ 823C119
+SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
 	lock
 	faceplayer
-	compare VAR_PORTHOLE_STATE, 4
-	goto_if_eq SSTidalCorridor_EventScript_23C13B
-	compare VAR_PORTHOLE_STATE, 8
-	goto_if_eq SSTidalCorridor_EventScript_23C15A
-	msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
+	goto_if_eq SSTidalCorridor_EventScript_ExitLilycove
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_ExitSlateport
+	msgbox SSTidalCorridor_Text_CanRestInCabin2, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C13B:: @ 823C13B
+SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
-	msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT
-	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179
+	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SSTidalCorridor_EventScript_23C15A:: @ 823C15A
+SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
-	msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT
-	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179
+	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SSTidalCorridor_EventScript_23C179:: @ 823C179
+SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179
 	setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 	return
 
-SSTidalCorridor_EventScript_23C17D:: @ 823C17D
+SSTidalCorridor_EventScript_Porthole:: @ 823C17D
 	lockall
-	compare VAR_PORTHOLE_STATE, 2
-	goto_if_eq SSTidalCorridor_EventScript_23C19E
-	compare VAR_PORTHOLE_STATE, 7
-	goto_if_eq SSTidalCorridor_EventScript_23C19E
-	msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+	msgbox SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C19E:: @ 823C19E
-	special sub_80FB7A4
+SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E
+	special LookThroughPorthole
 	waitstate
 	end
 
-SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3
+SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_23C1BD
-	call SSTidalCorridor_EventScript_23C1C7
-	msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise
+	call SSTidalCorridor_EventScript_CheckIfTrainersDefeated
+	msgbox SSTidalCorridor_Text_VisitOtherCabins, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD
-	msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT
+SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
+	msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7
+SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
 	checktrainerflag TRAINER_PHILLIP
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_LEONARD
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_COLTON
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_MICAH
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_THOMAS
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_LEA_AND_JED
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_GARRET
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_NAOMI
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
-	goto SSTidalCorridor_EventScript_23C1BD
+	goto SSTidalCorridor_EventScript_EnjoyYourCruise
 	return
 
-SSTidalCorridor_EventScript_23C218:: @ 823C218
+SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
 	return
 
-SSTidalCorridor_EventScript_23C219:: @ 823C219
+SSTidalCorridor_EventScript_ScottScene:: @ 823C219
 	lockall
-	applymovement 5, SSTidalCorridor_Movement_23C26D
+	applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT
+	msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D
-	applymovement 1, SSTidalCorridor_Movement_23C284
-	applymovement 5, SSTidalCorridor_Movement_23C275
+	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit
+	applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott
+	applymovement 5, SSTidalCorridor_Movement_ScottExit
 	waitmovement 0
 	playse SE_KAIDAN
 	waitse
 	removeobject 5
-	applymovement 1, SSTidalCorridor_Movement_23C28B
+	applymovement 1, SSTidalCorridor_Movement_SailorReturn
 	waitmovement 0
 	delay 30
 	setflag FLAG_MET_SCOTT_ON_SS_TIDAL
@@ -220,7 +220,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
 	releaseall
 	end
 
-SSTidalCorridor_Movement_23C26D: @ 823C26D
+SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ SSTidalCorridor_Movement_23C26D: @ 823C26D
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_23C275: @ 823C275
+SSTidalCorridor_Movement_ScottExit: @ 823C275
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -240,7 +240,7 @@ SSTidalCorridor_Movement_23C275: @ 823C275
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_23C27D: @ 823C27D
+SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
 	delay_16
 	delay_16
 	delay_16
@@ -249,7 +249,7 @@ SSTidalCorridor_Movement_23C27D: @ 823C27D
 	walk_in_place_fastest_down
 	step_end
 
-SSTidalCorridor_Movement_23C284: @ 823C284
+SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
 	delay_16
 	walk_right
 	walk_right
@@ -258,13 +258,13 @@ SSTidalCorridor_Movement_23C284: @ 823C284
 	walk_in_place_fastest_left
 	step_end
 
-SSTidalCorridor_Movement_23C28B: @ 823C28B
+SSTidalCorridor_Movement_SailorReturn: @ 823C28B
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-SSTidalCorridor_Text_23C28F: @ 823C28F
+SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
 	.string "SCOTT: Well, hi, hi!\n"
 	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
 	.string "Something's come up, so I have to\n"
@@ -284,27 +284,25 @@ SSTidalCorridor_Text_23C28F: @ 823C28F
 	.string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n"
 	.string "at the BATTLE FRONTIER!$"
 
-SSTidalCorridor_Text_23C462: @ 823C462
-SSTidalRooms_Text_23C462: @ 823C462
+SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462
 	.string "This ferry is built to plow through\n"
 	.string "fast-running currents.\p"
 	.string "We hope you enjoy your voyage with us.\n"
 	.string "Feel free to explore the ship.$"
 
-SSTidalCorridor_Text_23C4E3: @ 823C4E3
+SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3
 	.string "We hope you enjoy your voyage on\n"
 	.string "our ferry.$"
 
-SSTidalCorridor_Text_23C50F: @ 823C50F
-SSTidalRooms_Text_23C50F: @ 823C50F
+SSTidal_Text_MadeLandInSlateport: @ 823C50F
 	.string "We have made land in SLATEPORT CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalRooms_Text_23C553: @ 823C553
+SSTidal_Text_MadeLandInLilycove: @ 823C553
 	.string "We have made land in LILYCOVE CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalCorridor_Text_23C596: @ 823C596
+SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
 	.string "It'll be some time before we make land,\n"
 	.string "I reckon.\p"
 	.string "You can rest up in your cabin if you'd\n"
@@ -312,22 +310,22 @@ SSTidalCorridor_Text_23C596: @ 823C596
 	.string "The bed in there is soft and plushy.\n"
 	.string "I can attest to how comfy it is!$"
 
-SSTidalCorridor_Text_23C64F: @ 823C64F
+SSTidalCorridor_Text_WeveArrived: @ 823C64F
 	.string "We've arrived!$"
 
-SSTidalCorridor_Text_23C65E: @ 823C65E
+SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E
 	.string "Go visit other cabins.\n"
 	.string "TRAINERS bored of the boat trip will\l"
 	.string "be itching to battle.$"
 
-SSTidalCorridor_Text_23C6B0: @ 823C6B0
+SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0
 	.string "Enjoy your cruise!$"
 
-SSTidalCorridor_Text_23C6C3: @ 823C6C3
+SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3
 	.string "The horizon spreads beyond\n"
 	.string "the porthole.$"
 
-SSTidalCorridor_Text_23C6EC: @ 823C6EC
+SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
 	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
 	.string "They made me honorary captain of\n"
 	.string "the S.S. TIDAL!\p"
@@ -337,17 +335,17 @@ SSTidalCorridor_Text_23C6EC: @ 823C6EC
 	.string "Let me just say, it stirred my sleeping\n"
 	.string "soul as a sailor!$"
 
-SSTidalCorridor_Text_23C7E1: @ 823C7E1
+SSTidalCorridor_Text_Peeko: @ 823C7E1
 	.string "PEEKO: Pihyo pihyohyo…$"
 
-SSTidalCorridor_Text_23C7F8: @ 823C7F8
+SSTidalCorridor_Text_Cabin1: @ 823C7F8
 	.string "Cabin 1$"
 
-SSTidalCorridor_Text_23C800: @ 823C800
+SSTidalCorridor_Text_Cabin2: @ 823C800
 	.string "Cabin 2$"
 
-SSTidalCorridor_Text_23C808: @ 823C808
+SSTidalCorridor_Text_Cabin3: @ 823C808
 	.string "Cabin 3$"
 
-SSTidalCorridor_Text_23C810: @ 823C810
+SSTidalCorridor_Text_Cabin4: @ 823C810
 	.string "Cabin 4$"
diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json
index 3e678ca8c..45610454a 100644
--- a/data/maps/SSTidalLowerDeck/map.json
+++ b/data/maps/SSTidalLowerDeck/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalLowerDeck_EventScript_23C819",
+      "script": "SSTidalLowerDeck_EventScript_Phillip",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalLowerDeck_EventScript_23C830",
+      "script": "SSTidalLowerDeck_EventScript_Leonard",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 68761376d..c90366c23 100644
--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -1,38 +1,38 @@
 SSTidalLowerDeck_MapScripts:: @ 823C818
 	.byte 0
 
-SSTidalLowerDeck_EventScript_23C819:: @ 823C819
-	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
-	msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Phillip:: @ 823C819
+	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat
+	msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_EventScript_23C830:: @ 823C830
-	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
-	msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Leonard:: @ 823C830
+	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat
+	msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_Text_23C847: @ 823C847
+SSTidalLowerDeck_Text_PhillipIntro: @ 823C847
 	.string "Arrrgh! I'm fed up and dog-tired of\n"
 	.string "cleaning this huge place!\p"
 	.string "Let's have a quick battle!$"
 
-SSTidalLowerDeck_Text_23C8A0: @ 823C8A0
+SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0
 	.string "Little bro, I lost!$"
 
-SSTidalLowerDeck_Text_23C8B4: @ 823C8B4
+SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
 
-SSTidalLowerDeck_Text_23C917: @ 823C917
+SSTidalLowerDeck_Text_LeonardIntro: @ 823C917
 	.string "This is the bottom of the ship's hull.\n"
 	.string "There's plenty of room.\l"
 	.string "It'll be alright for a POKéMON battle.$"
 
-SSTidalLowerDeck_Text_23C97D: @ 823C97D
+SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D
 	.string "Big bro, I lost!$"
 
-SSTidalLowerDeck_Text_23C98E: @ 823C98E
+SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json
index 8fb4bd05d..b2da534c3 100644
--- a/data/maps/SSTidalRooms/map.json
+++ b/data/maps/SSTidalRooms/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CA49",
+      "script": "SSTidalRooms_EventScript_Colton",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalRooms_EventScript_23CA60",
+      "script": "SSTidalRooms_EventScript_Micah",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CA77",
+      "script": "SSTidalRooms_EventScript_Thomas",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "SSTidalRooms_EventScript_23CA8E",
+      "script": "SSTidalRooms_EventScript_Jed",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "SSTidalRooms_EventScript_23CAA9",
+      "script": "SSTidalRooms_EventScript_Lea",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalRooms_EventScript_23CAC4",
+      "script": "SSTidalRooms_EventScript_Garret",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CADB",
+      "script": "SSTidalRooms_EventScript_Naomi",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23C9F2",
+      "script": "SSTidalRooms_EventScript_SnatchGiver",
       "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER"
     }
   ],
@@ -213,7 +213,7 @@
       "y": 11,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalRooms_EventScript_23CA33"
+      "script": "SSTidalRooms_EventScript_Bed"
     },
     {
       "type": "sign",
@@ -221,7 +221,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalRooms_EventScript_23CA33"
+      "script": "SSTidalRooms_EventScript_Bed"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index 3b8df90a3..bf2c5e36b 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -1,175 +1,175 @@
 SSTidalRooms_MapScripts:: @ 823C9F1
 	.byte 0
 
-SSTidalRooms_EventScript_23C9F2:: @ 823C9F2
+SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_23CA29
-	msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch
+	msgbox SSTidalRooms_Text_NotSuspiciousTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM49
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM49
-	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
+	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_23CA29:: @ 823CA29
-	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
+SSTidalRooms_EventScript_ExplainSnatch:: @ 823CA29
+	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_23CA33:: @ 823CA33
+SSTidalRooms_EventScript_Bed:: @ 823CA33
 	lockall
-	msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT
+	msgbox SSTidalRooms_Text_TakeRestOnBed, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
-	call SSTidalRooms_EventScript_23C0A7
+	call SSTidalRooms_EventScript_ProgessCruiseAfterBed
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23CA49:: @ 823CA49
-	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58
-	msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Colton:: @ 823CA49
+	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_ColtonIntro, SSTidalRooms_Text_ColtonDefeat
+	msgbox SSTidalRooms_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA60:: @ 823CA60
-	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04
-	msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Micah:: @ 823CA60
+	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_MicahIntro, SSTidalRooms_Text_MicahDefeat
+	msgbox SSTidalRooms_Text_MicahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA77:: @ 823CA77
-	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A
-	msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Thomas:: @ 823CA77
+	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_ThomasIntro, SSTidalRooms_Text_ThomasDefeat
+	msgbox SSTidalRooms_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA8E:: @ 823CA8E
-	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6
-	msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Jed:: @ 823CA8E
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_JedIntro, SSTidalRooms_Text_JedDefeat, SSTidalRooms_Text_JedNotEnoughMons
+	msgbox SSTidalRooms_Text_JedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CAA9:: @ 823CAA9
-	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0
-	msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Lea:: @ 823CAA9
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_LeaIntro, SSTidalRooms_Text_LeaDefeat, SSTidalRooms_Text_LeaNotEnoughMons
+	msgbox SSTidalRooms_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CAC4:: @ 823CAC4
-	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36
-	msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Garret:: @ 823CAC4
+	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_GarretIntro, SSTidalRooms_Text_GarretDefeat
+	msgbox SSTidalRooms_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CADB:: @ 823CADB
-	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4
-	msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Naomi:: @ 823CADB
+	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_NaomiIntro, SSTidalRooms_Text_NaomiDefeat
+	msgbox SSTidalRooms_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_Text_23CAF2: @ 823CAF2
+SSTidalRooms_Text_TakeRestOnBed: @ 823CAF2
 	.string "There's a bed…\n"
 	.string "Let's take a rest.$"
 
-SSTidalRooms_Text_23CB14: @ 823CB14
+SSTidalRooms_Text_ColtonIntro: @ 823CB14
 	.string "I often sail to LILYCOVE CITY.\p"
 	.string "I enjoy attending CONTESTS,\n"
 	.string "you see.$"
 
-SSTidalRooms_Text_23CB58: @ 823CB58
+SSTidalRooms_Text_ColtonDefeat: @ 823CB58
 	.string "That was an enjoyable match!$"
 
-SSTidalRooms_Text_23CB75: @ 823CB75
+SSTidalRooms_Text_ColtonPostBattle: @ 823CB75
 	.string "I get so excited imagining what kinds\n"
 	.string "of POKéMON I'll get to see in the next\l"
 	.string "CONTEST. The anticipation of it thrills!$"
 
-SSTidalRooms_Text_23CBEB: @ 823CBEB
+SSTidalRooms_Text_MicahIntro: @ 823CBEB
 	.string "Are your friends strong?$"
 
-SSTidalRooms_Text_23CC04: @ 823CC04
+SSTidalRooms_Text_MicahDefeat: @ 823CC04
 	.string "Your friends are, indeed, strong.$"
 
-SSTidalRooms_Text_23CC26: @ 823CC26
+SSTidalRooms_Text_MicahPostBattle: @ 823CC26
 	.string "Friends need not be human.\n"
 	.string "For me, POKéMON are treasured friends!$"
 
-SSTidalRooms_Text_23CC68: @ 823CC68
+SSTidalRooms_Text_ThomasIntro: @ 823CC68
 	.string "Child…\n"
 	.string "Did you knock on the door?$"
 
-SSTidalRooms_Text_23CC8A: @ 823CC8A
+SSTidalRooms_Text_ThomasDefeat: @ 823CC8A
 	.string "A loss is to be accepted without haste\n"
 	.string "or panic.$"
 
-SSTidalRooms_Text_23CCBB: @ 823CCBB
+SSTidalRooms_Text_ThomasPostBattle: @ 823CCBB
 	.string "To be never ruffled in any situation is\n"
 	.string "the GENTLEMAN's code of conduct.$"
 
-SSTidalRooms_Text_23CD04: @ 823CD04
+SSTidalRooms_Text_JedIntro: @ 823CD04
 	.string "JED: I feel a little shy about this, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_23CD54: @ 823CD54
+SSTidalRooms_Text_JedDefeat: @ 823CD54
 	.string "JED: Sigh…$"
 
-SSTidalRooms_Text_23CD5F: @ 823CD5F
+SSTidalRooms_Text_JedPostBattle: @ 823CD5F
 	.string "JED: It's the first time that our lovey-\n"
 	.string "dovey power couldn't prevail!\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_23CDC6: @ 823CDC6
+SSTidalRooms_Text_JedNotEnoughMons: @ 823CDC6
 	.string "JED: You only have one POKéMON?\n"
 	.string "Isn't that just too lonesome?$"
 
-SSTidalRooms_Text_23CE04: @ 823CE04
+SSTidalRooms_Text_LeaIntro: @ 823CE04
 	.string "LEA: I feel a little silly, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_23CE4B: @ 823CE4B
+SSTidalRooms_Text_LeaDefeat: @ 823CE4B
 	.string "LEA: Oh, boo!$"
 
-SSTidalRooms_Text_23CE59: @ 823CE59
+SSTidalRooms_Text_LeaPostBattle: @ 823CE59
 	.string "LEA: I can't believe it!\n"
 	.string "Our lovey-dovey power failed…\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_23CEB0: @ 823CEB0
+SSTidalRooms_Text_LeaNotEnoughMons: @ 823CEB0
 	.string "LEA: I wanted to battle…\n"
 	.string "But you don't even have two POKéMON…$"
 
-SSTidalRooms_Text_23CEEE: @ 823CEEE
+SSTidalRooms_Text_GarretIntro: @ 823CEEE
 	.string "Ah, you've come just in time.\p"
 	.string "I'm bored, you see.\n"
 	.string "You may entertain me.$"
 
-SSTidalRooms_Text_23CF36: @ 823CF36
+SSTidalRooms_Text_GarretDefeat: @ 823CF36
 	.string "…That will do.$"
 
-SSTidalRooms_Text_23CF45: @ 823CF45
+SSTidalRooms_Text_GarretPostBattle: @ 823CF45
 	.string "Perhaps I shall get Father to acquire\n"
 	.string "a yacht for me.\l"
 	.string "A yacht for me and POKéMON!$"
 
-SSTidalRooms_Text_23CF97: @ 823CF97
+SSTidalRooms_Text_NaomiIntro: @ 823CF97
 	.string "Oh, you're such an adorable TRAINER.\n"
 	.string "Would you like to have tea?\l"
 	.string "Or would you rather battle?$"
 
-SSTidalRooms_Text_23CFF4: @ 823CFF4
+SSTidalRooms_Text_NaomiDefeat: @ 823CFF4
 	.string "I see.\n"
 	.string "You're the active sort.$"
 
-SSTidalRooms_Text_23D013: @ 823D013
+SSTidalRooms_Text_NaomiPostBattle: @ 823D013
 	.string "A world cruise on a luxury liner has its\n"
 	.string "charms, I must say…\p"
 	.string "But, I will admit there is an appealing\n"
 	.string "side to touring HOENN by ferry.$"
 
-SSTidalRooms_Text_23D098: @ 823D098
+SSTidalRooms_Text_NotSuspiciousTakeThis: @ 823D098
 	.string "Uh… Hi! I… I'm not acting suspicious!\n"
 	.string "Uh… You can have this! For free!\p"
 	.string "It… Honestly, I didn't SNATCH it from\n"
 	.string "someone! I'd never do such a thing!\l"
 	.string "It's clean! You can use it!$"
 
-SSTidalRooms_Text_23D145: @ 823D145
+SSTidalRooms_Text_ExplainSnatch: @ 823D145
 	.string "SNATCH steals the beneficial effects\n"
 	.string "of certain moves before they can be\l"
 	.string "used by a foe or ally.$"
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 68db475cd..43c503682 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -37,10 +37,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
 	waitstate
 	setvar VAR_RESULT, 1
 	playse SE_W197
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
+	dofieldeffectsparkle 16, 42, 0
 	waitfieldeffect FLDEFF_SPARKLE
 	closemessage
 	setvar VAR_RESULT, 0
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index bf30da747..1abb66b57 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
 	msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
-	setvar VAR_PORTHOLE_STATE, 1
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT
 	call SlateportCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc
index e726f8566..59f90b8bd 100644
--- a/data/maps/TrainerHill_1F/scripts.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_1F_MapScripts:: @ 8268F71
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc
index dd1f356de..0e8775cd5 100644
--- a/data/maps/TrainerHill_2F/scripts.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_2F_MapScripts:: @ 8268F81
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc
index b4793f457..eee6bd99d 100644
--- a/data/maps/TrainerHill_3F/scripts.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_3F_MapScripts:: @ 8268F91
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc
index 66b8ed3bb..74ce0bf08 100644
--- a/data/maps/TrainerHill_4F/scripts.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_4F_MapScripts:: @ 8268F9C
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json
index 03354b0da..07cdaa80d 100644
--- a/data/maps/TrainerHill_Elevator/map.json
+++ b/data/maps/TrainerHill_Elevator/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Elevator_EventScript_26935F",
+      "script": "TrainerHill_Elevator_EventScript_Attendant",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc
index 39fa51db4..498f7a3c0 100644
--- a/data/maps/TrainerHill_Elevator/scripts.inc
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
@@ -1,89 +1,89 @@
 TrainerHill_Elevator_MapScripts:: @ 826934F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_OnFrame
 	.byte 0
 
-TrainerHill_Elevator_MapScript2_269355: @ 8269355
-	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375
+TrainerHill_Elevator_OnFrame: @ 8269355
+	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_EnterElevator
 	.2byte 0
 
-TrainerHill_Elevator_EventScript_26935F:: @ 826935F
+TrainerHill_Elevator_EventScript_Attendant:: @ 826935F
 	end
 
-TrainerHill_Elevator_EventScript_269360:: @ 8269360
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693EB
+TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof
 	waitmovement 0
 	releaseall
 	warp MAP_TRAINER_HILL_ROOF, 255, 15, 5
 	waitstate
 	end
 
-TrainerHill_Elevator_EventScript_269375:: @ 8269375
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E4
+TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant
 	waitmovement 0
-	applymovement 1, TrainerHill_Elevator_Movement_2693EE
+	applymovement 1, TrainerHill_Elevator_Movement_AttendantFacePlayer
 	waitmovement 0
 	lockall
-	msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO
+	msgbox TrainerHill_Elevator_Text_ReturnToReception, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq TrainerHill_Elevator_EventScript_269360
+	goto_if_eq TrainerHill_Elevator_EventScript_ExitToRoof
 	releaseall
-	applymovement 1, TrainerHill_Elevator_Movement_2693F0
+	applymovement 1, TrainerHill_Elevator_Movement_AttendantFaceDown
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693DF
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator
 	waitmovement 0
-	call TrainerHill_Elevator_EventScript_2693D9
+	call TrainerHill_Elevator_EventScript_MoveElevator
 	delay 25
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E7
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator
 	waitmovement 0
 	warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8
 	waitstate
 	end
 
 @ Unused
-TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE
-	goto TrainerHill_Elevator_EventScript_2693D4
+TrainerHill_Elevator_EventScript_ExitFloorSelect:: @ 82693CE
+	goto TrainerHill_Elevator_EventScript_CloseFloorSelect
 	end
 
 @ Functionally unused
-TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
+TrainerHill_Elevator_EventScript_CloseFloorSelect:: @ 82693D4
 	special CloseDeptStoreElevatorWindow
 	releaseall
 	end
 
-TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
+TrainerHill_Elevator_EventScript_MoveElevator:: @ 82693D9
 	waitse
 	special MoveElevator
 	waitstate
 	return
 
-TrainerHill_Elevator_Movement_2693DF: @ 82693DF
+TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator: @ 82693DF
 	walk_up
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-TrainerHill_Elevator_Movement_2693E4: @ 82693E4
+TrainerHill_Elevator_Movement_PlayerApproachAttendant: @ 82693E4
 	delay_16
 	walk_left
 	step_end
 
-TrainerHill_Elevator_Movement_2693E7: @ 82693E7
+TrainerHill_Elevator_Movement_PlayerExitElevator: @ 82693E7
 	delay_16
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Elevator_Movement_2693EB: @ 82693EB
+TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof: @ 82693EB
 	face_down
 	delay_16
 	step_end
 
-TrainerHill_Elevator_Movement_2693EE: @ 82693EE
+TrainerHill_Elevator_Movement_AttendantFacePlayer: @ 82693EE
 	face_right
 	step_end
 
-TrainerHill_Elevator_Movement_2693F0: @ 82693F0
+TrainerHill_Elevator_Movement_AttendantFaceDown: @ 82693F0
 	face_down
 	step_end
 
diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json
index 42f1daa9d..f581988b6 100644
--- a/data/maps/TrainerHill_Entrance/map.json
+++ b/data/maps/TrainerHill_Entrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2681FD",
+      "script": "TrainerHill_Entrance_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2681EF",
+      "script": "TrainerHill_Entrance_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2683C7",
+      "script": "TrainerHill_Entrance_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2683AC",
+      "script": "TrainerHill_Entrance_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_268391",
+      "script": "TrainerHill_Entrance_EventScript_Man",
       "flag": "0"
     }
   ],
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TRAINER_HILL_IS_ACTIVE",
       "var_value": "0",
-      "script": "TrainerHill_Entrance_EventScript_268229"
+      "script": "TrainerHill_Entrance_EventScript_EntryTrigger"
     }
   ],
   "bg_events": [
@@ -121,7 +121,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "TrainerHill_Entrance_EventScript_268388"
+      "script": "TrainerHill_Entrance_EventScript_Records"
     }
   ]
 }
 \ No newline at end of file
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 3b9fb77a4..909aaaf9f 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -1,9 +1,9 @@
 TrainerHill_Entrance_MapScripts:: @ 82680AC
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_OnReturn
 	map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E
+	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_OnFrame
 	.byte 0
 
 TrainerHill_Entrance_OnTransition: @ 82680C6
@@ -11,58 +11,59 @@ TrainerHill_Entrance_OnTransition: @ 82680C6
 	getplayerxy VAR_TEMP_D, VAR_RESULT
 	end
 
-TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
+@ Unused
+TrainerHill_Entrance_OnWarp: @ 82680CF
 	end
 
-TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
+TrainerHill_Entrance_OnResume: @ 82680D0
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_2680FF
+	compare VAR_RESULT, 0  @ VAR_RESULT always 0 here
+	goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
 	setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_16
+TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_WON
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_Entrance_EventScript_26811A
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_26811A:: @ 826811A
+TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A
 	end
 
-TrainerHill_Entrance_MapScript1_26811B: @ 826811B
+TrainerHill_Entrance_OnReturn: @ 826811B
 	addobject 2
 	addobject 1
 	addobject 5
 	addobject 4
 	end
 
-TrainerHill_Entrance_MapScript1_268128: @ 8268128
+TrainerHill_Entrance_OnLoad: @ 8268128
 	compare VAR_TEMP_D, 17
-	call_if_eq TrainerHill_Entrance_EventScript_268134
+	call_if_eq TrainerHill_Entrance_EventScript_OpenCounterDoor
 	end
 
-TrainerHill_Entrance_EventScript_268134:: @ 8268134
+TrainerHill_Entrance_EventScript_OpenCounterDoor:: @ 8268134
 	setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
 	return
 
-TrainerHill_Entrance_MapScript2_26813E: @ 826813E
-	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182
-	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160
-	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229
-	map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF
+TrainerHill_Entrance_OnFrame: @ 826813E
+	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_ExitChallenge
+	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_ExitElevator
+	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_EntryTrigger
+	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
-TrainerHill_Entrance_EventScript_268160:: @ 8268160
+TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator
 	waitmovement 0
 	setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
 	special DrawWholeMapView
@@ -72,38 +73,36 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268182:: @ 8268182
+TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
 	setvar VAR_TEMP_0, 1
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_2681B5
-	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_2681CA
-	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_2681EE
+	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_ExitChallengeLost
+	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
+	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_EndExitChallenge
 
-TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5
+TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_2681DA
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_PlayerExitChallenge
 
-TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
+TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special HealPlayerParty
 	releaseall
-
-TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
+TrainerHill_Entrance_EventScript_EndExitChallenge:: @ 82681EE
 	end
 
-TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
+TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
 	setvar VAR_0x800B, 2
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -111,128 +110,127 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
 	release
 	end
 
-TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
+TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_26821F
-	msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_268227
-
-TrainerHill_Entrance_EventScript_26821F:: @ 826821F
-	msgbox TrainerHill_Entrance_Text_2687AC, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_268227:: @ 8268227
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerHill_Entrance_EventScript_ThanksForPlaying
+	msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AttendantEnd
+
+TrainerHill_Entrance_EventScript_ThanksForPlaying:: @ 826821F
+	msgbox TrainerHill_Entrance_Text_ThankYouForPlaying, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227
 	release
 	end
 
-TrainerHill_Entrance_EventScript_268229:: @ 8268229
+TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
-	msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_13
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
+	msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	call_if_eq TrainerHill_Entrance_EventScript_26832E
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_8
+	compare VAR_RESULT, FALSE
+	call_if_eq TrainerHill_Entrance_EventScript_SaveGame
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_Entrance_EventScript_268275
-	msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_26827D
-
-TrainerHill_Entrance_EventScript_268275:: @ 8268275
-	msgbox TrainerHill_Entrance_Text_26859E, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_26827D:: @ 826827D
-	message TrainerHill_Entrance_Text_2685F8
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerHill_Entrance_EventScript_AllFloorsUsed
+	msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
+
+TrainerHill_Entrance_EventScript_AllFloorsUsed:: @ 8268275
+	msgbox TrainerHill_Entrance_Text_TrainersInEveryRoom, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
+	message TrainerHill_Entrance_Text_LikeToChallengeTrainers
 	waitmessage
 	multichoice 15, 6, MULTI_YESNOINFO, 0
 	switch VAR_RESULT
-	case 0, TrainerHill_Entrance_EventScript_2682C8
-	case 1, TrainerHill_Entrance_EventScript_268314
-	case 2, TrainerHill_Entrance_EventScript_2682BA
-	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314
+	case 0, TrainerHill_Entrance_EventScript_ChooseChallenge
+	case 1, TrainerHill_Entrance_EventScript_CancelEntry
+	case 2, TrainerHill_Entrance_EventScript_Info
+	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA
-	msgbox TrainerHill_Entrance_Text_2687C3, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_26827D
+TrainerHill_Entrance_EventScript_Info:: @ 82682BA
+	msgbox TrainerHill_Entrance_Text_ExplainTrainerHill, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
 	end
 
-TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
+TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
 	multichoice 13, 2, MULTI_TAG_MATCH_TYPE, 0
 	switch VAR_RESULT
-	case 4, TrainerHill_Entrance_EventScript_268314
-	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314
+	case 4, TrainerHill_Entrance_EventScript_CancelEntry
+	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
 	copyvar VAR_0x8005, VAR_RESULT
 	special CallTrainerHillFunction
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
-	msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_TimeProgessGetSetGo, MSGBOX_DEFAULT
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
 	special CallTrainerHillFunction
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268314:: @ 8268314
+TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
 	setvar VAR_TEMP_5, 0
-	msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_26832E:: @ 826832E
-	msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
+TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
+	msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_5, 1
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_26835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerHill_Entrance_EventScript_SaveFailed
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	return
 
-TrainerHill_Entrance_EventScript_26835C:: @ 826835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_15
+TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_GAME_SAVED
 	special CallTrainerHillFunction
-	goto TrainerHill_Entrance_EventScript_268314
+	goto TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_26836A:: @ 826836A
-	msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_Closed:: @ 826836A
+	msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-TrainerHill_Entrance_Movement_26837F: @ 826837F
+TrainerHill_Entrance_Movement_PlayerFaceAttendant: @ 826837F
 	face_right
 	step_end
 
-TrainerHill_Entrance_Movement_268381: @ 8268381
+TrainerHill_Entrance_Movement_PushPlayerBackFromCounter: @ 8268381
 	walk_down
 	step_end
 
-TrainerHill_Entrance_Movement_268383: @ 8268383
+@ Unused
+TrainerHill_Entrance_Movement_FaceUp: @ 8268383
 	face_up
 	step_end
 
-TrainerHill_Entrance_Movement_268385: @ 8268385
+TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Entrance_EventScript_268388:: @ 8268388
+TrainerHill_Entrance_EventScript_Records:: @ 8268388
 	lockall
 	fadescreen 1
 	special ShowTrainerHillRecords
@@ -240,37 +238,37 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268391:: @ 8268391
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3
-	msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_Man:: @ 8268391
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ManTrainerHillClosed
+	msgbox TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3
-	msgbox TrainerHill_Entrance_Text_268DDA, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_ManTrainerHillClosed:: @ 82683A3
+	msgbox TrainerHill_Entrance_Text_CantWaitToTestTheWaters, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE
-	msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_Girl:: @ 82683AC
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_GirlTrainerHillClosed
+	msgbox TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE
-	msgbox TrainerHill_Entrance_Text_268EDC, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_GirlTrainerHillClosed:: @ 82683BE
+	msgbox TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7
+TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402
-	pokemart TrainerHill_Entrance_Pokemart_2683E8
+	goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ExpandedPokemart
+	pokemart TrainerHill_Entrance_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
+TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -286,14 +284,14 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
 	release
 	end
 
-TrainerHill_Entrance_EventScript_268402:: @ 8268402
-	pokemart TrainerHill_Entrance_Pokemart_268414
+TrainerHill_Entrance_EventScript_ExpandedPokemart:: @ 8268402
+	pokemart TrainerHill_Entrance_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_268414: @ 8268414
+TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
 	.2byte ITEM_FULL_RESTORE
@@ -310,69 +308,69 @@ TrainerHill_Entrance_Pokemart_268414: @ 8268414
 	release
 	end
 
-TrainerHill_Entrance_Text_268430: @ 8268430
+TrainerHill_Entrance_Text_StillGettingReady: @ 8268430
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS.\p"
 	.string "Unfortunately, we're still getting\n"
 	.string "things ready. Please come back later!$"
 
-TrainerHill_Entrance_Text_2684C6: @ 82684C6
+TrainerHill_Entrance_Text_WelcomeToTrainerHill: @ 82684C6
 	.string "Welcome!\p"
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS!$"
 
-TrainerHill_Entrance_Text_26851C: @ 826851C
+TrainerHill_Entrance_Text_SaveGameBeforeEnter: @ 826851C
 	.string "Is this your first visit here?\p"
 	.string "Before you enter, please save\n"
 	.string "your game.$"
 
-TrainerHill_Entrance_Text_268564: @ 8268564
+TrainerHill_Entrance_Text_TrainersUpToFloorX: @ 8268564
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "Up to floor no. {STR_VAR_1}.$"
 
-TrainerHill_Entrance_Text_26859E: @ 826859E
+TrainerHill_Entrance_Text_TrainersInEveryRoom: @ 826859E
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "There appear to be TRAINERS gathered\n"
 	.string "in every room.$"
 
-TrainerHill_Entrance_Text_2685F8: @ 82685F8
+TrainerHill_Entrance_Text_LikeToChallengeTrainers: @ 82685F8
 	.string "Would you like to challenge the\n"
 	.string "waiting TRAINERS?$"
 
-TrainerHill_Entrance_Text_26862A: @ 826862A
+TrainerHill_Entrance_Text_TimeProgessGetSetGo: @ 826862A
 	.string "I will time your progress.\n"
 	.string "Best of luck!\p"
 	.string "On your marks…\p"
 	.string "Get set…\p"
 	.string "Go!$"
 
-TrainerHill_Entrance_Text_26866F: @ 826866F
+TrainerHill_Entrance_Text_PleaseVisitUsAgain: @ 826866F
 	.string "Please do visit us again!$"
 
-TrainerHill_Entrance_Text_268689: @ 8268689
+TrainerHill_Entrance_Text_TooBadTremendousEffort: @ 8268689
 	.string "That was too bad.\p"
 	.string "I think you put in a tremendous\n"
 	.string "effort in your battling.\p"
 	.string "Please come back and try again!$"
 
-TrainerHill_Entrance_Text_2686F4: @ 82686F4
+TrainerHill_Entrance_Text_HopeYouGiveItYourBest: @ 82686F4
 	.string "I hope you give it your best.$"
 
-TrainerHill_Entrance_Text_268712: @ 8268712
+TrainerHill_Entrance_Text_MovedReceptionHereForSwitch: @ 8268712
 	.string "When the TRAINERS switch places,\n"
 	.string "the movement can be hectic.\p"
 	.string "To avoid the stampede, we moved\n"
 	.string "the reception counter here.\p"
 	.string "I'm sorry for the inconvenience.$"
 
-TrainerHill_Entrance_Text_2687AC: @ 82687AC
+TrainerHill_Entrance_Text_ThankYouForPlaying: @ 82687AC
 	.string "Thank you for playing!$"
 
-TrainerHill_Entrance_Text_2687C3: @ 82687C3
+TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
 	.string "Here at the TRAINER HILL, we conduct\n"
 	.string "an event called the Time Attack.\p"
 	.string "It is a race that measures how long\n"
@@ -385,13 +383,14 @@ TrainerHill_Entrance_Text_2687C3: @ 82687C3
 	.string "neither Exp. Points nor money will\l"
 	.string "be awarded.$"
 
-TrainerHill_Entrance_Text_26890D: @ 826890D
+@ Unused
+TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon: @ 826890D
 	.string "Oh, I'm sorry, but you appear to have\n"
 	.string "only one POKéMON with you.\p"
 	.string "You will need at least two POKéMON\n"
 	.string "to enter this event.$"
 
-TrainerHill_Roof_Text_268986: @ 8268986
+TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
 	.string "Hm! Hm!\p"
 	.string "You finally came!\n"
 	.string "Yes, you have arrived!\p"
@@ -407,15 +406,15 @@ TrainerHill_Roof_Text_268986: @ 8268986
 	.string "Anyway, I watched you on your way up.\n"
 	.string "Marvelous battling! Bravo, indeed!$"
 
-TrainerHill_Roof_Text_268AC5: @ 8268AC5
+TrainerHill_Roof_Text_HaveTheMostMarvelousGift: @ 8268AC5
 	.string "For a marvelous someone like you,\n"
 	.string "I have the most marvelous gift!$"
 
-TrainerHill_Roof_Text_268B07: @ 8268B07
+TrainerHill_Roof_Text_FullUpBeBackLaterForThis: @ 8268B07
 	.string "Oh, no, full up with things!\n"
 	.string "You'll be back later for this!$"
 
-TrainerHill_Roof_Text_268B43: @ 8268B43
+TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
 	.string "Oh, hold on here! Did you possibly get\n"
 	.string "here marvelously quickly?\p"
 	.string "How splendid! You needn't have\n"
@@ -423,50 +422,51 @@ TrainerHill_Roof_Text_268B43: @ 8268B43
 	.string "That is so delightful. I'll have the Time\n"
 	.string "Board at the reception updated!$"
 
-TrainerHill_Roof_Text_268C03: @ 8268C03
+TrainerHill_Roof_Text_YouWerentVeryQuick: @ 8268C03
 	.string "But, oh…\n"
 	.string "You weren't very quick getting here.$"
 
-TrainerHill_Roof_Text_268C31: @ 8268C31
+TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
 	.string "Perhaps it would please me more if you\n"
 	.string "arrived zippier next time.\p"
 	.string "Then, I should be pleased to form\n"
 	.string "a tag team with you!\p"
 	.string "Until we meet again, amigo!$"
 
-TrainerHill_Roof_Text_268CC6: @ 8268CC6
+@ Unused
+TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner: @ 8268CC6
 	.string "I had the TRAINER HILL built for but\n"
 	.string "one reason and one only!\p"
 	.string "To find the most suitable partner\n"
 	.string "with whom I may form a tag team!$"
 
-TrainerHill_Entrance_Text_268D47: @ 8268D47
+TrainerHill_Entrance_Text_ChallengeTime: @ 8268D47
 	.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
 
-TrainerHill_Entrance_Text_268D5A: @ 8268D5A
+TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead: @ 8268D5A
 	.string "Who knows what sort of TRAINERS\n"
 	.string "and POKéMON combos are ahead?\p"
 	.string "All I know is that I'll knock aside\n"
 	.string "anyone that stands in my way!$"
 
-TrainerHill_Entrance_Text_268DDA: @ 8268DDA
+TrainerHill_Entrance_Text_CantWaitToTestTheWaters: @ 8268DDA
 	.string "I heard tough TRAINERS come to this\n"
 	.string "TRAINER HILL from all over.\p"
 	.string "I can't wait to test the waters!\p"
 	.string "I'll knock aside anyone that stands\n"
 	.string "in my way!$"
 
-TrainerHill_Entrance_Text_268E6A: @ 8268E6A
+TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop: @ 8268E6A
 	.string "Do you see the Time Board over there?\p"
 	.string "My friends and I are trying to see who\n"
 	.string "can reach the top in the least time.$"
 
-TrainerHill_Entrance_Text_268EDC: @ 8268EDC
+TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen: @ 8268EDC
 	.string "Do you know when they're opening\n"
 	.string "this place up?\p"
 	.string "I'm waiting here to be the first\n"
 	.string "challenger ever!$"
 
-TrainerHill_Elevator_Text_268F3E: @ 8268F3E
+TrainerHill_Elevator_Text_ReturnToReception: @ 8268F3E
 	.string "Would you like to return to\n"
 	.string "the reception counter?$"
diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json
index 8a623028e..280494788 100644
--- a/data/maps/TrainerHill_Roof/map.json
+++ b/data/maps/TrainerHill_Roof/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Roof_EventScript_268FB2",
+      "script": "TrainerHill_Roof_EventScript_Owner",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index f7ced5d07..af4c9ea5a 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -1,70 +1,66 @@
 TrainerHill_Roof_MapScripts:: @ 8268FA7
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
-TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
+TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
 	special CallTrainerHillFunction
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_1
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_OWNER_STATE
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_268FEA
-	case 1, TrainerHill_Roof_EventScript_268FF2
-	case 2, TrainerHill_Roof_EventScript_2690A8
-
-TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
-	msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT
-
-TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_2
+	case 0, TrainerHill_Roof_EventScript_Arrived
+	case 1, TrainerHill_Roof_EventScript_GivePrize
+	case 2, TrainerHill_Roof_EventScript_AlreadyReceivedPrize
+TrainerHill_Roof_EventScript_Arrived:: @ 8268FEA
+	msgbox TrainerHill_Roof_Text_YouFinallyCameBravo, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GIVE_PRIZE
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_269020
-	case 1, TrainerHill_Roof_EventScript_269037
-	case 2, TrainerHill_Roof_EventScript_269054
-
-TrainerHill_Roof_EventScript_269020:: @ 8269020
-	msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT
+	case 0, TrainerHill_Roof_EventScript_ReceivePrize
+	case 1, TrainerHill_Roof_EventScript_NoRoomForPrize
+	case 2, TrainerHill_Roof_EventScript_CheckFinalTime
+TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020
+	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA1
 	message gText_ObtainedTheItem
 	waitfanfare
 	waitmessage
-	goto TrainerHill_Roof_EventScript_269054
+	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_269037:: @ 8269037
-	msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_NoRoomForPrize:: @ 8269037
+	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
-	msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_269054
+	msgbox TrainerHill_Roof_Text_FullUpBeBackLaterForThis, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_269054:: @ 8269054
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_3
+TrainerHill_Roof_EventScript_CheckFinalTime:: @ 8269054
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CHECK_FINAL_TIME
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_269082
-	case 1, TrainerHill_Roof_EventScript_269090
-	case 2, TrainerHill_Roof_EventScript_26909E
-
-TrainerHill_Roof_EventScript_269082:: @ 8269082
-	msgbox TrainerHill_Roof_Text_268B43, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_26909E
+	case 0, TrainerHill_Roof_EventScript_NewRecord
+	case 1, TrainerHill_Roof_EventScript_NoNewRecord
+	case 2, TrainerHill_Roof_EventScript_EndSpeakToOwner
+TrainerHill_Roof_EventScript_NewRecord:: @ 8269082
+	msgbox TrainerHill_Roof_Text_GotHereMarvelouslyQuickly, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_269090:: @ 8269090
-	msgbox TrainerHill_Roof_Text_268C03, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_26909E
+TrainerHill_Roof_EventScript_NoNewRecord:: @ 8269090
+	msgbox TrainerHill_Roof_Text_YouWerentVeryQuick, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_26909E:: @ 826909E
-	msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_EndSpeakToOwner:: @ 826909E
+	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
-TrainerHill_Roof_EventScript_2690A8:: @ 82690A8
-	msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_AlreadyReceivedPrize:: @ 82690A8
+	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
index c42cd362c..4c7b487fb 100644
--- a/data/maps/UnionRoom/map.json
+++ b/data/maps/UnionRoom/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D236",
+      "script": "UnionRoom_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D204",
+      "script": "UnionRoom_EventScript_Player4",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D22C",
+      "script": "UnionRoom_EventScript_Player8",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D222",
+      "script": "UnionRoom_EventScript_Player7",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D218",
+      "script": "UnionRoom_EventScript_Player6",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D20E",
+      "script": "UnionRoom_EventScript_Player5",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D1FA",
+      "script": "UnionRoom_EventScript_Player3",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D1F0",
+      "script": "UnionRoom_EventScript_Player2",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "UnionRoom_EventScript_23D1E6",
+      "script": "UnionRoom_EventScript_Player1",
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
     }
   ],
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index c2f375e0f..eac27fb5c 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,9 +1,9 @@
 UnionRoom_MapScripts:: @ 823D1A6
-	map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1
+	map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
 	.byte 0
 
-UnionRoom_MapScript1_23D1B1: @ 823D1B1
+UnionRoom_OnResume: @ 823D1B1
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
@@ -26,7 +26,7 @@ UnionRoom_MapScript1_23D1B1: @ 823D1B1
 UnionRoom_OnTransition: @ 823D1E5
 	end
 
-UnionRoom_EventScript_23D1E6:: @ 823D1E6
+UnionRoom_EventScript_Player1:: @ 823D1E6
 	lock
 	faceplayer
 	setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnionRoom_EventScript_23D1E6:: @ 823D1E6
 	release
 	end
 
-UnionRoom_EventScript_23D1F0:: @ 823D1F0
+UnionRoom_EventScript_Player2:: @ 823D1F0
 	lock
 	faceplayer
 	setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnionRoom_EventScript_23D1F0:: @ 823D1F0
 	release
 	end
 
-UnionRoom_EventScript_23D1FA:: @ 823D1FA
+UnionRoom_EventScript_Player3:: @ 823D1FA
 	lock
 	faceplayer
 	setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnionRoom_EventScript_23D1FA:: @ 823D1FA
 	release
 	end
 
-UnionRoom_EventScript_23D204:: @ 823D204
+UnionRoom_EventScript_Player4:: @ 823D204
 	lock
 	faceplayer
 	setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnionRoom_EventScript_23D204:: @ 823D204
 	release
 	end
 
-UnionRoom_EventScript_23D20E:: @ 823D20E
+UnionRoom_EventScript_Player5:: @ 823D20E
 	lock
 	faceplayer
 	setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnionRoom_EventScript_23D20E:: @ 823D20E
 	release
 	end
 
-UnionRoom_EventScript_23D218:: @ 823D218
+UnionRoom_EventScript_Player6:: @ 823D218
 	lock
 	faceplayer
 	setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnionRoom_EventScript_23D218:: @ 823D218
 	release
 	end
 
-UnionRoom_EventScript_23D222:: @ 823D222
+UnionRoom_EventScript_Player7:: @ 823D222
 	lock
 	faceplayer
 	setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnionRoom_EventScript_23D222:: @ 823D222
 	release
 	end
 
-UnionRoom_EventScript_23D22C:: @ 823D22C
+UnionRoom_EventScript_Player8:: @ 823D22C
 	lock
 	faceplayer
 	setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnionRoom_EventScript_23D22C:: @ 823D22C
 	release
 	end
 
-UnionRoom_EventScript_23D236:: @ 823D236
+UnionRoom_EventScript_Attendant:: @ 823D236
 	lock
 	faceplayer
 	setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnionRoom_EventScript_23D236:: @ 823D236
 	release
 	end
 
-UnionRoom_EventScript_23D240:: @ 823D240
+UnionRoom_EventScript_Unused:: @ 823D240
 	lockall
 	setvar VAR_RESULT, 10
 	waitstate
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index b2c900e31..e7d7d2fb4 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -41,8 +41,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
 	goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
 
 VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
-	setvar VAR_0x8004, 3
-	special sub_8161F74
+	setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
+	special CallBattleTowerFunc
 	addobject 2
 	applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
 	waitmovement 0
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index cc4b5b137..4035bc3f3 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -537,7 +537,7 @@
     "BattleFrontier_BattlePikeRandomRoom3",
     "BattleFrontier_RankingHall",
     "BattleFrontier_Lounge1",
-    "BattleFrontier_BattlePointExchangeServiceCorner",
+    "BattleFrontier_ExchangeServiceCorner",
     "BattleFrontier_Lounge2",
     "BattleFrontier_Lounge3",
     "BattleFrontier_Lounge4",
author	GriffinR <griffin.richards@comcast.net>	2019-11-18 12:45:56 -0500
committer	GriffinR <griffin.richards@comcast.net>	2019-11-18 12:47:10 -0500
commit	a486c8affd35bec6e3b71c8c1bfbaba2dc94ec4b (patch)
tree	062ac919817dbfa142929167da4e131c2dc58d49 /data/maps
parent	fc3783b7395b25d290ec650d79fbdc80518046cd (diff)
parent	5393b42f7ccfd10986a9a253e29ce54fae847a78 (diff)