Set up remaining facility script doc, use Palace macros

8 files changed, 267 insertions, 252 deletions

diff --git a/src/battle_arena.c b/src/battle_arena.c
index e9af29622..7202cf7b5 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -33,8 +33,8 @@ static void InitArenaChallenge(void);
 static void GetArenaData(void);
 static void SetArenaData(void);
 static void SaveArenaChallenge(void);
-static void SetArenaRewardItem(void);
-static void GiveArenaRewardItem(void);
+static void SetArenaPrize(void);
+static void GiveArenaPrize(void);
 static void BufferArenaOpponentName(void);
 static void SpriteCb_JudgmentIcon(struct Sprite *sprite);
 static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler);
@@ -473,12 +473,12 @@ static void (* const sArenaFunctions[])(void) =
     [BATTLE_ARENA_FUNC_GET_DATA]         = GetArenaData,
     [BATTLE_ARENA_FUNC_SET_DATA]         = SetArenaData,
     [BATTLE_ARENA_FUNC_SAVE]             = SaveArenaChallenge,
-    [BATTLE_ARENA_FUNC_SET_REWARD]       = SetArenaRewardItem,
-    [BATTLE_ARENA_FUNC_GIVE_REWARD]      = GiveArenaRewardItem,
+    [BATTLE_ARENA_FUNC_SET_PRIZE]        = SetArenaPrize,
+    [BATTLE_ARENA_FUNC_GIVE_PRIZE]       = GiveArenaPrize,
     [BATTLE_ARENA_FUNC_GET_TRAINER_NAME] = BufferArenaOpponentName,
 };
 
-static const u16 sShortStreakRewardItems[] =
+static const u16 sShortStreakPrizeItems[] =
 {
     ITEM_HP_UP,
     ITEM_PROTEIN,
@@ -488,7 +488,7 @@ static const u16 sShortStreakRewardItems[] =
     ITEM_ZINC,
 };
 
-static const u16 sLongStreakRewardItems[] =
+static const u16 sLongStreakPrizeItems[] =
 {
     ITEM_BRIGHT_POWDER,
     ITEM_WHITE_HERB,
@@ -810,8 +810,8 @@ static void GetArenaData(void)
 
     switch (gSpecialVar_0x8005)
     {
-    case ARENA_DATA_REWARD:
-        gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaRewardItem;
+    case ARENA_DATA_PRIZE:
+        gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaPrize;
         break;
     case ARENA_DATA_WIN_STREAK:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode];
@@ -831,8 +831,8 @@ static void SetArenaData(void)
 
     switch (gSpecialVar_0x8005)
     {
-    case ARENA_DATA_REWARD:
-        gSaveBlock2Ptr->frontier.arenaRewardItem = gSpecialVar_0x8006;
+    case ARENA_DATA_PRIZE:
+        gSaveBlock2Ptr->frontier.arenaPrize = gSpecialVar_0x8006;
         break;
     case ARENA_DATA_WIN_STREAK:
         gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006;
@@ -864,22 +864,22 @@ static void SaveArenaChallenge(void)
     SaveGameFrontier();
 }
 
-static void SetArenaRewardItem(void)
+static void SetArenaPrize(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
 
     if (gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] > 41)
-        gSaveBlock2Ptr->frontier.arenaRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)];
+        gSaveBlock2Ptr->frontier.arenaPrize = sLongStreakPrizeItems[Random() % ARRAY_COUNT(sLongStreakPrizeItems)];
     else
-        gSaveBlock2Ptr->frontier.arenaRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)];
+        gSaveBlock2Ptr->frontier.arenaPrize = sShortStreakPrizeItems[Random() % ARRAY_COUNT(sShortStreakPrizeItems)];
 }
 
-static void GiveArenaRewardItem(void)
+static void GiveArenaPrize(void)
 {
-    if (AddBagItem(gSaveBlock2Ptr->frontier.arenaRewardItem, 1) == TRUE)
+    if (AddBagItem(gSaveBlock2Ptr->frontier.arenaPrize, 1) == TRUE)
     {
-        CopyItemName(gSaveBlock2Ptr->frontier.arenaRewardItem, gStringVar1);
-        gSaveBlock2Ptr->frontier.arenaRewardItem = ITEM_NONE;
+        CopyItemName(gSaveBlock2Ptr->frontier.arenaPrize, gStringVar1);
+        gSaveBlock2Ptr->frontier.arenaPrize = ITEM_NONE;
         gSpecialVar_Result = TRUE;
     }
     else
diff --git a/src/battle_dome.c b/src/battle_dome.c
index fc254e74d..3bd44611e 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -30,6 +30,7 @@
 #include "scanline_effect.h"
 #include "script_pokemon_util_80F87D8.h"
 #include "graphics.h"
+#include "constants/battle_dome.h"
 #include "constants/frontier_util.h"
 #include "constants/species.h"
 #include "constants/moves.h"
@@ -39,13 +40,6 @@
 #include "constants/battle_frontier.h"
 #include "constants/rgb.h"
 
-#define DOME_ROUND1 0
-#define DOME_ROUND2 1
-#define DOME_QUARTERFINAL 1 // Different name for the same round.
-#define DOME_SEMIFINAL 2
-#define DOME_FINAL 3
-#define DOME_ROUNDS_COUNT 4
-
 struct BattleDomeStruct
 {
     u8 arr[DOME_TOURNAMENT_TRAINERS_COUNT];
@@ -107,9 +101,9 @@ static void SetDomeOpponentId(void);
 static void SetDomeOpponentGraphicsId(void);
 static void ShowNonInteractiveDomeTourneyTree(void);
 static void ResolveDomeRoundWinners(void);
-static void sub_81902F8(void);
-static void UpdateDomeStreaks(void);
-static void RestoreDomePlayerParty(void);
+static void SaveDomeChallenge(void);
+static void IncrementDomeStreaks(void);
+static void ResetSketchedMoves(void);
 static void RestoreDomePlayerPartyHeldItems(void);
 static void ReduceDomePlayerPartyTo3Mons(void);
 static void GetPlayerSeededBeforeOpponent(void);
@@ -1079,29 +1073,29 @@ static const u8 sTourneyTreeTrainerIds[] = {0, 8, 12, 4, 7, 15, 11, 3, 2, 10, 14
 
 static void (* const sBattleDomeFunctions[])(void) =
 {
-    InitDomeChallenge,
-    GetDomeData,
-    SetDomeData,
-    BufferDomeRoundText,
-    BufferDomeOpponentName,
-    InitDomeOpponentParty,
-    ShowDomeOpponentInfo,
-    ShowDomeTourneyTree,
-    ShowPreviousDomeResultsTourneyTree,
-    SetDomeOpponentId,
-    SetDomeOpponentGraphicsId,
-    ShowNonInteractiveDomeTourneyTree,
-    ResolveDomeRoundWinners,
-    sub_81902F8,
-    UpdateDomeStreaks,
-    InitDomeFacilityTrainersAndMons,
-    RestoreDomePlayerParty,
-    RestoreDomePlayerPartyHeldItems,
-    ReduceDomePlayerPartyTo3Mons,
-    GetPlayerSeededBeforeOpponent,
-    BufferLastDomeWinnerName,
-    sub_8194F58,
-    InitDomeTrainers,
+    [BATTLE_DOME_FUNC_INIT]                     = InitDomeChallenge,
+    [BATTLE_DOME_FUNC_GET_DATA]                 = GetDomeData,
+    [BATTLE_DOME_FUNC_SET_DATA]                 = SetDomeData,
+    [BATTLE_DOME_FUNC_GET_ROUND_TEXT]           = BufferDomeRoundText,
+    [BATTLE_DOME_FUNC_GET_OPPONENT_NAME]        = BufferDomeOpponentName,
+    [BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY]      = InitDomeOpponentParty,
+    [BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO]       = ShowDomeOpponentInfo,
+    [BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE]        = ShowDomeTourneyTree,
+    [BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE]   = ShowPreviousDomeResultsTourneyTree,
+    [BATTLE_DOME_FUNC_SET_OPPONENT_ID]          = SetDomeOpponentId,
+    [BATTLE_DOME_FUNC_SET_OPPONENT_GFX]         = SetDomeOpponentGraphicsId,
+    [BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE] = ShowNonInteractiveDomeTourneyTree,
+    [BATTLE_DOME_FUNC_RESOLVE_WINNERS]          = ResolveDomeRoundWinners,
+    [BATTLE_DOME_FUNC_SAVE]                     = SaveDomeChallenge,
+    [BATTLE_DOME_FUNC_INCREMENT_STREAK]         = IncrementDomeStreaks,
+    [BATTLE_DOME_FUNC_SET_TRAINERS]             = InitDomeFacilityTrainersAndMons,
+    [BATTLE_DOME_FUNC_RESET_SKETCH]             = ResetSketchedMoves,
+    [BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS]       = RestoreDomePlayerPartyHeldItems,
+    [BATTLE_DOME_FUNC_REDUCE_PARTY]             = ReduceDomePlayerPartyTo3Mons,
+    [BATTLE_DOME_FUNC_COMPARE_SEEDS]            = GetPlayerSeededBeforeOpponent,
+    [BATTLE_DOME_FUNC_GET_WINNER_NAME]          = BufferLastDomeWinnerName,
+    [BATTLE_DOME_FUNC_21]                       = sub_8194F58,
+    [BATTLE_DOME_FUNC_INIT_TRAINERS]            = InitDomeTrainers,
 };
 
 static const u32 sWinStreakFlags[][2] =
@@ -2280,25 +2274,25 @@ static void GetDomeData(void)
 
     switch (gSpecialVar_0x8005)
     {
-    case 0:
+    case DOME_DATA_STREAK:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode];
         break;
-    case 1:
+    case DOME_DATA_STREAK_ACTIVE:
         gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]) != 0);
         break;
-    case 2:
+    case DOME_DATA_2:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_0;
         break;
-    case 3:
+    case DOME_DATA_3:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_1;
         break;
-    case 4:
+    case DOME_DATA_4:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_2;
         break;
-    case 5:
+    case DOME_DATA_5:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_3;
         break;
-    case 6:
+    case DOME_DATA_6:
         if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
         {
             if (lvlMode)
@@ -2314,7 +2308,7 @@ static void GetDomeData(void)
                 gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_0;
         }
         break;
-    case 7:
+    case DOME_DATA_7:
         if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
         {
             if (lvlMode)
@@ -2330,12 +2324,12 @@ static void GetDomeData(void)
                 gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D08_2;
         }
         break;
-    case 8:
+    case DOME_DATA_8:
         ClearSelectedPartyOrder();
         gSelectedOrderFromParty[0] = gSaveBlock2Ptr->frontier.selectedPartyMons[3];
         gSelectedOrderFromParty[1] = gSaveBlock2Ptr->frontier.selectedPartyMons[3] >> 8;
         break;
-    case 9:
+    case DOME_DATA_9:
         gSpecialVar_Result = (gSaveBlock2Ptr->frontier.field_D0A * 2) - 3 + gSaveBlock2Ptr->frontier.field_D0B;
         break;
     }
@@ -2348,28 +2342,28 @@ static void SetDomeData(void)
 
     switch (gSpecialVar_0x8005)
     {
-    case 0:
+    case DOME_DATA_STREAK:
         gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
         break;
-    case 1:
+    case DOME_DATA_STREAK_ACTIVE:
         if (gSpecialVar_0x8006)
             gSaveBlock2Ptr->frontier.winStreakActiveFlags |= sWinStreakFlags[battleMode][lvlMode];
         else
             gSaveBlock2Ptr->frontier.winStreakActiveFlags &= sWinStreakMasks[battleMode][lvlMode];
         break;
-    case 2:
+    case DOME_DATA_2:
         gSaveBlock2Ptr->frontier.field_D08_0 = gSpecialVar_0x8006;
         break;
-    case 3:
+    case DOME_DATA_3:
         gSaveBlock2Ptr->frontier.field_D08_1 = gSpecialVar_0x8006;
         break;
-    case 4:
+    case DOME_DATA_4:
         gSaveBlock2Ptr->frontier.field_D08_2 = gSpecialVar_0x8006;
         break;
-    case 5:
+    case DOME_DATA_5:
         gSaveBlock2Ptr->frontier.field_D08_3 = gSpecialVar_0x8006;
         break;
-    case 6:
+    case DOME_DATA_6:
         if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
         {
             if (lvlMode)
@@ -2385,7 +2379,7 @@ static void SetDomeData(void)
                 gSaveBlock2Ptr->frontier.field_D08_0 = gSpecialVar_0x8006;
         }
         break;
-    case 7:
+    case DOME_DATA_7:
         if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
         {
             if (lvlMode)
@@ -2401,7 +2395,7 @@ static void SetDomeData(void)
                 gSaveBlock2Ptr->frontier.field_D08_2 = gSpecialVar_0x8006;
         }
         break;
-    case 8:
+    case DOME_DATA_8:
         gSaveBlock2Ptr->frontier.selectedPartyMons[3] = T1_READ_16(gSelectedOrderFromParty);
         break;
     }
@@ -2411,7 +2405,7 @@ static void InitDomeTrainers(void)
 {
     int i, j, k;
     int monLevel;
-    int species[3];
+    int species[FRONTIER_PARTY_SIZE];
     int monTypesBits, monTypesCount;
     int trainerId;
     int monSetId;
@@ -2472,7 +2466,7 @@ static void InitDomeTrainers(void)
             gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId;
         }
 
-        for (j = 0; j < 3; j++)
+        for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
         {
             // Make sure the mon is valid.
             do
@@ -2528,7 +2522,7 @@ static void InitDomeTrainers(void)
         monTypesBits = 0;
         statSums[i] = 0;
         ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
-        for (j = 0; j < 3; j++)
+        for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
         {
             CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
                              monLevel, ivs,
@@ -2595,7 +2589,7 @@ static void InitDomeTrainers(void)
             gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId = TRAINER_FRONTIER_BRAIN;
         }
 
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
             gSaveBlock2Ptr->frontier.domeMonIds[j][i] = GetFrontierBrainMonSpecies(i);
     }
 
@@ -2765,14 +2759,14 @@ int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId)
 static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1)
 {
     int i, moveId, playerMonId;
-    int array[3];
+    int array[FRONTIER_PARTY_SIZE];
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         array[i] = 0;
         for (moveId = 0; moveId < MAX_MON_MOVES; moveId++)
         {
-            for (playerMonId = 0; playerMonId < 3; playerMonId++)
+            for (playerMonId = 0; playerMonId < FRONTIER_PARTY_SIZE; playerMonId++)
             {
                 if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN)
                 {
@@ -2793,14 +2787,14 @@ static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1)
 static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1)
 {
     int i, moveId, playerMonId;
-    int array[3];
+    int array[FRONTIER_PARTY_SIZE];
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         array[i] = 0;
         for (moveId = 0; moveId < MAX_MON_MOVES; moveId++)
         {
-            for (playerMonId = 0; playerMonId < 3; playerMonId++)
+            for (playerMonId = 0; playerMonId < FRONTIER_PARTY_SIZE; playerMonId++)
             {
                 if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN)
                 {
@@ -3327,7 +3321,7 @@ static void SetDomeOpponentGraphicsId(void)
     SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
 }
 
-static void sub_81902F8(void)
+static void SaveDomeChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
@@ -3335,7 +3329,7 @@ static void sub_81902F8(void)
     SaveGameFrontier();
 }
 
-static void UpdateDomeStreaks(void)
+static void IncrementDomeStreaks(void)
 {
     u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -5937,7 +5931,7 @@ static void InitDomeFacilityTrainersAndMons(void)
     gFacilityTrainers = gBattleFrontierTrainers;
 }
 
-static void RestoreDomePlayerParty(void)
+static void ResetSketchedMoves(void)
 {
     int i, moveSlot;
 
@@ -6005,7 +5999,7 @@ static void sub_8194F58(void)
 {
     int i, j, k;
     int monLevel;
-    int species[3];
+    int species[FRONTIER_PARTY_SIZE];
     int monTypesBits;
     int trainerId;
     int monSetId;
@@ -6021,7 +6015,7 @@ static void sub_8194F58(void)
         return;
 
     statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT);
-    statValues = AllocZeroed(sizeof(int) * 6);
+    statValues = AllocZeroed(sizeof(int) * NUM_STATS);
     lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     gSaveBlock2Ptr->frontier.lvlMode = 0;
     // This one, I'd like to call a 'C fakematching'.
@@ -6050,7 +6044,7 @@ static void sub_8194F58(void)
         } while (j != i);
 
         gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId;
-        for (j = 0; j < 3; j++)
+        for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
         {
             // Make sure the mon is valid.
             do
@@ -6081,7 +6075,7 @@ static void sub_8194F58(void)
         monTypesBits = 0;
         statSums[i] = 0;
         ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
-        for (j = 0; j < 3; j++)
+        for (j = 0; j < FRONTIER_PARTY_SIZE; j++)
         {
             CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
                              monLevel, ivs,
diff --git a/src/battle_factory.c b/src/battle_factory.c
index cc1fd12b7..e04cd931a 100644
--- a/src/battle_factory.c
+++ b/src/battle_factory.c
@@ -23,7 +23,7 @@ static bool8 sPerformedRentalSwap;
 static void InitFactoryChallenge(void);
 static void GetBattleFactoryData(void);
 static void SetBattleFactoryData(void);
-static void sub_81A613C(void);
+static void SaveFactoryChallenge(void);
 static void nullsub_75(void);
 static void nullsub_123(void);
 static void SelectInitialRentalMons(void);
@@ -116,7 +116,7 @@ static void (* const sBattleFactoryFunctions[])(void) =
     InitFactoryChallenge,
     GetBattleFactoryData,
     SetBattleFactoryData,
-    sub_81A613C,
+    SaveFactoryChallenge,
     nullsub_75,
     nullsub_123,
     SelectInitialRentalMons,
@@ -253,7 +253,7 @@ static void SetBattleFactoryData(void)
     }
 }
 
-static void sub_81A613C(void)
+static void SaveFactoryChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
diff --git a/src/battle_palace.c b/src/battle_palace.c
index ec909e442..6c41aa0e7 100644
--- a/src/battle_palace.c
+++ b/src/battle_palace.c
@@ -14,34 +14,54 @@
 #include "constants/trainers.h"
 
 // This file's functions.
-static void sub_8195980(void);
-static void sub_8195A38(void);
-static void sub_8195AE4(void);
-static void sub_8195BB0(void);
-static void sub_8195C20(void);
+static void InitPalaceChallenge(void);
+static void GetPalaceData(void);
+static void SetPalaceData(void);
+static void GetPalaceCommentId(void);
+static void SetPalaceOpponent(void);
 static void BufferOpponentIntroSpeech(void);
-static void sub_8195C7C(void);
-static void sub_8195CE4(void);
-static void sub_8195D28(void);
-static void sub_8195DB8(void);
+static void IncrementPalaceStreak(void);
+static void SavePalaceChallenge(void);
+static void SetRandomPalacePrize(void);
+static void GivePalacePrize(void);
 
 // Const rom data.
 static void (* const sBattlePalaceFunctions[])(void) =
 {
-    [BATTLE_PALACE_FUNC_0] = sub_8195980,
-    [BATTLE_PALACE_FUNC_1] = sub_8195A38,
-    [BATTLE_PALACE_FUNC_2] = sub_8195AE4,
-    [BATTLE_PALACE_FUNC_3] = sub_8195BB0,
-    [BATTLE_PALACE_FUNC_4] = sub_8195C20,
+    [BATTLE_PALACE_FUNC_INIT]               = InitPalaceChallenge,
+    [BATTLE_PALACE_FUNC_GET_DATA]           = GetPalaceData,
+    [BATTLE_PALACE_FUNC_SET_DATA]           = SetPalaceData,
+    [BATTLE_PALACE_FUNC_GET_COMMENT_ID]     = GetPalaceCommentId,
+    [BATTLE_PALACE_FUNC_SET_OPPONENT]       = SetPalaceOpponent,
     [BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO] = BufferOpponentIntroSpeech,
-    [BATTLE_PALACE_FUNC_6] = sub_8195C7C,
-    [BATTLE_PALACE_FUNC_7] = sub_8195CE4,
-    [BATTLE_PALACE_FUNC_8] = sub_8195D28,
-    [BATTLE_PALACE_FUNC_9] = sub_8195DB8,
+    [BATTLE_PALACE_FUNC_INCREMENT_STREAK]   = IncrementPalaceStreak,
+    [BATTLE_PALACE_FUNC_SAVE]               = SavePalaceChallenge,
+    [BATTLE_PALACE_FUNC_SET_PRIZE]          = SetRandomPalacePrize,
+    [BATTLE_PALACE_FUNC_GIVE_PRIZE]         = GivePalacePrize,
 };
 
-static const u16 gUnknown_0860DE78[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC};
-static const u16 gUnknown_0860DE84[] = {ITEM_BRIGHT_POWDER, ITEM_WHITE_HERB, ITEM_QUICK_CLAW, ITEM_LEFTOVERS, ITEM_MENTAL_HERB, ITEM_KINGS_ROCK, ITEM_FOCUS_BAND, ITEM_SCOPE_LENS, ITEM_CHOICE_BAND};
+static const u16 sBattlePalaceEarlyPrizes[] = 
+{
+    ITEM_HP_UP, 
+    ITEM_PROTEIN, 
+    ITEM_IRON, 
+    ITEM_CALCIUM, 
+    ITEM_CARBOS, 
+    ITEM_ZINC
+};
+
+static const u16 sBattlePalaceLatePrizes[] = 
+{
+    ITEM_BRIGHT_POWDER, 
+    ITEM_WHITE_HERB, 
+    ITEM_QUICK_CLAW, 
+    ITEM_LEFTOVERS, 
+    ITEM_MENTAL_HERB, 
+    ITEM_KINGS_ROCK, 
+    ITEM_FOCUS_BAND, 
+    ITEM_SCOPE_LENS, 
+    ITEM_CHOICE_BAND
+};
 
 static const u32 sWinStreakFlags[][2] =
 {
@@ -61,7 +81,7 @@ void CallBattlePalaceFunction(void)
     sBattlePalaceFunctions[gSpecialVar_0x8004]();
 }
 
-static void sub_8195980(void)
+static void InitPalaceChallenge(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -77,39 +97,39 @@ static void sub_8195980(void)
     gTrainerBattleOpponent_A = 0;
 }
 
-static void sub_8195A38(void)
+static void GetPalaceData(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
 
     switch (gSpecialVar_0x8005)
     {
-    case 0:
-        gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DC6;
+    case PALACE_DATA_PRIZE:
+        gSpecialVar_Result = gSaveBlock2Ptr->frontier.palacePrize;
         break;
-    case 1:
+    case PALACE_DATA_STREAK:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
         break;
-    case 2:
+    case PALACE_DATA_STREAK_ACTIVE:
         gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]) != 0);
         break;
     }
 }
 
-static void sub_8195AE4(void)
+static void SetPalaceData(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
 
     switch (gSpecialVar_0x8005)
     {
-    case 0:
-        gSaveBlock2Ptr->frontier.field_DC6 = gSpecialVar_0x8006;
+    case PALACE_DATA_PRIZE:
+        gSaveBlock2Ptr->frontier.palacePrize = gSpecialVar_0x8006;
         break;
-    case 1:
+    case PALACE_DATA_STREAK:
         gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
         break;
-    case 2:
+    case PALACE_DATA_STREAK_ACTIVE:
         if (gSpecialVar_0x8006)
             gSaveBlock2Ptr->frontier.winStreakActiveFlags |= sWinStreakFlags[battleMode][lvlMode];
         else
@@ -118,7 +138,7 @@ static void sub_8195AE4(void)
     }
 }
 
-static void sub_8195BB0(void)
+static void GetPalaceCommentId(void)
 {
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
@@ -131,7 +151,7 @@ static void sub_8195BB0(void)
         gSpecialVar_Result = 4;
 }
 
-static void sub_8195C20(void)
+static void SetPalaceOpponent(void)
 {
     gTrainerBattleOpponent_A = 5 *(Random() % 255) / 64u;
     SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
@@ -143,7 +163,7 @@ static void BufferOpponentIntroSpeech(void)
         FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
 }
 
-static void sub_8195C7C(void)
+static void IncrementPalaceStreak(void)
 {
     u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -158,7 +178,7 @@ static void sub_8195C7C(void)
     }
 }
 
-static void sub_8195CE4(void)
+static void SavePalaceChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
@@ -166,23 +186,23 @@ static void sub_8195CE4(void)
     SaveGameFrontier();
 }
 
-static void sub_8195D28(void)
+static void SetRandomPalacePrize(void)
 {
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
 
     if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] > 41)
-        gSaveBlock2Ptr->frontier.field_DC6 = gUnknown_0860DE84[Random() % ARRAY_COUNT(gUnknown_0860DE84)];
+        gSaveBlock2Ptr->frontier.palacePrize = sBattlePalaceLatePrizes[Random() % ARRAY_COUNT(sBattlePalaceLatePrizes)];
     else
-        gSaveBlock2Ptr->frontier.field_DC6 = gUnknown_0860DE78[Random() % ARRAY_COUNT(gUnknown_0860DE78)];
+        gSaveBlock2Ptr->frontier.palacePrize = sBattlePalaceEarlyPrizes[Random() % ARRAY_COUNT(sBattlePalaceEarlyPrizes)];
 }
 
-static void sub_8195DB8(void)
+static void GivePalacePrize(void)
 {
-    if (AddBagItem(gSaveBlock2Ptr->frontier.field_DC6, 1) == TRUE)
+    if (AddBagItem(gSaveBlock2Ptr->frontier.palacePrize, 1) == TRUE)
     {
-        CopyItemName(gSaveBlock2Ptr->frontier.field_DC6, gStringVar1);
-        gSaveBlock2Ptr->frontier.field_DC6 = 0;
+        CopyItemName(gSaveBlock2Ptr->frontier.palacePrize, gStringVar1);
+        gSaveBlock2Ptr->frontier.palacePrize = 0;
         gSpecialVar_Result = TRUE;
     }
     else
diff --git a/src/battle_pike.c b/src/battle_pike.c
index c2f8ae417..55d1c9f18 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -57,7 +57,7 @@ static void SetupRoomEventObjects(void);
 static void GetRoomType(void);
 static void sub_81A7400(void);
 static void sub_81A740C(void);
-static void sub_81A7418(void);
+static void SavePikeChallenge(void);
 static void nullsub_76(void);
 static void nullsub_124(void);
 static void GetRoomInflictedStatus(void);
@@ -488,7 +488,7 @@ static void (* const sBattlePikeFunctions[])(void) =
     [BATTLE_PIKE_FUNC_GET_ROOM_TYPE] = GetRoomType,
     [BATTLE_PIKE_FUNC_6] = sub_81A7400,
     [BATTLE_PIKE_FUNC_7] = sub_81A740C,
-    [BATTLE_PIKE_FUNC_8] = sub_81A7418,
+    [BATTLE_PIKE_FUNC_SAVE] = SavePikeChallenge,
     [BATTLE_PIKE_FUNC_NULL_9] = nullsub_76,
     [BATTLE_PIKE_FUNC_NULL_10] = nullsub_124,
     [BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus,
@@ -624,7 +624,7 @@ static void GetBattlePikeData(void)
     switch (gSpecialVar_0x8005)
     {
     case 0:
-        gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E02;
+        gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikePrize;
         break;
     case 1:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikeWinStreaks[gSaveBlock2Ptr->frontier.lvlMode];
@@ -651,7 +651,7 @@ static void SetBattlePikeData(void)
     switch (gSpecialVar_0x8005)
     {
     case 0:
-        gSaveBlock2Ptr->frontier.field_E02 = gSpecialVar_0x8006;
+        gSaveBlock2Ptr->frontier.pikePrize = gSpecialVar_0x8006;
         break;
     case 1:
         if (gSpecialVar_0x8006 <= MAX_STREAK)
@@ -707,7 +707,7 @@ static void sub_81A740C(void)
     sUnknown_0300128E = FALSE;
 }
 
-static void sub_81A7418(void)
+static void SavePikeChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index de53c9a47..43b1836f3 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -71,9 +71,9 @@ struct PyramidTrainerEncounterMusic
 static void InitPyramidChallenge(void);
 static void GetBattlePyramidData(void);
 static void SetBattlePyramidData(void);
-static void sub_81A9134(void);
-static void SetBattlePyramidRewardItem(void);
-static void GiveBattlePyramidRewardItem(void);
+static void SavePyramidChallenge(void);
+static void SetBattlePyramidPrize(void);
+static void GiveBattlePyramidPrize(void);
 static void SeedPyramidFloor(void);
 static void SetPickupItem(void);
 static void HidePyramidItem(void);
@@ -790,9 +790,9 @@ static void (* const sBattlePyramidFunctions[])(void) =
     InitPyramidChallenge,
     GetBattlePyramidData,
     SetBattlePyramidData,
-    sub_81A9134,
-    SetBattlePyramidRewardItem,
-    GiveBattlePyramidRewardItem,
+    SavePyramidChallenge,
+    SetBattlePyramidPrize,
+    GiveBattlePyramidPrize,
     SeedPyramidFloor,
     SetPickupItem,
     HidePyramidItem,
@@ -869,7 +869,7 @@ static void GetBattlePyramidData(void)
     switch (gSpecialVar_0x8005)
     {
     case 0:
-        gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidRewardItem;
+        gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidPrize;
         break;
     case 1:
         gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode];
@@ -902,7 +902,7 @@ static void SetBattlePyramidData(void)
     switch (gSpecialVar_0x8005)
     {
     case 0:
-        gSaveBlock2Ptr->frontier.pyramidRewardItem = gSpecialVar_0x8006;
+        gSaveBlock2Ptr->frontier.pyramidPrize = gSpecialVar_0x8006;
         break;
     case 1:
         gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] = gSpecialVar_0x8006;
@@ -929,7 +929,7 @@ static void SetBattlePyramidData(void)
     }
 }
 
-static void sub_81A9134(void)
+static void SavePyramidChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
@@ -938,22 +938,22 @@ static void sub_81A9134(void)
     TrySavingData(SAVE_LINK);
 }
 
-static void SetBattlePyramidRewardItem(void)
+static void SetBattlePyramidPrize(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
 
     if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] > 41)
-        gSaveBlock2Ptr->frontier.pyramidRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)];
+        gSaveBlock2Ptr->frontier.pyramidPrize = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)];
     else
-        gSaveBlock2Ptr->frontier.pyramidRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)];
+        gSaveBlock2Ptr->frontier.pyramidPrize = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)];
 }
 
-static void GiveBattlePyramidRewardItem(void)
+static void GiveBattlePyramidPrize(void)
 {
-    if (AddBagItem(gSaveBlock2Ptr->frontier.pyramidRewardItem, 1) == TRUE)
+    if (AddBagItem(gSaveBlock2Ptr->frontier.pyramidPrize, 1) == TRUE)
     {
-        CopyItemName(gSaveBlock2Ptr->frontier.pyramidRewardItem, gStringVar1);
-        gSaveBlock2Ptr->frontier.pyramidRewardItem = 0;
+        CopyItemName(gSaveBlock2Ptr->frontier.pyramidPrize, gStringVar1);
+        gSaveBlock2Ptr->frontier.pyramidPrize = 0;
         gSpecialVar_Result = TRUE;
     }
     else
diff --git a/src/battle_tent.c b/src/battle_tent.c
index 6e3df49a9..89bb332a6 100644
--- a/src/battle_tent.c
+++ b/src/battle_tent.c
@@ -15,31 +15,32 @@
 #include "constants/layouts.h"
 #include "constants/region_map_sections.h"
 #include "constants/species.h"
+#include "constants/trainers.h"
 
 // This file's functions.
-static void sub_81B99D4(void);
-static void sub_81B9A28(void);
-static void sub_81B9A44(void);
-static void sub_81B9A60(void);
-static void sub_81B9A90(void);
-static void sub_81B9ABC(void);
-static void sub_81B9B00(void);
-static void sub_81B9B28(void);
-static void sub_81B9BA0(void);
-static void sub_81B9BF4(void);
-static void sub_81B9C10(void);
-static void sub_81B9C2C(void);
-static void sub_81B9C70(void);
-static void sub_81B9C98(void);
-static void sub_81B9CF0(void);
-static void sub_81B9D28(void);
-static void sub_81B9D7C(void);
-static void sub_81B9D98(void);
-static void sub_81B9DB4(void);
-static void sub_81B9DF8(void);
-static void sub_81B9E20(void);
-static void sub_81B9E78(void);
-static void sub_81B9E88(void);
+static void InitVerdanturfTentChallenge(void);
+static void GetVerdanturfTentPrize(void);
+static void SetVerdanturfTentPrize(void);
+static void SetVerdanturfTentTrainerGfx(void);
+static void BufferVerdanturfTentTrainerIntro(void);
+static void SaveVerdanturfTentChallenge(void);
+static void SetRandomVerdanturfTentPrize(void);
+static void GiveVerdanturfTentPrize(void);
+static void InitFallarborTentChallenge(void);
+static void GetFallarborTentPrize(void);
+static void SetFallarborTentPrize(void);
+static void SaveFallarborTentChallenge(void);
+static void SetRandomFallarborTentPrize(void);
+static void GiveFallarborTentPrize(void);
+static void BufferFallarborTentTrainerName(void);
+static void InitSlateportTentChallenge(void);
+static void GetSlateportTentPrize(void);
+static void SetSlateportTentPrize(void);
+static void SaveSlateportTentChallenge(void);
+static void SetRandomSlateportTentPrize(void);
+static void GiveSlateportTentPrize(void);
+static void SelectInitialRentalMons(void);
+static void SwapRentalMons(void);
 static void sub_81BA040(void);
 static void sub_81B9EC0(void);
 
@@ -49,41 +50,41 @@ static u16 sRandMonSetId;
 // const rom data
 void static (*const sVerdanturfTentFuncs[])(void) =
 {
-    sub_81B99D4,
-    sub_81B9A28,
-    sub_81B9A44,
-    sub_81B9A60,
-    sub_81B9A90,
-    sub_81B9ABC,
-    sub_81B9B00,
-    sub_81B9B28
+    InitVerdanturfTentChallenge,
+    GetVerdanturfTentPrize,
+    SetVerdanturfTentPrize,
+    SetVerdanturfTentTrainerGfx,
+    BufferVerdanturfTentTrainerIntro,
+    SaveVerdanturfTentChallenge,
+    SetRandomVerdanturfTentPrize,
+    GiveVerdanturfTentPrize
 };
 
 static const u16 sVerdanturfTentRewards[] = {ITEM_NEST_BALL};
 
 void static (*const sFallarborTentFuncs[])(void) =
 {
-    sub_81B9BA0,
-    sub_81B9BF4,
-    sub_81B9C10,
-    sub_81B9C2C,
-    sub_81B9C70,
-    sub_81B9C98,
-    sub_81B9CF0
+    InitFallarborTentChallenge,
+    GetFallarborTentPrize,
+    SetFallarborTentPrize,
+    SaveFallarborTentChallenge,
+    SetRandomFallarborTentPrize,
+    GiveFallarborTentPrize,
+    BufferFallarborTentTrainerName
 };
 
 static const u16 sFallarborTentRewards[] = {ITEM_HYPER_POTION};
 
 void static (*const sSlateportTentFuncs[])(void) =
 {
-    sub_81B9D28,
-    sub_81B9D7C,
-    sub_81B9D98,
-    sub_81B9DB4,
-    sub_81B9DF8,
-    sub_81B9E20,
-    sub_81B9E78,
-    sub_81B9E88,
+    InitSlateportTentChallenge,
+    GetSlateportTentPrize,
+    SetSlateportTentPrize,
+    SaveSlateportTentChallenge,
+    SetRandomSlateportTentPrize,
+    GiveSlateportTentPrize,
+    SelectInitialRentalMons,
+    SwapRentalMons,
     sub_81BA040,
     sub_81B9EC0
 };
@@ -96,7 +97,7 @@ void CallVerdanturfTentFunction(void)
     sVerdanturfTentFuncs[gSpecialVar_0x8004]();
 }
 
-static void sub_81B99D4(void)
+static void InitVerdanturfTentChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = 0;
     gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
@@ -104,29 +105,29 @@ static void sub_81B99D4(void)
     SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
-static void sub_81B9A28(void)
+static void GetVerdanturfTentPrize(void)
 {
-    gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6A;
+    gSpecialVar_Result = gSaveBlock2Ptr->frontier.verdanturfTentPrize;
 }
 
-static void sub_81B9A44(void)
+static void SetVerdanturfTentPrize(void)
 {
-    gSaveBlock2Ptr->frontier.field_E6A = gSpecialVar_0x8006;
+    gSaveBlock2Ptr->frontier.verdanturfTentPrize = gSpecialVar_0x8006;
 }
 
-static void sub_81B9A60(void)
+static void SetVerdanturfTentTrainerGfx(void)
 {
     gTrainerBattleOpponent_A = (u32)((Random() % 255) * 5) / 64;
     SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
 }
 
-static void sub_81B9A90(void)
+static void BufferVerdanturfTentTrainerIntro(void)
 {
-    if (gTrainerBattleOpponent_A < 300)
+    if (gTrainerBattleOpponent_A < TRAINER_RECORD_MIXING_FRIEND)
         FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
 }
 
-static void sub_81B9ABC(void)
+static void SaveVerdanturfTentChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
@@ -134,17 +135,17 @@ static void sub_81B9ABC(void)
     SaveGameFrontier();
 }
 
-static void sub_81B9B00(void)
+static void SetRandomVerdanturfTentPrize(void)
 {
-    gSaveBlock2Ptr->frontier.field_E6A = sVerdanturfTentRewards[Random() % ARRAY_COUNT(sVerdanturfTentRewards)];
+    gSaveBlock2Ptr->frontier.verdanturfTentPrize = sVerdanturfTentRewards[Random() % ARRAY_COUNT(sVerdanturfTentRewards)];
 }
 
-static void sub_81B9B28(void)
+static void GiveVerdanturfTentPrize(void)
 {
-    if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6A, 1) == TRUE)
+    if (AddBagItem(gSaveBlock2Ptr->frontier.verdanturfTentPrize, 1) == TRUE)
     {
-        CopyItemName(gSaveBlock2Ptr->frontier.field_E6A, gStringVar1);
-        gSaveBlock2Ptr->frontier.field_E6A = ITEM_NONE;
+        CopyItemName(gSaveBlock2Ptr->frontier.verdanturfTentPrize, gStringVar1);
+        gSaveBlock2Ptr->frontier.verdanturfTentPrize = ITEM_NONE;
         gSpecialVar_Result = TRUE;
     }
     else
@@ -158,7 +159,7 @@ void CallFallarborTentFunction(void)
     sFallarborTentFuncs[gSpecialVar_0x8004]();
 }
 
-static void sub_81B9BA0(void)
+static void InitFallarborTentChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = 0;
     gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
@@ -166,17 +167,17 @@ static void sub_81B9BA0(void)
     SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
-static void sub_81B9BF4(void)
+static void GetFallarborTentPrize(void)
 {
-    gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6C;
+    gSpecialVar_Result = gSaveBlock2Ptr->frontier.fallarborTentPrize;
 }
 
-static void sub_81B9C10(void)
+static void SetFallarborTentPrize(void)
 {
-    gSaveBlock2Ptr->frontier.field_E6C = gSpecialVar_0x8006;
+    gSaveBlock2Ptr->frontier.fallarborTentPrize = gSpecialVar_0x8006;
 }
 
-static void sub_81B9C2C(void)
+static void SaveFallarborTentChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
@@ -184,17 +185,17 @@ static void sub_81B9C2C(void)
     SaveGameFrontier();
 }
 
-static void sub_81B9C70(void)
+static void SetRandomFallarborTentPrize(void)
 {
-    gSaveBlock2Ptr->frontier.field_E6C = sFallarborTentRewards[Random() % ARRAY_COUNT(sFallarborTentRewards)];
+    gSaveBlock2Ptr->frontier.fallarborTentPrize = sFallarborTentRewards[Random() % ARRAY_COUNT(sFallarborTentRewards)];
 }
 
-static void sub_81B9C98(void)
+static void GiveFallarborTentPrize(void)
 {
-    if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6C, 1) == TRUE)
+    if (AddBagItem(gSaveBlock2Ptr->frontier.fallarborTentPrize, 1) == TRUE)
     {
-        CopyItemName(gSaveBlock2Ptr->frontier.field_E6C, gStringVar1);
-        gSaveBlock2Ptr->frontier.field_E6C = ITEM_NONE;
+        CopyItemName(gSaveBlock2Ptr->frontier.fallarborTentPrize, gStringVar1);
+        gSaveBlock2Ptr->frontier.fallarborTentPrize = ITEM_NONE;
         gSpecialVar_Result = TRUE;
     }
     else
@@ -203,7 +204,7 @@ static void sub_81B9C98(void)
     }
 }
 
-static void sub_81B9CF0(void)
+static void BufferFallarborTentTrainerName(void)
 {
     GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A);
 }
@@ -213,7 +214,7 @@ void CallSlateportTentFunction(void)
     sSlateportTentFuncs[gSpecialVar_0x8004]();
 }
 
-static void sub_81B9D28(void)
+static void InitSlateportTentChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = 0;
     gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
@@ -221,17 +222,17 @@ static void sub_81B9D28(void)
     SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
-static void sub_81B9D7C(void)
+static void GetSlateportTentPrize(void)
 {
-    gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6E;
+    gSpecialVar_Result = gSaveBlock2Ptr->frontier.slateportTentPrize;
 }
 
-static void sub_81B9D98(void)
+static void SetSlateportTentPrize(void)
 {
-    gSaveBlock2Ptr->frontier.field_E6E = gSpecialVar_0x8006;
+    gSaveBlock2Ptr->frontier.slateportTentPrize = gSpecialVar_0x8006;
 }
 
-static void sub_81B9DB4(void)
+static void SaveSlateportTentChallenge(void)
 {
     gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005;
     VarSet(VAR_TEMP_0, 0);
@@ -239,17 +240,17 @@ static void sub_81B9DB4(void)
     SaveGameFrontier();
 }
 
-static void sub_81B9DF8(void)
+static void SetRandomSlateportTentPrize(void)
 {
-    gSaveBlock2Ptr->frontier.field_E6E = sSlateportTentRewards[Random() % ARRAY_COUNT(sSlateportTentRewards)];
+    gSaveBlock2Ptr->frontier.slateportTentPrize = sSlateportTentRewards[Random() % ARRAY_COUNT(sSlateportTentRewards)];
 }
 
-static void sub_81B9E20(void)
+static void GiveSlateportTentPrize(void)
 {
-    if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6E, 1) == TRUE)
+    if (AddBagItem(gSaveBlock2Ptr->frontier.slateportTentPrize, 1) == TRUE)
     {
-        CopyItemName(gSaveBlock2Ptr->frontier.field_E6E, gStringVar1);
-        gSaveBlock2Ptr->frontier.field_E6E = ITEM_NONE;
+        CopyItemName(gSaveBlock2Ptr->frontier.slateportTentPrize, gStringVar1);
+        gSaveBlock2Ptr->frontier.slateportTentPrize = ITEM_NONE;
         gSpecialVar_Result = TRUE;
     }
     else
@@ -258,13 +259,13 @@ static void sub_81B9E20(void)
     }
 }
 
-static void sub_81B9E78(void)
+static void SelectInitialRentalMons(void)
 {
     ZeroPlayerPartyMons();
     DoBattleFactorySelectScreen();
 }
 
-static void sub_81B9E88(void)
+static void SwapRentalMons(void)
 {
     DoBattleFactorySwapScreen();
 }
diff --git a/src/battle_tower.c b/src/battle_tower.c
index c8b243ad0..8d1fc9689 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -45,13 +45,13 @@ EWRAM_DATA const struct FacilityMon *gFacilityTrainerMons = NULL;
 u16 gUnknown_03006298[4];
 
 // This file's functions.
-static void sub_8161F94(void);
-static void sub_8162054(void);
-static void sub_81620F4(void);
+static void InitTowerChallenge(void);
+static void GetTowerData(void);
+static void SetTowerData(void);
 static void ChooseNextBattleTowerTrainer(void);
 static void sub_81621C0(void);
 static void AwardBattleTowerRibbons(void);
-static void SaveBattleTowerProgress(void);
+static void SaveTowerChallenge(void);
 static void sub_8163914(void);
 static void nullsub_61(void);
 static void nullsub_116(void);
@@ -1056,13 +1056,13 @@ struct
 
 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_INIT] = InitTowerChallenge,
+    [BATTLE_TOWER_FUNC_GET_DATA] = GetTowerData,
+    [BATTLE_TOWER_FUNC_SET_DATA] = SetTowerData,
     [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_SAVE] = SaveTowerChallenge,
     [BATTLE_TOWER_FUNC_7] = sub_8163914,
     [BATTLE_TOWER_FUNC_NOP] = nullsub_61,
     [BATTLE_TOWER_FUNC_NOP2] = nullsub_116,
@@ -1154,7 +1154,7 @@ void CallBattleTowerFunc(void)
     sBattleTowerFuncs[gSpecialVar_0x8004]();
 }
 
-static void sub_8161F94(void)
+static void InitTowerChallenge(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -1172,7 +1172,7 @@ static void sub_8161F94(void)
     gTrainerBattleOpponent_A = 0;
 }
 
-static void sub_8162054(void)
+static void GetTowerData(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -1193,7 +1193,7 @@ static void sub_8162054(void)
     }
 }
 
-static void sub_81620F4(void)
+static void SetTowerData(void)
 {
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -2423,7 +2423,7 @@ static void sub_8163EE4(void)
     SaveCurrentWinStreak();
 }
 
-static void SaveBattleTowerProgress(void)
+static void SaveTowerChallenge(void)
 {
     u16 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
     u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);