diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index bba76939c2..42f3f8282d 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -220,6 +220,8 @@
 #define METLOC_IN_GAME_TRADE                0xFE
 #define METLOC_FATEFUL_ENCOUNTER            0xFF
 
-#define KANTO_MAPSEC_COUNT (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC)
+#define KANTO_MAPSEC_START  MAPSEC_PALLET_TOWN
+#define KANTO_MAPSEC_END    MAPSEC_SPECIAL_AREA
+#define KANTO_MAPSEC_COUNT (KANTO_MAPSEC_END - KANTO_MAPSEC_START + 1)
 
 #endif //GUARD_REGIONMAPSEC_H
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index b84489a176..2010cea59e 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -359,10 +359,10 @@ static void LoadMapNamePopUpWindowBg(void)
     u8 popupWindowId = GetMapNamePopUpWindowId();
     u16 regionMapSectionId = gMapHeader.regionMapSectionId;
 
-    if (regionMapSectionId > MAPSEC_DYNAMIC)
+    if (regionMapSectionId >= KANTO_MAPSEC_START)
     {
-        if (regionMapSectionId > MAPSEC_SPECIAL_AREA)
-            regionMapSectionId -= (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC);
+        if (regionMapSectionId > KANTO_MAPSEC_END)
+            regionMapSectionId -= KANTO_MAPSEC_COUNT;
         else
             regionMapSectionId = 0; // Discard kanto region sections;
     }
diff --git a/src/tv.c b/src/tv.c
index 95f816745e..386fdb0c83 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -47,13 +47,15 @@
 
 // Static type declarations
 
+#define LAST_TVSHOW_IDX (TV_SHOWS_COUNT - 1)
+
 #define rbernoulli(num, den) TV_BernoulliTrial(0xFFFF * (num) / (den))
 
 // Static RAM declarations
 
 s8 sCurTVShowSlot;
 u16 sTV_SecretBaseVisitMovesTemp[8];
-u8 sTV_DecorationsBuffer[16];
+u8 sTV_DecorationsBuffer[DECOR_MAX_SECRET_BASE];
 struct {
     u8 level;
     u16 species;
@@ -131,8 +133,8 @@ void PutPokemonTodayFailedOnTheAir(void);
 static void sub_80ED718(void);
 static void sub_80EED88(void);
 void TV_SortPurchasesByQuantity(void);
-static void sub_80ED8B4(u16 days);
-void UpdateMassOutbreakTimeLeft(u16 days);
+static void UpdateMassOutbreakTimeLeft(u16 days);
+static void TryEndMassOutbreak(u16 days);
 static void sub_80EF120(u16 days);
 static void sub_80EDA48(u16 days);
 static void sub_80EEB98(u16 days);
@@ -191,29 +193,34 @@ static const struct {
     u8 location;
 } sPokeOutbreakSpeciesList[] = {
     {
-        SPECIES_SEEDOT,
-        {MOVE_BIDE, MOVE_HARDEN, MOVE_LEECH_SEED},
-        3, 0x11 // Route 102
+        .species = SPECIES_SEEDOT,
+        .moves = {MOVE_BIDE, MOVE_HARDEN, MOVE_LEECH_SEED},
+        .level = 3, 
+        .location = MAP_NUM(ROUTE102)
     },
     {
-        SPECIES_NUZLEAF,
-        {MOVE_HARDEN, MOVE_GROWTH, MOVE_NATURE_POWER, MOVE_LEECH_SEED},
-        15, 0x1D // Route 114
+        .species = SPECIES_NUZLEAF,
+        .moves = {MOVE_HARDEN, MOVE_GROWTH, MOVE_NATURE_POWER, MOVE_LEECH_SEED},
+        .level = 15, 
+        .location = MAP_NUM(ROUTE114),
     },
     {
-        SPECIES_SEEDOT,
-        {MOVE_HARDEN, MOVE_GROWTH, MOVE_NATURE_POWER, MOVE_LEECH_SEED},
-        13, 0x20 // Route 117
+        .species = SPECIES_SEEDOT,
+        .moves = {MOVE_HARDEN, MOVE_GROWTH, MOVE_NATURE_POWER, MOVE_LEECH_SEED},
+        .level = 13, 
+        .location = MAP_NUM(ROUTE117),
     },
     {
-        SPECIES_SEEDOT,
-        {MOVE_GIGA_DRAIN, MOVE_FRUSTRATION, MOVE_SOLAR_BEAM, MOVE_LEECH_SEED},
-        25, 0x23 // Route 110
+        .species = SPECIES_SEEDOT,
+        .moves = {MOVE_GIGA_DRAIN, MOVE_FRUSTRATION, MOVE_SOLAR_BEAM, MOVE_LEECH_SEED},
+        .level = 25, 
+        .location = MAP_NUM(ROUTE120),
     },
     {
-        SPECIES_SKITTY,
-        {MOVE_GROWL, MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_ATTRACT},
-        8, 0x1F // Route 116
+        .species = SPECIES_SKITTY,
+        .moves = {MOVE_GROWL, MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_ATTRACT},
+        .level = 8, 
+        .location = MAP_NUM(ROUTE116),
     }
 };
 
@@ -1176,10 +1183,10 @@ void UpdateWorldOfMastersAndPutItOnTheAir(void)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     if (show->worldOfMasters.kind != TVSHOW_WORLD_OF_MASTERS)
     {
-        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
         show->worldOfMasters.steps = GetGameStat(GAME_STAT_STEPS);
         show->worldOfMasters.kind = TVSHOW_WORLD_OF_MASTERS;
     }
@@ -1255,7 +1262,7 @@ static void InterviewAfter_ContestLiveUpdates(void)
     TVShow *show;
     TVShow *show2;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     if (show->contestLiveUpdates.kind == TVSHOW_CONTEST_LIVE_UPDATES)
     {
         show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
@@ -1274,7 +1281,7 @@ static void InterviewAfter_ContestLiveUpdates(void)
         tv_store_id_2x(show2);
         show2->contestLiveUpdates.language = gGameLanguage;
         show2->contestLiveUpdates.winningTrainerLanguage = show->contestLiveUpdates.winningTrainerLanguage;
-        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
     }
 }
 
@@ -1396,11 +1403,11 @@ void ContestLiveUpdates_BeforeInterview_1(u8 a0)
 {
     TVShow *show;
 
-    DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+    DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
-        show = &gSaveBlock1Ptr->tvShows[24];
+        show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
         show->contestLiveUpdates.round1Rank = a0;
         show->contestLiveUpdates.kind = TVSHOW_CONTEST_LIVE_UPDATES;
     }
@@ -1410,7 +1417,7 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
@@ -1422,7 +1429,7 @@ void ContestLiveUpdates_BeforeInterview_3(u8 a0)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
@@ -1434,7 +1441,7 @@ void ContestLiveUpdates_BeforeInterview_4(u16 a0)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
@@ -1446,7 +1453,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
@@ -1474,7 +1481,7 @@ static void InterviewAfter_BravoTrainerPokemonProfile(void)
     TVShow *show;
     TVShow *show2;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     if (show->bravoTrainer.kind == TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE)
     {
         show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
@@ -1498,7 +1505,7 @@ static void InterviewAfter_BravoTrainerPokemonProfile(void)
         {
             show2->bravoTrainer.pokemonNameLanguage = show->bravoTrainer.pokemonNameLanguage;
         }
-        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
     }
 }
 
@@ -1506,12 +1513,12 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     InterviewBefore_BravoTrainerPkmnProfile();
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
-        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
         show->bravoTrainer.move = a0;
         show->bravoTrainer.kind = TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE;
     }
@@ -1521,7 +1528,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 contestStandingPlace)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     if (sCurTVShowSlot != -1)
     {
@@ -1734,7 +1741,7 @@ static void sub_80ED718(void)
 
     if (FlagGet(FLAG_SYS_GAME_CLEAR))
     {
-        for (i = 0; i < 24; i ++)
+        for (i = 0; i < LAST_TVSHOW_IDX; i ++)
         {
             if (gSaveBlock1Ptr->tvShows[i].common.kind == TVSHOW_MASS_OUTBREAK)
             {
@@ -1791,49 +1798,42 @@ void EndMassOutbreak(void)
 
 void UpdateTVShowsPerDay(u16 days)
 {
-    sub_80ED8B4(days);
     UpdateMassOutbreakTimeLeft(days);
+    TryEndMassOutbreak(days);
     sub_80EF120(days);
     sub_80EDA48(days);
     sub_80EEB98(days);
 }
 
-static void sub_80ED8B4(u16 days)
+static void UpdateMassOutbreakTimeLeft(u16 days)
 {
     u8 i;
     TVShow *show;
 
     if (gSaveBlock1Ptr->outbreakPokemonSpecies == SPECIES_NONE)
     {
-        for (i = 0; i < 24; i ++)
+        for (i = 0; i < LAST_TVSHOW_IDX; i ++)
         {
             if (gSaveBlock1Ptr->tvShows[i].massOutbreak.kind == TVSHOW_MASS_OUTBREAK && gSaveBlock1Ptr->tvShows[i].massOutbreak.active == TRUE)
             {
                 show = &gSaveBlock1Ptr->tvShows[i];
                 if (show->massOutbreak.daysLeft < days)
-                {
                     show->massOutbreak.daysLeft = 0;
-                }
                 else
-                {
                     show->massOutbreak.daysLeft -= days;
-                }
+
                 break;
             }
         }
     }
 }
 
-void UpdateMassOutbreakTimeLeft(u16 days)
+static void TryEndMassOutbreak(u16 days)
 {
     if (gSaveBlock1Ptr->outbreakDaysLeft <= days)
-    {
         EndMassOutbreak();
-    }
     else
-    {
         gSaveBlock1Ptr->outbreakDaysLeft -= days;
-    }
 }
 
 void sub_80ED950(bool8 flag)
@@ -1892,14 +1892,14 @@ static void sub_80EDA48(u16 days)
 {
     TVShow *show;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     if (show->worldOfMasters.kind == TVSHOW_WORLD_OF_MASTERS)
     {
         if (show->worldOfMasters.numPokeCaught >= 20)
         {
             sub_80EDA80();
         }
-        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+        DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
     }
 }
 
@@ -1908,7 +1908,7 @@ void sub_80EDA80(void)
     TVShow *show;
     TVShow *show2;
 
-    show = &gSaveBlock1Ptr->tvShows[24];
+    show = &gSaveBlock1Ptr->tvShows[LAST_TVSHOW_IDX];
     if (!rbernoulli(1, 1))
     {
         sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
@@ -1925,7 +1925,7 @@ void sub_80EDA80(void)
             StringCopy(show2->worldOfMasters.playerName, gSaveBlock2Ptr->playerName);
             tv_store_id_3x(show2);
             show2->worldOfMasters.language = gGameLanguage;
-            DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
+            DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, LAST_TVSHOW_IDX);
         }
     }
 }
@@ -2093,16 +2093,16 @@ static void sub_80EDE98(TVShow *show)
     u8 deco;
     u8 x;
 
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < DECOR_MAX_SECRET_BASE; i ++)
     {
         sTV_DecorationsBuffer[i] = 0;
     }
-    for (i = 0, n = 0; i < 16; i ++)
+    for (i = 0, n = 0; i < DECOR_MAX_SECRET_BASE; i ++)
     {
         deco = gSaveBlock1Ptr->secretBases[0].decorations[i];
         if (deco)
         {
-            for (j = 0; j < 16; j ++)
+            for (j = 0; j < DECOR_MAX_SECRET_BASE; j ++)
             {
                 if (sTV_DecorationsBuffer[j] == 0)
                 {
@@ -2481,7 +2481,7 @@ bool8 ShouldAirFrontierTVShow(void)
     {
         shows = gSaveBlock1Ptr->tvShows;
         playerId = GetPlayerIDAsU32();
-        for (showIdx = 5; showIdx < 24; showIdx ++)
+        for (showIdx = 5; showIdx < LAST_TVSHOW_IDX; showIdx ++)
         {
             if (shows[showIdx].common.kind == TVSHOW_FRONTIER && (playerId & 0xFF) == shows[showIdx].common.trainerIdLo && ((playerId >> 8) & 0xFF) == shows[showIdx].common.trainerIdHi)
             {
@@ -2681,7 +2681,7 @@ s8 sub_80EEE30(PokeNews *pokeNews)
 {
     s8 i;
 
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         if (pokeNews[i].kind == 0)
         {
@@ -2695,7 +2695,7 @@ void ClearPokemonNews(void)
 {
     u8 i;
 
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         ClearPokemonNewsI(i);
     }
@@ -2713,11 +2713,11 @@ static void sub_80EEEB8(void)
     u8 i;
     u8 j;
 
-    for (i = 0; i < 15; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT - 1; i ++)
     {
         if (gSaveBlock1Ptr->pokeNews[i].kind == POKENEWS_NONE)
         {
-            for (j = i + 1; j < 16; j ++)
+            for (j = i + 1; j < POKE_NEWS_COUNT; j ++)
             {
                 if (gSaveBlock1Ptr->pokeNews[j].kind != POKENEWS_NONE)
                 {
@@ -2734,7 +2734,7 @@ u8 FindAnyTVNewsOnTheAir(void)
 {
     u8 i;
 
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         if (gSaveBlock1Ptr->pokeNews[i].kind != POKENEWS_NONE && gSaveBlock1Ptr->pokeNews[i].state == TRUE && gSaveBlock1Ptr->pokeNews[i].days < 3)
         {
@@ -2828,7 +2828,7 @@ bool8 sub_80EF0E4(u8 newsKind)
     {
         return TRUE;
     }
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         if (gSaveBlock1Ptr->pokeNews[i].kind == newsKind)
         {
@@ -2842,7 +2842,7 @@ static void sub_80EF120(u16 days)
 {
     u8 i;
 
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         if (gSaveBlock1Ptr->pokeNews[i].kind != POKENEWS_NONE)
         {
@@ -2965,7 +2965,7 @@ bool8 HasMixableShowAlreadyBeenSpawnedWithPlayerID(u8 kind, bool8 flag)
 
     shows = gSaveBlock1Ptr->tvShows;
     playerId = GetPlayerIDAsU32();
-    for (i = 5; i < 24; i ++)
+    for (i = 5; i < LAST_TVSHOW_IDX; i ++)
     {
         if (shows[i].common.kind == kind && (playerId & 0xFF) == shows[i].common.trainerIdLo && ((playerId >> 8) & 0xFF) == shows[i].common.trainerIdHi)
         {
@@ -3195,11 +3195,11 @@ static void sub_80EF93C(TVShow *shows)
             }
         }
     }
-    for (i = 5; i < 24; i ++)
+    for (i = 5; i < LAST_TVSHOW_IDX; i ++)
     {
         if (shows[i].common.kind == TVSHOW_OFF_AIR)
         {
-            for (j = i + 1; j < 24; j ++)
+            for (j = i + 1; j < LAST_TVSHOW_IDX; j ++)
             {
                 if (shows[j].common.kind != TVSHOW_OFF_AIR)
                 {
@@ -3279,7 +3279,7 @@ s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows)
 {
     s8 i;
 
-    for (i = 5; i < 24; i ++)
+    for (i = 5; i < LAST_TVSHOW_IDX; i ++)
     {
         if (shows[i].common.kind == TVSHOW_OFF_AIR)
         {
@@ -3790,7 +3790,7 @@ static s8 sub_80F06D0(TVShow *tvShows)
 {
     u8 i;
 
-    for (i = 0; i < 24; i ++)
+    for (i = 0; i < LAST_TVSHOW_IDX; i ++)
     {
         if (tvShows[i].common.active == FALSE && (u8)(tvShows[i].common.kind - 1) < 60)
         {
@@ -3806,7 +3806,7 @@ static void sub_80F0708(void) // FIXME: register allocation shenanigans
     u16 i;
     TVShow *show;
 
-    for (i = 0; i < 24; i ++)
+    for (i = 0; i < LAST_TVSHOW_IDX; i ++)
     {
         switch (gSaveBlock1Ptr->tvShows[i].common.kind)
         {
@@ -4384,7 +4384,7 @@ static void sub_80F0B64(void)
 
     if (FlagGet(FLAG_SYS_GAME_CLEAR) != TRUE)
     {
-        for (i = 0; i < 24; i ++)
+        for (i = 0; i < LAST_TVSHOW_IDX; i ++)
         {
             if (gSaveBlock1Ptr->tvShows[i].common.kind == TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE)
             {
@@ -4417,7 +4417,7 @@ static void sub_80F0C04(void)
     s8 ct;
 
     ct = 0;
-    for (i = 5; i < 24; i ++)
+    for (i = 5; i < LAST_TVSHOW_IDX; i ++)
     {
         if (gSaveBlock1Ptr->tvShows[i].common.kind == TVSHOW_OFF_AIR)
         {
@@ -4477,7 +4477,7 @@ static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews pla
     argslist[2] = &player3;
     argslist[3] = &player4;
     sTVShowNewsMixingNumPlayers = GetLinkPlayerCount();
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         for (j = 0; j < sTVShowNewsMixingNumPlayers; j ++)
         {
@@ -4517,7 +4517,7 @@ static bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot)
     {
         return FALSE;
     }
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         if (dest[i].kind == src->kind)
         {
@@ -4543,7 +4543,7 @@ static void sub_80F0EEC(void)
 {
     u8 i;
 
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < POKE_NEWS_COUNT; i ++)
     {
         if (gSaveBlock1Ptr->pokeNews[i].kind > POKENEWS_BLENDMASTER)
         {
@@ -4559,7 +4559,7 @@ static void sub_80F0F24(void)
 
     if (FlagGet(FLAG_SYS_GAME_CLEAR) != TRUE)
     {
-        for (i = 0; i < 16; i ++)
+        for (i = 0; i < POKE_NEWS_COUNT; i ++)
         {
             gSaveBlock1Ptr->pokeNews[i].state = 0;
         }
@@ -4582,7 +4582,7 @@ static void sub_80F0F64(TVShow *show, u32 language)
     TVShow **r4;
 
     r4 = calloc(11, sizeof(TVShow *));
-    for (i = 0; i < 24; i ++)
+    for (i = 0; i < LAST_TVSHOW_IDX; i ++)
     {
         switch (show[i].common.kind)
         {
@@ -4646,7 +4646,7 @@ void sub_80F1208(TVShow *shows)
     TVShow *curShow;
 
     sub_80F14F8(shows);
-    for (curShow = shows; curShow < shows + 24; curShow ++)
+    for (curShow = shows; curShow < shows + LAST_TVSHOW_IDX; curShow ++)
     {
         if (curShow->bravoTrainerTower.kind == TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE)
         {
@@ -4662,7 +4662,7 @@ static void sub_80F1254(TVShow *shows)
 {
     TVShow *curShow;
 
-    for (curShow = shows; curShow < shows + 24; curShow ++)
+    for (curShow = shows; curShow < shows + LAST_TVSHOW_IDX; curShow ++)
     {
         if (curShow->bravoTrainerTower.kind == TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE)
         {
@@ -4687,7 +4687,7 @@ static void sub_80F12A4(TVShow *shows)
 {
     TVShow *curShow;
 
-    for (curShow = shows; curShow < shows + 24; curShow ++)
+    for (curShow = shows; curShow < shows + LAST_TVSHOW_IDX; curShow ++)
     {
         switch(curShow->common.kind)
         {
@@ -4797,18 +4797,18 @@ void sub_80F14F8(TVShow *shows)
 {
     int i;
 
-    for (i = 0; i < 24; i ++)
+    for (i = 0; i < LAST_TVSHOW_IDX; i ++)
     {
         switch (shows[i].common.kind)
         {
             case TVSHOW_WORLD_OF_MASTERS:
-                if (shows[i].worldOfMasters.location > 0x58)
+                if (shows[i].worldOfMasters.location > KANTO_MAPSEC_START)
                 {
                     memset(&shows[i], 0, sizeof(TVShow));
                 }
                 break;
             case TVSHOW_POKEMON_TODAY_FAILED:
-                if (shows[i].pokemonTodayFailed.location > 0x58)
+                if (shows[i].pokemonTodayFailed.location > KANTO_MAPSEC_START)
                 {
                     memset(&shows[i], 0, sizeof(TVShow));
                 }