Document Battle Frontier lounges

19 files changed, 743 insertions, 736 deletions

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..47cb51ce7 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_RewardBet20
+	msgbox BattleFrontier_Lounge3_Text_ObtainedBattlePoints, 9
 	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_RewardBet20:: @ 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/include/constants/flags.h b/include/constants/flags.h
index 79947caf5..f72adf50a 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -363,7 +363,7 @@
 #define FLAG_MET_BATTLE_FRONTIER_MANIAC      0x154
 #define FLAG_ENTERED_CONTEST                 0x155
 #define FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN  0x156
-#define FLAG_MET_BATTLE_FRONTIER_BETTOR      0x157
+#define FLAG_MET_BATTLE_FRONTIER_GAMBLER     0x157
 #define FLAG_ENABLE_MR_STONE_POKENAV         0x158
 #define FLAG_NURSE_MENTIONS_GOLD_CARD        0x159
 #define FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR  0x15A
diff --git a/include/strings.h b/include/strings.h
index f135944bd..34cbfb887 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -583,6 +583,8 @@ extern const u8 gText_BigGirl[];
 extern const u8 gText_Son[];
 extern const u8 gText_Daughter[];
 
+// Multichoice strings
+extern const u8 gText_Exit[];
 extern const u8 gText_1F[];
 extern const u8 gText_2F[];
 extern const u8 gText_3F[];
@@ -601,8 +603,6 @@ extern const u8 gText_B4F[];
 extern const u8 gText_Rooftop[];
 extern const u8 gText_ElevatorNowOn[];
 
-extern const u8 gText_Exit[];
-
 extern const u8 gText_BlueFlute[];
 extern const u8 gText_YellowFlute[];
 extern const u8 gText_RedFlute[];
@@ -610,7 +610,6 @@ extern const u8 gText_WhiteFlute[];
 extern const u8 gText_BlackFlute[];
 extern const u8 gText_PrettyChair[];
 extern const u8 gText_PrettyDesk[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_0Pts[];
 extern const u8 gText_10Pts[];
@@ -635,14 +634,12 @@ extern const u8 gText_DittoDoll48BP[];
 extern const u8 gText_CyndaquilDoll80BP[];
 extern const u8 gText_ChikoritaDoll80BP[];
 extern const u8 gText_TotodileDoll80BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_LaprasDoll128BP[];
 extern const u8 gText_SnorlaxDoll128BP[];
 extern const u8 gText_VenusaurDoll256BP[];
 extern const u8 gText_CharizardDoll256BP[];
 extern const u8 gText_BlastoiseDoll256BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_Protein1BP[];
 extern const u8 gText_Calcium1BP[];
@@ -650,7 +647,6 @@ extern const u8 gText_Iron1BP[];
 extern const u8 gText_Zinc1BP[];
 extern const u8 gText_Carbos1BP[];
 extern const u8 gText_HpUp1BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_Leftovers48BP[];
 extern const u8 gText_WhiteHerb48BP[];
@@ -661,7 +657,6 @@ extern const u8 gText_ChoiceBand64BP[];
 extern const u8 gText_KingsRock64BP[];
 extern const u8 gText_FocusBand64BP[];
 extern const u8 gText_ScopeLens64BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_EnergyPowder50[];
 extern const u8 gText_EnergyRoot80[];
@@ -674,7 +669,6 @@ extern const u8 gText_Calcium1000[];
 extern const u8 gText_Zinc1000[];
 extern const u8 gText_HPUp1000[];
 extern const u8 gText_PPUp3000[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_BattleTower2[];
 extern const u8 gText_BattleDome[];
@@ -685,8 +679,8 @@ extern const u8 gText_BattlePike[];
 extern const u8 gText_BattlePyramid[];
 extern const u8 gText_RankingHall[];
 extern const u8 gText_ExchangeService[];
-extern const u8 gText_Exit[];
 
+// Battle Frontier Move Tutors
 extern const u8 gText_Softboiled16BP[];
 extern const u8 gText_SeismicToss24BP[];
 extern const u8 gText_DreamEater24BP[];
@@ -697,8 +691,6 @@ extern const u8 gText_RockSlide48BP[];
 extern const u8 gText_Counter48BP[];
 extern const u8 gText_ThunderWave48BP[];
 extern const u8 gText_SwordsDance48BP[];
-extern const u8 gText_Exit[];
-
 extern const u8 gText_DefenseCurl16BP[];
 extern const u8 gText_Snore24BP[];
 extern const u8 gText_MudSlap24BP[];
@@ -709,7 +701,6 @@ extern const u8 gText_PsychUp48BP[];
 extern const u8 gText_IcePunch48BP[];
 extern const u8 gText_ThunderPunch48BP[];
 extern const u8 gText_FirePunch48BP[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_SlateportCity[];
 extern const u8 gText_BattleFrontier[];
@@ -717,7 +708,6 @@ extern const u8 gText_SouthernIsland[];
 extern const u8 gText_NavelRock[];
 extern const u8 gText_BirthIsland[];
 extern const u8 gText_FarawayIsland[];
-extern const u8 gText_Exit[];
 
 extern const u8 gText_BattleTrainers[];
 extern const u8 gText_BattleBasics[];
@@ -725,38 +715,34 @@ extern const u8 gText_PokemonNature[];
 extern const u8 gText_PokemonMoves[];
 extern const u8 gText_Underpowered[];
 extern const u8 gText_WhenInDanger[];
-extern const u8 gText_Exit[];
 
-extern const u8 BattleFrontier_Lounge2_Text_260971[];
-extern const u8 BattleFrontier_Lounge2_Text_260A1E[];
-extern const u8 BattleFrontier_Lounge2_Text_260AE7[];
-extern const u8 BattleFrontier_Lounge2_Text_2619AC[];
-extern const u8 BattleFrontier_Lounge2_Text_261A91[];
-extern const u8 BattleFrontier_Lounge2_Text_261B0C[];
-extern const u8 BattleFrontier_Lounge2_Text_261B95[];
-extern const u8 BattleFrontier_Lounge2_Text_261B95[];
-extern const u8 BattleFrontier_Lounge2_Text_261B95[];
-extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
-extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
-extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
-extern const u8 BattleFrontier_Lounge2_Text_260BC4[];
-extern const u8 BattleFrontier_Lounge2_Text_260C6D[];
-extern const u8 BattleFrontier_Lounge2_Text_260D3A[];
-extern const u8 BattleFrontier_Lounge2_Text_260E1E[];
-extern const u8 BattleFrontier_Lounge2_Text_260EC7[];
-extern const u8 BattleFrontier_Lounge2_Text_260F74[];
-extern const u8 BattleFrontier_Lounge2_Text_2614E6[];
-extern const u8 BattleFrontier_Lounge2_Text_261591[];
-extern const u8 BattleFrontier_Lounge2_Text_26166F[];
-extern const u8 BattleFrontier_Lounge2_Text_261282[];
-extern const u8 BattleFrontier_Lounge2_Text_261329[];
-extern const u8 BattleFrontier_Lounge2_Text_261403[];
-extern const u8 BattleFrontier_Lounge2_Text_261026[];
-extern const u8 BattleFrontier_Lounge2_Text_2610CC[];
-extern const u8 BattleFrontier_Lounge2_Text_261194[];
-extern const u8 BattleFrontier_Lounge2_Text_26174D[];
-extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
-extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
+// Battle Frontier Maniac
+extern const u8 BattleFrontier_Lounge2_Text_SalonMaidenIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_SalonMaidenSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_SalonMaidenGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_DoubleBattleAdvice1[];
+extern const u8 BattleFrontier_Lounge2_Text_DoubleBattleAdvice2[];
+extern const u8 BattleFrontier_Lounge2_Text_DoubleBattleAdvice3[];
+extern const u8 BattleFrontier_Lounge2_Text_MultiBattleAdvice[];
+extern const u8 BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice[];
+extern const u8 BattleFrontier_Lounge2_Text_DomeAceIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_DomeAceSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_DomeAceGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_FactoryHeadIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_FactoryHeadSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_FactoryHeadGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PalaceMavenIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_PalaceMavenSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PalaceMavenGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_ArenaTycoonIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PikeQueenIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_PikeQueenSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PikeQueenGoldMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PyramidKingIsThere[];
+extern const u8 BattleFrontier_Lounge2_Text_PyramidKingSilverMons[];
+extern const u8 BattleFrontier_Lounge2_Text_PyramidKingGoldMons[];
 
 // Battle Frontier Nature Girl
 extern const u8 BattleFrontier_Lounge5_Text_NatureGirlHardy[];
@@ -782,31 +768,31 @@ extern const u8 BattleFrontier_Lounge5_Text_NatureGirlGentle[];
 extern const u8 BattleFrontier_Lounge5_Text_NatureGirlSassy[];
 extern const u8 BattleFrontier_Lounge5_Text_NatureGirlCareful[];
 
-extern const u8 BattleFrontier_Lounge3_Text_262261[];
-extern const u8 BattleFrontier_Lounge3_Text_26230D[];
-extern const u8 BattleFrontier_Lounge3_Text_2623B9[];
-extern const u8 BattleFrontier_Lounge3_Text_262464[];
-extern const u8 BattleFrontier_Lounge3_Text_26250E[];
-extern const u8 BattleFrontier_Lounge3_Text_2625B8[];
-extern const u8 BattleFrontier_Lounge3_Text_26266A[];
-extern const u8 BattleFrontier_Lounge3_Text_26271C[];
-extern const u8 BattleFrontier_Lounge3_Text_2627C9[];
-extern const u8 BattleFrontier_Lounge3_Text_262876[];
-extern const u8 BattleFrontier_Lounge3_Text_26291A[];
-extern const u8 BattleFrontier_Lounge3_Text_2629BC[];
-
-extern const u8 BattleFrontier_Lounge3_Text_262C04[];
-extern const u8 BattleFrontier_Lounge3_Text_262C90[];
-extern const u8 BattleFrontier_Lounge3_Text_262D1C[];
-extern const u8 BattleFrontier_Lounge3_Text_262DA7[];
-extern const u8 BattleFrontier_Lounge3_Text_262E34[];
-extern const u8 BattleFrontier_Lounge3_Text_262EC1[];
-extern const u8 BattleFrontier_Lounge3_Text_262F56[];
-extern const u8 BattleFrontier_Lounge3_Text_262FEB[];
-extern const u8 BattleFrontier_Lounge3_Text_263078[];
-extern const u8 BattleFrontier_Lounge3_Text_263105[];
-extern const u8 BattleFrontier_Lounge3_Text_26318C[];
-extern const u8 BattleFrontier_Lounge3_Text_263211[];
+// Battle Frontier Gambler
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattleArena[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePike[];
+extern const u8 BattleFrontier_Lounge3_Text_ChallengeBattlePyramid[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleTowerSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleTowerDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleTowerMulti[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleDomeSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleDomeDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleFactorySingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattleArena[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePike[];
+extern const u8 BattleFrontier_Lounge3_Text_GetToBattlePyramid[];
 
 extern const u8 gText_BP[];
 
@@ -840,27 +826,27 @@ extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8[];
 extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2[];
 extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260613[];
 
-extern const u8 BattleFrontier_Lounge7_Text_265E30[];
-extern const u8 BattleFrontier_Lounge7_Text_265E5B[];
-extern const u8 BattleFrontier_Lounge7_Text_265E8A[];
-extern const u8 BattleFrontier_Lounge7_Text_265EC0[];
-extern const u8 BattleFrontier_Lounge7_Text_265EED[];
-extern const u8 BattleFrontier_Lounge7_Text_265F1C[];
-extern const u8 BattleFrontier_Lounge7_Text_265F47[];
-extern const u8 BattleFrontier_Lounge7_Text_265F77[];
-extern const u8 BattleFrontier_Lounge7_Text_265FAA[];
-extern const u8 BattleFrontier_Lounge7_Text_265FDD[];
-
-extern const u8 BattleFrontier_Lounge7_Text_26600A[];
-extern const u8 BattleFrontier_Lounge7_Text_26603E[];
-extern const u8 BattleFrontier_Lounge7_Text_266070[];
-extern const u8 BattleFrontier_Lounge7_Text_2660A6[];
-extern const u8 BattleFrontier_Lounge7_Text_2660D0[];
-extern const u8 BattleFrontier_Lounge7_Text_2660FF[];
-extern const u8 BattleFrontier_Lounge7_Text_26612D[];
-extern const u8 BattleFrontier_Lounge7_Text_26615F[];
-extern const u8 BattleFrontier_Lounge7_Text_266185[];
-extern const u8 BattleFrontier_Lounge7_Text_2661B5[];
+// Battle Frontier Move Tutors
+extern const u8 BattleFrontier_Lounge7_Text_SoftboiledDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SeismicTossDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_DreamEaterDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_MegaPunchDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_MegaKickDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_BodySlamDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_RockSlideDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_CounterDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_ThunderWaveDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SwordsDanceDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_DefenseCurlDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SnoreDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_MudSlapDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_SwiftDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_IcyWindDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_EndureDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_PsychUpDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_IcePunchDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_ThunderPunchDesc[];
+extern const u8 BattleFrontier_Lounge7_Text_FirePunchDesc[];
 
 extern const u8 gText_YourPartnerHasRetired[];
 
diff --git a/src/field_specials.c b/src/field_specials.c
index 6221071d0..6fe59d628 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -2083,63 +2083,63 @@ void ShowFrontierManiacMessage(void)
     {
         [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES] =
         { 
-            BattleFrontier_Lounge2_Text_260971, 
-            BattleFrontier_Lounge2_Text_260A1E, 
-            BattleFrontier_Lounge2_Text_260AE7 
+            BattleFrontier_Lounge2_Text_SalonMaidenIsThere, 
+            BattleFrontier_Lounge2_Text_SalonMaidenSilverMons, 
+            BattleFrontier_Lounge2_Text_SalonMaidenGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES] =
         { 
-            BattleFrontier_Lounge2_Text_2619AC, 
-            BattleFrontier_Lounge2_Text_261A91, 
-            BattleFrontier_Lounge2_Text_261B0C 
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice1, 
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice2, 
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice3 
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS] = 
         { 
-            BattleFrontier_Lounge2_Text_261B95, 
-            BattleFrontier_Lounge2_Text_261B95, 
-            BattleFrontier_Lounge2_Text_261B95 
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice 
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS] =
         { 
-            BattleFrontier_Lounge2_Text_261C1A, 
-            BattleFrontier_Lounge2_Text_261C1A, 
-            BattleFrontier_Lounge2_Text_261C1A 
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice 
         },
         [FRONTIER_MANIAC_BATTLE_DOME] =
         { 
-            BattleFrontier_Lounge2_Text_260BC4, 
-            BattleFrontier_Lounge2_Text_260C6D, 
-            BattleFrontier_Lounge2_Text_260D3A 
+            BattleFrontier_Lounge2_Text_DomeAceIsThere, 
+            BattleFrontier_Lounge2_Text_DomeAceSilverMons, 
+            BattleFrontier_Lounge2_Text_DomeAceGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_FACTORY] =
         { 
-            BattleFrontier_Lounge2_Text_260E1E, 
-            BattleFrontier_Lounge2_Text_260EC7, 
-            BattleFrontier_Lounge2_Text_260F74 
+            BattleFrontier_Lounge2_Text_FactoryHeadIsThere, 
+            BattleFrontier_Lounge2_Text_FactoryHeadSilverMons, 
+            BattleFrontier_Lounge2_Text_FactoryHeadGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_PALACE] =
         { 
-            BattleFrontier_Lounge2_Text_2614E6, 
-            BattleFrontier_Lounge2_Text_261591, 
-            BattleFrontier_Lounge2_Text_26166F 
+            BattleFrontier_Lounge2_Text_PalaceMavenIsThere, 
+            BattleFrontier_Lounge2_Text_PalaceMavenSilverMons, 
+            BattleFrontier_Lounge2_Text_PalaceMavenGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_ARENA] =
         { 
-            BattleFrontier_Lounge2_Text_261282, 
-            BattleFrontier_Lounge2_Text_261329, 
-            BattleFrontier_Lounge2_Text_261403 
+            BattleFrontier_Lounge2_Text_ArenaTycoonIsThere, 
+            BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons, 
+            BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_PIKE] = 
         { 
-            BattleFrontier_Lounge2_Text_261026, 
-            BattleFrontier_Lounge2_Text_2610CC, 
-            BattleFrontier_Lounge2_Text_261194 
+            BattleFrontier_Lounge2_Text_PikeQueenIsThere, 
+            BattleFrontier_Lounge2_Text_PikeQueenSilverMons, 
+            BattleFrontier_Lounge2_Text_PikeQueenGoldMons 
         },
         [FRONTIER_MANIAC_BATTLE_PYRAMID] =
         { 
-            BattleFrontier_Lounge2_Text_26174D, 
-            BattleFrontier_Lounge2_Text_2617F9, 
-            BattleFrontier_Lounge2_Text_2618C4 
+            BattleFrontier_Lounge2_Text_PyramidKingIsThere, 
+            BattleFrontier_Lounge2_Text_PyramidKingSilverMons, 
+            BattleFrontier_Lounge2_Text_PyramidKingGoldMons 
         },
     };
 
@@ -2904,18 +2904,18 @@ void ShowFrontierGamblerLookingMessage(void)
 {
     static const u8 *const sFrontierGamblerLookingMessages[] = 
     {
-        BattleFrontier_Lounge3_Text_262261,
-        BattleFrontier_Lounge3_Text_26230D,
-        BattleFrontier_Lounge3_Text_2623B9,
-        BattleFrontier_Lounge3_Text_262464,
-        BattleFrontier_Lounge3_Text_26250E,
-        BattleFrontier_Lounge3_Text_2625B8,
-        BattleFrontier_Lounge3_Text_26266A,
-        BattleFrontier_Lounge3_Text_26271C,
-        BattleFrontier_Lounge3_Text_2627C9,
-        BattleFrontier_Lounge3_Text_262876,
-        BattleFrontier_Lounge3_Text_26291A,
-        BattleFrontier_Lounge3_Text_2629BC,
+        BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti,
+        BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble,
+        BattleFrontier_Lounge3_Text_ChallengeBattleArena,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePike,
+        BattleFrontier_Lounge3_Text_ChallengeBattlePyramid,
     };
 
     u16 challenge = VarGet(VAR_FRONTIER_GAMBLER_CHALLENGE);
@@ -2927,18 +2927,18 @@ void ShowFrontierGamblerGoMessage(void)
 {
     static const u8 *const sFrontierGamblerGoMessages[] = 
     {
-        BattleFrontier_Lounge3_Text_262C04,
-        BattleFrontier_Lounge3_Text_262C90,
-        BattleFrontier_Lounge3_Text_262D1C,
-        BattleFrontier_Lounge3_Text_262DA7,
-        BattleFrontier_Lounge3_Text_262E34,
-        BattleFrontier_Lounge3_Text_262EC1,
-        BattleFrontier_Lounge3_Text_262F56,
-        BattleFrontier_Lounge3_Text_262FEB,
-        BattleFrontier_Lounge3_Text_263078,
-        BattleFrontier_Lounge3_Text_263105,
-        BattleFrontier_Lounge3_Text_26318C,
-        BattleFrontier_Lounge3_Text_263211,
+        BattleFrontier_Lounge3_Text_GetToBattleTowerSingle,
+        BattleFrontier_Lounge3_Text_GetToBattleTowerDouble,
+        BattleFrontier_Lounge3_Text_GetToBattleTowerMulti,
+        BattleFrontier_Lounge3_Text_GetToBattleDomeSingle,
+        BattleFrontier_Lounge3_Text_GetToBattleDomeDouble,
+        BattleFrontier_Lounge3_Text_GetToBattleFactorySingle,
+        BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble,
+        BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle,
+        BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble,
+        BattleFrontier_Lounge3_Text_GetToBattleArena,
+        BattleFrontier_Lounge3_Text_GetToBattlePike,
+        BattleFrontier_Lounge3_Text_GetToBattlePyramid,
     };
 
     ShowFieldMessage(sFrontierGamblerGoMessages[VarGet(VAR_FRONTIER_GAMBLER_SET_CHALLENGE)]);
@@ -3213,31 +3213,31 @@ static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection)
 {
     static const u8 *const sBattleFrontier_TutorMoveDescriptions1[] = 
     {
-        BattleFrontier_Lounge7_Text_265E30,
-        BattleFrontier_Lounge7_Text_265E5B,
-        BattleFrontier_Lounge7_Text_265E8A,
-        BattleFrontier_Lounge7_Text_265EC0,
-        BattleFrontier_Lounge7_Text_265EED,
-        BattleFrontier_Lounge7_Text_265F1C,
-        BattleFrontier_Lounge7_Text_265F47,
-        BattleFrontier_Lounge7_Text_265F77,
-        BattleFrontier_Lounge7_Text_265FAA,
-        BattleFrontier_Lounge7_Text_265FDD,
+        BattleFrontier_Lounge7_Text_SoftboiledDesc,
+        BattleFrontier_Lounge7_Text_SeismicTossDesc,
+        BattleFrontier_Lounge7_Text_DreamEaterDesc,
+        BattleFrontier_Lounge7_Text_MegaPunchDesc,
+        BattleFrontier_Lounge7_Text_MegaKickDesc,
+        BattleFrontier_Lounge7_Text_BodySlamDesc,
+        BattleFrontier_Lounge7_Text_RockSlideDesc,
+        BattleFrontier_Lounge7_Text_CounterDesc,
+        BattleFrontier_Lounge7_Text_ThunderWaveDesc,
+        BattleFrontier_Lounge7_Text_SwordsDanceDesc,
         gText_Exit,
     };
 
     static const u8 *const sBattleFrontier_TutorMoveDescriptions2[] = 
     {
-        BattleFrontier_Lounge7_Text_26600A,
-        BattleFrontier_Lounge7_Text_26603E,
-        BattleFrontier_Lounge7_Text_266070,
-        BattleFrontier_Lounge7_Text_2660A6,
-        BattleFrontier_Lounge7_Text_2660D0,
-        BattleFrontier_Lounge7_Text_2660FF,
-        BattleFrontier_Lounge7_Text_26612D,
-        BattleFrontier_Lounge7_Text_26615F,
-        BattleFrontier_Lounge7_Text_266185,
-        BattleFrontier_Lounge7_Text_2661B5,
+        BattleFrontier_Lounge7_Text_DefenseCurlDesc,
+        BattleFrontier_Lounge7_Text_SnoreDesc,
+        BattleFrontier_Lounge7_Text_MudSlapDesc,
+        BattleFrontier_Lounge7_Text_SwiftDesc,
+        BattleFrontier_Lounge7_Text_IcyWindDesc,
+        BattleFrontier_Lounge7_Text_EndureDesc,
+        BattleFrontier_Lounge7_Text_PsychUpDesc,
+        BattleFrontier_Lounge7_Text_IcePunchDesc,
+        BattleFrontier_Lounge7_Text_ThunderPunchDesc,
+        BattleFrontier_Lounge7_Text_FirePunchDesc,
         gText_Exit,
     };