Document Ranking Hall scripts

7 files changed, 144 insertions, 143 deletions

diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json
index af28ecea6..f26e03e41 100644
--- a/data/maps/BattleFrontier_RankingHall/map.json
+++ b/data/maps/BattleFrontier_RankingHall/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E52F",
+      "script": "BattleFrontier_RankingHall_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E54A",
+      "script": "BattleFrontier_RankingHall_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_RankingHall_EventScript_25E573",
+      "script": "BattleFrontier_RankingHall_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -78,7 +78,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4AA"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerSinglesRecords"
     },
     {
       "type": "sign",
@@ -86,7 +86,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4B6"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerDoublesRecords"
     },
     {
       "type": "sign",
@@ -94,7 +94,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4C2"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerMultisRecords"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4CE"
+      "script": "BattleFrontier_RankingHall_EventScript_TowerLinkRecords"
     },
     {
       "type": "sign",
@@ -110,7 +110,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4DA"
+      "script": "BattleFrontier_RankingHall_EventScript_ArenaRecords"
     },
     {
       "type": "sign",
@@ -118,7 +118,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4E6"
+      "script": "BattleFrontier_RankingHall_EventScript_PalaceRecords"
     },
     {
       "type": "sign",
@@ -126,7 +126,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4F2"
+      "script": "BattleFrontier_RankingHall_EventScript_FactoryRecords"
     },
     {
       "type": "sign",
@@ -134,7 +134,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E4FE"
+      "script": "BattleFrontier_RankingHall_EventScript_DomeRecords"
     },
     {
       "type": "sign",
@@ -142,7 +142,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E50A"
+      "script": "BattleFrontier_RankingHall_EventScript_PikeRecords"
     },
     {
       "type": "sign",
@@ -150,7 +150,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "BattleFrontier_RankingHall_EventScript_25E516"
+      "script": "BattleFrontier_RankingHall_EventScript_PyramidRecords"
     },
     {
       "type": "sign",
@@ -158,7 +158,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_RankingHall_EventScript_25E538"
+      "script": "BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign"
     },
     {
       "type": "sign",
@@ -166,7 +166,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_RankingHall_EventScript_25E541"
+      "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc
index 86682522c..e8415c828 100644
--- a/data/maps/BattleFrontier_RankingHall/scripts.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
@@ -1,67 +1,67 @@
 BattleFrontier_RankingHall_MapScripts:: @ 825E4A9
 	.byte 0
 
-BattleFrontier_RankingHall_EventScript_25E4AA:: @ 825E4AA
+BattleFrontier_RankingHall_EventScript_TowerSinglesRecords:: @ 825E4AA
 	lockall
-	setvar VAR_0x8005, 0
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4B6:: @ 825E4B6
+BattleFrontier_RankingHall_EventScript_TowerDoublesRecords:: @ 825E4B6
 	lockall
-	setvar VAR_0x8005, 1
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4C2:: @ 825E4C2
+BattleFrontier_RankingHall_EventScript_TowerMultisRecords:: @ 825E4C2
 	lockall
-	setvar VAR_0x8005, 2
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4CE:: @ 825E4CE
+BattleFrontier_RankingHall_EventScript_TowerLinkRecords:: @ 825E4CE
 	lockall
-	setvar VAR_0x8005, 9
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4DA:: @ 825E4DA
+BattleFrontier_RankingHall_EventScript_ArenaRecords:: @ 825E4DA
 	lockall
-	setvar VAR_0x8005, 5
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4E6:: @ 825E4E6
+BattleFrontier_RankingHall_EventScript_PalaceRecords:: @ 825E4E6
 	lockall
-	setvar VAR_0x8005, 4
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4F2:: @ 825E4F2
+BattleFrontier_RankingHall_EventScript_FactoryRecords:: @ 825E4F2
 	lockall
-	setvar VAR_0x8005, 6
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E4FE:: @ 825E4FE
+BattleFrontier_RankingHall_EventScript_DomeRecords:: @ 825E4FE
 	lockall
-	setvar VAR_0x8005, 3
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E50A:: @ 825E50A
+BattleFrontier_RankingHall_EventScript_PikeRecords:: @ 825E50A
 	lockall
-	setvar VAR_0x8005, 7
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516
+BattleFrontier_RankingHall_EventScript_PyramidRecords:: @ 825E516
 	lockall
-	setvar VAR_0x8005, 8
-	goto BattleFrontier_RankingHall_EventScript_25E522
+	setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID
+	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
+BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
 	special ShowRankingHallRecordsWindow
 	waitbuttonpress
 	special ScrollRankingHallRecordsWindow
@@ -70,64 +70,64 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
 	releaseall
 	end
 
-BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F
-	msgbox BattleFrontier_RankingHall_Text_25E57C, MSGBOX_NPC
+BattleFrontier_RankingHall_EventScript_Attendant:: @ 825E52F
+	msgbox BattleFrontier_RankingHall_Text_ExplainRankingHall, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538
-	msgbox BattleFrontier_RankingHall_Text_25E5F9, MSGBOX_SIGN
+BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign:: @ 825E538
+	msgbox BattleFrontier_RankingHall_Text_DomePikeFactoryRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541
-	msgbox BattleFrontier_RankingHall_Text_25E62E, MSGBOX_SIGN
+BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn:: @ 825E541
+	msgbox BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A
+BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
 	lock
 	faceplayer
-	msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO
+	msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq BattleFrontier_RankingHall_EventScript_25E569
-	msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT
+	goto_if_eq BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList
+	msgbox BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569
-	msgbox BattleFrontier_RankingHall_Text_25E685, MSGBOX_DEFAULT
+BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList:: @ 825E569
+	msgbox BattleFrontier_RankingHall_Text_WowThatsSuper, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573
-	msgbox BattleFrontier_RankingHall_Text_25E715, MSGBOX_NPC
+BattleFrontier_RankingHall_EventScript_Boy:: @ 825E573
+	msgbox BattleFrontier_RankingHall_Text_MyNamesNotUpThere, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_Text_25E57C: @ 825E57C
+BattleFrontier_RankingHall_Text_ExplainRankingHall: @ 825E57C
 	.string "This is the RANKING HALL.\p"
 	.string "This is where we recognize the immortal\n"
 	.string "TRAINERS who left great records in\l"
 	.string "BATTLE FRONTIER events.$"
 
-BattleFrontier_RankingHall_Text_25E5F9: @ 825E5F9
+BattleFrontier_RankingHall_Text_DomePikeFactoryRecords: @ 825E5F9
 	.string "BATTLE DOME, BATTLE PIKE,\n"
 	.string "and BATTLE FACTORY Records$"
 
-BattleFrontier_RankingHall_Text_25E62E: @ 825E62E
+BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords: @ 825E62E
 	.string "BATTLE PALACE, BATTLE ARENA,\n"
 	.string "and BATTLE PYRAMID Records$"
 
-BattleFrontier_RankingHall_Text_25E666: @ 825E666
+BattleFrontier_RankingHall_Text_IsYourNameOnThisList: @ 825E666
 	.string "Hi, is your name on this list?$"
 
-BattleFrontier_RankingHall_Text_25E685: @ 825E685
+BattleFrontier_RankingHall_Text_WowThatsSuper: @ 825E685
 	.string "Wow, that's super!\n"
 	.string "I'll have to try harder, too!$"
 
-BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6
+BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName: @ 825E6B6
 	.string "Oh, is that right?\p"
 	.string "If you saw your friend's name up here,\n"
 	.string "I bet it would make you work harder!$"
 
-BattleFrontier_RankingHall_Text_25E715: @ 825E715
+BattleFrontier_RankingHall_Text_MyNamesNotUpThere: @ 825E715
 	.string "Hmm…\n"
 	.string "My name's not up there…\p"
 	.string "Well, it's only natural since I haven't\n"
diff --git a/include/strings.h b/include/strings.h
index 080417b6e..7a477e166 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1312,11 +1312,11 @@ extern const u8 gText_Are2[];
 extern const u8 gText_123Dot[][3];
 
 // Frontier util.
-extern const u8 gUnknown_085ED164[];
-extern const u8 gUnknown_085ED170[];
-extern const u8 gUnknown_085ED17C[];
-extern const u8 gUnknown_085ED188[];
-extern const u8 gUnknown_085ED190[];
+extern const u8 gText_FacilitySingle[];
+extern const u8 gText_FacilityDouble[];
+extern const u8 gText_FacilityMulti[];
+extern const u8 gText_FacilityLink[];
+extern const u8 gText_Facility[];
 
 extern const u8 gText_RecordsLv50[];
 extern const u8 gText_RecordsOpenLevel[];
diff --git a/src/battle_tower.c b/src/battle_tower.c
index a6e816b7d..9c838a473 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -24,6 +24,7 @@
 #include "tv.h"
 #include "battle_factory.h"
 #include "constants/battle_frontier.h"
+#include "constants/battle_tower.h"
 #include "constants/items.h"
 #include "constants/trainers.h"
 #include "constants/event_objects.h"
@@ -1051,24 +1052,24 @@ struct
 
 #include "data/battle_frontier/battle_tent.h"
 
-static void (* const gUnknown_085DF96C[])(void) =
-{
-    sub_8161F94,
-    sub_8162054,
-    sub_81620F4,
-    ChooseNextBattleTowerTrainer,
-    sub_81621C0,
-    AwardBattleTowerRibbons,
-    SaveBattleTowerProgress,
-    sub_8163914,
-    nullsub_61,
-    SpriteCB_Null6,
-    sub_81642A0,
-    sub_8164828,
-    sub_8164B74,
-    sub_8164DCC,
-    sub_8164DE4,
-    sub_8164E04,
+static void (* const sBattleTowerFuncs[])(void) =
+{
+    [BATTLE_TOWER_FUNC_0] = sub_8161F94,
+    [BATTLE_TOWER_FUNC_1] = sub_8162054,
+    [BATTLE_TOWER_FUNC_2] = sub_81620F4,
+    [BATTLE_TOWER_FUNC_CHOOSE_TRAINER] = ChooseNextBattleTowerTrainer,
+    [BATTLE_TOWER_FUNC_4] = sub_81621C0,
+    [BATTLE_TOWER_FUNC_GIVE_RIBBONS] = AwardBattleTowerRibbons,
+    [BATTLE_TOWER_FUNC_SAVE] = SaveBattleTowerProgress,
+    [BATTLE_TOWER_FUNC_7] = sub_8163914,
+    [BATTLE_TOWER_FUNC_NOP] = nullsub_61,
+    [BATTLE_TOWER_FUNC_NOP_SPRITE] = SpriteCB_Null6,
+    [BATTLE_TOWER_FUNC_10] = sub_81642A0,
+    [BATTLE_TOWER_FUNC_11] = sub_8164828,
+    [BATTLE_TOWER_FUNC_12] = sub_8164B74,
+    [BATTLE_TOWER_FUNC_13] = sub_8164DCC,
+    [BATTLE_TOWER_FUNC_14] = sub_8164DE4,
+    [BATTLE_TOWER_FUNC_15] = sub_8164E04,
 };
 
 static const u32 gUnknown_085DF9AC[][2] =
@@ -1145,9 +1146,9 @@ static const u16 gUnknown_085DFA52[] =
 };
 
 // code
-void sub_8161F74(void)
+void CallBattleTowerFunc(void)
 {
-    gUnknown_085DF96C[gSpecialVar_0x8004]();
+    sBattleTowerFuncs[gSpecialVar_0x8004]();
 }
 
 static void sub_8161F94(void)
diff --git a/src/field_specials.c b/src/field_specials.c
index 6fe59d628..57e0d087a 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -2099,7 +2099,7 @@ void ShowFrontierManiacMessage(void)
             BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
             BattleFrontier_Lounge2_Text_MultiBattleAdvice 
         },
-        [FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS] =
+        [FRONTIER_MANIAC_BATTLE_TOWER_LINK] =
         { 
             BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
             BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
@@ -2145,16 +2145,16 @@ void ShowFrontierManiacMessage(void)
 
     static const u8 sFrontierManiacStreakThresholds[][FRONTIER_MANIAC_MESSAGE_COUNT - 1] = 
     {
-        [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES]     = { 21, 56 },
-        [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES]     = { 21, 35 },
-        [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS]      = { 255, 255 },
-        [FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS] = { 255, 255 },
-        [FRONTIER_MANIAC_BATTLE_DOME]              = { 2, 4 },
-        [FRONTIER_MANIAC_BATTLE_FACTORY]           = { 7, 21 },
-        [FRONTIER_MANIAC_BATTLE_PALACE]            = { 7, 21 },
-        [FRONTIER_MANIAC_BATTLE_ARENA]             = { 14, 28 },
-        [FRONTIER_MANIAC_BATTLE_PIKE]              = { 13, 112 }, //BUG: 112 (0x70) is probably a mistake; the Pike Queen is battled twice well before that
-        [FRONTIER_MANIAC_BATTLE_PYRAMID]           = { 7, 56 }
+        [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES] = { 21, 56 },
+        [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES] = { 21, 35 },
+        [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS]  = { 255, 255 },
+        [FRONTIER_MANIAC_BATTLE_TOWER_LINK]    = { 255, 255 },
+        [FRONTIER_MANIAC_BATTLE_DOME]          = { 2, 4 },
+        [FRONTIER_MANIAC_BATTLE_FACTORY]       = { 7, 21 },
+        [FRONTIER_MANIAC_BATTLE_PALACE]        = { 7, 21 },
+        [FRONTIER_MANIAC_BATTLE_ARENA]         = { 14, 28 },
+        [FRONTIER_MANIAC_BATTLE_PIKE]          = { 13, 112 }, //BUG: 112 (0x70) is probably a mistake; the Pike Queen is battled twice well before that
+        [FRONTIER_MANIAC_BATTLE_PYRAMID]       = { 7, 56 }
     };
 
     u8 i;
@@ -2166,7 +2166,7 @@ void ShowFrontierManiacMessage(void)
         case FRONTIER_MANIAC_BATTLE_TOWER_SINGLES:
         case FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES:
         case FRONTIER_MANIAC_BATTLE_TOWER_MULTIS:
-        case FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS:
+        case FRONTIER_MANIAC_BATTLE_TOWER_LINK:
             if (gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50] 
                 >= gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN])
             {
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 4a17159a6..baf830af9 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -680,38 +680,38 @@ const u16 gFrontierBannedSpecies[] =
     SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF
 };
 
-static const u8 *const gUnknown_08611CB0[][2] =
-{
-    {gText_BattleTower2,  gUnknown_085ED164},
-    {gText_BattleTower2,  gUnknown_085ED170},
-    {gText_BattleTower2,  gUnknown_085ED17C},
-    {gText_BattleDome,    gUnknown_085ED164},
-    {gText_BattlePalace,  gUnknown_085ED164},
-    {gText_BattleArena,   gUnknown_085ED190},
-    {gText_BattleFactory, gUnknown_085ED164},
-    {gText_BattlePike,    gUnknown_085ED190},
-    {gText_BattlePyramid, gUnknown_085ED190},
-    {gText_BattleTower2,  gUnknown_085ED188},
+static const u8 *const sRecordsWindowChallengeTexts[][2] =
+{
+    [RANKING_HALL_BATTLE_TOWER_SINGLES] = {gText_BattleTower2,  gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_TOWER_DOUBLES] = {gText_BattleTower2,  gText_FacilityDouble},
+    [RANKING_HALL_BATTLE_TOWER_MULTIS]  = {gText_BattleTower2,  gText_FacilityMulti},
+    [RANKING_HALL_BATTLE_DOME]          = {gText_BattleDome,    gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_PALACE]        = {gText_BattlePalace,  gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_ARENA]         = {gText_BattleArena,   gText_Facility},
+    [RANKING_HALL_BATTLE_FACTORY]       = {gText_BattleFactory, gText_FacilitySingle},
+    [RANKING_HALL_BATTLE_PIKE]          = {gText_BattlePike,    gText_Facility},
+    [RANKING_HALL_BATTLE_PYRAMID]       = {gText_BattlePyramid, gText_Facility},
+    [RANKING_HALL_BATTLE_TOWER_LINK]    = {gText_BattleTower2,  gText_FacilityLink},
 };
 
-static const u8 *const gLevelModeText[] =
+static const u8 *const sLevelModeText[] =
 {
     gText_RecordsLv50,
     gText_RecordsOpenLevel,
 };
 
-static const u8 *const gHallFacilityToRecordsText[] =
-{
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityClearStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityKOsStreak,
-    gText_FrontierFacilityWinStreak,
-    gText_FrontierFacilityRoomsCleared,
-    gText_FrontierFacilityFloorsCleared,
-    gText_FrontierFacilityWinStreak,
+static const u8 *const sHallFacilityToRecordsText[] =
+{
+    [RANKING_HALL_BATTLE_TOWER_SINGLES] = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_TOWER_DOUBLES] = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_TOWER_MULTIS]  = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_DOME]          = gText_FrontierFacilityClearStreak,
+    [RANKING_HALL_BATTLE_PALACE]        = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_ARENA]         = gText_FrontierFacilityKOsStreak,
+    [RANKING_HALL_BATTLE_FACTORY]       = gText_FrontierFacilityWinStreak,
+    [RANKING_HALL_BATTLE_PIKE]          = gText_FrontierFacilityRoomsCleared,
+    [RANKING_HALL_BATTLE_PYRAMID]       = gText_FrontierFacilityFloorsCleared,
+    [RANKING_HALL_BATTLE_TOWER_LINK]    = gText_FrontierFacilityWinStreak,
 };
 
 static const u16 gFacilityToBrainTrainerId[] =
@@ -2220,8 +2220,8 @@ static void Print1PRecord(s32 position, s32 x, s32 y, struct RankingHall1P *hall
         if (winStreak > 9999)
             winStreak = 9999;
         ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4);
-        StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[hallFacilityId]);
-        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
+        StringExpandPlaceholders(gStringVar4, sHallFacilityToRecordsText[hallFacilityId]);
+        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, sHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
     }
 }
 
@@ -2247,8 +2247,8 @@ static void Print2PRecord(s32 position, s32 x, s32 y, struct RankingHall2P *hall
         if (winStreak > 9999)
             winStreak = 9999;
         ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4);
-        StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[9]);
-        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
+        StringExpandPlaceholders(gStringVar4, sHallFacilityToRecordsText[RANKING_HALL_BATTLE_TOWER_LINK]);
+        AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, sHallFacilityToRecordsText[RANKING_HALL_BATTLE_TOWER_LINK], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
     }
 }
 
@@ -2327,12 +2327,12 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode)
     struct RankingHall1P records1P[3];
     struct RankingHall2P records2P[3];
 
-    StringCopy(gStringVar1, gUnknown_08611CB0[hallFacilityId][0]);
-    StringExpandPlaceholders(gStringVar4, gUnknown_08611CB0[hallFacilityId][1]);
+    StringCopy(gStringVar1, sRecordsWindowChallengeTexts[hallFacilityId][0]);
+    StringExpandPlaceholders(gStringVar4, sRecordsWindowChallengeTexts[hallFacilityId][1]);
     AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL);
-    x = GetStringRightAlignXOffset(1, gLevelModeText[lvlMode], 0xD0);
-    AddTextPrinterParameterized(gRecordsWindowId, 1, gLevelModeText[lvlMode], x, 1, TEXT_SPEED_FF, NULL);
-    if (hallFacilityId == HALL_FACILITIES_COUNT)
+    x = GetStringRightAlignXOffset(1, sLevelModeText[lvlMode], 0xD0);
+    AddTextPrinterParameterized(gRecordsWindowId, 1, sLevelModeText[lvlMode], x, 1, TEXT_SPEED_FF, NULL);
+    if (hallFacilityId == RANKING_HALL_BATTLE_TOWER_LINK)
     {
         gSaveBlock2Ptr->frontier.opponentName[0][PLAYER_NAME_LENGTH] = EOS;
         gSaveBlock2Ptr->frontier.opponentName[1][PLAYER_NAME_LENGTH] = EOS;
diff --git a/src/strings.c b/src/strings.c
index ef63b52c4..afa567b9f 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1220,11 +1220,11 @@ const u8 gText_BattleArena[] = _("BATTLE ARENA");
 const u8 gText_BattlePike[] = _("BATTLE PIKE");
 const u8 gText_BattlePyramid[] = _("BATTLE PYRAMID");
 
-ALIGNED(4) const u8 gUnknown_085ED164[] = _("{STR_VAR_1} SINGLE");
-ALIGNED(4) const u8 gUnknown_085ED170[] = _("{STR_VAR_1} DOUBLE");
-ALIGNED(4) const u8 gUnknown_085ED17C[] = _("{STR_VAR_1} MULTI");
-ALIGNED(4) const u8 gUnknown_085ED188[] = _("{STR_VAR_1} LINK");
-ALIGNED(4) const u8 gUnknown_085ED190[] = _("{STR_VAR_1}");
+ALIGNED(4) const u8 gText_FacilitySingle[] = _("{STR_VAR_1} SINGLE");
+ALIGNED(4) const u8 gText_FacilityDouble[] = _("{STR_VAR_1} DOUBLE");
+ALIGNED(4) const u8 gText_FacilityMulti[] = _("{STR_VAR_1} MULTI");
+ALIGNED(4) const u8 gText_FacilityLink[] = _("{STR_VAR_1} LINK");
+ALIGNED(4) const u8 gText_Facility[] = _("{STR_VAR_1}");
 
 const u8 gText_Give[] = _("Give");
 const u8 gText_NoNeed[] = _("No need");