Merge pull request #1165 from GriffinRichards/fix-underwatermaps

Give proper names to underwater maps

5 files changed, 252 insertions, 252 deletions

diff --git a/src/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h
index 1d503d72f..6b433f90f 100644
--- a/src/data/region_map/region_map_entries.h
+++ b/src/data/region_map/region_map_entries.h
@@ -200,219 +200,219 @@ static const u8 sMapName_DesertUnderpass[] = _("DESERT UNDERPASS");
 static const u8 sMapName_TrainerHill[] = _("TRAINER HILL");
 
 const struct RegionMapLocation gRegionMapEntries[] = {
-    [MAPSEC_LITTLEROOT_TOWN]           = { 4, 11, 1, 1, sMapName_LittlerootTown},
-    [MAPSEC_OLDALE_TOWN]               = { 4,  9, 1, 1, sMapName_OldaleTown},
-    [MAPSEC_DEWFORD_TOWN]              = { 2, 14, 1, 1, sMapName_DewfordTown},
-    [MAPSEC_LAVARIDGE_TOWN]            = { 5,  3, 1, 1, sMapName_LavaridgeTown},
-    [MAPSEC_FALLARBOR_TOWN]            = { 3,  0, 1, 1, sMapName_FallarborTown},
-    [MAPSEC_VERDANTURF_TOWN]           = { 4,  6, 1, 1, sMapName_VerdanturfTown},
-    [MAPSEC_PACIFIDLOG_TOWN]           = {17, 10, 1, 1, sMapName_PacifidlogTown},
-    [MAPSEC_PETALBURG_CITY]            = { 1,  9, 1, 1, sMapName_PetalburgCity},
-    [MAPSEC_SLATEPORT_CITY]            = { 8, 10, 1, 2, sMapName_SlateportCity},
-    [MAPSEC_MAUVILLE_CITY]             = { 8,  6, 2, 1, sMapName_MauvilleCity},
-    [MAPSEC_RUSTBORO_CITY]             = { 0,  5, 1, 2, sMapName_RustboroCity},
-    [MAPSEC_FORTREE_CITY]              = {12,  0, 1, 1, sMapName_FortreeCity},
-    [MAPSEC_LILYCOVE_CITY]             = {18,  3, 2, 1, sMapName_LilycoveCity},
-    [MAPSEC_MOSSDEEP_CITY]             = {24,  5, 2, 1, sMapName_MossdeepCity},
-    [MAPSEC_SOOTOPOLIS_CITY]           = {21,  7, 1, 1, sMapName_SootopolisCity},
-    [MAPSEC_EVER_GRANDE_CITY]          = {27,  8, 1, 2, sMapName_EverGrandeCity},
-    [MAPSEC_ROUTE_101]                 = { 4, 10, 1, 1, sMapName_Route101},
-    [MAPSEC_ROUTE_102]                 = { 2,  9, 2, 1, sMapName_Route102},
-    [MAPSEC_ROUTE_103]                 = { 4,  8, 4, 1, sMapName_Route103},
-    [MAPSEC_ROUTE_104]                 = { 0,  7, 1, 3, sMapName_Route104},
-    [MAPSEC_ROUTE_105]                 = { 0, 10, 1, 3, sMapName_Route105},
-    [MAPSEC_ROUTE_106]                 = { 0, 13, 2, 1, sMapName_Route106},
-    [MAPSEC_ROUTE_107]                 = { 3, 14, 3, 1, sMapName_Route107},
-    [MAPSEC_ROUTE_108]                 = { 6, 14, 2, 1, sMapName_Route108},
-    [MAPSEC_ROUTE_109]                 = { 8, 12, 1, 3, sMapName_Route109},
-    [MAPSEC_ROUTE_110]                 = { 8,  7, 1, 3, sMapName_Route110},
-    [MAPSEC_ROUTE_111]                 = { 8,  0, 1, 6, sMapName_Route111},
-    [MAPSEC_ROUTE_112]                 = { 6,  3, 2, 1, sMapName_Route112},
-    [MAPSEC_ROUTE_113]                 = { 4,  0, 4, 1, sMapName_Route113},
-    [MAPSEC_ROUTE_114]                 = { 1,  0, 2, 3, sMapName_Route114},
-    [MAPSEC_ROUTE_115]                 = { 0,  2, 1, 3, sMapName_Route115},
-    [MAPSEC_ROUTE_116]                 = { 1,  5, 4, 1, sMapName_Route116},
-    [MAPSEC_ROUTE_117]                 = { 5,  6, 3, 1, sMapName_Route117},
-    [MAPSEC_ROUTE_118]                 = {10,  6, 2, 1, sMapName_Route118},
-    [MAPSEC_ROUTE_119]                 = {11,  0, 1, 6, sMapName_Route119},
-    [MAPSEC_ROUTE_120]                 = {13,  0, 1, 4, sMapName_Route120},
-    [MAPSEC_ROUTE_121]                 = {14,  3, 4, 1, sMapName_Route121},
-    [MAPSEC_ROUTE_122]                 = {16,  4, 1, 2, sMapName_Route122},
-    [MAPSEC_ROUTE_123]                 = {12,  6, 5, 1, sMapName_Route123},
-    [MAPSEC_ROUTE_124]                 = {20,  3, 4, 3, sMapName_Route124},
-    [MAPSEC_ROUTE_125]                 = {24,  3, 2, 2, sMapName_Route125},
-    [MAPSEC_ROUTE_126]                 = {20,  6, 3, 3, sMapName_Route126},
-    [MAPSEC_ROUTE_127]                 = {23,  6, 3, 3, sMapName_Route127},
-    [MAPSEC_ROUTE_128]                 = {23,  9, 4, 1, sMapName_Route128},
-    [MAPSEC_ROUTE_129]                 = {24, 10, 2, 1, sMapName_Route129},
-    [MAPSEC_ROUTE_130]                 = {21, 10, 3, 1, sMapName_Route130},
-    [MAPSEC_ROUTE_131]                 = {18, 10, 3, 1, sMapName_Route131},
-    [MAPSEC_ROUTE_132]                 = {15, 10, 2, 1, sMapName_Route132},
-    [MAPSEC_ROUTE_133]                 = {12, 10, 3, 1, sMapName_Route133},
-    [MAPSEC_ROUTE_134]                 = { 9, 10, 3, 1, sMapName_Route134},
-    [MAPSEC_UNDERWATER_124]            = {20,  3, 4, 3, sMapName_Underwater},
-    [MAPSEC_UNDERWATER_125]            = {20,  6, 3, 3, sMapName_Underwater},
-    [MAPSEC_UNDERWATER_126]            = {23,  6, 3, 3, sMapName_Underwater},
-    [MAPSEC_UNDERWATER_127]            = {23,  9, 4, 1, sMapName_Underwater},
-    [MAPSEC_UNDERWATER_SOOTOPOLIS]     = {21,  7, 1, 1, sMapName_Underwater},
-    [MAPSEC_GRANITE_CAVE]              = { 1, 13, 1, 1, sMapName_GraniteCave},
-    [MAPSEC_MT_CHIMNEY]                = { 6,  2, 1, 1, sMapName_MtChimney},
-    [MAPSEC_SAFARI_ZONE]               = {16,  2, 1, 1, sMapName_SafariZone},
-    [MAPSEC_BATTLE_FRONTIER]           = {22, 12, 1, 1, sMapName_BattleFrontier},
-    [MAPSEC_PETALBURG_WOODS]           = { 0,  8, 1, 1, sMapName_PetalburgWoods},
-    [MAPSEC_RUSTURF_TUNNEL]            = { 2,  5, 1, 1, sMapName_RusturfTunnel},
-    [MAPSEC_ABANDONED_SHIP]            = { 6, 14, 1, 1, sMapName_AbandonedShip},
-    [MAPSEC_NEW_MAUVILLE]              = { 8,  7, 1, 1, sMapName_NewMauville},
-    [MAPSEC_METEOR_FALLS]              = { 0,  3, 1, 1, sMapName_MeteorFalls},
-    [MAPSEC_METEOR_FALLS2]             = { 1,  2, 1, 1, sMapName_MeteorFalls},
-    [MAPSEC_MT_PYRE]                   = {16,  4, 1, 1, sMapName_MtPyre},
-    [MAPSEC_AQUA_HIDEOUT_OLD]          = {19,  3, 1, 1, sMapName_AquaHideoutOld},
-    [MAPSEC_SHOAL_CAVE]                = {24,  4, 1, 1, sMapName_ShoalCave},
-    [MAPSEC_SEAFLOOR_CAVERN]           = {24,  9, 1, 1, sMapName_SeafloorCavern},
-    [MAPSEC_UNDERWATER_128]            = {24,  9, 1, 1, sMapName_Underwater},
-    [MAPSEC_VICTORY_ROAD]              = {27,  9, 1, 1, sMapName_VictoryRoad},
-    [MAPSEC_MIRAGE_ISLAND]             = {17, 10, 1, 1, sMapName_MirageIsland},
-    [MAPSEC_CAVE_OF_ORIGIN]            = {21,  7, 1, 1, sMapName_CaveOfOrigin},
-    [MAPSEC_SOUTHERN_ISLAND]           = {12, 14, 1, 1, sMapName_SouthernIsland},
-    [MAPSEC_FIERY_PATH]                = { 6,  3, 1, 1, sMapName_FieryPath},
-    [MAPSEC_FIERY_PATH2]               = { 7,  3, 1, 1, sMapName_FieryPath},
-    [MAPSEC_JAGGED_PASS]               = { 6,  3, 1, 1, sMapName_JaggedPass},
-    [MAPSEC_JAGGED_PASS2]              = { 7,  2, 1, 1, sMapName_JaggedPass},
-    [MAPSEC_SEALED_CHAMBER]            = {11, 10, 1, 1, sMapName_SealedChamber},
-    [MAPSEC_UNDERWATER_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_Underwater},
-    [MAPSEC_SCORCHED_SLAB]             = {13,  0, 1, 1, sMapName_ScorchedSlab},
-    [MAPSEC_ISLAND_CAVE]               = { 0, 10, 1, 1, sMapName_IslandCave},
-    [MAPSEC_DESERT_RUINS]              = { 8,  3, 1, 1, sMapName_DesertRuins},
-    [MAPSEC_ANCIENT_TOMB]              = {13,  2, 1, 1, sMapName_AncientTomb},
-    [MAPSEC_INSIDE_OF_TRUCK]           = { 0,  0, 1, 1, sMapName_InsideOfTruck},
-    [MAPSEC_SKY_PILLAR]                = {19, 10, 1, 1, sMapName_SkyPillar},
-    [MAPSEC_SECRET_BASE]               = { 0,  0, 1, 1, sMapName_SecretBase},
-    [MAPSEC_DYNAMIC]                   = { 0,  0, 1, 1, sMapName_None},
-    [MAPSEC_PALLET_TOWN]               = { 0,  0, 1, 1, sMapName_PalletTown},
-    [MAPSEC_VIRIDIAN_CITY]             = { 0,  0, 1, 1, sMapName_ViridianCity},
-    [MAPSEC_PEWTER_CITY]               = { 0,  0, 1, 1, sMapName_PewterCity},
-    [MAPSEC_CERULEAN_CITY]             = { 0,  0, 1, 1, sMapName_CeruleanCity},
-    [MAPSEC_LAVENDER_TOWN]             = { 0,  0, 1, 1, sMapName_LavenderTown},
-    [MAPSEC_VERMILION_CITY]            = { 0,  0, 1, 1, sMapName_VermilionCity},
-    [MAPSEC_CELADON_CITY]              = { 0,  0, 1, 1, sMapName_CeladonCity},
-    [MAPSEC_FUCHSIA_CITY]              = { 0,  0, 1, 1, sMapName_FuchsiaCity},
-    [MAPSEC_CINNABAR_ISLAND]           = { 0,  0, 1, 1, sMapName_CinnabarIsland},
-    [MAPSEC_INDIGO_PLATEAU]            = { 0,  0, 1, 1, sMapName_IndigoPlateau},
-    [MAPSEC_SAFFRON_CITY]              = { 0,  0, 1, 1, sMapName_SaffronCity},
-    [MAPSEC_ROUTE_4_FLYDUP]            = { 0,  0, 1, 1, sMapName_Route4},
-    [MAPSEC_ROUTE_10_FLYDUP]           = { 0,  0, 1, 1, sMapName_Route10},
-    [MAPSEC_ROUTE_1]                   = { 0,  0, 1, 1, sMapName_Route1},
-    [MAPSEC_ROUTE_2]                   = { 0,  0, 1, 1, sMapName_Route2},
-    [MAPSEC_ROUTE_3]                   = { 0,  0, 1, 1, sMapName_Route3},
-    [MAPSEC_ROUTE_4]                   = { 0,  0, 1, 1, sMapName_Route4_2},
-    [MAPSEC_ROUTE_5]                   = { 0,  0, 1, 1, sMapName_Route5},
-    [MAPSEC_ROUTE_6]                   = { 0,  0, 1, 1, sMapName_Route6},
-    [MAPSEC_ROUTE_7]                   = { 0,  0, 1, 1, sMapName_Route7},
-    [MAPSEC_ROUTE_8]                   = { 0,  0, 1, 1, sMapName_Route8},
-    [MAPSEC_ROUTE_9]                   = { 0,  0, 1, 1, sMapName_Route9},
-    [MAPSEC_ROUTE_10]                  = { 0,  0, 1, 1, sMapName_Route10_2},
-    [MAPSEC_ROUTE_11]                  = { 0,  0, 1, 1, sMapName_Route11},
-    [MAPSEC_ROUTE_12]                  = { 0,  0, 1, 1, sMapName_Route12},
-    [MAPSEC_ROUTE_13]                  = { 0,  0, 1, 1, sMapName_Route13},
-    [MAPSEC_ROUTE_14]                  = { 0,  0, 1, 1, sMapName_Route14},
-    [MAPSEC_ROUTE_15]                  = { 0,  0, 1, 1, sMapName_Route15},
-    [MAPSEC_ROUTE_16]                  = { 0,  0, 1, 1, sMapName_Route16},
-    [MAPSEC_ROUTE_17]                  = { 0,  0, 1, 1, sMapName_Route17},
-    [MAPSEC_ROUTE_18]                  = { 0,  0, 1, 1, sMapName_Route18},
-    [MAPSEC_ROUTE_19]                  = { 0,  0, 1, 1, sMapName_Route19},
-    [MAPSEC_ROUTE_20]                  = { 0,  0, 1, 1, sMapName_Route20},
-    [MAPSEC_ROUTE_21]                  = { 0,  0, 1, 1, sMapName_Route21},
-    [MAPSEC_ROUTE_22]                  = { 0,  0, 1, 1, sMapName_Route22},
-    [MAPSEC_ROUTE_23]                  = { 0,  0, 1, 1, sMapName_Route23},
-    [MAPSEC_ROUTE_24]                  = { 0,  0, 1, 1, sMapName_Route24},
-    [MAPSEC_ROUTE_25]                  = { 0,  0, 1, 1, sMapName_Route25},
-    [MAPSEC_VIRIDIAN_FOREST]           = { 0,  0, 1, 1, sMapName_ViridianForest},
-    [MAPSEC_MT_MOON]                   = { 0,  0, 1, 1, sMapName_MtMoon},
-    [MAPSEC_S_S_ANNE]                  = { 0,  0, 1, 1, sMapName_SSAnne},
-    [MAPSEC_UNDERGROUND_PATH]          = { 0,  0, 1, 1, sMapName_UndergroundPath},
-    [MAPSEC_UNDERGROUND_PATH_2]        = { 0,  0, 1, 1, sMapName_UndergroundPath2},
-    [MAPSEC_DIGLETTS_CAVE]             = { 0,  0, 1, 1, sMapName_DiglettsCave},
-    [MAPSEC_KANTO_VICTORY_ROAD]        = { 0,  0, 1, 1, sMapName_KantoVictoryRoad},
-    [MAPSEC_ROCKET_HIDEOUT]            = { 0,  0, 1, 1, sMapName_RocketHideout},
-    [MAPSEC_SILPH_CO]                  = { 0,  0, 1, 1, sMapName_SilphCo},
-    [MAPSEC_POKEMON_MANSION]           = { 0,  0, 1, 1, sMapName_PokemonMansion},
-    [MAPSEC_KANTO_SAFARI_ZONE]         = { 0,  0, 1, 1, sMapName_KantoSafariZone},
-    [MAPSEC_POKEMON_LEAGUE]            = { 0,  0, 1, 1, sMapName_PokemonLeague},
-    [MAPSEC_ROCK_TUNNEL]               = { 0,  0, 1, 1, sMapName_RockTunnel},
-    [MAPSEC_SEAFOAM_ISLANDS]           = { 0,  0, 1, 1, sMapName_SeafoamIslands},
-    [MAPSEC_POKEMON_TOWER]             = { 0,  0, 1, 1, sMapName_PokemonTower},
-    [MAPSEC_CERULEAN_CAVE]             = { 0,  0, 1, 1, sMapName_CeruleanCave},
-    [MAPSEC_POWER_PLANT]               = { 0,  0, 1, 1, sMapName_PowerPlant},
-    [MAPSEC_ONE_ISLAND]                = { 0,  0, 1, 1, sMapName_OneIsland},
-    [MAPSEC_TWO_ISLAND]                = { 0,  0, 1, 1, sMapName_TwoIsland},
-    [MAPSEC_THREE_ISLAND]              = { 0,  0, 1, 1, sMapName_ThreeIsland},
-    [MAPSEC_FOUR_ISLAND]               = { 0,  0, 1, 1, sMapName_FourIsland},
-    [MAPSEC_FIVE_ISLAND]               = { 0,  0, 1, 1, sMapName_FiveIsland},
-    [MAPSEC_SEVEN_ISLAND]              = { 0,  0, 1, 1, sMapName_SevenIsland},
-    [MAPSEC_SIX_ISLAND]                = { 0,  0, 1, 1, sMapName_SixIsland},
-    [MAPSEC_KINDLE_ROAD]               = { 0,  0, 1, 1, sMapName_KindleRoad},
-    [MAPSEC_TREASURE_BEACH]            = { 0,  0, 1, 1, sMapName_TreasureBeach},
-    [MAPSEC_CAPE_BRINK]                = { 0,  0, 1, 1, sMapName_CapeBrink},
-    [MAPSEC_BOND_BRIDGE]               = { 0,  0, 1, 1, sMapName_BondBridge},
-    [MAPSEC_THREE_ISLE_PORT]           = { 0,  0, 1, 1, sMapName_ThreeIslePort},
-    [MAPSEC_SEVII_ISLE_6]              = { 0,  0, 1, 1, sMapName_SeviiIsle6},
-    [MAPSEC_SEVII_ISLE_7]              = { 0,  0, 1, 1, sMapName_SeviiIsle7},
-    [MAPSEC_SEVII_ISLE_8]              = { 0,  0, 1, 1, sMapName_SeviiIsle8},
-    [MAPSEC_SEVII_ISLE_9]              = { 0,  0, 1, 1, sMapName_SeviiIsle9},
-    [MAPSEC_RESORT_GORGEOUS]           = { 0,  0, 1, 1, sMapName_ResortGorgeous},
-    [MAPSEC_WATER_LABYRINTH]           = { 0,  0, 1, 1, sMapName_WaterLabyrinth},
-    [MAPSEC_FIVE_ISLE_MEADOW]          = { 0,  0, 1, 1, sMapName_FiveIsleMeadow},
-    [MAPSEC_MEMORIAL_PILLAR]           = { 0,  0, 1, 1, sMapName_MemorialPillar},
-    [MAPSEC_OUTCAST_ISLAND]            = { 0,  0, 1, 1, sMapName_OutcastIsland},
-    [MAPSEC_GREEN_PATH]                = { 0,  0, 1, 1, sMapName_GreenPath},
-    [MAPSEC_WATER_PATH]                = { 0,  0, 1, 1, sMapName_WaterPath},
-    [MAPSEC_RUIN_VALLEY]               = { 0,  0, 1, 1, sMapName_RuinValley},
-    [MAPSEC_TRAINER_TOWER]             = { 0,  0, 1, 1, sMapName_TrainerTower},
-    [MAPSEC_CANYON_ENTRANCE]           = { 0,  0, 1, 1, sMapName_CanyonEntrance},
-    [MAPSEC_SEVAULT_CANYON]            = { 0,  0, 1, 1, sMapName_SevaultCanyon},
-    [MAPSEC_TANOBY_RUINS]              = { 0,  0, 1, 1, sMapName_TanobyRuins},
-    [MAPSEC_SEVII_ISLE_22]             = { 0,  0, 1, 1, sMapName_SeviiIsle22},
-    [MAPSEC_SEVII_ISLE_23]             = { 0,  0, 1, 1, sMapName_SeviiIsle23},
-    [MAPSEC_SEVII_ISLE_24]             = { 0,  0, 1, 1, sMapName_SeviiIsle24},
-    [MAPSEC_NAVEL_ROCK_FRLG]           = { 0,  0, 1, 1, sMapName_NavelRock},
-    [MAPSEC_MT_EMBER]                  = { 0,  0, 1, 1, sMapName_MtEmber},
-    [MAPSEC_BERRY_FOREST]              = { 0,  0, 1, 1, sMapName_BerryForest},
-    [MAPSEC_ICEFALL_CAVE]              = { 0,  0, 1, 1, sMapName_IcefallCave},
-    [MAPSEC_ROCKET_WAREHOUSE]          = { 0,  0, 1, 1, sMapName_RocketWarehouse},
-    [MAPSEC_TRAINER_TOWER_2]           = { 0,  0, 1, 1, sMapName_TrainerTower2},
-    [MAPSEC_DOTTED_HOLE]               = { 0,  0, 1, 1, sMapName_DottedHole},
-    [MAPSEC_LOST_CAVE]                 = { 0,  0, 1, 1, sMapName_LostCave},
-    [MAPSEC_PATTERN_BUSH]              = { 0,  0, 1, 1, sMapName_PatternBush},
-    [MAPSEC_ALTERING_CAVE_FRLG]        = { 0,  0, 1, 1, sMapName_AlteringCave},
-    [MAPSEC_TANOBY_CHAMBERS]           = { 0,  0, 1, 1, sMapName_TanobyChambers},
-    [MAPSEC_THREE_ISLE_PATH]           = { 0,  0, 1, 1, sMapName_ThreeIslePath},
-    [MAPSEC_TANOBY_KEY]                = { 0,  0, 1, 1, sMapName_TanobyKey},
-    [MAPSEC_BIRTH_ISLAND_FRLG]         = { 0,  0, 1, 1, sMapName_BirthIsland},
-    [MAPSEC_MONEAN_CHAMBER]            = { 0,  0, 1, 1, sMapName_MoneanChamber},
-    [MAPSEC_LIPTOO_CHAMBER]            = { 0,  0, 1, 1, sMapName_LiptooChamber},
-    [MAPSEC_WEEPTH_CHAMBER]            = { 0,  0, 1, 1, sMapName_WeepthChamber},
-    [MAPSEC_DILFORD_CHAMBER]           = { 0,  0, 1, 1, sMapName_DilfordChamber},
-    [MAPSEC_SCUFIB_CHAMBER]            = { 0,  0, 1, 1, sMapName_ScufibChamber},
-    [MAPSEC_RIXY_CHAMBER]              = { 0,  0, 1, 1, sMapName_RixyChamber},
-    [MAPSEC_VIAPOIS_CHAMBER]           = { 0,  0, 1, 1, sMapName_ViapoisChamber},
-    [MAPSEC_EMBER_SPA]                 = { 0,  0, 1, 1, sMapName_EmberSpa},
-    [MAPSEC_SPECIAL_AREA]              = { 0,  0, 1, 1, sMapName_SpecialArea},
-    [MAPSEC_AQUA_HIDEOUT]              = {19,  3, 1, 1, sMapName_AquaHideout},
-    [MAPSEC_MAGMA_HIDEOUT]             = { 6,  3, 1, 1, sMapName_MagmaHideout},
-    [MAPSEC_MIRAGE_TOWER]              = { 8,  2, 1, 1, sMapName_MirageTower},
-    [MAPSEC_BIRTH_ISLAND]              = { 0,  0, 1, 1, sMapName_BirthIsland},
-    [MAPSEC_FARAWAY_ISLAND]            = { 0,  0, 1, 1, sMapName_FarawayIsland},
-    [MAPSEC_ARTISAN_CAVE]              = {22, 12, 1, 1, sMapName_ArtisanCave},
-    [MAPSEC_MARINE_CAVE]               = { 0,  0, 1, 1, sMapName_MarineCave},
-    [MAPSEC_UNDERWATER_MARINE_CAVE]    = { 0,  0, 1, 1, sMapName_Underwater},
-    [MAPSEC_TERRA_CAVE]                = { 0,  0, 1, 1, sMapName_TerraCave},
-    [MAPSEC_UNDERWATER_TERRA_CAVE]     = { 0, 10, 1, 3, sMapName_Underwater},
-    [MAPSEC_UNDERWATER_UNK1]           = {24,  3, 2, 2, sMapName_Underwater},
-    [MAPSEC_UNDERWATER_129]            = {24, 10, 2, 1, sMapName_Underwater},
-    [MAPSEC_DESERT_UNDERPASS]          = { 2,  0, 1, 1, sMapName_DesertUnderpass},
-    [MAPSEC_ALTERING_CAVE]             = { 6,  8, 1, 1, sMapName_AlteringCave},
-    [MAPSEC_NAVEL_ROCK]                = { 0,  0, 1, 1, sMapName_NavelRock},
-    [MAPSEC_TRAINER_HILL]              = { 8,  4, 1, 1, sMapName_TrainerHill}
+    [MAPSEC_LITTLEROOT_TOWN]            = { 4, 11, 1, 1, sMapName_LittlerootTown},
+    [MAPSEC_OLDALE_TOWN]                = { 4,  9, 1, 1, sMapName_OldaleTown},
+    [MAPSEC_DEWFORD_TOWN]               = { 2, 14, 1, 1, sMapName_DewfordTown},
+    [MAPSEC_LAVARIDGE_TOWN]             = { 5,  3, 1, 1, sMapName_LavaridgeTown},
+    [MAPSEC_FALLARBOR_TOWN]             = { 3,  0, 1, 1, sMapName_FallarborTown},
+    [MAPSEC_VERDANTURF_TOWN]            = { 4,  6, 1, 1, sMapName_VerdanturfTown},
+    [MAPSEC_PACIFIDLOG_TOWN]            = {17, 10, 1, 1, sMapName_PacifidlogTown},
+    [MAPSEC_PETALBURG_CITY]             = { 1,  9, 1, 1, sMapName_PetalburgCity},
+    [MAPSEC_SLATEPORT_CITY]             = { 8, 10, 1, 2, sMapName_SlateportCity},
+    [MAPSEC_MAUVILLE_CITY]              = { 8,  6, 2, 1, sMapName_MauvilleCity},
+    [MAPSEC_RUSTBORO_CITY]              = { 0,  5, 1, 2, sMapName_RustboroCity},
+    [MAPSEC_FORTREE_CITY]               = {12,  0, 1, 1, sMapName_FortreeCity},
+    [MAPSEC_LILYCOVE_CITY]              = {18,  3, 2, 1, sMapName_LilycoveCity},
+    [MAPSEC_MOSSDEEP_CITY]              = {24,  5, 2, 1, sMapName_MossdeepCity},
+    [MAPSEC_SOOTOPOLIS_CITY]            = {21,  7, 1, 1, sMapName_SootopolisCity},
+    [MAPSEC_EVER_GRANDE_CITY]           = {27,  8, 1, 2, sMapName_EverGrandeCity},
+    [MAPSEC_ROUTE_101]                  = { 4, 10, 1, 1, sMapName_Route101},
+    [MAPSEC_ROUTE_102]                  = { 2,  9, 2, 1, sMapName_Route102},
+    [MAPSEC_ROUTE_103]                  = { 4,  8, 4, 1, sMapName_Route103},
+    [MAPSEC_ROUTE_104]                  = { 0,  7, 1, 3, sMapName_Route104},
+    [MAPSEC_ROUTE_105]                  = { 0, 10, 1, 3, sMapName_Route105},
+    [MAPSEC_ROUTE_106]                  = { 0, 13, 2, 1, sMapName_Route106},
+    [MAPSEC_ROUTE_107]                  = { 3, 14, 3, 1, sMapName_Route107},
+    [MAPSEC_ROUTE_108]                  = { 6, 14, 2, 1, sMapName_Route108},
+    [MAPSEC_ROUTE_109]                  = { 8, 12, 1, 3, sMapName_Route109},
+    [MAPSEC_ROUTE_110]                  = { 8,  7, 1, 3, sMapName_Route110},
+    [MAPSEC_ROUTE_111]                  = { 8,  0, 1, 6, sMapName_Route111},
+    [MAPSEC_ROUTE_112]                  = { 6,  3, 2, 1, sMapName_Route112},
+    [MAPSEC_ROUTE_113]                  = { 4,  0, 4, 1, sMapName_Route113},
+    [MAPSEC_ROUTE_114]                  = { 1,  0, 2, 3, sMapName_Route114},
+    [MAPSEC_ROUTE_115]                  = { 0,  2, 1, 3, sMapName_Route115},
+    [MAPSEC_ROUTE_116]                  = { 1,  5, 4, 1, sMapName_Route116},
+    [MAPSEC_ROUTE_117]                  = { 5,  6, 3, 1, sMapName_Route117},
+    [MAPSEC_ROUTE_118]                  = {10,  6, 2, 1, sMapName_Route118},
+    [MAPSEC_ROUTE_119]                  = {11,  0, 1, 6, sMapName_Route119},
+    [MAPSEC_ROUTE_120]                  = {13,  0, 1, 4, sMapName_Route120},
+    [MAPSEC_ROUTE_121]                  = {14,  3, 4, 1, sMapName_Route121},
+    [MAPSEC_ROUTE_122]                  = {16,  4, 1, 2, sMapName_Route122},
+    [MAPSEC_ROUTE_123]                  = {12,  6, 5, 1, sMapName_Route123},
+    [MAPSEC_ROUTE_124]                  = {20,  3, 4, 3, sMapName_Route124},
+    [MAPSEC_ROUTE_125]                  = {24,  3, 2, 2, sMapName_Route125},
+    [MAPSEC_ROUTE_126]                  = {20,  6, 3, 3, sMapName_Route126},
+    [MAPSEC_ROUTE_127]                  = {23,  6, 3, 3, sMapName_Route127},
+    [MAPSEC_ROUTE_128]                  = {23,  9, 4, 1, sMapName_Route128},
+    [MAPSEC_ROUTE_129]                  = {24, 10, 2, 1, sMapName_Route129},
+    [MAPSEC_ROUTE_130]                  = {21, 10, 3, 1, sMapName_Route130},
+    [MAPSEC_ROUTE_131]                  = {18, 10, 3, 1, sMapName_Route131},
+    [MAPSEC_ROUTE_132]                  = {15, 10, 2, 1, sMapName_Route132},
+    [MAPSEC_ROUTE_133]                  = {12, 10, 3, 1, sMapName_Route133},
+    [MAPSEC_ROUTE_134]                  = { 9, 10, 3, 1, sMapName_Route134},
+    [MAPSEC_UNDERWATER_124]             = {20,  3, 4, 3, sMapName_Underwater},
+    [MAPSEC_UNDERWATER_126]             = {20,  6, 3, 3, sMapName_Underwater},
+    [MAPSEC_UNDERWATER_127]             = {23,  6, 3, 3, sMapName_Underwater},
+    [MAPSEC_UNDERWATER_128]             = {23,  9, 4, 1, sMapName_Underwater},
+    [MAPSEC_UNDERWATER_SOOTOPOLIS]      = {21,  7, 1, 1, sMapName_Underwater},
+    [MAPSEC_GRANITE_CAVE]               = { 1, 13, 1, 1, sMapName_GraniteCave},
+    [MAPSEC_MT_CHIMNEY]                 = { 6,  2, 1, 1, sMapName_MtChimney},
+    [MAPSEC_SAFARI_ZONE]                = {16,  2, 1, 1, sMapName_SafariZone},
+    [MAPSEC_BATTLE_FRONTIER]            = {22, 12, 1, 1, sMapName_BattleFrontier},
+    [MAPSEC_PETALBURG_WOODS]            = { 0,  8, 1, 1, sMapName_PetalburgWoods},
+    [MAPSEC_RUSTURF_TUNNEL]             = { 2,  5, 1, 1, sMapName_RusturfTunnel},
+    [MAPSEC_ABANDONED_SHIP]             = { 6, 14, 1, 1, sMapName_AbandonedShip},
+    [MAPSEC_NEW_MAUVILLE]               = { 8,  7, 1, 1, sMapName_NewMauville},
+    [MAPSEC_METEOR_FALLS]               = { 0,  3, 1, 1, sMapName_MeteorFalls},
+    [MAPSEC_METEOR_FALLS2]              = { 1,  2, 1, 1, sMapName_MeteorFalls},
+    [MAPSEC_MT_PYRE]                    = {16,  4, 1, 1, sMapName_MtPyre},
+    [MAPSEC_AQUA_HIDEOUT_OLD]           = {19,  3, 1, 1, sMapName_AquaHideoutOld},
+    [MAPSEC_SHOAL_CAVE]                 = {24,  4, 1, 1, sMapName_ShoalCave},
+    [MAPSEC_SEAFLOOR_CAVERN]            = {24,  9, 1, 1, sMapName_SeafloorCavern},
+    [MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = {24,  9, 1, 1, sMapName_Underwater},
+    [MAPSEC_VICTORY_ROAD]               = {27,  9, 1, 1, sMapName_VictoryRoad},
+    [MAPSEC_MIRAGE_ISLAND]              = {17, 10, 1, 1, sMapName_MirageIsland},
+    [MAPSEC_CAVE_OF_ORIGIN]             = {21,  7, 1, 1, sMapName_CaveOfOrigin},
+    [MAPSEC_SOUTHERN_ISLAND]            = {12, 14, 1, 1, sMapName_SouthernIsland},
+    [MAPSEC_FIERY_PATH]                 = { 6,  3, 1, 1, sMapName_FieryPath},
+    [MAPSEC_FIERY_PATH2]                = { 7,  3, 1, 1, sMapName_FieryPath},
+    [MAPSEC_JAGGED_PASS]                = { 6,  3, 1, 1, sMapName_JaggedPass},
+    [MAPSEC_JAGGED_PASS2]               = { 7,  2, 1, 1, sMapName_JaggedPass},
+    [MAPSEC_SEALED_CHAMBER]             = {11, 10, 1, 1, sMapName_SealedChamber},
+    [MAPSEC_UNDERWATER_SEALED_CHAMBER]  = {11, 10, 1, 1, sMapName_Underwater},
+    [MAPSEC_SCORCHED_SLAB]              = {13,  0, 1, 1, sMapName_ScorchedSlab},
+    [MAPSEC_ISLAND_CAVE]                = { 0, 10, 1, 1, sMapName_IslandCave},
+    [MAPSEC_DESERT_RUINS]               = { 8,  3, 1, 1, sMapName_DesertRuins},
+    [MAPSEC_ANCIENT_TOMB]               = {13,  2, 1, 1, sMapName_AncientTomb},
+    [MAPSEC_INSIDE_OF_TRUCK]            = { 0,  0, 1, 1, sMapName_InsideOfTruck},
+    [MAPSEC_SKY_PILLAR]                 = {19, 10, 1, 1, sMapName_SkyPillar},
+    [MAPSEC_SECRET_BASE]                = { 0,  0, 1, 1, sMapName_SecretBase},
+    [MAPSEC_DYNAMIC]                    = { 0,  0, 1, 1, sMapName_None},
+    [MAPSEC_PALLET_TOWN]                = { 0,  0, 1, 1, sMapName_PalletTown},
+    [MAPSEC_VIRIDIAN_CITY]              = { 0,  0, 1, 1, sMapName_ViridianCity},
+    [MAPSEC_PEWTER_CITY]                = { 0,  0, 1, 1, sMapName_PewterCity},
+    [MAPSEC_CERULEAN_CITY]              = { 0,  0, 1, 1, sMapName_CeruleanCity},
+    [MAPSEC_LAVENDER_TOWN]              = { 0,  0, 1, 1, sMapName_LavenderTown},
+    [MAPSEC_VERMILION_CITY]             = { 0,  0, 1, 1, sMapName_VermilionCity},
+    [MAPSEC_CELADON_CITY]               = { 0,  0, 1, 1, sMapName_CeladonCity},
+    [MAPSEC_FUCHSIA_CITY]               = { 0,  0, 1, 1, sMapName_FuchsiaCity},
+    [MAPSEC_CINNABAR_ISLAND]            = { 0,  0, 1, 1, sMapName_CinnabarIsland},
+    [MAPSEC_INDIGO_PLATEAU]             = { 0,  0, 1, 1, sMapName_IndigoPlateau},
+    [MAPSEC_SAFFRON_CITY]               = { 0,  0, 1, 1, sMapName_SaffronCity},
+    [MAPSEC_ROUTE_4_FLYDUP]             = { 0,  0, 1, 1, sMapName_Route4},
+    [MAPSEC_ROUTE_10_FLYDUP]            = { 0,  0, 1, 1, sMapName_Route10},
+    [MAPSEC_ROUTE_1]                    = { 0,  0, 1, 1, sMapName_Route1},
+    [MAPSEC_ROUTE_2]                    = { 0,  0, 1, 1, sMapName_Route2},
+    [MAPSEC_ROUTE_3]                    = { 0,  0, 1, 1, sMapName_Route3},
+    [MAPSEC_ROUTE_4]                    = { 0,  0, 1, 1, sMapName_Route4_2},
+    [MAPSEC_ROUTE_5]                    = { 0,  0, 1, 1, sMapName_Route5},
+    [MAPSEC_ROUTE_6]                    = { 0,  0, 1, 1, sMapName_Route6},
+    [MAPSEC_ROUTE_7]                    = { 0,  0, 1, 1, sMapName_Route7},
+    [MAPSEC_ROUTE_8]                    = { 0,  0, 1, 1, sMapName_Route8},
+    [MAPSEC_ROUTE_9]                    = { 0,  0, 1, 1, sMapName_Route9},
+    [MAPSEC_ROUTE_10]                   = { 0,  0, 1, 1, sMapName_Route10_2},
+    [MAPSEC_ROUTE_11]                   = { 0,  0, 1, 1, sMapName_Route11},
+    [MAPSEC_ROUTE_12]                   = { 0,  0, 1, 1, sMapName_Route12},
+    [MAPSEC_ROUTE_13]                   = { 0,  0, 1, 1, sMapName_Route13},
+    [MAPSEC_ROUTE_14]                   = { 0,  0, 1, 1, sMapName_Route14},
+    [MAPSEC_ROUTE_15]                   = { 0,  0, 1, 1, sMapName_Route15},
+    [MAPSEC_ROUTE_16]                   = { 0,  0, 1, 1, sMapName_Route16},
+    [MAPSEC_ROUTE_17]                   = { 0,  0, 1, 1, sMapName_Route17},
+    [MAPSEC_ROUTE_18]                   = { 0,  0, 1, 1, sMapName_Route18},
+    [MAPSEC_ROUTE_19]                   = { 0,  0, 1, 1, sMapName_Route19},
+    [MAPSEC_ROUTE_20]                   = { 0,  0, 1, 1, sMapName_Route20},
+    [MAPSEC_ROUTE_21]                   = { 0,  0, 1, 1, sMapName_Route21},
+    [MAPSEC_ROUTE_22]                   = { 0,  0, 1, 1, sMapName_Route22},
+    [MAPSEC_ROUTE_23]                   = { 0,  0, 1, 1, sMapName_Route23},
+    [MAPSEC_ROUTE_24]                   = { 0,  0, 1, 1, sMapName_Route24},
+    [MAPSEC_ROUTE_25]                   = { 0,  0, 1, 1, sMapName_Route25},
+    [MAPSEC_VIRIDIAN_FOREST]            = { 0,  0, 1, 1, sMapName_ViridianForest},
+    [MAPSEC_MT_MOON]                    = { 0,  0, 1, 1, sMapName_MtMoon},
+    [MAPSEC_S_S_ANNE]                   = { 0,  0, 1, 1, sMapName_SSAnne},
+    [MAPSEC_UNDERGROUND_PATH]           = { 0,  0, 1, 1, sMapName_UndergroundPath},
+    [MAPSEC_UNDERGROUND_PATH_2]         = { 0,  0, 1, 1, sMapName_UndergroundPath2},
+    [MAPSEC_DIGLETTS_CAVE]              = { 0,  0, 1, 1, sMapName_DiglettsCave},
+    [MAPSEC_KANTO_VICTORY_ROAD]         = { 0,  0, 1, 1, sMapName_KantoVictoryRoad},
+    [MAPSEC_ROCKET_HIDEOUT]             = { 0,  0, 1, 1, sMapName_RocketHideout},
+    [MAPSEC_SILPH_CO]                   = { 0,  0, 1, 1, sMapName_SilphCo},
+    [MAPSEC_POKEMON_MANSION]            = { 0,  0, 1, 1, sMapName_PokemonMansion},
+    [MAPSEC_KANTO_SAFARI_ZONE]          = { 0,  0, 1, 1, sMapName_KantoSafariZone},
+    [MAPSEC_POKEMON_LEAGUE]             = { 0,  0, 1, 1, sMapName_PokemonLeague},
+    [MAPSEC_ROCK_TUNNEL]                = { 0,  0, 1, 1, sMapName_RockTunnel},
+    [MAPSEC_SEAFOAM_ISLANDS]            = { 0,  0, 1, 1, sMapName_SeafoamIslands},
+    [MAPSEC_POKEMON_TOWER]              = { 0,  0, 1, 1, sMapName_PokemonTower},
+    [MAPSEC_CERULEAN_CAVE]              = { 0,  0, 1, 1, sMapName_CeruleanCave},
+    [MAPSEC_POWER_PLANT]                = { 0,  0, 1, 1, sMapName_PowerPlant},
+    [MAPSEC_ONE_ISLAND]                 = { 0,  0, 1, 1, sMapName_OneIsland},
+    [MAPSEC_TWO_ISLAND]                 = { 0,  0, 1, 1, sMapName_TwoIsland},
+    [MAPSEC_THREE_ISLAND]               = { 0,  0, 1, 1, sMapName_ThreeIsland},
+    [MAPSEC_FOUR_ISLAND]                = { 0,  0, 1, 1, sMapName_FourIsland},
+    [MAPSEC_FIVE_ISLAND]                = { 0,  0, 1, 1, sMapName_FiveIsland},
+    [MAPSEC_SEVEN_ISLAND]               = { 0,  0, 1, 1, sMapName_SevenIsland},
+    [MAPSEC_SIX_ISLAND]                 = { 0,  0, 1, 1, sMapName_SixIsland},
+    [MAPSEC_KINDLE_ROAD]                = { 0,  0, 1, 1, sMapName_KindleRoad},
+    [MAPSEC_TREASURE_BEACH]             = { 0,  0, 1, 1, sMapName_TreasureBeach},
+    [MAPSEC_CAPE_BRINK]                 = { 0,  0, 1, 1, sMapName_CapeBrink},
+    [MAPSEC_BOND_BRIDGE]                = { 0,  0, 1, 1, sMapName_BondBridge},
+    [MAPSEC_THREE_ISLE_PORT]            = { 0,  0, 1, 1, sMapName_ThreeIslePort},
+    [MAPSEC_SEVII_ISLE_6]               = { 0,  0, 1, 1, sMapName_SeviiIsle6},
+    [MAPSEC_SEVII_ISLE_7]               = { 0,  0, 1, 1, sMapName_SeviiIsle7},
+    [MAPSEC_SEVII_ISLE_8]               = { 0,  0, 1, 1, sMapName_SeviiIsle8},
+    [MAPSEC_SEVII_ISLE_9]               = { 0,  0, 1, 1, sMapName_SeviiIsle9},
+    [MAPSEC_RESORT_GORGEOUS]            = { 0,  0, 1, 1, sMapName_ResortGorgeous},
+    [MAPSEC_WATER_LABYRINTH]            = { 0,  0, 1, 1, sMapName_WaterLabyrinth},
+    [MAPSEC_FIVE_ISLE_MEADOW]           = { 0,  0, 1, 1, sMapName_FiveIsleMeadow},
+    [MAPSEC_MEMORIAL_PILLAR]            = { 0,  0, 1, 1, sMapName_MemorialPillar},
+    [MAPSEC_OUTCAST_ISLAND]             = { 0,  0, 1, 1, sMapName_OutcastIsland},
+    [MAPSEC_GREEN_PATH]                 = { 0,  0, 1, 1, sMapName_GreenPath},
+    [MAPSEC_WATER_PATH]                 = { 0,  0, 1, 1, sMapName_WaterPath},
+    [MAPSEC_RUIN_VALLEY]                = { 0,  0, 1, 1, sMapName_RuinValley},
+    [MAPSEC_TRAINER_TOWER]              = { 0,  0, 1, 1, sMapName_TrainerTower},
+    [MAPSEC_CANYON_ENTRANCE]            = { 0,  0, 1, 1, sMapName_CanyonEntrance},
+    [MAPSEC_SEVAULT_CANYON]             = { 0,  0, 1, 1, sMapName_SevaultCanyon},
+    [MAPSEC_TANOBY_RUINS]               = { 0,  0, 1, 1, sMapName_TanobyRuins},
+    [MAPSEC_SEVII_ISLE_22]              = { 0,  0, 1, 1, sMapName_SeviiIsle22},
+    [MAPSEC_SEVII_ISLE_23]              = { 0,  0, 1, 1, sMapName_SeviiIsle23},
+    [MAPSEC_SEVII_ISLE_24]              = { 0,  0, 1, 1, sMapName_SeviiIsle24},
+    [MAPSEC_NAVEL_ROCK_FRLG]            = { 0,  0, 1, 1, sMapName_NavelRock},
+    [MAPSEC_MT_EMBER]                   = { 0,  0, 1, 1, sMapName_MtEmber},
+    [MAPSEC_BERRY_FOREST]               = { 0,  0, 1, 1, sMapName_BerryForest},
+    [MAPSEC_ICEFALL_CAVE]               = { 0,  0, 1, 1, sMapName_IcefallCave},
+    [MAPSEC_ROCKET_WAREHOUSE]           = { 0,  0, 1, 1, sMapName_RocketWarehouse},
+    [MAPSEC_TRAINER_TOWER_2]            = { 0,  0, 1, 1, sMapName_TrainerTower2},
+    [MAPSEC_DOTTED_HOLE]                = { 0,  0, 1, 1, sMapName_DottedHole},
+    [MAPSEC_LOST_CAVE]                  = { 0,  0, 1, 1, sMapName_LostCave},
+    [MAPSEC_PATTERN_BUSH]               = { 0,  0, 1, 1, sMapName_PatternBush},
+    [MAPSEC_ALTERING_CAVE_FRLG]         = { 0,  0, 1, 1, sMapName_AlteringCave},
+    [MAPSEC_TANOBY_CHAMBERS]            = { 0,  0, 1, 1, sMapName_TanobyChambers},
+    [MAPSEC_THREE_ISLE_PATH]            = { 0,  0, 1, 1, sMapName_ThreeIslePath},
+    [MAPSEC_TANOBY_KEY]                 = { 0,  0, 1, 1, sMapName_TanobyKey},
+    [MAPSEC_BIRTH_ISLAND_FRLG]          = { 0,  0, 1, 1, sMapName_BirthIsland},
+    [MAPSEC_MONEAN_CHAMBER]             = { 0,  0, 1, 1, sMapName_MoneanChamber},
+    [MAPSEC_LIPTOO_CHAMBER]             = { 0,  0, 1, 1, sMapName_LiptooChamber},
+    [MAPSEC_WEEPTH_CHAMBER]             = { 0,  0, 1, 1, sMapName_WeepthChamber},
+    [MAPSEC_DILFORD_CHAMBER]            = { 0,  0, 1, 1, sMapName_DilfordChamber},
+    [MAPSEC_SCUFIB_CHAMBER]             = { 0,  0, 1, 1, sMapName_ScufibChamber},
+    [MAPSEC_RIXY_CHAMBER]               = { 0,  0, 1, 1, sMapName_RixyChamber},
+    [MAPSEC_VIAPOIS_CHAMBER]            = { 0,  0, 1, 1, sMapName_ViapoisChamber},
+    [MAPSEC_EMBER_SPA]                  = { 0,  0, 1, 1, sMapName_EmberSpa},
+    [MAPSEC_SPECIAL_AREA]               = { 0,  0, 1, 1, sMapName_SpecialArea},
+    [MAPSEC_AQUA_HIDEOUT]               = {19,  3, 1, 1, sMapName_AquaHideout},
+    [MAPSEC_MAGMA_HIDEOUT]              = { 6,  3, 1, 1, sMapName_MagmaHideout},
+    [MAPSEC_MIRAGE_TOWER]               = { 8,  2, 1, 1, sMapName_MirageTower},
+    [MAPSEC_BIRTH_ISLAND]               = { 0,  0, 1, 1, sMapName_BirthIsland},
+    [MAPSEC_FARAWAY_ISLAND]             = { 0,  0, 1, 1, sMapName_FarawayIsland},
+    [MAPSEC_ARTISAN_CAVE]               = {22, 12, 1, 1, sMapName_ArtisanCave},
+    [MAPSEC_MARINE_CAVE]                = { 0,  0, 1, 1, sMapName_MarineCave},
+    [MAPSEC_UNDERWATER_MARINE_CAVE]     = { 0,  0, 1, 1, sMapName_Underwater},
+    [MAPSEC_TERRA_CAVE]                 = { 0,  0, 1, 1, sMapName_TerraCave},
+    [MAPSEC_UNDERWATER_105]             = { 0, 10, 1, 3, sMapName_Underwater},
+    [MAPSEC_UNDERWATER_125]             = {24,  3, 2, 2, sMapName_Underwater},
+    [MAPSEC_UNDERWATER_129]             = {24, 10, 2, 1, sMapName_Underwater},
+    [MAPSEC_DESERT_UNDERPASS]           = { 2,  0, 1, 1, sMapName_DesertUnderpass},
+    [MAPSEC_ALTERING_CAVE]              = { 6,  8, 1, 1, sMapName_AlteringCave},
+    [MAPSEC_NAVEL_ROCK]                 = { 0,  0, 1, 1, sMapName_NavelRock},
+    [MAPSEC_TRAINER_HILL]               = { 8,  4, 1, 1, sMapName_TrainerHill}
 };
 
 #endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
index b27de4513..0b30c0f65 100755
--- a/src/data/wild_encounters.json
+++ b/src/data/wild_encounters.json
@@ -2265,8 +2265,8 @@
           }
         },
         {
-          "map": "MAP_UNDERWATER2",
-          "base_label": "gUnderwater2",
+          "map": "MAP_UNDERWATER_ROUTE126",
+          "base_label": "gUnderwater_Route126",
           "water_mons": {
             "encounter_rate": 4,
             "mons": [
@@ -9075,8 +9075,8 @@
           }
         },
         {
-          "map": "MAP_UNDERWATER1",
-          "base_label": "gUnderwater1",
+          "map": "MAP_UNDERWATER_ROUTE124",
+          "base_label": "gUnderwater_Route124",
           "water_mons": {
             "encounter_rate": 4,
             "mons": [
diff --git a/src/field_specials.c b/src/field_specials.c
index c1fc92dbe..1e7634174 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3649,14 +3649,14 @@ bool8 AbnormalWeatherHasExpired(void)
             }
         }
 
-        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER3))
+        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_ROUTE127))
         {
             switch (gSaveBlock1Ptr->location.mapNum)
             {
-                case MAP_NUM(UNDERWATER3):
-                case MAP_NUM(UNDERWATER5):
-                case MAP_NUM(UNDERWATER6):
-                case MAP_NUM(UNDERWATER7):
+                case MAP_NUM(UNDERWATER_ROUTE127):
+                case MAP_NUM(UNDERWATER_ROUTE129):
+                case MAP_NUM(UNDERWATER_ROUTE105):
+                case MAP_NUM(UNDERWATER_ROUTE125):
                     VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
                     return FALSE;
                 default:
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 32da4d0b4..8939edd90 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -121,9 +121,9 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
     [MAPSEC_ROUTE_133] = MAPPOPUP_THEME_UNDERWATER,
     [MAPSEC_ROUTE_134] = MAPPOPUP_THEME_UNDERWATER,
     [MAPSEC_UNDERWATER_124] = MAPPOPUP_THEME_STONE2,
-    [MAPSEC_UNDERWATER_125] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_UNDERWATER_126] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_UNDERWATER_127] = MAPPOPUP_THEME_STONE2,
+    [MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_UNDERWATER_SOOTOPOLIS] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_GRANITE_CAVE] = MAPPOPUP_THEME_STONE,
     [MAPSEC_MT_CHIMNEY] = MAPPOPUP_THEME_STONE,
@@ -139,7 +139,7 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
     [MAPSEC_AQUA_HIDEOUT_OLD] = MAPPOPUP_THEME_STONE,
     [MAPSEC_SHOAL_CAVE] = MAPPOPUP_THEME_STONE,
     [MAPSEC_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_STONE,
-    [MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_STONE2,
+    [MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_VICTORY_ROAD] = MAPPOPUP_THEME_STONE,
     [MAPSEC_MIRAGE_ISLAND] = MAPPOPUP_THEME_WOOD,
     [MAPSEC_CAVE_OF_ORIGIN] = MAPPOPUP_THEME_STONE,
@@ -167,8 +167,8 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
     [MAPSEC_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
     [MAPSEC_UNDERWATER_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
-    [MAPSEC_UNDERWATER_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
-    [MAPSEC_UNDERWATER_UNK1 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
+    [MAPSEC_UNDERWATER_105 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
+    [MAPSEC_UNDERWATER_125 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_UNDERWATER_129 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
     [MAPSEC_DESERT_UNDERPASS - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
     [MAPSEC_ALTERING_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
diff --git a/src/region_map.c b/src/region_map.c
index de3b04cb2..3438ea3ed 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -129,30 +129,30 @@ static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/regi
 
 static const u16 sRegionMap_SpecialPlaceLocations[][2] =
 {
-    {MAPSEC_UNDERWATER_TERRA_CAVE,     MAPSEC_ROUTE_105},
-    {MAPSEC_UNDERWATER_124,            MAPSEC_ROUTE_124},
-    {MAPSEC_UNDERWATER_UNK1,           MAPSEC_ROUTE_129},
-    {MAPSEC_UNDERWATER_125,            MAPSEC_ROUTE_126},
-    {MAPSEC_UNDERWATER_126,            MAPSEC_ROUTE_127},
-    {MAPSEC_UNDERWATER_127,            MAPSEC_ROUTE_128},
-    {MAPSEC_UNDERWATER_129,            MAPSEC_ROUTE_129},
-    {MAPSEC_UNDERWATER_SOOTOPOLIS,     MAPSEC_SOOTOPOLIS_CITY},
-    {MAPSEC_UNDERWATER_128,            MAPSEC_ROUTE_128},
-    {MAPSEC_AQUA_HIDEOUT,              MAPSEC_LILYCOVE_CITY},
-    {MAPSEC_AQUA_HIDEOUT_OLD,          MAPSEC_LILYCOVE_CITY},
-    {MAPSEC_MAGMA_HIDEOUT,             MAPSEC_ROUTE_112},
-    {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_MIRAGE_TOWER,              MAPSEC_ROUTE_111},
-    {MAPSEC_TRAINER_HILL,              MAPSEC_ROUTE_111},
-    {MAPSEC_DESERT_UNDERPASS,          MAPSEC_ROUTE_114},
-    {MAPSEC_ALTERING_CAVE,             MAPSEC_ROUTE_103},
-    {MAPSEC_ARTISAN_CAVE,              MAPSEC_ROUTE_103},
-    {MAPSEC_ABANDONED_SHIP,            MAPSEC_ROUTE_108},
-    {MAPSEC_NONE,                      MAPSEC_NONE}
+    {MAPSEC_UNDERWATER_105,             MAPSEC_ROUTE_105},
+    {MAPSEC_UNDERWATER_124,             MAPSEC_ROUTE_124},
+    {MAPSEC_UNDERWATER_125,             MAPSEC_ROUTE_129}, // BUG: Map will incorrectly display the name of Route 129 when diving on Route 125 (for Marine Cave only)
+    {MAPSEC_UNDERWATER_126,             MAPSEC_ROUTE_126},
+    {MAPSEC_UNDERWATER_127,             MAPSEC_ROUTE_127},
+    {MAPSEC_UNDERWATER_128,             MAPSEC_ROUTE_128},
+    {MAPSEC_UNDERWATER_129,             MAPSEC_ROUTE_129},
+    {MAPSEC_UNDERWATER_SOOTOPOLIS,      MAPSEC_SOOTOPOLIS_CITY},
+    {MAPSEC_UNDERWATER_SEAFLOOR_CAVERN, MAPSEC_ROUTE_128},
+    {MAPSEC_AQUA_HIDEOUT,               MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_AQUA_HIDEOUT_OLD,           MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_MAGMA_HIDEOUT,              MAPSEC_ROUTE_112},
+    {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_MIRAGE_TOWER,               MAPSEC_ROUTE_111},
+    {MAPSEC_TRAINER_HILL,               MAPSEC_ROUTE_111},
+    {MAPSEC_DESERT_UNDERPASS,           MAPSEC_ROUTE_114},
+    {MAPSEC_ALTERING_CAVE,              MAPSEC_ROUTE_103},
+    {MAPSEC_ARTISAN_CAVE,               MAPSEC_ROUTE_103},
+    {MAPSEC_ABANDONED_SHIP,             MAPSEC_ROUTE_108},
+    {MAPSEC_NONE,                       MAPSEC_NONE}
 };
 
 static const u16 sMarineCaveMapSecIds[] =
@@ -998,7 +998,7 @@ static void InitMapBasedOnPlayerLocation(void)
         mapHeight = gMapHeader.mapLayout->height;
         x = gSaveBlock1Ptr->pos.x;
         y = gSaveBlock1Ptr->pos.y;
-        if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_128 || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
+        if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_SEAFLOOR_CAVERN || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
             gRegionMap->playerIsInCave = TRUE;
         break;
     case MAP_TYPE_UNDERGROUND:
@@ -1089,7 +1089,7 @@ static void InitMapBasedOnPlayerLocation(void)
             x = 0;
         break;
     case MAPSEC_ROUTE_126:
-    case MAPSEC_UNDERWATER_125:
+    case MAPSEC_UNDERWATER_126:
         x = 0;
         if (gSaveBlock1Ptr->pos.x > 32)
             x++;