Use all caps for MAPSEC enums

5 files changed, 138 insertions, 138 deletions

diff --git a/src/data/region_map_layout.h b/src/data/region_map_layout.h
index 06e308593..1bc93cbb3 100644
--- a/src/data/region_map_layout.h
+++ b/src/data/region_map_layout.h
@@ -1,26 +1,26 @@
 // Abbreviated definitions to make the map layout more visual
-#define R(routeNum) MAPSEC_Route##routeNum
-#define LITT_T      MAPSEC_LittlerootTown
-#define OLDA_T      MAPSEC_OldaleTown
-#define DEWF_T      MAPSEC_DewfordTown
-#define LAVA_T      MAPSEC_LavaridgeTown
-#define FALL_T      MAPSEC_FallarborTown
-#define VERD_T      MAPSEC_VerdanturfTown
-#define PACI_T      MAPSEC_PacifidlogTown
-#define PETA_C      MAPSEC_PetalburgCity
-#define SLAT_C      MAPSEC_SlateportCity
-#define MAUV_C      MAPSEC_MauvilleCity
-#define RUST_C      MAPSEC_RustboroCity
-#define FORT_C      MAPSEC_FortreeCity
-#define LILY_C      MAPSEC_LilycoveCity
-#define MOSS_C      MAPSEC_MossdeepCity
-#define SOOT_C      MAPSEC_SootopolisCity
-#define EVER_C      MAPSEC_EverGrandeCity
-#define MTCHIM      MAPSEC_MtChimney
-#define SAFARI      MAPSEC_SafariZone
-#define BTLTWR      MAPSEC_BattleTower
-#define S_ISLD      MAPSEC_SouthernIsland
-#define ______      MAPSEC_Nothing
+#define R(routeNum) MAPSEC_ROUTE_##routeNum
+#define LITT_T      MAPSEC_LITTLEROOT_TOWN
+#define OLDA_T      MAPSEC_OLDALE_TOWN
+#define DEWF_T      MAPSEC_DEWFORD_TOWN
+#define LAVA_T      MAPSEC_LAVARIDGE_TOWN
+#define FALL_T      MAPSEC_FALLARBOR_TOWN
+#define VERD_T      MAPSEC_VERDANTURF_TOWN
+#define PACI_T      MAPSEC_PACIFIDLOG_TOWN
+#define PETA_C      MAPSEC_PETALBURG_CITY
+#define SLAT_C      MAPSEC_SLATEPORT_CITY
+#define MAUV_C      MAPSEC_MAUVILLE_CITY
+#define RUST_C      MAPSEC_RUSTBORO_CITY
+#define FORT_C      MAPSEC_FORTREE_CITY
+#define LILY_C      MAPSEC_LILYCOVE_CITY
+#define MOSS_C      MAPSEC_MOSSDEEP_CITY
+#define SOOT_C      MAPSEC_SOOTOPOLIS_CITY
+#define EVER_C      MAPSEC_EVER_GRANDE_CITY
+#define MTCHIM      MAPSEC_MT_CHIMNEY
+#define SAFARI      MAPSEC_SAFARI_ZONE
+#define BTLTWR      MAPSEC_BATTLE_TOWER
+#define S_ISLD      MAPSEC_SOUTHERN_ISLAND
+#define ______      MAPSEC_NOTHING
 
 static const u8 sRegionMapLayout[] =
 {
diff --git a/src/landmark.c b/src/landmark.c
index 4fd9595fe..0572da4ca 100644
--- a/src/landmark.c
+++ b/src/landmark.c
@@ -315,52 +315,52 @@ static const struct Landmark *const Landmarks_MtChimney_2[]  =
 
 static const struct LandmarkList gLandmarkLists[] =
 {
-	{MAPSEC_Route104, 0, Landmarks_Route104_0},
-    {MAPSEC_Route104, 1, Landmarks_Route104_1},
-    {MAPSEC_Route105, 0, Landmarks_Route105_0},
-    {MAPSEC_Route106, 1, Landmarks_Route106_1},
-    {MAPSEC_Route108, 0, Landmarks_Route108_0},
-    {MAPSEC_Route109, 0, Landmarks_Route109_0},
-    {MAPSEC_Route110, 0, Landmarks_Route110_0},
-    {MAPSEC_Route110, 1, Landmarks_Route110_1},
-    {MAPSEC_Route110, 2, Landmarks_Route110_2},
-    {MAPSEC_Route111, 0, Landmarks_Route111_0},
-    {MAPSEC_Route111, 1, Landmarks_Route111_1},
-    {MAPSEC_Route111, 2, Landmarks_Route111_1},
-    {MAPSEC_Route111, 3, Landmarks_Route111_3},
-    {MAPSEC_Route111, 4, Landmarks_Route111_4},
-    {MAPSEC_Route112, 0, Landmarks_Route112_0},
-    {MAPSEC_Route112, 1, Landmarks_Route112_1},
-    {MAPSEC_Route113, 1, Landmarks_Route113_1},
-    {MAPSEC_Route114, 1, Landmarks_Route114_1},
-    {MAPSEC_Route114, 2, Landmarks_Route114_2},
-    {MAPSEC_Route114, 3, Landmarks_MeteorFalls},
-    {MAPSEC_Route115, 0, Landmarks_MeteorFalls},
-    {MAPSEC_Route115, 1, Landmarks_MeteorFalls},
-    {MAPSEC_Route116, 1, Landmarks_Route116_1},
-    {MAPSEC_Route116, 2, Landmarks_Route116_2},
-    {MAPSEC_Route117, 2, Landmarks_Route117_2},
-    {MAPSEC_Route119, 1, Landmarks_Route119_1},
-    {MAPSEC_Route120, 0, Landmarks_Route120_0},
-    {MAPSEC_Route120, 2, Landmarks_Route120_2},
-    {MAPSEC_Route121, 2, Landmarks_Route121_2},
-    {MAPSEC_Route122, 0, Landmarks_Route122_0},
-    {MAPSEC_Route123, 0, Landmarks_Route123_0},
-    {MAPSEC_Route122, 1, Landmarks_Route122_0},
-    {MAPSEC_Route124, 7, Landmarks_Route124_7},
-    {MAPSEC_Route125, 2, Landmarks_Route125_2},
-    {MAPSEC_Route128, 1, Landmarks_Route128_1},
-    {MAPSEC_Route131, 1, Landmarks_Route131_1},
-    {MAPSEC_Route132, 0, Landmarks_OceanCurrent},
-    {MAPSEC_Route132, 1, Landmarks_OceanCurrent},
-    {MAPSEC_Route133, 0, Landmarks_OceanCurrent},
-    {MAPSEC_Route133, 1, Landmarks_OceanCurrent},
-    {MAPSEC_Route133, 2, Landmarks_OceanCurrent},
-    {MAPSEC_Route134, 0, Landmarks_OceanCurrent},
-    {MAPSEC_Route134, 1, Landmarks_OceanCurrent},
-    {MAPSEC_Route134, 2, Landmarks_Route134_2},
-    {MAPSEC_MtChimney, 2, Landmarks_MtChimney_2},
-    {MAPSEC_Nothing, 0, NULL},
+	{MAPSEC_ROUTE_104, 0, Landmarks_Route104_0},
+    {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1},
+    {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0},
+    {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1},
+    {MAPSEC_ROUTE_108, 0, Landmarks_Route108_0},
+    {MAPSEC_ROUTE_109, 0, Landmarks_Route109_0},
+    {MAPSEC_ROUTE_110, 0, Landmarks_Route110_0},
+    {MAPSEC_ROUTE_110, 1, Landmarks_Route110_1},
+    {MAPSEC_ROUTE_110, 2, Landmarks_Route110_2},
+    {MAPSEC_ROUTE_111, 0, Landmarks_Route111_0},
+    {MAPSEC_ROUTE_111, 1, Landmarks_Route111_1},
+    {MAPSEC_ROUTE_111, 2, Landmarks_Route111_1},
+    {MAPSEC_ROUTE_111, 3, Landmarks_Route111_3},
+    {MAPSEC_ROUTE_111, 4, Landmarks_Route111_4},
+    {MAPSEC_ROUTE_112, 0, Landmarks_Route112_0},
+    {MAPSEC_ROUTE_112, 1, Landmarks_Route112_1},
+    {MAPSEC_ROUTE_113, 1, Landmarks_Route113_1},
+    {MAPSEC_ROUTE_114, 1, Landmarks_Route114_1},
+    {MAPSEC_ROUTE_114, 2, Landmarks_Route114_2},
+    {MAPSEC_ROUTE_114, 3, Landmarks_MeteorFalls},
+    {MAPSEC_ROUTE_115, 0, Landmarks_MeteorFalls},
+    {MAPSEC_ROUTE_115, 1, Landmarks_MeteorFalls},
+    {MAPSEC_ROUTE_116, 1, Landmarks_Route116_1},
+    {MAPSEC_ROUTE_116, 2, Landmarks_Route116_2},
+    {MAPSEC_ROUTE_117, 2, Landmarks_Route117_2},
+    {MAPSEC_ROUTE_119, 1, Landmarks_Route119_1},
+    {MAPSEC_ROUTE_120, 0, Landmarks_Route120_0},
+    {MAPSEC_ROUTE_120, 2, Landmarks_Route120_2},
+    {MAPSEC_ROUTE_121, 2, Landmarks_Route121_2},
+    {MAPSEC_ROUTE_122, 0, Landmarks_Route122_0},
+    {MAPSEC_ROUTE_123, 0, Landmarks_Route123_0},
+    {MAPSEC_ROUTE_122, 1, Landmarks_Route122_0},
+    {MAPSEC_ROUTE_124, 7, Landmarks_Route124_7},
+    {MAPSEC_ROUTE_125, 2, Landmarks_Route125_2},
+    {MAPSEC_ROUTE_128, 1, Landmarks_Route128_1},
+    {MAPSEC_ROUTE_131, 1, Landmarks_Route131_1},
+    {MAPSEC_ROUTE_132, 0, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_132, 1, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_133, 0, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_133, 1, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_133, 2, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_134, 0, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_134, 1, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_134, 2, Landmarks_Route134_2},
+    {MAPSEC_MT_CHIMNEY, 2, Landmarks_MtChimney_2},
+    {MAPSEC_NOTHING, 0, NULL},
 };
 
 static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id);
@@ -396,7 +396,7 @@ static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id)
 {
     u16 i = 0;
 
-    for (; gLandmarkLists[i].mapSection != MAPSEC_Nothing; i++)
+    for (; gLandmarkLists[i].mapSection != MAPSEC_NOTHING; i++)
     {
         if (gLandmarkLists[i].mapSection > mapSection)
             return NULL;
@@ -404,7 +404,7 @@ static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id)
             break;
     }
 
-    if (gLandmarkLists[i].mapSection == MAPSEC_Nothing)
+    if (gLandmarkLists[i].mapSection == MAPSEC_NOTHING)
         return NULL;
 
     for (; gLandmarkLists[i].mapSection == mapSection; i++)
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index ac7635d1a..fd60581b9 100644
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -96,9 +96,9 @@ static const u16 sFeebasData[][3] = {
 };
 
 static const u16 sLandmarkData[][2] = {
-    {MAPSEC_SkyPillar,      FLAG_LANDMARK_SKY_PILLAR},
-    {MAPSEC_SeafloorCavern, FLAG_LANDMARK_SEAFLOOR_CAVERN},
-    {MAPSEC_Nothing}
+    {MAPSEC_SKY_PILLAR,      FLAG_LANDMARK_SKY_PILLAR},
+    {MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN},
+    {MAPSEC_NOTHING}
 };
 
 static struct PokedexAreaScreenEwramStruct *const gPokedexAreaScreenPtr = &ePokedexAreaScreen;
@@ -302,9 +302,9 @@ static void SetSpecialMapHasMon(u16 mapGroup, u16 mapNum)
     if (gPokedexAreaScreenPtr->numSpecialAreas < 0x20)
     {
         mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
-        if (mapHeader->regionMapSectionId < MAPSEC_Nothing)
+        if (mapHeader->regionMapSectionId < MAPSEC_NOTHING)
         {
-            for (i = 0; sLandmarkData[i][0] != MAPSEC_Nothing; i++)
+            for (i = 0; sLandmarkData[i][0] != MAPSEC_NOTHING; i++)
             {
                 if (mapHeader->regionMapSectionId == sLandmarkData[i][0] && !FlagGet(sLandmarkData[i][1]))
                     return;
diff --git a/src/region_map.c b/src/region_map.c
index 11ec64f19..4b591c2e5 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -153,19 +153,19 @@ const struct RegionMapLocation gRegionMapLocations[] =
 
 static const u16 sUnderwaterMaps[][2] =
 {
-    {MAPSEC_Underwater124,       MAPSEC_Route124},
-    {MAPSEC_Underwater125,       MAPSEC_Route126},
-    {MAPSEC_Underwater126,       MAPSEC_Route127},
-    {MAPSEC_Underwater127,       MAPSEC_Route128},
-    {MAPSEC_UnderwaterSootopolis,       MAPSEC_SootopolisCity},
-    {MAPSEC_Underwater128,       MAPSEC_Route128},
-    {MAPSEC_EvilTeamHideout, MAPSEC_LilycoveCity},
-    {MAPSEC_UnderwaterSealedChamber,       MAPSEC_Route134},
-    {MAPSEC_PetalburgWoods,   MAPSEC_Route104},
-    {MAPSEC_JaggedPass,     MAPSEC_Route112},
-    {MAPSEC_MtPyre,           MAPSEC_Route122},
-    {MAPSEC_SkyPillar,        MAPSEC_Route131},
-    {MAPSEC_Nothing,              MAPSEC_Nothing},
+    {MAPSEC_UNDERWATER_124,       MAPSEC_ROUTE_124},
+    {MAPSEC_UNDERWATER_125,       MAPSEC_ROUTE_126},
+    {MAPSEC_UNDERWATER_126,       MAPSEC_ROUTE_127},
+    {MAPSEC_UNDERWATER_127,       MAPSEC_ROUTE_128},
+    {MAPSEC_UNDERWATER_SOOTOPOLIS,       MAPSEC_SOOTOPOLIS_CITY},
+    {MAPSEC_UNDERWATER_128,       MAPSEC_ROUTE_128},
+    {MAPSEC_EVIL_TEAM_HIDEOUT, MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_UNDERWATER_SEALED_CHAMBER,       MAPSEC_ROUTE_134},
+    {MAPSEC_PETALBURG_WOODS,   MAPSEC_ROUTE_104},
+    {MAPSEC_JAGGED_PASS,     MAPSEC_ROUTE_112},
+    {MAPSEC_MT_PYRE,           MAPSEC_ROUTE_122},
+    {MAPSEC_SKY_PILLAR,        MAPSEC_ROUTE_131},
+    {MAPSEC_NOTHING,              MAPSEC_NOTHING},
 };
 
 static u8 sub_80FAB78(void);
@@ -593,7 +593,7 @@ void RegionMapDefaultZoomOffsetPlayerSprite(s16 a, s16 b)
 static u16 GetRegionMapSectionAt(u16 x, u16 y)
 {
     if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
-        return MAPSEC_Nothing;
+        return MAPSEC_NOTHING;
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
     return sRegionMapLayout[x + y * 28];
@@ -632,7 +632,7 @@ static void InitializeCursorPosition(void)
         mapHeight = gMapHeader.mapData->height;
         x = gSaveBlock1.pos.x;
         y = gSaveBlock1.pos.y;
-        if (gRegionMap->mapSectionId == MAPSEC_Underwater128)
+        if (gRegionMap->mapSectionId == MAPSEC_UNDERWATER_128)
             gRegionMap->playerIsInCave = TRUE;
         break;
     case 3:
@@ -659,7 +659,7 @@ static void InitializeCursorPosition(void)
             struct WarpData *r4;
 
             gRegionMap->mapSectionId = gMapHeader.regionMapSectionId;
-            if (gRegionMap->mapSectionId != MAPSEC_Dynamic)
+            if (gRegionMap->mapSectionId != MAPSEC_DYNAMIC)
             {
                 r4 = &gSaveBlock1.warp4;
                 mapHeader = Overworld_GetMapHeaderByGroupAndId(r4->mapGroup, r4->mapNum);
@@ -697,12 +697,12 @@ static void InitializeCursorPosition(void)
 
     switch (gRegionMap->mapSectionId)
     {
-    case MAPSEC_Route114:
+    case MAPSEC_ROUTE_114:
         if (y != 0)
             x = 0;
         break;
-    case MAPSEC_Route126:
-    case MAPSEC_Underwater125:
+    case MAPSEC_ROUTE_126:
+    case MAPSEC_UNDERWATER_125:
         x = 0;
         if (gSaveBlock1.pos.x > 32)
             x = 1;
@@ -714,7 +714,7 @@ static void InitializeCursorPosition(void)
         if (gSaveBlock1.pos.y > 0x38)
             y++;
         break;
-    case MAPSEC_Route121:
+    case MAPSEC_ROUTE_121:
         x = 0;
         if (r9 > 14)
             x = 1;
@@ -740,16 +740,16 @@ static void sub_80FB600(void)
     switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4))
     {
     case 1:
-        gRegionMap->mapSectionId = MAPSEC_SlateportCity;
+        gRegionMap->mapSectionId = MAPSEC_SLATEPORT_CITY;
         break;
     case 2:
-        gRegionMap->mapSectionId = MAPSEC_LilycoveCity;
+        gRegionMap->mapSectionId = MAPSEC_LILYCOVE_CITY;
         break;
     case 3:
-        gRegionMap->mapSectionId = MAPSEC_Route124;
+        gRegionMap->mapSectionId = MAPSEC_ROUTE_124;
         break;
     case 4:
-        gRegionMap->mapSectionId = MAPSEC_Route131;
+        gRegionMap->mapSectionId = MAPSEC_ROUTE_131;
         break;
     default:
     case 0:
@@ -783,44 +783,44 @@ static u16 sub_80FB758(u16 mapSectionId)
 {
     switch (mapSectionId)
     {
-    case MAPSEC_Nothing:
+    case MAPSEC_NOTHING:
         return 0;
-    case MAPSEC_LittlerootTown:
+    case MAPSEC_LITTLEROOT_TOWN:
         return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3;
-    case MAPSEC_OldaleTown:
+    case MAPSEC_OLDALE_TOWN:
         return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? 2 : 3;
-    case MAPSEC_DewfordTown:
+    case MAPSEC_DEWFORD_TOWN:
         return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? 2 : 3;
-    case MAPSEC_LavaridgeTown:
+    case MAPSEC_LAVARIDGE_TOWN:
         return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? 2 : 3;
-    case MAPSEC_FallarborTown:
+    case MAPSEC_FALLARBOR_TOWN:
         return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? 2 : 3;
-    case MAPSEC_VerdanturfTown:
+    case MAPSEC_VERDANTURF_TOWN:
         return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? 2 : 3;
-    case MAPSEC_PacifidlogTown:
+    case MAPSEC_PACIFIDLOG_TOWN:
         return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? 2 : 3;
-    case MAPSEC_PetalburgCity:
+    case MAPSEC_PETALBURG_CITY:
         return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? 2 : 3;
-    case MAPSEC_SlateportCity:
+    case MAPSEC_SLATEPORT_CITY:
         return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? 2 : 3;
-    case MAPSEC_MauvilleCity:
+    case MAPSEC_MAUVILLE_CITY:
         return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? 2 : 3;
-    case MAPSEC_RustboroCity:
+    case MAPSEC_RUSTBORO_CITY:
         return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? 2 : 3;
-    case MAPSEC_FortreeCity:
+    case MAPSEC_FORTREE_CITY:
         return FlagGet(FLAG_VISITED_FORTREE_CITY) ? 2 : 3;
-    case MAPSEC_LilycoveCity:
+    case MAPSEC_LILYCOVE_CITY:
         return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? 2 : 3;
-    case MAPSEC_MossdeepCity:
+    case MAPSEC_MOSSDEEP_CITY:
         return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? 2 : 3;
-    case MAPSEC_SootopolisCity:
+    case MAPSEC_SOOTOPOLIS_CITY:
         return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? 2 : 3;
-    case MAPSEC_EverGrandeCity:
+    case MAPSEC_EVER_GRANDE_CITY:
         return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
 
-    case MAPSEC_BattleTower:
+    case MAPSEC_BATTLE_TOWER:
         return FlagGet(FLAG_LANDMARK_BATTLE_TOWER) ? 4 : 0;
-    case MAPSEC_SouthernIsland:
+    case MAPSEC_SOUTHERN_ISLAND:
         return FlagGet(FLAG_LANDMARK_SOUTHERN_ISLAND) ? 1 : 0;
     default:
         return 1;
@@ -836,7 +836,7 @@ static u16 GetOverworldMapFromUnderwaterMap_(u16 mapSectionId)
 {
     u16 i;
 
-    for (i = 0; sUnderwaterMaps[i][0] != MAPSEC_Nothing; i++)
+    for (i = 0; sUnderwaterMaps[i][0] != MAPSEC_NOTHING; i++)
     {
         if (sUnderwaterMaps[i][0] == mapSectionId)
             return sUnderwaterMaps[i][1];
@@ -855,7 +855,7 @@ static void sub_80FBA18(void)
     u16 y;
     u16 i;
 
-    if (gRegionMap->mapSectionId == MAPSEC_Nothing)
+    if (gRegionMap->mapSectionId == MAPSEC_NOTHING)
     {
         gRegionMap->everGrandeCityArea = 0;
         return;
@@ -1208,9 +1208,9 @@ void sub_80FBF94(void)
 
 const u8 *GetMapSectionName(u8 *dest, u16 mapSectionId, u16 length)
 {
-    if (mapSectionId == MAPSEC_SecretBase)
+    if (mapSectionId == MAPSEC_SECRET_BASE)
         return GetSecretBaseMapName(dest);
-    if (mapSectionId < MAPSEC_Nothing)
+    if (mapSectionId < MAPSEC_NOTHING)
         return StringCopy(dest, gRegionMapLocations[mapSectionId].regionMapSectionId);
     if (length == 0)
         length = 18;
@@ -1221,9 +1221,9 @@ const u8 *CopyMapName(u8 *dest, u16 mapSectionId)
 {
     switch (mapSectionId)
     {
-    case MAPSEC_Dynamic:
+    case MAPSEC_DYNAMIC:
         return StringCopy(dest, gOtherText_Ferry);
-    case MAPSEC_SecretBase:
+    case MAPSEC_SECRET_BASE:
         return StringCopy(dest, gOtherText_SecretBase);
     default:
         return GetMapSectionName(dest, mapSectionId, 0);
@@ -1232,7 +1232,7 @@ const u8 *CopyMapName(u8 *dest, u16 mapSectionId)
 
 const u8 *CopyLocationName(u8 *dest, u16 mapSectionId)
 {
-    if (mapSectionId == MAPSEC_EvilTeamHideout)
+    if (mapSectionId == MAPSEC_EVIL_TEAM_HIDEOUT)
         return StringCopy(dest, gOtherText_Hideout);
     else
         return CopyMapName(dest, mapSectionId);
@@ -1330,7 +1330,7 @@ struct MultiPartMapSection
 // Map sections that are divided into multiple parts. Ever Grande City is the only one.
 static const struct MultiPartMapSection sMultiPartMapSections[1] =
 {
-    {sEverGrandeCityAreaNames, MAPSEC_EverGrandeCity, FLAG_SYS_POKEMON_LEAGUE_FLY},
+    {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY},
 };
 
 static struct UnknownStruct3 *const sFlyDataPtr = (struct UnknownStruct3 *)gSharedMem;
@@ -1341,8 +1341,8 @@ static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons
 static const u16 sSpecialFlyAreas[][2] =
 {
     // flag, mapSectionId
-    {0x848, MAPSEC_BattleTower},
-    {0xFFFF, MAPSEC_Nothing},
+    {0x848, MAPSEC_BATTLE_TOWER},
+    {0xFFFF, MAPSEC_NOTHING},
 };
 
 static const struct OamData sFlyTargetOamData =
@@ -1607,7 +1607,7 @@ static void CreateSpecialAreaFlyTargetIcons(void)
 {
     u16 i;
 
-    for (i = 0; sSpecialFlyAreas[i][1] != MAPSEC_Nothing; i++)
+    for (i = 0; sSpecialFlyAreas[i][1] != MAPSEC_NOTHING; i++)
     {
         u16 x;
         u16 y;
@@ -1716,16 +1716,16 @@ void sub_80FC69C(void)
         {
             switch (sFlyDataPtr->regionMap.mapSectionId)
             {
-            case MAPSEC_SouthernIsland:
+            case MAPSEC_SOUTHERN_ISLAND:
                 sub_8053538(22);
                 break;
-            case MAPSEC_BattleTower:
+            case MAPSEC_BATTLE_TOWER:
                 sub_8053538(21);
                 break;
-            case MAPSEC_LittlerootTown:
+            case MAPSEC_LITTLEROOT_TOWN:
                 sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13);
                 break;
-            case MAPSEC_EverGrandeCity:
+            case MAPSEC_EVER_GRANDE_CITY:
                 sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? 20 : 11);
                 break;
             default:
diff --git a/src/tv.c b/src/tv.c
index 046c6f14c..87cecbefc 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -90,31 +90,31 @@ const struct OutbreakPokemon gPokeOutbreakSpeciesList[5] =
         .species = SPECIES_SURSKIT,
         .moves = {MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE},
         .level = 3,
-        .location = MAPSEC_Route102,
+        .location = MAPSEC_ROUTE_102,
     },
     {
         .species = SPECIES_SURSKIT,
         .moves = {MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE},
         .level = 15,
-        .location = MAPSEC_Route114,
+        .location = MAPSEC_ROUTE_114,
     },
     {
         .species = SPECIES_SURSKIT,
         .moves = {MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE},
         .level = 15,
-        .location = MAPSEC_Route117,
+        .location = MAPSEC_ROUTE_117,
     },
     {
         .species = SPECIES_SURSKIT,
         .moves = {MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE},
         .level = 28,
-        .location = MAPSEC_Route120,
+        .location = MAPSEC_ROUTE_120,
     },
     {
         .species = SPECIES_SKITTY,
         .moves = {MOVE_GROWL, MOVE_TACKLE, MOVE_NONE, MOVE_NONE},
         .level = 15,
-        .location = MAPSEC_Route116,
+        .location = MAPSEC_ROUTE_116,
     },
 };