battle file more done and clean up tv

5 files changed, 589 insertions, 354 deletions

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 3c8b1563f..3d5ffeb3a 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -121,10 +121,10 @@ void sub_8032768(void)
     }
 
     for (i = 0; i < sizeof(gBattleStruct->field_1A4); i++)
-        *(gBattleStruct->field_1A4 + i) = 0;
+        *((u8*)(&gBattleStruct->field_1A4) + i) = 0;
 
     for (i = 0; i < sizeof(gBattleStruct->field_204); i++)
-        *(gBattleStruct->field_204 + i) = 0;
+        *((u8*)(&gBattleStruct->field_204) + i) = 0;
 }
 
 static void InitSinglePlayerBtlControllers(void)
diff --git a/src/battle_link_817C95C.c b/src/battle_link_817C95C.c
index c92a963eb..1a8a201aa 100644
--- a/src/battle_link_817C95C.c
+++ b/src/battle_link_817C95C.c
@@ -9,89 +9,6 @@
 #include "battle_message.h"
 #include "tv.h"
 
-struct BattleLinkStringSide
-{
-    u32 spikesMonId:3;
-    u32 reflectMoveId:3;
-    u32 lightScreenMonId:3;
-    u32 safeguardMonId:3;
-    u32 mistMonId:3;
-    u32 futureSightMonId:3;
-    u32 doomDesireMonId:3;
-    u32 perishSongMonId:3;
-    u32 wishMonId:3;
-    u32 grudgeMonId:3;
-    u32 field_8_6:2;
-    u32 spikesMoveSlot:2;
-    u32 reflectMoveSlot:2;
-    u32 lightScreenMoveSlot:2;
-    u32 safeguardMoveSlot:2;
-    u32 mistMoveSlot:2;
-    u32 futureSightMoveSlot:2;
-    u32 doomDesireMoveSlot:2;
-    u32 perishSongMoveSlot:2;
-    u32 wishMoveSlot:2;
-    u32 grudgeMoveSlot:2;
-    u32 destinyBondMonId:3;
-    u32 destinyBondMoveSlot:2;
-    u32 field_3_0:4;
-    u32 field_3_1:3;
-    u32 field_4_0_0:1;
-    u32 field_4_0:2;
-    u32 field_4_0_b:3;
-    u32 field_4_1:1;
-    u32 field_4_2:1;
-    u32 field_5_0:3;
-    u32 field_5_1:2;
-};
-
-struct BattleLinkStringPosition
-{
-    u32 curseMonId:3;
-    u32 leechSeedMonId:3;
-    u32 nightmareMonId:3;
-    u32 wrapMonId:3;
-    u32 attractMonId:3;
-    u32 confusionMonId:3;
-    u32 curseMoveSlot:2;
-    u32 leechSeedMoveSlot:2;
-    u32 nightmareMoveSlot:2;
-    u32 wrapMoveSlot:2;
-    u32 attractMoveSlot:2;
-    u32 confusionMoveSlot:2;
-    u32 waterSportMoveSlot:2;
-    u32 waterSportMonId:3;
-    u32 mudSportMonId:3;
-    u32 mudSportMoveSlot:2;
-    u32 ingrainMonId:3;
-    u32 ingrainMoveSlot:2;
-    u32 field_5_5:3;
-    u32 field_6_0:2;
-};
-
-struct BattleLinkStringMon
-{
-    u32 psnMonId:3;
-    u32 badPsnMonId:3;
-    u32 brnMonId:3;
-    u32 prlzMonId:3;
-    u32 slpMonId:3;
-    u32 frzMonId:3;
-    u32 psnMoveSlot:2;
-    u32 badPsnMoveSlot:2;
-    u32 brnMoveSlot:2;
-    u32 prlzMoveSlot:2;
-    u32 slpMoveSlot:2;
-    u32 frzMoveSlot:2;
-};
-
-struct UnknownBattleLinkStruct
-{
-    struct BattleLinkStringMon mon[2][6]; // [side][partyId]
-    struct BattleLinkStringPosition pos[2][2]; // [side][flank]
-    struct BattleLinkStringSide side[2]; // [side]
-};
-
 extern struct StringInfoBattle *gStringInfo;
 
 extern const struct BattleMove gBattleMoves[];
@@ -102,9 +19,12 @@ void sub_817E684(u8 arg0, u16 arg1, u8 arg2, u8 arg3);
 void sub_817EECC(void);
 void sub_817EA80(u8 arg0);
 void sub_817F394(u16 weatherFlags, u16 moveId, u8 moveSlot);
+bool8 sub_817F21C(u16 moveId, s32 *dmg, u16 *powerOverride);
 
 // const rom data
+extern const u16 *const gUnknown_0860A834[];
 extern const u16 gUnknown_0860A8A4[];
+extern const u16 gUnknown_0860A4AC[];
 
 // code
 void sub_817C95C(u16 stringId)
@@ -120,7 +40,7 @@ void sub_817C95C(u16 stringId)
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && stringId != STRINGID_ITDOESNTAFFECT && stringId != STRINGID_NOTVERYEFFECTIVE)
         return;
 
-    structPtr = (struct UnknownBattleLinkStruct*)(&gBattleStruct->field_204);
+    structPtr = &gBattleStruct->field_204;
 
     atkSide = GetBattlerSide(gBattlerAttacker);
     defSide = GetBattlerSide(gBattlerTarget);
@@ -179,7 +99,7 @@ void sub_817C95C(u16 stringId)
     case STRINGID_FAINTINTHREE:
         structPtr->side[atkSide].perishSongMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1;
         structPtr->side[atkSide].perishSongMoveSlot = moveSlot;
-        structPtr->side[atkSide].field_4_1 = 1;
+        structPtr->side[atkSide].perishSong = 1;
         break;
     case STRINGID_PKMNPERISHCOUNTFELL:
         if (*perishCount == 0)
@@ -455,7 +375,7 @@ void sub_817C95C(u16 stringId)
         break;
     case STRINGID_PKMNRAISEDDEF:
     case STRINGID_PKMNRAISEDDEFALITTLE:
-        structPtr->side[atkSide].reflectMoveId = gBattlerPartyIndexes[gBattlerAttacker] + 1;
+        structPtr->side[atkSide].reflectMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1;
         structPtr->side[atkSide].reflectMoveSlot = moveSlot;
         break;
     case STRINGID_PKMNRAISEDSPDEF:
@@ -466,7 +386,7 @@ void sub_817C95C(u16 stringId)
     case STRINGID_PKMNSXWOREOFF:
         if (*finishedMoveId == MOVE_REFLECT)
         {
-            structPtr->side[atkSide].reflectMoveId = 0;
+            structPtr->side[atkSide].reflectMonId = 0;
             structPtr->side[atkSide].reflectMoveSlot = 0;
         }
         if (*finishedMoveId == MOVE_LIGHT_SCREEN)
@@ -501,7 +421,7 @@ void sub_817C95C(u16 stringId)
             sub_817E684(16, 0, structPtr->side[defSide].mistMonId - 1, structPtr->side[defSide].mistMoveSlot);
         break;
     case STRINGID_THEWALLSHATTERED:
-        structPtr->side[defSide].reflectMoveId = 0;
+        structPtr->side[defSide].reflectMonId = 0;
         structPtr->side[defSide].reflectMoveSlot = 0;
         structPtr->side[defSide].lightScreenMonId = 0;
         structPtr->side[defSide].lightScreenMoveSlot = 0;
@@ -548,7 +468,7 @@ void sub_817E0FC(u16 move, u16 weatherFlags, struct DisableStruct *disableStruct
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
         return;
 
-    structPtr = (struct UnknownBattleLinkStruct*)(&gBattleStruct->field_204);
+    structPtr = &gBattleStruct->field_204;
 
     atkSide = GetBattlerSide(gBattlerAttacker);
     defSide = GetBattlerSide(gBattlerTarget);
@@ -575,10 +495,10 @@ void sub_817E0FC(u16 move, u16 weatherFlags, struct DisableStruct *disableStruct
     }
     if (move == MOVE_SELF_DESTRUCT || move == MOVE_EXPLOSION)
     {
-        structPtr->side[atkSide ^ BIT_SIDE].field_4_0_b = gBattlerPartyIndexes[gBattlerAttacker] + 1;
-        structPtr->side[atkSide ^ BIT_SIDE].field_4_0 = moveSlot;
+        structPtr->side[atkSide ^ BIT_SIDE].explosionMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1;
+        structPtr->side[atkSide ^ BIT_SIDE].explosionMoveSlot = moveSlot;
         structPtr->side[atkSide ^ BIT_SIDE].field_3_0 = 13;
-        structPtr->side[atkSide ^ BIT_SIDE].field_4_0_0 = 1;
+        structPtr->side[atkSide ^ BIT_SIDE].explosion = 1;
     }
 
     sub_817E684(13, gBattleMoves[move].type, gBattleMoves[move].power, 0);
@@ -595,7 +515,7 @@ void sub_817E32C(u8 animationId)
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
         return;
 
-    structPtr = (struct UnknownBattleLinkStruct*)(&gBattleStruct->field_204);
+    structPtr = &gBattleStruct->field_204;
     atkSide = GetBattlerSide(gBattlerAttacker);
     switch (animationId)
     {
@@ -625,7 +545,7 @@ void sub_817E3F4(void)
     u16 playerBestSpecies = 0, opponentBestSpecies = 0;
     s16 playerBestSum = 0, opponentBestSum = SHRT_MAX;
     u8 playerBestMonId = 0, opponentBestMonId = 0;
-    s16 *array = NULL;
+    struct UnknownBattleLinkArrayStruct *array = NULL;
     u8 countPlayer = 0, countOpponent = 0;
     s16 sum = 0;
     u16 species = 0;
@@ -635,7 +555,7 @@ void sub_817E3F4(void)
     if (gBattleStruct->field_B3)
         return;
 
-    array = (void*) &gBattleStruct->field_1A4[0];
+    array = &gBattleStruct->field_1A4;
     for (i = 0; i < PARTY_SIZE; i++)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
@@ -653,7 +573,7 @@ void sub_817E3F4(void)
         if (species != SPECIES_NONE && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG, NULL))
         {
             for (sum = 0, j = 0; j < 4; j++)
-                sum += array[i * 4 + j];
+                sum += array->unk0[0][i * 4 + j];
 
             if (playerBestSum < sum)
             {
@@ -666,8 +586,9 @@ void sub_817E3F4(void)
         species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, NULL);
         if (species != SPECIES_NONE && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG, NULL))
         {
+            s32 id = 1;
             for (sum = 0, j = 0; j < 4; j++)
-                sum += array[i * 4 + j];
+                sum += array->unk0[id][i * 4 + j];
 
             if (opponentBestSum == sum)
             {
@@ -689,9 +610,9 @@ void sub_817E3F4(void)
 
     for (sum = 0, i = 0, j = 0; j < 4; j++)
     {
-        if (sum < array[playerBestMonId * 4 + j])
+        if (sum < array->unk0[0][playerBestMonId * 4 + j])
         {
-            sum = array[playerBestMonId * 4 + j];
+            sum = array->unk0[0][playerBestMonId * 4 + j];
             i = j;
         }
     }
@@ -1041,3 +962,345 @@ _0817E670:\n\
 	.pool");
 }
 #endif
+
+void sub_817E684(u8 caseId, u16 arg1, u8 arg2, u8 arg3)
+{
+    struct UnknownBattleLinkArrayStruct *array = &gBattleStruct->field_1A4;
+    struct UnknownBattleLinkStruct *structPtr = &gBattleStruct->field_204;
+    u32 atkSide = GetBattlerSide(gBattlerAttacker);
+    u32 defSide = GetBattlerSide(gBattlerTarget);
+    const u16 *ptr;
+    s32 i;
+
+    switch (caseId)
+    {
+    case 0:
+    case 1:
+    case 18:
+    case 22 ... 27:
+        array->unk0[atkSide][gBattlerPartyIndexes[gBattlerAttacker] * 4 + arg1] += gUnknown_0860A834[caseId][arg2];
+        break;
+    case 3 ... 7:
+        i = 0;
+        ptr = gUnknown_0860A834[caseId];
+        do
+        {
+            if (arg1 == ptr[i])
+            {
+                array->unk0[atkSide][gBattlerPartyIndexes[gBattlerAttacker] * 4 + arg2] += ptr[i+1];
+                break;
+            }
+            i += 2;
+        } while (ptr[i] != 0xFFFF);
+        break;
+    case 19:
+        structPtr->side[arg2 ^ 1].field_3_0 = 0;
+        array->unk0[arg2][0 * 4 + arg3] += gUnknown_0860A834[caseId][arg1];
+        break;
+    case 20:
+        structPtr->side[arg2].field_3_0 = 0;
+    case 2:
+        array->unk0[arg2][0 * 4 + arg3] += gUnknown_0860A834[caseId][arg1];
+        break;
+    case 17:
+        array->unk0[atkSide][arg2 * 4 + arg3] += gUnknown_0860A834[caseId][arg1];
+        break;
+    case 8:
+    case 9:
+    case 15:
+    case 16:
+    case 21:
+        array->unk0[atkSide ^ BIT_SIDE][arg2 * 4 + arg3] += gUnknown_0860A834[caseId][arg1];
+        break;
+    case 10:
+        array->unk0[arg1][arg2 * 4 + arg3] += gUnknown_0860A834[caseId][0];
+        break;
+    case 11:
+        if (structPtr->pos[defSide][0].waterSportMonId != -(structPtr->pos[defSide][1].waterSportMonId) && arg1 == 10)
+        {
+            if (structPtr->pos[defSide][0].waterSportMonId != 0)
+            {
+                u32 id = (structPtr->pos[defSide][0].waterSportMonId - 1) * 4;
+                array->unk0[defSide][id + structPtr->pos[defSide][0].waterSportMoveSlot] += gUnknown_0860A834[caseId][0];
+            }
+            if (structPtr->pos[defSide][1].waterSportMonId != 0)
+            {
+                u32 id = (structPtr->pos[defSide][1].waterSportMonId - 1) * 4;
+                array->unk0[defSide][id + structPtr->pos[defSide][1].waterSportMoveSlot] += gUnknown_0860A834[caseId][0];
+            }
+        }
+        break;
+    case 12:
+        if (structPtr->pos[defSide][0].mudSportMonId != -(structPtr->pos[defSide][1].mudSportMonId) && arg1 == 13)
+        {
+            if (structPtr->pos[defSide][0].mudSportMonId != 0)
+            {
+                u32 id = (structPtr->pos[defSide][0].mudSportMonId - 1) * 4;
+                array->unk0[defSide][id + structPtr->pos[defSide][0].mudSportMoveSlot] += gUnknown_0860A834[caseId][0];
+            }
+            if (structPtr->pos[defSide][1].mudSportMonId != 0)
+            {
+                u32 id = (structPtr->pos[defSide][1].mudSportMonId - 1) * 4;
+                array->unk0[defSide][id + structPtr->pos[defSide][1].mudSportMoveSlot] += gUnknown_0860A834[caseId][0];
+            }
+        }
+        break;
+    case 13:
+        if (arg1 <= 8 && arg2 != 0 && structPtr->side[defSide].reflectMonId != 0)
+        {
+            u32 id = (structPtr->side[defSide].reflectMonId - 1) * 4;
+            array->unk0[defSide][id + structPtr->side[defSide].reflectMoveSlot] += gUnknown_0860A834[caseId][0];
+        }
+        break;
+    case 14:
+        if (arg1 > 8 && arg2 != 0 && structPtr->side[defSide].lightScreenMonId != 0)
+        {
+            u32 id = (structPtr->side[defSide].lightScreenMonId - 1) * 4;
+            array->unk0[defSide][id + structPtr->side[defSide].lightScreenMoveSlot] += gUnknown_0860A834[caseId][0];
+        }
+        break;
+        break;
+    }
+}
+
+void sub_817EA80(u8 arg0)
+{
+    struct UnknownBattleLinkStruct *structPtr = &gBattleStruct->field_204;
+    u32 atkSide = GetBattlerSide(gBattlerAttacker);
+    u32 defSide = GetBattlerSide(gBattlerTarget);
+    u32 atkArrId = structPtr->side[atkSide].field_3_1;
+    s32 i;
+
+    if (structPtr->side[atkSide].field_3_0 != 0)
+    {
+        switch (structPtr->side[atkSide].field_3_0)
+        {
+        case 1:
+            if (structPtr->pos[atkSide][atkArrId].curseMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->pos[atkSide][atkArrId].curseMonId - 1) * 4 + structPtr->pos[atkSide][atkArrId].curseMoveSlot);
+            }
+            break;
+        case 2:
+            if (structPtr->pos[atkSide][atkArrId].leechSeedMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->pos[atkSide][atkArrId].leechSeedMonId - 1) * 4 + structPtr->pos[atkSide][atkArrId].leechSeedMoveSlot);
+            }
+            break;
+        case 3:
+            if (structPtr->mon[atkSide][atkArrId].psnMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->mon[atkSide][atkArrId].psnMonId - 1) * 4 + structPtr->mon[atkSide][atkArrId].psnMoveSlot);
+            }
+            if (structPtr->mon[atkSide][atkArrId].badPsnMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->mon[atkSide][atkArrId].badPsnMonId - 1) * 4 + structPtr->mon[atkSide][atkArrId].badPsnMoveSlot);
+            }
+            break;
+        case 4:
+            if (structPtr->mon[atkSide][atkArrId].brnMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->mon[atkSide][atkArrId].brnMonId - 1) * 4 + structPtr->mon[atkSide][atkArrId].brnMoveSlot);
+            }
+            break;
+        case 5:
+            if (structPtr->pos[atkSide][atkArrId].nightmareMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->pos[atkSide][atkArrId].nightmareMonId - 1) * 4 + structPtr->pos[atkSide][atkArrId].nightmareMoveSlot);
+            }
+            break;
+        case 6:
+            if (structPtr->pos[atkSide][atkArrId].wrapMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->pos[atkSide][atkArrId].wrapMonId - 1) * 4 + structPtr->pos[atkSide][atkArrId].wrapMoveSlot);
+            }
+            break;
+        case 7:
+            if (structPtr->side[atkSide].spikesMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->side[atkSide].spikesMonId - 1) * 4 + structPtr->side[atkSide].spikesMoveSlot);
+            }
+            break;
+        case 8:
+            if (structPtr->side[atkSide].futureSightMonId != 0)
+            {
+                sub_817E684(20, 0, atkSide,
+                (structPtr->side[atkSide].futureSightMonId - 1) * 4 + structPtr->side[atkSide].futureSightMoveSlot);
+            }
+            break;
+        case 9:
+            if (structPtr->side[atkSide].doomDesireMonId != 0)
+            {
+                sub_817E684(20, 0, atkSide,
+                (structPtr->side[atkSide].doomDesireMonId - 1) * 4 + structPtr->side[atkSide].doomDesireMoveSlot);
+            }
+            break;
+        case 10:
+            if (structPtr->side[atkSide].perishSong
+                && structPtr->side[atkSide].perishSongMonId - 1 != gBattlerPartyIndexes[gBattlerAttacker])
+            {
+                sub_817E684(19, 0, atkSide,
+                (structPtr->side[atkSide].perishSongMonId - 1) * 4 + structPtr->side[atkSide].perishSongMoveSlot);
+            }
+            if (structPtr->side[atkSide ^ BIT_SIDE].perishSong)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->side[atkSide ^ BIT_SIDE].perishSongMonId - 1) * 4 + structPtr->side[atkSide ^ BIT_SIDE].perishSongMoveSlot);
+            }
+            break;
+        case 11:
+            if (structPtr->side[atkSide ^ BIT_SIDE].destinyBondMonId != 0)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->side[atkSide ^ BIT_SIDE].destinyBondMonId - 1) * 4 + structPtr->side[atkSide ^ BIT_SIDE].destinyBondMoveSlot);
+            }
+            break;
+        case 12:
+            for (i = 0; i < 2; i++)
+            {
+                if (structPtr->pos[atkSide][i].confusionMonId != 0)
+                {
+                    sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                    (structPtr->pos[atkSide][i].confusionMonId - 1) * 4 + structPtr->pos[atkSide][i].confusionMoveSlot);
+                }
+            }
+            break;
+        case 13:
+            if (structPtr->side[atkSide].explosion)
+            {
+                sub_817E684(19, 0, atkSide,
+                (structPtr->side[atkSide].explosionMonId - 1) * 4 + structPtr->side[atkSide].explosionMoveSlot);
+            }
+            if (structPtr->side[atkSide ^ BIT_SIDE].explosion)
+            {
+                sub_817E684(19, 0, atkSide ^ BIT_SIDE,
+                (structPtr->side[atkSide ^ BIT_SIDE].explosionMonId - 1) * 4 + structPtr->side[atkSide ^ BIT_SIDE].explosionMoveSlot);
+            }
+            break;
+        case 14:
+            if (arg0 == 1)
+            {
+                sub_817E684(20, 0, atkSide,
+                (gBattlerPartyIndexes[gBattlerAttacker]) * 4 + structPtr->side[atkSide].field_8_6);
+            }
+            break;
+        case 15:
+            break;
+        }
+    }
+    else
+    {
+        if (structPtr->side[defSide].field_3_0 == 7)
+        {
+            if (structPtr->side[defSide].spikesMonId != 0)
+            {
+                sub_817E684(19, 0, defSide ^ BIT_SIDE,
+                (structPtr->side[defSide].spikesMonId - 1) * 4 + structPtr->side[defSide].spikesMoveSlot);
+            }
+        }
+        else
+        {
+            sub_817E684(20, 0, atkSide,
+            (gBattlerPartyIndexes[gBattlerAttacker]) * 4 + structPtr->side[atkSide].field_8_6);
+        }
+    }
+}
+
+void sub_817EECC(void)
+{
+    s32 i;
+    s32 dmgByMove[4];
+    u16 powerOverride;
+    u16 currMoveSaved;
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+        return;
+    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)
+        return;
+    if (gBattleMons[gBattlerAttacker].statStages[STAT_ACC] <= 5)
+        return;
+    if (gBattleMons[gBattlerTarget].statStages[STAT_EVASION] > 6)
+        return;
+    if (gCurrentMove == MOVE_HIDDEN_POWER || gCurrentMove == MOVE_WEATHER_BALL)
+        return;
+    if (gBattleTypeFlags & (BATTLE_TYPE_PALACE | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID))
+        return;
+    if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[gMoveSelectionCursor[gBattlerAttacker]]].power == 0)
+        return;
+
+    i = 0;
+    currMoveSaved = gBattleMons[gBattlerAttacker].moves[gMoveSelectionCursor[gBattlerAttacker]];
+    while (1)
+    {
+        if (currMoveSaved == gUnknown_0860A4AC[i])
+            break;
+        i++;
+        if (gUnknown_0860A4AC[i] == 0xFFFF)
+            break;
+    }
+
+    if (gUnknown_0860A4AC[i] != 0xFFFF)
+        return;
+
+    dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage;
+    currMoveSaved = gCurrentMove;
+    for (i = 0; i < 4; i++)
+    {
+        gCurrentMove = gBattleMons[gBattlerAttacker].moves[i];
+        powerOverride = 0;
+        if (sub_817F21C(gCurrentMove, &dmgByMove[i], &powerOverride))
+        {
+            u8 moveResultFlags;
+            u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)];
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove,
+                                                    sideStatus, powerOverride,
+                                                    0, gBattlerAttacker, gBattlerTarget);
+
+            if (gStatuses3[gBattlerAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+                gBattleMoveDamage *= 2;
+            if (gProtectStructs[gBattlerAttacker].helpingHand)
+                gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
+
+            moveResultFlags = TypeCalc(gCurrentMove, gBattlerAttacker, gBattlerTarget);
+            dmgByMove[i] = gBattleMoveDamage;
+            if (dmgByMove[i] == 0 && !(moveResultFlags & MOVE_RESULT_NO_EFFECT))
+                dmgByMove[i] = 1;
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        if (i != gMoveSelectionCursor[gBattlerAttacker] && dmgByMove[i] > dmgByMove[gMoveSelectionCursor[gBattlerAttacker]])
+        {
+            u16 opponentSpecies, playerSpecies;
+            s32 bestMoveId;
+
+            if (gMoveSelectionCursor[gBattlerAttacker] != 0)
+                bestMoveId = 0;
+            else
+                bestMoveId = 1;
+
+            for (i = 0; i < 4; i++)
+            {
+                if (i != gMoveSelectionCursor[gBattlerAttacker] && dmgByMove[i] > dmgByMove[bestMoveId])
+                    bestMoveId = i;
+            }
+
+            opponentSpecies = GetMonData(&gEnemyParty [gBattlerPartyIndexes[gBattlerTarget]],   MON_DATA_SPECIES, NULL);
+            playerSpecies   = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]], MON_DATA_SPECIES, NULL);
+            sub_80EE35C(opponentSpecies, playerSpecies, gMoveSelectionCursor[gBattlerAttacker], gBattleMons[gBattlerAttacker].moves, gBattleMons[gBattlerAttacker].moves[bestMoveId]);
+            break;
+        }
+    }
+
+    gBattleMoveDamage = dmgByMove[gMoveSelectionCursor[gBattlerAttacker]];
+    gCurrentMove = currMoveSaved;
+}
diff --git a/src/pokemon.c b/src/pokemon.c
index 25d532204..9c55fb84d 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2196,7 +2196,7 @@ void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
     (var) /= (gStatStageRatios)[(mon)->statStages[(statIndex)]][1];                 \
 }
 
-s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 sideStatus, u16 powerOverride, u8 typeOverride, u8 bankAtk, u8 bankDef)
+s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 sideStatus, u16 powerOverride, u8 typeOverride, u8 battlerIdAtk, u8 battlerIdDef)
 {
     u32 i;
     s32 damage = 0;
@@ -2226,8 +2226,8 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
 
     if (attacker->item == ITEM_ENIGMA_BERRY)
     {
-        attackerHoldEffect = gEnigmaBerries[bankAtk].holdEffect;
-        attackerHoldEffectParam = gEnigmaBerries[bankAtk].holdEffectParam;
+        attackerHoldEffect = gEnigmaBerries[battlerIdAtk].holdEffect;
+        attackerHoldEffectParam = gEnigmaBerries[battlerIdAtk].holdEffectParam;
     }
     else
     {
@@ -2237,8 +2237,8 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
 
     if (defender->item == ITEM_ENIGMA_BERRY)
     {
-        defenderHoldEffect = gEnigmaBerries[bankDef].holdEffect;
-        defenderHoldEffectParam = gEnigmaBerries[bankDef].holdEffectParam;
+        defenderHoldEffect = gEnigmaBerries[battlerIdDef].holdEffect;
+        defenderHoldEffectParam = gEnigmaBerries[battlerIdDef].holdEffectParam;
     }
     else
     {
@@ -2249,13 +2249,13 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     if (attacker->ability == ABILITY_HUGE_POWER || attacker->ability == ABILITY_PURE_POWER)
         attack *= 2;
 
-    if (ShouldGetStatBadgeBoost(FLAG_BADGE01_GET, bankAtk))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE01_GET, battlerIdAtk))
         attack = (110 * attack) / 100;
-    if (ShouldGetStatBadgeBoost(FLAG_BADGE05_GET, bankDef))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE05_GET, battlerIdDef))
         defense = (110 * defense) / 100;
-    if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, bankAtk))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, battlerIdAtk))
         spAttack = (110 * spAttack) / 100;
-    if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, bankDef))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, battlerIdDef))
         spDefense = (110 * spDefense) / 100;
 
     for (i = 0; i < ARRAY_COUNT(sHoldEffectToType); i++)
@@ -2440,7 +2440,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
         }
 
         // flash fire triggered
-        if ((gBattleResources->flags->flags[bankAtk] & UNKNOWN_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
+        if ((gBattleResources->flags->flags[battlerIdAtk] & UNKNOWN_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
             damage = (15 * damage) / 10;
     }
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index b7e2474d4..a29e64979 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1612,7 +1612,7 @@ bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2 = sub_80EF370(v1);
+    u8 v2 = CountDigits(v1);
 
     ConvertIntToDecimalStringN(sScriptStringVars[stringVarIndex], v1, 0, v2);
     return FALSE;
diff --git a/src/tv.c b/src/tv.c
index 83cb18b3f..03d564828 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -36,9 +36,7 @@
 #include "decoration.h"
 #include "secret_base.h"
 #include "tv.h"
-
-extern const u8 gSpeciesNames[][11];
-extern const u8 gMoveNames[][13];
+#include "data2.h"
 
 // Static type declarations
 
@@ -87,101 +85,100 @@ void tv_store_id_3x(TVShow *show);
 void DeleteTVShowInArrayByIdx(TVShow *shows, u8 idx);
 s8 FindEmptyTVSlotWithinFirstFiveShowsOfArray(TVShow *shows);
 void FindActiveBroadcastByShowType_SetScriptResult(u8 kind);
-void InterviewBefore_BravoTrainerPkmnProfile(void);
-void InterviewBefore_NameRater(void);
+static void InterviewBefore_BravoTrainerPkmnProfile(void);
+static void InterviewBefore_NameRater(void);
 u16 TV_GetSomeOtherSpeciesAlreadySeenByPlayer(u16 passedSpecies);
-void sub_80EFA88(void);
-void sub_80EF93C(TVShow *shows);
+static void sub_80EFA88(void);
+static void sub_80EF93C(TVShow *shows);
 s8 sub_80EEE30(PokeNews *pokeNews);
 bool8 sub_80EF0E4(u8 newsKind);
 void ClearPokemonNewsI(u8 i);
-void sub_80F1254(TVShow *shows);
-void sub_80F12A4(TVShow *shows);
-void sub_80F0358(TVShow *player1, TVShow *player2, TVShow *player3, TVShow *player4);
-void sub_80F0C04(void);
-void sub_80F0708(void);
-void sub_80F0B64(void);
-s8 sub_80F06D0(TVShow *tvShows);
-bool8 sub_80F049C(TVShow *dest[], TVShow *src[], u8 idx);
-bool8 sub_80F0580(TVShow *tv1, TVShow *tv2, u8 idx);
-bool8 sub_80F05E8(TVShow *tv1, TVShow *tv2, u8 idx);
-bool8 sub_80F0668(TVShow *tv1, TVShow *tv2, u8 idx);
-void sub_80F0B00(u8 showIdx);
-void sub_80F0B24(u16 species, u8 showIdx);
-void sub_80F0D60(PokeNews *player1, PokeNews *player2, PokeNews *player3, PokeNews *player4);
-void sub_80F0EEC(void);
-void sub_80F0F24(void);
-s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx);
-void sub_80F0E58(PokeNews *dest[], PokeNews *src[]);
-bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot);
+static void sub_80F1254(TVShow *shows);
+static void sub_80F12A4(TVShow *shows);
+static void sub_80F0358(TVShow *player1, TVShow *player2, TVShow *player3, TVShow *player4);
+static void sub_80F0C04(void);
+static void sub_80F0708(void);
+static void sub_80F0B64(void);
+static s8 sub_80F06D0(TVShow *tvShows);
+static bool8 sub_80F049C(TVShow *dest[], TVShow *src[], u8 idx);
+static bool8 sub_80F0580(TVShow *tv1, TVShow *tv2, u8 idx);
+static bool8 sub_80F05E8(TVShow *tv1, TVShow *tv2, u8 idx);
+static bool8 sub_80F0668(TVShow *tv1, TVShow *tv2, u8 idx);
+void SetTvShowInactive(u8 showIdx);
+static void sub_80F0B24(u16 species, u8 showIdx);
+static void sub_80F0D60(PokeNews *player1, PokeNews *player2, PokeNews *player3, PokeNews *player4);
+static void sub_80F0EEC(void);
+static void sub_80F0F24(void);
+static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx);
+static void sub_80F0E58(PokeNews *dest[], PokeNews *src[]);
+static bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot);
 void TVShowDone(void);
-void InterviewAfter_FanClubLetter(void);
-void InterviewAfter_RecentHappenings(void);
-void InterviewAfter_PkmnFanClubOpinions(void);
-void InterviewAfter_DummyShow4(void);
-void InterviewAfter_BravoTrainerPokemonProfile(void);
-void InterviewAfter_BravoTrainerBattleTowerProfile(void);
-void InterviewAfter_ContestLiveUpdates(void);
+static void InterviewAfter_FanClubLetter(void);
+static void InterviewAfter_RecentHappenings(void);
+static void InterviewAfter_PkmnFanClubOpinions(void);
+static void InterviewAfter_DummyShow4(void);
+static void InterviewAfter_BravoTrainerPokemonProfile(void);
+static void InterviewAfter_BravoTrainerBattleTowerProfile(void);
+static void InterviewAfter_ContestLiveUpdates(void);
 void UpdateWorldOfMastersAndPutItOnTheAir(void);
 void PutPokemonTodayFailedOnTheAir(void);
-void sub_80ED718(void);
-void sub_80EED88(void);
+static void sub_80ED718(void);
+static void sub_80EED88(void);
 void TV_SortPurchasesByQuantity(void);
-void sub_80ED8B4(u16 days);
+static void sub_80ED8B4(u16 days);
 void UpdateMassOutbreakTimeLeft(u16 days);
-void sub_80EF120(u16 days);
-void sub_80EDA48(u16 days);
-void sub_80EEB98(u16 days);
+static void sub_80EF120(u16 days);
+static void sub_80EDA48(u16 days);
+static void sub_80EEB98(u16 days);
 void PutFishingAdviceShowOnTheAir(void);
-void sub_80EDA80(void);
 u8 TV_MonDataIdxToRibbon(u8 monDataIdx);
-void sub_80EEBF4(u8 actionIdx);
+static void sub_80EEBF4(u8 actionIdx);
 bool8 IsPriceDiscounted(u8 newsKind);
-void InterviewBefore_FanClubLetter(void);
-void InterviewBefore_RecentHappenings(void);
-void InterviewBefore_PkmnFanClubOpinions(void);
-void InterviewBefore_Dummy(void);
-void InterviewBefore_BravoTrainerBTProfile(void);
-void InterviewBefore_ContestLiveUpdates(void);
-void InterviewBefore_3CheersForPokeblocks(void);
-void InterviewBefore_FanClubSpecial(void);
+static void InterviewBefore_FanClubLetter(void);
+static void InterviewBefore_RecentHappenings(void);
+static void InterviewBefore_PkmnFanClubOpinions(void);
+static void InterviewBefore_Dummy(void);
+static void InterviewBefore_BravoTrainerBTProfile(void);
+static void InterviewBefore_ContestLiveUpdates(void);
+static void InterviewBefore_3CheersForPokeblocks(void);
+static void InterviewBefore_FanClubSpecial(void);
 void ChangeBoxPokemonNickname_CB(void);
-void DoTVShowPokemonFanClubLetter(void);
-void DoTVShowRecentHappenings(void);
-void DoTVShowPokemonFanClubOpinions(void);
-void DoTVShowDummiedOut(void);
-void DoTVShowPokemonNewsMassOutbreak(void);
-void DoTVShowBravoTrainerPokemonProfile(void);
-void DoTVShowBravoTrainerBattleTower(void);
-void DoTVShowPokemonTodaySuccessfulCapture(void);
-void DoTVShowTodaysSmartShopper(void);
-void DoTVShowTheNameRaterShow(void);
-void DoTVShowPokemonContestLiveUpdates(void);
-void DoTVShowPokemonBattleUpdate(void);
-void DoTVShow3CheersForPokeblocks(void);
-void DoTVShowPokemonTodayFailedCapture(void);
-void DoTVShowPokemonAngler(void);
-void DoTVShowTheWorldOfMasters(void);
-void DoTVShowTodaysRivalTrainer(void);
-void DoTVShowDewfordTrendWatcherNetwork(void);
-void DoTVShowHoennTreasureInvestigators(void);
-void DoTVShowFindThatGamer(void);
-void DoTVShowBreakingNewsTV(void);
-void DoTVShowSecretBaseVisit(void);
-void DoTVShowPokemonLotteryWinnerFlashReport(void);
-void DoTVShowThePokemonBattleSeminar(void);
-void DoTVShowTrainerFanClubSpecial(void);
-void DoTVShowTrainerFanClub(void);
-void DoTVShowSpotTheCuties(void);
-void DoTVShowPokemonNewsBattleFrontier(void);
-void DoTVShowWhatsNo1InHoennToday(void);
-void DoTVShowSecretBaseSecrets(void);
-void DoTVShowSafariFanClub(void);
-void DoTVShowPokemonContestLiveUpdates2(void);
+static void DoTVShowPokemonFanClubLetter(void);
+static void DoTVShowRecentHappenings(void);
+static void DoTVShowPokemonFanClubOpinions(void);
+static void DoTVShowDummiedOut(void);
+static void DoTVShowPokemonNewsMassOutbreak(void);
+static void DoTVShowBravoTrainerPokemonProfile(void);
+static void DoTVShowBravoTrainerBattleTower(void);
+static void DoTVShowPokemonTodaySuccessfulCapture(void);
+static void DoTVShowTodaysSmartShopper(void);
+static void DoTVShowTheNameRaterShow(void);
+static void DoTVShowPokemonContestLiveUpdates(void);
+static void DoTVShowPokemonBattleUpdate(void);
+static void DoTVShow3CheersForPokeblocks(void);
+static void DoTVShowPokemonTodayFailedCapture(void);
+static void DoTVShowPokemonAngler(void);
+static void DoTVShowTheWorldOfMasters(void);
+static void DoTVShowTodaysRivalTrainer(void);
+static void DoTVShowDewfordTrendWatcherNetwork(void);
+static void DoTVShowHoennTreasureInvestigators(void);
+static void DoTVShowFindThatGamer(void);
+static void DoTVShowBreakingNewsTV(void);
+static void DoTVShowSecretBaseVisit(void);
+static void DoTVShowPokemonLotteryWinnerFlashReport(void);
+static void DoTVShowThePokemonBattleSeminar(void);
+static void DoTVShowTrainerFanClubSpecial(void);
+static void DoTVShowTrainerFanClub(void);
+static void DoTVShowSpotTheCuties(void);
+static void DoTVShowPokemonNewsBattleFrontier(void);
+static void DoTVShowWhatsNo1InHoennToday(void);
+static void DoTVShowSecretBaseSecrets(void);
+static void DoTVShowSafariFanClub(void);
+static void DoTVShowPokemonContestLiveUpdates2(void);
 
 // .rodata
 
-const struct {
+static const struct {
     u16 species;
     u16 moves[4];
     u8 level;
@@ -214,8 +211,7 @@ const struct {
     }
 };
 
-// TODO: Figure out what these are, and define constants in include/flags.h
-const u16 sGoldSymbolFlags[] = {
+static const u16 sGoldSymbolFlags[] = {
     FLAG_SYS_TOWER_GOLD,
     FLAG_SYS_DOME_GOLD,
     FLAG_SYS_PALACE_GOLD,
@@ -225,7 +221,7 @@ const u16 sGoldSymbolFlags[] = {
     FLAG_SYS_PYRAMID_GOLD
 };
 
-const u16 sSilverSymbolFlags[] = {
+static const u16 sSilverSymbolFlags[] = {
     FLAG_SYS_TOWER_SILVER,
     FLAG_SYS_DOME_SILVER,
     FLAG_SYS_PALACE_SILVER,
@@ -235,8 +231,7 @@ const u16 sSilverSymbolFlags[] = {
     FLAG_SYS_PYRAMID_SILVER
 };
 
-// TODO: Figure out what these are, and define constants in include/vars.h
-const u16 sNumberOneVarsAndThresholds[][2] = {
+static const u16 sNumberOneVarsAndThresholds[][2] = {
     {VAR_DAILY_SLOTS, 100},
     {VAR_DAILY_ROULETTE,  50},
     {VAR_DAILY_WILDS, 100},
@@ -246,7 +241,7 @@ const u16 sNumberOneVarsAndThresholds[][2] = {
     {VAR_DAILY_BP,  30}
 };
 
-const u8 *const sPokeNewsTextGroup_Upcoming[] = {
+static const u8 *const sPokeNewsTextGroup_Upcoming[] = {
     NULL,
     gPokeNewsTextSlateport_Upcoming,
     gPokeNewsTextGameCorner_Upcoming,
@@ -254,7 +249,7 @@ const u8 *const sPokeNewsTextGroup_Upcoming[] = {
     gPokeNewsTextBlendMaster_Upcoming
 };
 
-const u8 *const sPokeNewsTextGroup_Ongoing[] = {
+static const u8 *const sPokeNewsTextGroup_Ongoing[] = {
     NULL,
     gPokeNewsTextSlateport_Ongoing,
     gPokeNewsTextGameCorner_Ongoing,
@@ -262,7 +257,7 @@ const u8 *const sPokeNewsTextGroup_Ongoing[] = {
     gPokeNewsTextBlendMaster_Ongoing
 };
 
-const u8 *const sPokeNewsTextGroup_Ending[] = {
+static const u8 *const sPokeNewsTextGroup_Ending[] = {
     NULL,
     gPokeNewsTextSlateport_Ending,
     gPokeNewsTextGameCorner_Ending,
@@ -276,7 +271,7 @@ u8 *const gTVStringVarPtrs[] = {
     gStringVar3
 };
 
-const u8 *const sTVFanClubTextGroup[] = {
+static const u8 *const sTVFanClubTextGroup[] = {
     gTVFanClubText00,
     gTVFanClubText01,
     gTVFanClubText02,
@@ -287,7 +282,7 @@ const u8 *const sTVFanClubTextGroup[] = {
     gTVFanClubText07
 };
 
-const u8 *const sTVRecentHappeninssTextGroup[] = {
+static const u8 *const sTVRecentHappeninssTextGroup[] = {
     gTVRecentHappeningsText00,
     gTVRecentHappeningsText01,
     gTVRecentHappeningsText02,
@@ -296,7 +291,7 @@ const u8 *const sTVRecentHappeninssTextGroup[] = {
     gTVRecentHappeningsText05
 };
 
-const u8 *const sTVFanClubOpinionsTextGroup[] = {
+static const u8 *const sTVFanClubOpinionsTextGroup[] = {
     gTVFanClubOpinionsText00,
     gTVFanClubOpinionsText01,
     gTVFanClubOpinionsText02,
@@ -304,11 +299,11 @@ const u8 *const sTVFanClubOpinionsTextGroup[] = {
     gTVFanClubOpinionsText04
 };
 
-const u8 *const sTVMassOutbreakTextGroup[] = {
+static const u8 *const sTVMassOutbreakTextGroup[] = {
     gTVMassOutbreakText00
 };
 
-const u8 *const sTVPokemonTodaySuccessfulTextGroup[] = {
+static const u8 *const sTVPokemonTodaySuccessfulTextGroup[] = {
     gTVPokemonTodaySuccessfulText00,
     gTVPokemonTodaySuccessfulText01,
     gTVPokemonTodaySuccessfulText02,
@@ -323,7 +318,7 @@ const u8 *const sTVPokemonTodaySuccessfulTextGroup[] = {
     gTVPokemonTodaySuccessfulText11
 };
 
-const u8 *const sTVTodaysSmartShopperTextGroup[] = {
+static const u8 *const sTVTodaysSmartShopperTextGroup[] = {
     gTVTodaysSmartShopperText00,
     gTVTodaysSmartShopperText01,
     gTVTodaysSmartShopperText02,
@@ -339,7 +334,7 @@ const u8 *const sTVTodaysSmartShopperTextGroup[] = {
     gTVTodaysSmartShopperText12
 };
 
-const u8 *const sTVBravoTrainerTextGroup[] = {
+static const u8 *const sTVBravoTrainerTextGroup[] = {
     gTVBravoTrainerText00,
     gTVBravoTrainerText01,
     gTVBravoTrainerText02,
@@ -351,7 +346,7 @@ const u8 *const sTVBravoTrainerTextGroup[] = {
     gTVBravoTrainerText08
 };
 
-const u8 *const sTV3CheersForPokeblocksTextGroup[] = {
+static const u8 *const sTV3CheersForPokeblocksTextGroup[] = {
     gTV3CheersForPokeblocksText00,
     gTV3CheersForPokeblocksText01,
     gTV3CheersForPokeblocksText02,
@@ -360,7 +355,7 @@ const u8 *const sTV3CheersForPokeblocksTextGroup[] = {
     gTV3CheersForPokeblocksText05
 };
 
-const u8 *const sTVBravoTrainerBattleTowerTextGroup[] = {
+static const u8 *const sTVBravoTrainerBattleTowerTextGroup[] = {
     gTVBravoTrainerBattleTowerText00,
     gTVBravoTrainerBattleTowerText01,
     gTVBravoTrainerBattleTowerText02,
@@ -378,7 +373,7 @@ const u8 *const sTVBravoTrainerBattleTowerTextGroup[] = {
     gTVBravoTrainerBattleTowerText14
 };
 
-const u8 *const sTVContestLiveUpdatesTextGroup[] = {
+static const u8 *const sTVContestLiveUpdatesTextGroup[] = {
     gTVContestLiveUpdatesText00,
     gTVContestLiveUpdatesText01,
     gTVContestLiveUpdatesText02,
@@ -414,7 +409,7 @@ const u8 *const sTVContestLiveUpdatesTextGroup[] = {
     gTVContestLiveUpdatesText32
 };
 
-const u8 *const sTVPokemonBattleUpdateTextGroup[] = {
+static const u8 *const sTVPokemonBattleUpdateTextGroup[] = {
     gTVPokemonBattleUpdateText00,
     gTVPokemonBattleUpdateText01,
     gTVPokemonBattleUpdateText02,
@@ -425,7 +420,7 @@ const u8 *const sTVPokemonBattleUpdateTextGroup[] = {
     gTVPokemonBattleUpdateText07
 };
 
-const u8 *const sTVTrainerFanClubSpecialTextGroup[] = {
+static const u8 *const sTVTrainerFanClubSpecialTextGroup[] = {
     gTVTrainerFanClubSpecialText00,
     gTVTrainerFanClubSpecialText01,
     gTVTrainerFanClubSpecialText02,
@@ -434,7 +429,7 @@ const u8 *const sTVTrainerFanClubSpecialTextGroup[] = {
     gTVTrainerFanClubSpecialText05
 };
 
-const u8 *const sTVNameRaterTextGroup[] = {
+static const u8 *const sTVNameRaterTextGroup[] = {
     gTVNameRaterText00,
     gTVNameRaterText01,
     gTVNameRaterText02,
@@ -456,14 +451,14 @@ const u8 *const sTVNameRaterTextGroup[] = {
     gTVNameRaterText18
 };
 
-const u8 *const sTVPokemonContestLiveUpdates2TextGroup[] = {
+static const u8 *const sTVPokemonContestLiveUpdates2TextGroup[] = {
     gTVPokemonContestLiveUpdates2Text00,
     gTVPokemonContestLiveUpdates2Text01,
     gTVPokemonContestLiveUpdates2Text02,
     gTVPokemonContestLiveUpdates2Text03
 };
 
-const u8 *const sTVPokemonTodayFailedTextGroup[] = {
+static const u8 *const sTVPokemonTodayFailedTextGroup[] = {
     gTVPokemonTodayFailedText00,
     gTVPokemonTodayFailedText01,
     gTVPokemonTodayFailedText02,
@@ -473,18 +468,18 @@ const u8 *const sTVPokemonTodayFailedTextGroup[] = {
     gTVPokemonTodayFailedText06
 };
 
-const u8 *const sTVPokemonAnslerTextGroup[] = {
+static const u8 *const sTVPokemonAnslerTextGroup[] = {
     gTVPokemonAnglerText00,
     gTVPokemonAnglerText01
 };
 
-const u8 *const sTVWorldOfMastersTextGroup[] = {
+static const u8 *const sTVWorldOfMastersTextGroup[] = {
     gTVWorldOfMastersText00,
     gTVWorldOfMastersText01,
     gTVWorldOfMastersText02
 };
 
-const u8 *const sTVTodaysRivalTrainerTextGroup[] = {
+static const u8 *const sTVTodaysRivalTrainerTextGroup[] = {
     gTVTodaysRivalTrainerText00,
     gTVTodaysRivalTrainerText01,
     gTVTodaysRivalTrainerText02,
@@ -498,7 +493,7 @@ const u8 *const sTVTodaysRivalTrainerTextGroup[] = {
     gTVTodaysRivalTrainerText10
 };
 
-const u8 *const sTVDewfordTrendWatcherNetworkTextGroup[] = {
+static const u8 *const sTVDewfordTrendWatcherNetworkTextGroup[] = {
     gTVDewfordTrendWatcherNetworkText00,
     gTVDewfordTrendWatcherNetworkText01,
     gTVDewfordTrendWatcherNetworkText02,
@@ -508,20 +503,20 @@ const u8 *const sTVDewfordTrendWatcherNetworkTextGroup[] = {
     gTVDewfordTrendWatcherNetworkText06
 };
 
-const u8 *const sTVHoennTreasureInvestisatorsTextGroup[] = {
+static const u8 *const sTVHoennTreasureInvestisatorsTextGroup[] = {
     gTVHoennTreasureInvestigatorsText00,
     gTVHoennTreasureInvestigatorsText01,
     gTVHoennTreasureInvestigatorsText02
 };
 
-const u8 *const sTVFindThatGamerTextGroup[] = {
+static const u8 *const sTVFindThatGamerTextGroup[] = {
     gTVFindThatGamerText00,
     gTVFindThatGamerText01,
     gTVFindThatGamerText02,
     gTVFindThatGamerText03
 };
 
-const u8 *const sTVBreakinsNewsTextGroup[] = {
+static const u8 *const sTVBreakinsNewsTextGroup[] = {
     gTVBreakingNewsText00,
     gTVBreakingNewsText01,
     gTVBreakingNewsText02,
@@ -537,7 +532,7 @@ const u8 *const sTVBreakinsNewsTextGroup[] = {
     gTVBreakingNewsText12
 };
 
-const u8 *const sTVSecretBaseVisitTextGroup[] = {
+static const u8 *const sTVSecretBaseVisitTextGroup[] = {
     gTVSecretBaseVisitText00,
     gTVSecretBaseVisitText01,
     gTVSecretBaseVisitText02,
@@ -554,11 +549,11 @@ const u8 *const sTVSecretBaseVisitTextGroup[] = {
     gTVSecretBaseVisitText13
 };
 
-const u8 *const sTVPokemonLotteryWinnerFlashReportTextGroup[] = {
+static const u8 *const sTVPokemonLotteryWinnerFlashReportTextGroup[] = {
     gTVPokemonLotteryWinnerFlashReportText00
 };
 
-const u8 *const sTVThePokemonBattleSeminarTextGroup[] = {
+static const u8 *const sTVThePokemonBattleSeminarTextGroup[] = {
     gTVThePokemonBattleSeminarText00,
     gTVThePokemonBattleSeminarText01,
     gTVThePokemonBattleSeminarText02,
@@ -568,7 +563,7 @@ const u8 *const sTVThePokemonBattleSeminarTextGroup[] = {
     gTVThePokemonBattleSeminarText06
 };
 
-const u8 *const sTVTrainerFanClubTextGroup[] = {
+static const u8 *const sTVTrainerFanClubTextGroup[] = {
     gTVTrainerFanClubText00,
     gTVTrainerFanClubText01,
     gTVTrainerFanClubText02,
@@ -583,7 +578,7 @@ const u8 *const sTVTrainerFanClubTextGroup[] = {
     gTVTrainerFanClubText11
 };
 
-const u8 *const sTVCutiesTextGroup[] = {
+static const u8 *const sTVCutiesTextGroup[] = {
     gTVCutiesText00,
     gTVCutiesText01,
     gTVCutiesText02,
@@ -602,7 +597,7 @@ const u8 *const sTVCutiesTextGroup[] = {
     gTVCutiesText15
 };
 
-const u8 *const sTVPokemonNewsBattleFrontierTextGroup[] = {
+static const u8 *const sTVPokemonNewsBattleFrontierTextGroup[] = {
     gTVPokemonNewsBattleFrontierText00,
     gTVPokemonNewsBattleFrontierText01,
     gTVPokemonNewsBattleFrontierText02,
@@ -624,7 +619,7 @@ const u8 *const sTVPokemonNewsBattleFrontierTextGroup[] = {
     gTVPokemonNewsBattleFrontierText18
 };
 
-const u8 *const sTVWhatsNo1InHoennTodayTextGroup[] = {
+static const u8 *const sTVWhatsNo1InHoennTodayTextGroup[] = {
     gTVWhatsNo1InHoennTodayText00,
     gTVWhatsNo1InHoennTodayText01,
     gTVWhatsNo1InHoennTodayText02,
@@ -636,7 +631,7 @@ const u8 *const sTVWhatsNo1InHoennTodayTextGroup[] = {
     gTVWhatsNo1InHoennTodayText08
 };
 
-const u8 *const sTVSecretBaseSecretsTextGroup[] = {
+static const u8 *const sTVSecretBaseSecretsTextGroup[] = {
     gTVSecretBaseSecretsText00,
     gTVSecretBaseSecretsText01,
     gTVSecretBaseSecretsText02,
@@ -682,7 +677,7 @@ const u8 *const sTVSecretBaseSecretsTextGroup[] = {
     gTVSecretBaseSecretsText42
 };
 
-const u8 *const sTVSafariFanClubTextGroup[] = {
+static const u8 *const sTVSafariFanClubTextGroup[] = {
     gTVSafariFanClubText00,
     gTVSafariFanClubText01,
     gTVSafariFanClubText02,
@@ -696,7 +691,7 @@ const u8 *const sTVSafariFanClubTextGroup[] = {
     gTVSafariFanClubText10
 };
 
-const u8 *const sTVInSearchOfTrainersTextGroup[] = {
+static const u8 *const sTVInSearchOfTrainersTextGroup[] = {
     gTVInSearchOfTrainersText00,
     gTVInSearchOfTrainersText01,
     gTVInSearchOfTrainersText02,
@@ -1253,7 +1248,7 @@ void tv_store_id_2x(TVShow *show)
     show->common.trainerIdHi = id >> 8;
 }
 
-void InterviewAfter_ContestLiveUpdates(void)
+static void InterviewAfter_ContestLiveUpdates(void)
 {
     TVShow *show;
     TVShow *show2;
@@ -1472,7 +1467,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1)
     }
 }
 
-void InterviewAfter_BravoTrainerPokemonProfile(void)
+static void InterviewAfter_BravoTrainerPokemonProfile(void)
 {
     TVShow *show;
     TVShow *show2;
@@ -1538,7 +1533,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0)
     }
 }
 
-void InterviewAfter_BravoTrainerBattleTowerProfile(void)
+static void InterviewAfter_BravoTrainerBattleTowerProfile(void)
 {
     TVShow *show;
 
@@ -1671,7 +1666,7 @@ void PutLilycoveContestLadyShowOnTheAir(void)
     }
 }
 
-void InterviewAfter_FanClubLetter(void)
+static void InterviewAfter_FanClubLetter(void)
 {
     TVShow *show;
 
@@ -1684,7 +1679,7 @@ void InterviewAfter_FanClubLetter(void)
     show->fanclubLetter.language = gGameLanguage;
 }
 
-void InterviewAfter_RecentHappenings(void)
+static void InterviewAfter_RecentHappenings(void)
 {
     TVShow *show;
 
@@ -1697,7 +1692,7 @@ void InterviewAfter_RecentHappenings(void)
     show->recentHappenings.language = gGameLanguage;
 }
 
-void InterviewAfter_PkmnFanClubOpinions(void)
+static void InterviewAfter_PkmnFanClubOpinions(void)
 {
     TVShow *show;
 
@@ -1722,14 +1717,14 @@ void InterviewAfter_PkmnFanClubOpinions(void)
     }
 }
 
-void InterviewAfter_DummyShow4()
+static void InterviewAfter_DummyShow4(void)
 {
     TVShow *show;
 
     show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
 }
 
-void sub_80ED718(void)
+static void sub_80ED718(void)
 {
     u8 i;
     u16 outbreakIdx;
@@ -1802,7 +1797,7 @@ void UpdateTVShowsPerDay(u16 days)
     sub_80EEB98(days);
 }
 
-void sub_80ED8B4(u16 days)
+static void sub_80ED8B4(u16 days)
 {
     u8 i;
     TVShow *show;
@@ -1872,7 +1867,7 @@ void PutFishingAdviceShowOnTheAir(void)
 {
     TVShow *show;
 
-     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
+    sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
@@ -1892,7 +1887,7 @@ void SetPokemonAnglerSpecies(u16 species)
     sPokemonAnglerSpecies = species;
 }
 
-void sub_80EDA48(u16 days)
+static void sub_80EDA48(u16 days)
 {
     TVShow *show;
 
@@ -2088,7 +2083,7 @@ void sub_80EDE84(u16 nCoinsSpent)
     sFindThatGamerCoinsSpent = nCoinsSpent;
 }
 
-void sub_80EDE98(TVShow *show)
+static void sub_80EDE98(TVShow *show)
 {
     u8 i;
     u8 j;
@@ -2153,7 +2148,7 @@ void sub_80EDE98(TVShow *show)
     }
 }
 
-void sub_80EDFB4(TVShow *show)
+static void sub_80EDFB4(TVShow *show)
 {
     u8 i;
     u16 move;
@@ -2590,7 +2585,7 @@ void sub_80EEA70(void)
     }
 }
 
-void sub_80EEB98(u16 days)
+static void sub_80EEB98(u16 days)
 {
     u8 i;
 
@@ -2608,7 +2603,7 @@ void sub_80EEB98(u16 days)
     }
 }
 
-void sub_80EEBF4(u8 actionIdx)
+static void sub_80EEBF4(u8 actionIdx)
 {
     TVShow *show;
 
@@ -2664,7 +2659,7 @@ void sub_80EED60(u16 delta)
 
 // PokeNews
 
-void sub_80EED88(void)
+static void sub_80EED88(void)
 {
     u8 newsKind;
 
@@ -2715,7 +2710,7 @@ void ClearPokemonNewsI(u8 i)
     gSaveBlock1Ptr->pokeNews[i].days = 0;
 }
 
-void sub_80EEEB8(void)
+static void sub_80EEEB8(void)
 {
     u8 i;
     u8 j;
@@ -2845,7 +2840,7 @@ bool8 sub_80EF0E4(u8 newsKind)
     return FALSE;
 }
 
-void sub_80EF120(u16 days)
+static void sub_80EF120(u16 days)
 {
     u8 i;
 
@@ -2923,48 +2918,25 @@ void TV_PrintIntToStringVar(u8 varIdx, int value)
 {
     int nDigits;
 
-    nDigits = sub_80EF370(value);
+    nDigits = CountDigits(value);
     ConvertIntToDecimalStringN(gTVStringVarPtrs[varIdx], value, STR_CONV_MODE_LEFT_ALIGN, nDigits);
 }
 
-size_t sub_80EF370(int value)
+size_t CountDigits(int value)
 {
-    if (value / 10 == 0)
-    {
-        return 1;
-    }
-    if (value / 100 == 0)
-    {
-        return 2;
-    }
-    if (value / 1000 == 0)
-    {
-        return 3;
-    }
-    if (value / 10000 == 0)
-    {
-        return 4;
-    }
-    if (value / 100000 == 0)
-    {
-        return 5;
-    }
-    if (value / 1000000 == 0)
-    {
-        return 6;
-    }
-    if (value / 10000000 == 0)
-    {
-        return 7;
-    }
-    if (value / 100000000 == 0)
-    {
-        return 8;
-    }
+    if (value / 10 == 0)        return 1;
+    if (value / 100 == 0)       return 2;
+    if (value / 1000 == 0)      return 3;
+    if (value / 10000 == 0)     return 4;
+    if (value / 100000 == 0)    return 5;
+    if (value / 1000000 == 0)   return 6;
+    if (value / 10000000 == 0)  return 7;
+    if (value / 100000000 == 0) return 8;
+
     return 1;
 }
 
-void sub_80EF40C(u8 varIdx, TVShow *show)
+static void sub_80EF40C(u8 varIdx, TVShow *show)
 {
     u8 i;
     int price;
@@ -3095,7 +3067,7 @@ void InterviewBefore(void)
     }
 }
 
-void InterviewBefore_FanClubLetter(void)
+static void InterviewBefore_FanClubLetter(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_LETTER);
     if (!gSpecialVar_Result)
@@ -3105,7 +3077,7 @@ void InterviewBefore_FanClubLetter(void)
     }
 }
 
-void InterviewBefore_RecentHappenings(void)
+static void InterviewBefore_RecentHappenings(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_RECENT_HAPPENINGS);
     if (!gSpecialVar_Result)
@@ -3114,7 +3086,7 @@ void InterviewBefore_RecentHappenings(void)
     }
 }
 
-void InterviewBefore_PkmnFanClubOpinions(void)
+static void InterviewBefore_PkmnFanClubOpinions(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_PKMN_FAN_CLUB_OPINIONS);
     if (!gSpecialVar_Result)
@@ -3126,17 +3098,17 @@ void InterviewBefore_PkmnFanClubOpinions(void)
     }
 }
 
-void InterviewBefore_Dummy(void)
+static void InterviewBefore_Dummy(void)
 {
     gSpecialVar_Result = TRUE;
 }
 
-void InterviewBefore_NameRater(void)
+static void InterviewBefore_NameRater(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_NAME_RATER_SHOW);
 }
 
-void InterviewBefore_BravoTrainerPkmnProfile(void)
+static void InterviewBefore_BravoTrainerPkmnProfile(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE);
     if (!gSpecialVar_Result)
@@ -3145,17 +3117,17 @@ void InterviewBefore_BravoTrainerPkmnProfile(void)
     }
 }
 
-void InterviewBefore_ContestLiveUpdates(void)
+static void InterviewBefore_ContestLiveUpdates(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_CONTEST_LIVE_UPDATES);
 }
 
-void InterviewBefore_3CheersForPokeblocks(void)
+static void InterviewBefore_3CheersForPokeblocks(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_3_CHEERS_FOR_POKEBLOCKS);
 }
 
-void InterviewBefore_BravoTrainerBTProfile(void)
+static void InterviewBefore_BravoTrainerBTProfile(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE);
     if (!gSpecialVar_Result)
@@ -3164,7 +3136,7 @@ void InterviewBefore_BravoTrainerBTProfile(void)
     }
 }
 
-void InterviewBefore_FanClubSpecial(void)
+static void InterviewBefore_FanClubSpecial(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_SPECIAL);
     if (!gSpecialVar_Result)
@@ -3205,7 +3177,7 @@ void DeleteTVShowInArrayByIdx(TVShow *shows, u8 idx)
     }
 }
 
-void sub_80EF93C(TVShow *shows)
+static void sub_80EF93C(TVShow *shows)
 {
     u8 i;
     u8 j;
@@ -3277,7 +3249,7 @@ u16 TV_GetSomeOtherSpeciesAlreadySeenByPlayer(u16 passedSpecies)
     return species;
 }
 
-void sub_80EFA88(void)
+static void sub_80EFA88(void)
 {
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     gSpecialVar_0x8006 = sCurTVShowSlot;
@@ -3686,7 +3658,7 @@ void sub_80F01E8(void *src, u32 size, u8 masterIdx)
     }
 }
 
-void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[25], TVShow player4[25])
+static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[25], TVShow player4[25])
 {
     u8 i;
     u8 j;
@@ -3734,7 +3706,7 @@ void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[25], TVS
     }
 }
 
-bool8 sub_80F049C(TVShow *dest[25], TVShow *src[25], u8 idx)
+static bool8 sub_80F049C(TVShow *dest[25], TVShow *src[25], u8 idx)
 {
     u8 value;
     u8 switchval;
@@ -3765,7 +3737,7 @@ bool8 sub_80F049C(TVShow *dest[25], TVShow *src[25], u8 idx)
     return FALSE;
 }
 
-u8 sub_80F0580(TVShow *tv1, TVShow *tv2, u8 idx)
+static bool8 sub_80F0580(TVShow *tv1, TVShow *tv2, u8 idx)
 {
     u32 linkTrainerId = GetLinkPlayerTrainerId(idx);
 
@@ -3782,7 +3754,7 @@ u8 sub_80F0580(TVShow *tv1, TVShow *tv2, u8 idx)
     return TRUE;
 }
 
-u8 sub_80F05E8(TVShow *tv1, TVShow *tv2, u8 idx)
+static bool8 sub_80F05E8(TVShow *tv1, TVShow *tv2, u8 idx)
 {
     u32 linkTrainerId = GetLinkPlayerTrainerId(idx);
     if ((linkTrainerId & 0xFF) == tv2->common.srcTrainerIdLo && ((linkTrainerId >> 8) & 0xFF) == tv2->common.srcTrainerIdHi)
@@ -3802,7 +3774,7 @@ u8 sub_80F05E8(TVShow *tv1, TVShow *tv2, u8 idx)
     return TRUE;
 }
 
-u8 sub_80F0668(TVShow *tv1, TVShow *tv2, u8 idx)
+static bool8 sub_80F0668(TVShow *tv1, TVShow *tv2, u8 idx)
 {
     u32 linkTrainerId = GetLinkPlayerTrainerId(idx);
     if ((linkTrainerId & 0xFF) == tv2->common.trainerIdLo && ((linkTrainerId >> 8) & 0xFF) == tv2->common.trainerIdHi)
@@ -3819,7 +3791,7 @@ u8 sub_80F0668(TVShow *tv1, TVShow *tv2, u8 idx)
     return TRUE;
 }
 
-s8 sub_80F06D0(TVShow *tvShows)
+static s8 sub_80F06D0(TVShow *tvShows)
 {
     u8 i;
 
@@ -3834,7 +3806,7 @@ s8 sub_80F06D0(TVShow *tvShows)
 }
 
 #ifdef NONMATCHING
-void sub_80F0708(void) // FIXME: register allocation shenanigans
+static void sub_80F0708(void) // FIXME: register allocation shenanigans
 {
     u16 i;
     TVShow *show;
@@ -3954,13 +3926,13 @@ void sub_80F0708(void) // FIXME: register allocation shenanigans
                 break;
 
             default:
-                sub_80F0B00(i);
+                SetTvShowInactive(i);
                 break;
         }
     }
 }
 #else
-ASM_DIRECT void sub_80F0708(void)
+ASM_DIRECT static void sub_80F0708(void)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r9\n"
@@ -4377,7 +4349,7 @@ ASM_DIRECT void sub_80F0708(void)
                     "\tmov r2, r9\n"
                     "\tlsls r0, r2, 24\n"
                     "\tlsrs r0, 24\n"
-                    "\tbl sub_80F0B00\n"
+                    "\tbl SetTvShowInactive\n"
                     "_080F0AE2_break:\n"
                     "\tmov r0, r9\n"
                     "\tadds r0, 0x1\n"
@@ -4398,12 +4370,12 @@ ASM_DIRECT void sub_80F0708(void)
 }
 #endif
 
-void sub_80F0B00(u8 showIdx)
+void SetTvShowInactive(u8 showIdx)
 {
     gSaveBlock1Ptr->tvShows[showIdx].common.active = FALSE;
 }
 
-void sub_80F0B24(u16 species, u8 showIdx)
+static void sub_80F0B24(u16 species, u8 showIdx)
 {
     if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 0) == 0)
     {
@@ -4411,7 +4383,7 @@ void sub_80F0B24(u16 species, u8 showIdx)
     }
 }
 
-void sub_80F0B64(void)
+static void sub_80F0B64(void)
 {
     u16 i;
 
@@ -4444,7 +4416,7 @@ void sub_80F0BB8(void)
     }
 }
 
-void sub_80F0C04(void)
+static void sub_80F0C04(void)
 {
     s8 i;
     s8 ct;
@@ -4498,7 +4470,7 @@ void sub_80F0C7C(void *src, u32 size, u8 masterIdx)
     }
 }
 
-void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews player3[16], PokeNews player4[16])
+static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews player3[16], PokeNews player4[16])
 {
     u8 i;
     u8 j;
@@ -4530,7 +4502,7 @@ void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews player3[16
     }
 }
 
-void sub_80F0E58(PokeNews *dest[16], PokeNews *src[16])
+static void sub_80F0E58(PokeNews *dest[16], PokeNews *src[16])
 {
     PokeNews *ptr1;
     PokeNews *ptr2;
@@ -4541,7 +4513,7 @@ void sub_80F0E58(PokeNews *dest[16], PokeNews *src[16])
     sub_80F0E84(ptr1, ptr2, sCurTVShowSlot);
 }
 
-bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot)
+static bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot)
 {
     u8 i;
     u8 kind;
@@ -4563,7 +4535,7 @@ bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot)
     return TRUE;
 }
 
-s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx)
+static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx)
 {
     if (pokeNews[idx].kind == POKENEWS_NONE)
     {
@@ -4572,7 +4544,7 @@ s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx)
     return idx;
 }
 
-void sub_80F0EEC(void)
+static void sub_80F0EEC(void)
 {
     u8 i;
 
@@ -4586,7 +4558,7 @@ void sub_80F0EEC(void)
     sub_80EEEB8();
 }
 
-void sub_80F0F24(void)
+static void sub_80F0F24(void)
 {
     u8 i;
 
@@ -4609,7 +4581,7 @@ else \
     (langptr) = langfix; \
 }
 
-void sub_80F0F64(TVShow *show, u32 language)
+static void sub_80F0F64(TVShow *show, u32 language)
 {
     int i;
     TVShow **r4;
@@ -4691,7 +4663,7 @@ void sub_80F1208(TVShow *shows)
     }
 }
 
-void sub_80F1254(TVShow *shows)
+static void sub_80F1254(TVShow *shows)
 {
     TVShow *curShow;
 
@@ -4716,7 +4688,7 @@ u8 TV_GetStringLanguage(u8 *str)
     return IsStringJapanese(str) ? LANGUAGE_JAPANESE : LANGUAGE_ENGLISH;
 }
 
-void sub_80F12A4(TVShow *shows)
+static void sub_80F12A4(TVShow *shows)
 {
     TVShow *curShow;
 
@@ -4956,7 +4928,7 @@ void DoTVShow(void)
     }
 }
 
-void DoTVShowBravoTrainerPokemonProfile(void)
+static void DoTVShowBravoTrainerPokemonProfile(void)
 {
     TVShow *show;
     u8 state;
@@ -5028,7 +5000,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     ShowFieldMessage(sTVBravoTrainerTextGroup[state]);
 }
 
-void DoTVShowBravoTrainerBattleTower(void)
+static void DoTVShowBravoTrainerBattleTower(void)
 {
     TVShow *show;
     u8 state;
@@ -5125,7 +5097,7 @@ void DoTVShowBravoTrainerBattleTower(void)
     ShowFieldMessage(sTVBravoTrainerBattleTowerTextGroup[state]);
 }
 
-void DoTVShowTodaysSmartShopper(void)
+static void DoTVShowTodaysSmartShopper(void)
 {
     TVShow *show;
     u8 state;
@@ -5248,7 +5220,7 @@ void DoTVShowTodaysSmartShopper(void)
     ShowFieldMessage(sTVTodaysSmartShopperTextGroup[state]);
 }
 
-void DoTVShowTheNameRaterShow(void)
+static void DoTVShowTheNameRaterShow(void)
 {
     TVShow *show;
     u8 state;
@@ -5346,7 +5318,7 @@ void DoTVShowTheNameRaterShow(void)
     ShowFieldMessage(sTVNameRaterTextGroup[state]);
 }
 
-void DoTVShowPokemonTodaySuccessfulCapture(void)
+static void DoTVShowPokemonTodaySuccessfulCapture(void)
 {
     TVShow *show;
     u8 state;
@@ -5424,7 +5396,7 @@ void DoTVShowPokemonTodaySuccessfulCapture(void)
     ShowFieldMessage(sTVPokemonTodaySuccessfulTextGroup[state]);
 }
 
-void DoTVShowPokemonTodayFailedCapture(void)
+static void DoTVShowPokemonTodayFailedCapture(void)
 {
     TVShow *show;
     u8 state;
@@ -5477,7 +5449,7 @@ void DoTVShowPokemonTodayFailedCapture(void)
     ShowFieldMessage(sTVPokemonTodayFailedTextGroup[state]);
 }
 
-void DoTVShowPokemonFanClubLetter(void)
+static void DoTVShowPokemonFanClubLetter(void)
 {
     TVShow *show;
     u8 state;
@@ -5531,7 +5503,7 @@ void DoTVShowPokemonFanClubLetter(void)
     ShowFieldMessage(sTVFanClubTextGroup[state]);
 }
 
-void DoTVShowRecentHappenings(void)
+static void DoTVShowRecentHappenings(void)
 {
     TVShow *show;
     u8 state;
@@ -5566,7 +5538,7 @@ void DoTVShowRecentHappenings(void)
     ShowFieldMessage(sTVRecentHappeninssTextGroup[state]);
 }
 
-void DoTVShowPokemonFanClubOpinions(void)
+static void DoTVShowPokemonFanClubOpinions(void)
 {
     TVShow *show;
     u8 state;
@@ -5599,12 +5571,12 @@ void DoTVShowPokemonFanClubOpinions(void)
     ShowFieldMessage(sTVFanClubOpinionsTextGroup[state]);
 }
 
-void DoTVShowDummiedOut(void)
+static void DoTVShowDummiedOut(void)
 {
 
 }
 
-void DoTVShowPokemonNewsMassOutbreak(void)
+static void DoTVShowPokemonNewsMassOutbreak(void)
 {
     TVShow *show;
 
@@ -5616,7 +5588,7 @@ void DoTVShowPokemonNewsMassOutbreak(void)
     ShowFieldMessage(sTVMassOutbreakTextGroup[sTVShowState]);
 }
 
-void DoTVShowPokemonContestLiveUpdates(void)
+static void DoTVShowPokemonContestLiveUpdates(void)
 {
     TVShow *show;
     u8 state;
@@ -5963,7 +5935,7 @@ void DoTVShowPokemonContestLiveUpdates(void)
     ShowFieldMessage(sTVContestLiveUpdatesTextGroup[state]);
 }
 
-void DoTVShowPokemonBattleUpdate(void)
+static void DoTVShowPokemonBattleUpdate(void)
 {
     TVShow *show;
     u8 state;
@@ -6035,7 +6007,7 @@ void DoTVShowPokemonBattleUpdate(void)
     ShowFieldMessage(sTVPokemonBattleUpdateTextGroup[state]);
 }
 
-void DoTVShow3CheersForPokeblocks(void)
+static void DoTVShow3CheersForPokeblocks(void)
 {
     TVShow *show;
     u8 state;
@@ -6206,7 +6178,7 @@ void DoTVShowInSearchOfTrainers(void)
     ShowFieldMessage(sTVInSearchOfTrainersTextGroup[state]);
 }
 
-void DoTVShowPokemonAngler(void)
+static void DoTVShowPokemonAngler(void)
 {
     TVShow *show;
     u8 state;
@@ -6240,7 +6212,7 @@ void DoTVShowPokemonAngler(void)
     ShowFieldMessage(sTVPokemonAnslerTextGroup[state]);
 }
 
-void DoTVShowTheWorldOfMasters(void)
+static void DoTVShowTheWorldOfMasters(void)
 {
     TVShow *show;
     u8 state;
@@ -6270,7 +6242,7 @@ void DoTVShowTheWorldOfMasters(void)
     ShowFieldMessage(sTVWorldOfMastersTextGroup[state]);
 }
 
-void DoTVShowTodaysRivalTrainer(void)
+static void DoTVShowTodaysRivalTrainer(void)
 {
     TVShow *show;
     u8 state;
@@ -6419,7 +6391,7 @@ void DoTVShowTodaysRivalTrainer(void)
     ShowFieldMessage(sTVTodaysRivalTrainerTextGroup[state]);
 }
 
-void DoTVShowDewfordTrendWatcherNetwork(void)
+static void DoTVShowDewfordTrendWatcherNetwork(void)
 {
     TVShow *show;
     u8 state;
@@ -6475,7 +6447,7 @@ void DoTVShowDewfordTrendWatcherNetwork(void)
     ShowFieldMessage(sTVDewfordTrendWatcherNetworkTextGroup[state]);
 }
 
-void DoTVShowHoennTreasureInvestigators(void)
+static void DoTVShowHoennTreasureInvestigators(void)
 {
     TVShow *show;
     u8 state;
@@ -6519,7 +6491,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     ShowFieldMessage(sTVHoennTreasureInvestisatorsTextGroup[state]);
 }
 
-void DoTVShowFindThatGamer(void)
+static void DoTVShowFindThatGamer(void)
 {
     TVShow *show;
     u8 state;
@@ -6593,7 +6565,7 @@ void DoTVShowFindThatGamer(void)
     ShowFieldMessage(sTVFindThatGamerTextGroup[state]);
 }
 
-void DoTVShowBreakingNewsTV(void)
+static void DoTVShowBreakingNewsTV(void)
 {
     TVShow *show;
     u8 state;
@@ -6696,7 +6668,7 @@ void DoTVShowBreakingNewsTV(void)
     ShowFieldMessage(sTVBreakinsNewsTextGroup[state]);
 }
 
-void DoTVShowSecretBaseVisit(void)
+static void DoTVShowSecretBaseVisit(void)
 {
     TVShow *show;
     u8 state;
@@ -6792,7 +6764,7 @@ void DoTVShowSecretBaseVisit(void)
     ShowFieldMessage(sTVSecretBaseVisitTextGroup[state]);
 }
 
-void DoTVShowPokemonLotteryWinnerFlashReport(void)
+static void DoTVShowPokemonLotteryWinnerFlashReport(void)
 {
     TVShow *show;
     u8 state;
@@ -6822,7 +6794,7 @@ void DoTVShowPokemonLotteryWinnerFlashReport(void)
     ShowFieldMessage(sTVPokemonLotteryWinnerFlashReportTextGroup[state]);
 }
 
-void DoTVShowThePokemonBattleSeminar(void)
+static void DoTVShowThePokemonBattleSeminar(void)
 {
     TVShow *show;
     u8 state;
@@ -6886,7 +6858,7 @@ void DoTVShowThePokemonBattleSeminar(void)
     ShowFieldMessage(sTVThePokemonBattleSeminarTextGroup[state]);
 }
 
-void DoTVShowTrainerFanClubSpecial(void)
+static void DoTVShowTrainerFanClubSpecial(void)
 {
     TVShow *show;
     u8 state;
@@ -6951,7 +6923,7 @@ void DoTVShowTrainerFanClubSpecial(void)
     ShowFieldMessage(sTVTrainerFanClubSpecialTextGroup[state]);
 }
 
-void DoTVShowTrainerFanClub(void)
+static void DoTVShowTrainerFanClub(void)
 {
     TVShow *show;
     u8 state;
@@ -7038,7 +7010,7 @@ void DoTVShowTrainerFanClub(void)
     ShowFieldMessage(sTVTrainerFanClubTextGroup[state]);
 }
 
-void DoTVShowSpotTheCuties(void)
+static void DoTVShowSpotTheCuties(void)
 {
     TVShow *show;
     u8 state;
@@ -7143,7 +7115,7 @@ void DoTVShowSpotTheCuties(void)
     ShowFieldMessage(sTVCutiesTextGroup[state]);
 }
 
-void DoTVShowPokemonNewsBattleFrontier(void)
+static void DoTVShowPokemonNewsBattleFrontier(void)
 {
     TVShow *show;
     u8 state;
@@ -7292,7 +7264,7 @@ void DoTVShowPokemonNewsBattleFrontier(void)
     ShowFieldMessage(sTVPokemonNewsBattleFrontierTextGroup[state]);
 }
 
-void DoTVShowWhatsNo1InHoennToday(void)
+static void DoTVShowWhatsNo1InHoennToday(void)
 {
     TVShow *show;
     u8 state;
@@ -7407,7 +7379,7 @@ u8 sub_80F51AC(TVShow *show, u8 a1)
     return 0;
 }
 
-void DoTVShowSecretBaseSecrets(void)
+static void DoTVShowSecretBaseSecrets(void)
 {
     TVShow *show;
     u8 state;
@@ -7645,7 +7617,7 @@ void DoTVShowSecretBaseSecrets(void)
     ShowFieldMessage(sTVSecretBaseSecretsTextGroup[state]);
 }
 
-void DoTVShowSafariFanClub(void)
+static void DoTVShowSafariFanClub(void)
 {
     TVShow *show;
     u8 state;
@@ -7732,7 +7704,7 @@ void DoTVShowSafariFanClub(void)
     ShowFieldMessage(sTVSafariFanClubTextGroup[state]);
 }
 
-void DoTVShowPokemonContestLiveUpdates2(void)
+static void DoTVShowPokemonContestLiveUpdates2(void)
 {
     TVShow *show;
     u8 state;