Decompile region map entry structs

4 files changed, 442 insertions, 818 deletions

diff --git a/data/region_map.s b/data/region_map.s
index d4ea89636..580923ec8 100644
--- a/data/region_map.s
+++ b/data/region_map.s
@@ -4,12 +4,6 @@
 	.section .rodata
 	.align 2, 0
 
-gUnknown_085A096C:: @ 85A096C
-	.incbin "baserom.gba", 0x5a096c, 0x1a4
-
-@ 85A0B10
-	.include "data/region_map_entries.inc"
-
 gUnknown_085A1B24:: @ 85A1B24
 	.incbin "baserom.gba", 0x5a1b24, 0x60
 
diff --git a/data/region_map_entries.inc b/data/region_map_entries.inc
deleted file mode 100644
index ced01648c..000000000
--- a/data/region_map_entries.inc
+++ /dev/null
@@ -1,809 +0,0 @@
-gMapName_LittlerootTown:: @ 85A0B10
-	.string "LITTLEROOT TOWN$"
-
-gMapName_OldaleTown:: @ 85A0B20
-	.string "OLDALE TOWN$"
-
-gMapName_DewfordTown:: @ 85A0B2C
-	.string "DEWFORD TOWN$"
-
-gMapName_LavaridgeTown:: @ 85A0B39
-	.string "LAVARIDGE TOWN$"
-
-gMapName_FallarborTown:: @ 85A0B48
-	.string "FALLARBOR TOWN$"
-
-gMapName_VerdanturfTown:: @ 85A0B57
-	.string "VERDANTURF TOWN$"
-
-gMapName_PacifidlogTown:: @ 85A0B67
-	.string "PACIFIDLOG TOWN$"
-
-gMapName_PetalburgCity:: @ 85A0B77
-	.string "PETALBURG CITY$"
-
-gMapName_SlateportCity:: @ 85A0B86
-	.string "SLATEPORT CITY$"
-
-gMapName_MauvilleCity:: @ 85A0B95
-	.string "MAUVILLE CITY$"
-
-gMapName_RustboroCity:: @ 85A0BA3
-	.string "RUSTBORO CITY$"
-
-gMapName_FortreeCity:: @ 85A0BB1
-	.string "FORTREE CITY$"
-
-gMapName_LilycoveCity:: @ 85A0BBE
-	.string "LILYCOVE CITY$"
-
-gMapName_MossdeepCity:: @ 85A0BCC
-	.string "MOSSDEEP CITY$"
-
-gMapName_SootopolisCity:: @ 85A0BDA
-	.string "SOOTOPOLIS CITY$"
-
-gMapName_EverGrandeCity:: @ 85A0BEA
-	.string "EVER GRANDE CITY$"
-
-gMapName_Route101:: @ 85A0BFB
-	.string "ROUTE 101$"
-
-gMapName_Route102:: @ 85A0C05
-	.string "ROUTE 102$"
-
-gMapName_Route103:: @ 85A0C0F
-	.string "ROUTE 103$"
-
-gMapName_Route104:: @ 85A0C19
-	.string "ROUTE 104$"
-
-gMapName_Route105:: @ 85A0C23
-	.string "ROUTE 105$"
-
-gMapName_Route106:: @ 85A0C2D
-	.string "ROUTE 106$"
-
-gMapName_Route107:: @ 85A0C37
-	.string "ROUTE 107$"
-
-gMapName_Route108:: @ 85A0C41
-	.string "ROUTE 108$"
-
-gMapName_Route109:: @ 85A0C4B
-	.string "ROUTE 109$"
-
-gMapName_Route110:: @ 85A0C55
-	.string "ROUTE 110$"
-
-gMapName_Route111:: @ 85A0C5F
-	.string "ROUTE 111$"
-
-gMapName_Route112:: @ 85A0C69
-	.string "ROUTE 112$"
-
-gMapName_Route113:: @ 85A0C73
-	.string "ROUTE 113$"
-
-gMapName_Route114:: @ 85A0C7D
-	.string "ROUTE 114$"
-
-gMapName_Route115:: @ 85A0C87
-	.string "ROUTE 115$"
-
-gMapName_Route116:: @ 85A0C91
-	.string "ROUTE 116$"
-
-gMapName_Route117:: @ 85A0C9B
-	.string "ROUTE 117$"
-
-gMapName_Route118:: @ 85A0CA5
-	.string "ROUTE 118$"
-
-gMapName_Route119:: @ 85A0CAF
-	.string "ROUTE 119$"
-
-gMapName_Route120:: @ 85A0CB9
-	.string "ROUTE 120$"
-
-gMapName_Route121:: @ 85A0CC3
-	.string "ROUTE 121$"
-
-gMapName_Route122:: @ 85A0CCD
-	.string "ROUTE 122$"
-
-gMapName_Route123:: @ 85A0CD7
-	.string "ROUTE 123$"
-
-gMapName_Route124:: @ 85A0CE1
-	.string "ROUTE 124$"
-
-gMapName_Route125:: @ 85A0CEB
-	.string "ROUTE 125$"
-
-gMapName_Route126:: @ 85A0CF5
-	.string "ROUTE 126$"
-
-gMapName_Route127:: @ 85A0CFF
-	.string "ROUTE 127$"
-
-gMapName_Route128:: @ 85A0D09
-	.string "ROUTE 128$"
-
-gMapName_Route129:: @ 85A0D13
-	.string "ROUTE 129$"
-
-gMapName_Route130:: @ 85A0D1D
-	.string "ROUTE 130$"
-
-gMapName_Route131:: @ 85A0D27
-	.string "ROUTE 131$"
-
-gMapName_Route132:: @ 85A0D31
-	.string "ROUTE 132$"
-
-gMapName_Route133:: @ 85A0D3B
-	.string "ROUTE 133$"
-
-gMapName_Route134:: @ 85A0D45
-	.string "ROUTE 134$"
-
-gMapName_Underwater:: @ 85A0D4F
-	.string "UNDERWATER$"
-
-gMapName_GraniteCave:: @ 85A0D5A
-	.string "GRANITE CAVE$"
-
-gMapName_MtChimney:: @ 85A0D67
-	.string "MT. CHIMNEY$"
-
-gMapName_SafariZone:: @ 85A0D73
-	.string "SAFARI ZONE$"
-
-gMapName_BattleFrontier:: @ 85A0D7F
-	.string "BATTLE FRONTIER$"
-
-gMapName_PetalburgWoods:: @ 85A0D8F
-	.string "PETALBURG WOODS$"
-
-gMapName_RusturfTunnel:: @ 85A0D9F
-	.string "RUSTURF TUNNEL$"
-
-gMapName_AbandonedShip:: @ 85A0DAE
-	.string "ABANDONED SHIP$"
-
-gMapName_NewMauville:: @ 85A0DBD
-	.string "NEW MAUVILLE$"
-
-gMapName_MeteorFalls:: @ 85A0DCA
-	.string "METEOR FALLS$"
-
-gMapName_MtPyre:: @ 85A0DD7
-	.string "MT. PYRE$"
-
-@ This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
-@ hideout in Emerald with their own new region map entries, and this name
-@ doesn't seem to be used anymore.
-gMapName_AquaHideoutOld:: @ 85A0DE0
-	.string "{AQUA} HIDEOUT$"
-
-gMapName_ShoalCave:: @ 85A0DEB
-	.string "SHOAL CAVE$"
-
-gMapName_SeafloorCavern:: @ 85A0DF6
-	.string "SEAFLOOR CAVERN$"
-
-gMapName_VictoryRoad:: @ 85A0E06
-	.string "VICTORY ROAD$"
-
-gMapName_MirageIsland:: @ 85A0E13
-	.string "MIRAGE ISLAND$"
-
-gMapName_CaveOfOrigin:: @ 85A0E21
-	.string "CAVE OF ORIGIN$"
-
-gMapName_SouthernIsland:: @ 85A0E30
-	.string "SOUTHERN ISLAND$"
-
-gMapName_FieryPath:: @ 85A0E40
-	.string "FIERY PATH$"
-
-gMapName_JaggedPass:: @ 85A0E4B
-	.string "JAGGED PASS$"
-
-gMapName_SealedChamber:: @ 85A0E57
-	.string "SEALED CHAMBER$"
-
-gMapName_ScorchedSlab:: @ 85A0E66
-	.string "SCORCHED SLAB$"
-
-gMapName_IslandCave:: @ 85A0E74
-	.string "ISLAND CAVE$"
-
-gMapName_DesertRuins:: @ 85A0E80
-	.string "DESERT RUINS$"
-
-gMapName_AncientTomb:: @ 85A0E8D
-	.string "ANCIENT TOMB$"
-
-gMapName_InsideOfTruck:: @ 85A0E9A
-	.string "INSIDE OF TRUCK$"
-
-gMapName_SkyPillar:: @ 85A0EAA
-	.string "SKY PILLAR$"
-
-gMapName_SecretBase:: @ 85A0EB5
-	.string "SECRET BASE$"
-
-gMapName_None:: @ 85A0EC1
-	.string "$"
-
-gMapName_PalletTown:: @ 85A0EC2
-	.string "PALLET TOWN$"
-
-gMapName_ViridianCity:: @ 85A0ECE
-	.string "VIRIDIAN CITY$"
-
-gMapName_PewterCity:: @ 85A0EDC
-	.string "PEWTER CITY$"
-
-gMapName_CeruleanCity:: @ 85A0EE8
-	.string "CERULEAN CITY$"
-
-gMapName_LavenderTown:: @ 85A0EF6
-	.string "LAVENDER TOWN$"
-
-gMapName_VermilionCity:: @ 85A0F04
-	.string "VERMILION CITY$"
-
-gMapName_CeladonCity:: @ 85A0F13
-	.string "CELADON CITY$"
-
-gMapName_FuchsiaCity:: @ 85A0F20
-	.string "FUCHSIA CITY$"
-
-gMapName_CinnabarIsland:: @ 85A0F2D
-	.string "CINNABAR ISLAND$"
-
-gMapName_IndigoPlateau:: @ 85A0F3D
-	.string "INDIGO PLATEAU$"
-
-gMapName_SaffronCity:: @ 85A0F4C
-	.string "SAFFRON CITY$"
-
-gMapName_Route4:: @ 85A0F59
-	.string "ROUTE 4$"
-
-gMapName_Route10:: @ 85A0F61
-	.string "ROUTE 10$"
-
-gMapName_Route1:: @ 85A0F6A
-	.string "ROUTE 1$"
-
-gMapName_Route2:: @ 85A0F72
-	.string "ROUTE 2$"
-
-gMapName_Route3:: @ 85A0F7A
-	.string "ROUTE 3$"
-
-gMapName_Route4_2:: @ 85A0F82
-	.string "ROUTE 4$"
-
-gMapName_Route5:: @ 85A0F8A
-	.string "ROUTE 5$"
-
-gMapName_Route6:: @ 85A0F92
-	.string "ROUTE 6$"
-
-gMapName_Route7:: @ 85A0F9A
-	.string "ROUTE 7$"
-
-gMapName_Route8:: @ 85A0FA2
-	.string "ROUTE 8$"
-
-gMapName_Route9:: @ 85A0FAA
-	.string "ROUTE 9$"
-
-gMapName_Route10_2:: @ 85A0FB2
-	.string "ROUTE 10$"
-
-gMapName_Route11:: @ 85A0FBB
-	.string "ROUTE 11$"
-
-gMapName_Route12:: @ 85A0FC4
-	.string "ROUTE 12$"
-
-gMapName_Route13:: @ 85A0FCD
-	.string "ROUTE 13$"
-
-gMapName_Route14:: @ 85A0FD6
-	.string "ROUTE 14$"
-
-gMapName_Route15:: @ 85A0FDF
-	.string "ROUTE 15$"
-
-gMapName_Route16:: @ 85A0FE8
-	.string "ROUTE 16$"
-
-gMapName_Route17:: @ 85A0FF1
-	.string "ROUTE 17$"
-
-gMapName_Route18:: @ 85A0FFA
-	.string "ROUTE 18$"
-
-gMapName_Route19:: @ 85A1003
-	.string "ROUTE 19$"
-
-gMapName_Route20:: @ 85A100C
-	.string "ROUTE 20$"
-
-gMapName_Route21:: @ 85A1015
-	.string "ROUTE 21$"
-
-gMapName_Route22:: @ 85A101E
-	.string "ROUTE 22$"
-
-gMapName_Route23:: @ 85A1027
-	.string "ROUTE 23$"
-
-gMapName_Route24:: @ 85A1030
-	.string "ROUTE 24$"
-
-gMapName_Route25:: @ 85A1039
-	.string "ROUTE 25$"
-
-gMapName_ViridianForest:: @ 85A1042
-	.string "VIRIDIAN FOREST$"
-
-gMapName_MtMoon:: @ 85A1052
-	.string "MT. MOON$"
-
-gMapName_SSAnne:: @ 85A105B
-	.string "S.S. ANNE$"
-
-gMapName_UndergroundPath:: @ 85A1065
-	.string "UNDERGROUND PATH$"
-
-gMapName_UndergroundPath2:: @ 85A1076
-	.string "UNDERGROUND PATH$"
-
-gMapName_DiglettsCave:: @ 85A1087
-	.string "DIGLETT’S CAVE$"
-
-gMapName_KantoVictoryRoad:: @ 85A1096
-	.string "VICTORY ROAD$"
-
-gMapName_RocketHideout:: @ 85A10A3
-	.string "ROCKET HIDEOUT$"
-
-gMapName_SilphCo:: @ 85A10B2
-	.string "SILPH CO.$"
-
-gMapName_PokemonMansion:: @ 85A10BC
-	.string "POKéMON MANSION$"
-
-gMapName_KantoSafariZone:: @ 85A10CC
-	.string "SAFARI ZONE$"
-
-gMapName_PokemonLeague:: @ 85A10D8
-	.string "POKéMON LEAGUE$"
-
-gMapName_RockTunnel:: @ 85A10E7
-	.string "ROCK TUNNEL$"
-
-gMapName_SeafoamIslands:: @ 85A10F3
-	.string "SEAFOAM ISLANDS$"
-
-gMapName_PokemonTower:: @ 85A1103
-	.string "POKéMON TOWER$"
-
-gMapName_CeruleanCave:: @ 85A1111
-	.string "CERULEAN CAVE$"
-
-gMapName_PowerPlant:: @ 85A111F
-	.string "POWER PLANT$"
-
-gMapName_OneIsland:: @ 85A112B
-	.string "ONE ISLAND$"
-
-gMapName_TwoIsland:: @ 85A1136
-	.string "TWO ISLAND$"
-
-gMapName_ThreeIsland:: @ 85A1141
-	.string "THREE ISLAND$"
-
-gMapName_FourIsland:: @ 85A114E
-	.string "FOUR ISLAND$"
-
-gMapName_FiveIsland:: @ 85A115A
-	.string "FIVE ISLAND$"
-
-gMapName_SevenIsland:: @ 85A1166
-	.string "SEVEN ISLAND$"
-
-gMapName_SixIsland:: @ 85A1173
-	.string "SIX ISLAND$"
-
-gMapName_KindleRoad:: @ 85A117E
-	.string "KINDLE ROAD$"
-
-gMapName_TreasureBeach:: @ 85A118A
-	.string "TREASURE BEACH$"
-
-gMapName_CapeBrink:: @ 85A1199
-	.string "CAPE BRINK$"
-
-gMapName_BondBridge:: @ 85A11A4
-	.string "BOND BRIDGE$"
-
-gMapName_ThreeIslePort:: @ 85A11B0
-	.string "THREE ISLE PORT$"
-
-gMapName_SeviiIsle6:: @ 85A11C0
-	.string "SEVII ISLE 6$"
-
-gMapName_SeviiIsle7:: @ 85A11CD
-	.string "SEVII ISLE 7$"
-
-gMapName_SeviiIsle8:: @ 85A11DA
-	.string "SEVII ISLE 8$"
-
-gMapName_SeviiIsle9:: @ 85A11E7
-	.string "SEVII ISLE 9$"
-
-gMapName_ResortGorgeous:: @ 85A11F4
-	.string "RESORT GORGEOUS$"
-
-gMapName_WaterLabyrinth:: @ 85A1204
-	.string "WATER LABYRINTH$"
-
-gMapName_FiveIsleMeadow:: @ 85A1214
-	.string "FIVE ISLE MEADOW$"
-
-gMapName_MemorialPillar:: @ 85A1225
-	.string "MEMORIAL PILLAR$"
-
-gMapName_OutcastIsland:: @ 85A1235
-	.string "OUTCAST ISLAND$"
-
-gMapName_GreenPath:: @ 85A1244
-	.string "GREEN PATH$"
-
-gMapName_WaterPath:: @ 85A124F
-	.string "WATER PATH$"
-
-gMapName_RuinValley:: @ 85A125A
-	.string "RUIN VALLEY$"
-
-gMapName_TrainerTower:: @ 85A1266
-	.string "TRAINER TOWER$"
-
-gMapName_CanyonEntrance:: @ 85A1274
-	.string "CANYON ENTRANCE$"
-
-gMapName_SevaultCanyon:: @ 85A1284
-	.string "SEVAULT CANYON$"
-
-gMapName_TanobyRuins:: @ 85A1293
-	.string "TANOBY RUINS$"
-
-gMapName_SeviiIsle22:: @ 85A12A0
-	.string "SEVII ISLE 22$"
-
-gMapName_SeviiIsle23:: @ 85A12AE
-	.string "SEVII ISLE 23$"
-
-gMapName_SeviiIsle24:: @ 85A12BC
-	.string "SEVII ISLE 24$"
-
-gMapName_NavelRock:: @ 85A12CA
-	.string "NAVEL ROCK$"
-
-gMapName_MtEmber:: @ 85A12D5
-	.string "MT. EMBER$"
-
-gMapName_BerryForest:: @ 85A12DF
-	.string "BERRY FOREST$"
-
-gMapName_IcefallCave:: @ 85A12EC
-	.string "ICEFALL CAVE$"
-
-gMapName_RocketWarehouse:: @ 85A12F9
-	.string "ROCKET WAREHOUSE$"
-
-gMapName_TrainerTower2:: @ 85A130A
-	.string "TRAINER TOWER$"
-
-gMapName_DottedHole:: @ 85A1318
-	.string "DOTTED HOLE$"
-
-gMapName_LostCave:: @ 85A1324
-	.string "LOST CAVE$"
-
-gMapName_PatternBush:: @ 85A132E
-	.string "PATTERN BUSH$"
-
-gMapName_AlteringCave:: @ 85A133B
-	.string "ALTERING CAVE$"
-
-gMapName_TanobyChambers:: @ 85A1349
-	.string "TANOBY CHAMBERS$"
-
-gMapName_ThreeIslePath:: @ 85A1359
-	.string "THREE ISLE PATH$"
-
-gMapName_TanobyKey:: @ 85A1369
-	.string "TANOBY KEY$"
-
-gMapName_BirthIsland:: @ 85A1374
-	.string "BIRTH ISLAND$"
-
-gMapName_MoneanChamber:: @ 85A1381
-	.string "MONEAN CHAMBER$"
-
-gMapName_LiptooChamber:: @ 85A1390
-	.string "LIPTOO CHAMBER$"
-
-gMapName_WeepthChamber:: @ 85A139F
-	.string "WEEPTH CHAMBER$"
-
-gMapName_DilfordChamber:: @ 85A13AE
-	.string "DILFORD CHAMBER$"
-
-gMapName_ScufibChamber:: @ 85A13BE
-	.string "SCUFIB CHAMBER$"
-
-gMapName_RixyChamber:: @ 85A13CD
-	.string "RIXY CHAMBER$"
-
-gMapName_ViapoisChamber:: @ 85A13DA
-	.string "VIAPOIS CHAMBER$"
-
-gMapName_EmberSpa:: @ 85A13EA
-	.string "EMBER SPA$"
-
-gMapName_SpecialArea:: @ 85A13F4
-	.string "SPECIAL AREA$"
-
-gMapName_AquaHideout:: @ 85A1401
-	.string "AQUA HIDEOUT$"
-
-gMapName_MagmaHideout:: @ 85A140E
-	.string "MAGMA HIDEOUT$"
-
-gMapName_MirageTower:: @ 85A141C
-	.string "MIRAGE TOWER$"
-
-gMapName_FarawayIsland:: @ 85A1429
-	.string "FARAWAY ISLAND$"
-
-gMapName_ArtisanCave:: @ 85A1438
-	.string "ARTISAN CAVE$"
-
-gMapName_MarineCave:: @ 85A1445
-	.string "MARINE CAVE$"
-
-gMapName_TerraCave:: @ 85A1451
-	.string "TERRA CAVE$"
-
-gMapName_DesertUnderpass:: @ 85A145C
-	.string "DESERT UNDERPASS$"
-
-gMapName_TrainerHill:: @ 85A146D
-	.string "TRAINER HILL$"
-
-	.align 2
-gRegionMapEntries:: @ 85A147C
-	region_map_entry  4, 11, 1, 1, LittlerootTown
-	region_map_entry  4,  9, 1, 1, OldaleTown
-	region_map_entry  2, 14, 1, 1, DewfordTown
-	region_map_entry  5,  3, 1, 1, LavaridgeTown
-	region_map_entry  3,  0, 1, 1, FallarborTown
-	region_map_entry  4,  6, 1, 1, VerdanturfTown
-	region_map_entry 17, 10, 1, 1, PacifidlogTown
-	region_map_entry  1,  9, 1, 1, PetalburgCity
-	region_map_entry  8, 10, 1, 2, SlateportCity
-	region_map_entry  8,  6, 2, 1, MauvilleCity
-	region_map_entry  0,  5, 1, 2, RustboroCity
-	region_map_entry 12,  0, 1, 1, FortreeCity
-	region_map_entry 18,  3, 2, 1, LilycoveCity
-	region_map_entry 24,  5, 2, 1, MossdeepCity
-	region_map_entry 21,  7, 1, 1, SootopolisCity
-	region_map_entry 27,  8, 1, 2, EverGrandeCity
-	region_map_entry  4, 10, 1, 1, Route101
-	region_map_entry  2,  9, 2, 1, Route102
-	region_map_entry  4,  8, 4, 1, Route103
-	region_map_entry  0,  7, 1, 3, Route104
-	region_map_entry  0, 10, 1, 3, Route105
-	region_map_entry  0, 13, 2, 1, Route106
-	region_map_entry  3, 14, 3, 1, Route107
-	region_map_entry  6, 14, 2, 1, Route108
-	region_map_entry  8, 12, 1, 3, Route109
-	region_map_entry  8,  7, 1, 3, Route110
-	region_map_entry  8,  0, 1, 6, Route111
-	region_map_entry  6,  3, 2, 1, Route112
-	region_map_entry  4,  0, 4, 1, Route113
-	region_map_entry  1,  0, 2, 3, Route114
-	region_map_entry  0,  2, 1, 3, Route115
-	region_map_entry  1,  5, 4, 1, Route116
-	region_map_entry  5,  6, 3, 1, Route117
-	region_map_entry 10,  6, 2, 1, Route118
-	region_map_entry 11,  0, 1, 6, Route119
-	region_map_entry 13,  0, 1, 4, Route120
-	region_map_entry 14,  3, 4, 1, Route121
-	region_map_entry 16,  4, 1, 2, Route122
-	region_map_entry 12,  6, 5, 1, Route123
-	region_map_entry 20,  3, 4, 3, Route124
-	region_map_entry 24,  3, 2, 2, Route125
-	region_map_entry 20,  6, 3, 3, Route126
-	region_map_entry 23,  6, 3, 3, Route127
-	region_map_entry 23,  9, 4, 1, Route128
-	region_map_entry 24, 10, 2, 1, Route129
-	region_map_entry 21, 10, 3, 1, Route130
-	region_map_entry 18, 10, 3, 1, Route131
-	region_map_entry 15, 10, 2, 1, Route132
-	region_map_entry 12, 10, 3, 1, Route133
-	region_map_entry  9, 10, 3, 1, Route134
-	region_map_entry 20,  3, 4, 3, Underwater
-	region_map_entry 20,  6, 3, 3, Underwater
-	region_map_entry 23,  6, 3, 3, Underwater
-	region_map_entry 23,  9, 4, 1, Underwater
-	region_map_entry 21,  7, 1, 1, Underwater
-	region_map_entry  1, 13, 1, 1, GraniteCave
-	region_map_entry  6,  2, 1, 1, MtChimney
-	region_map_entry 16,  2, 1, 1, SafariZone
-	region_map_entry 22, 12, 1, 1, BattleFrontier
-	region_map_entry  0,  8, 1, 1, PetalburgWoods
-	region_map_entry  2,  5, 1, 1, RusturfTunnel
-	region_map_entry  6, 14, 1, 1, AbandonedShip
-	region_map_entry  8,  7, 1, 1, NewMauville
-	region_map_entry  0,  3, 1, 1, MeteorFalls
-	region_map_entry  1,  2, 1, 1, MeteorFalls
-	region_map_entry 16,  4, 1, 1, MtPyre
-	region_map_entry 19,  3, 1, 1, AquaHideoutOld
-	region_map_entry 24,  4, 1, 1, ShoalCave
-	region_map_entry 24,  9, 1, 1, SeafloorCavern
-	region_map_entry 24,  9, 1, 1, Underwater
-	region_map_entry 27,  9, 1, 1, VictoryRoad
-	region_map_entry 17, 10, 1, 1, MirageIsland
-	region_map_entry 21,  7, 1, 1, CaveOfOrigin
-	region_map_entry 12, 14, 1, 1, SouthernIsland
-	region_map_entry  6,  3, 1, 1, FieryPath
-	region_map_entry  7,  3, 1, 1, FieryPath
-	region_map_entry  6,  3, 1, 1, JaggedPass
-	region_map_entry  7,  2, 1, 1, JaggedPass
-	region_map_entry 11, 10, 1, 1, SealedChamber
-	region_map_entry 11, 10, 1, 1, Underwater
-	region_map_entry 13,  0, 1, 1, ScorchedSlab
-	region_map_entry  0, 10, 1, 1, IslandCave
-	region_map_entry  8,  3, 1, 1, DesertRuins
-	region_map_entry 13,  2, 1, 1, AncientTomb
-	region_map_entry  0,  0, 1, 1, InsideOfTruck
-	region_map_entry 19, 10, 1, 1, SkyPillar
-	region_map_entry  0,  0, 1, 1, SecretBase
-	region_map_entry  0,  0, 1, 1, None
-	region_map_entry  0,  0, 1, 1, PalletTown
-	region_map_entry  0,  0, 1, 1, ViridianCity
-	region_map_entry  0,  0, 1, 1, PewterCity
-	region_map_entry  0,  0, 1, 1, CeruleanCity
-	region_map_entry  0,  0, 1, 1, LavenderTown
-	region_map_entry  0,  0, 1, 1, VermilionCity
-	region_map_entry  0,  0, 1, 1, CeladonCity
-	region_map_entry  0,  0, 1, 1, FuchsiaCity
-	region_map_entry  0,  0, 1, 1, CinnabarIsland
-	region_map_entry  0,  0, 1, 1, IndigoPlateau
-	region_map_entry  0,  0, 1, 1, SaffronCity
-	region_map_entry  0,  0, 1, 1, Route4
-	region_map_entry  0,  0, 1, 1, Route10
-	region_map_entry  0,  0, 1, 1, Route1
-	region_map_entry  0,  0, 1, 1, Route2
-	region_map_entry  0,  0, 1, 1, Route3
-	region_map_entry  0,  0, 1, 1, Route4_2
-	region_map_entry  0,  0, 1, 1, Route5
-	region_map_entry  0,  0, 1, 1, Route6
-	region_map_entry  0,  0, 1, 1, Route7
-	region_map_entry  0,  0, 1, 1, Route8
-	region_map_entry  0,  0, 1, 1, Route9
-	region_map_entry  0,  0, 1, 1, Route10_2
-	region_map_entry  0,  0, 1, 1, Route11
-	region_map_entry  0,  0, 1, 1, Route12
-	region_map_entry  0,  0, 1, 1, Route13
-	region_map_entry  0,  0, 1, 1, Route14
-	region_map_entry  0,  0, 1, 1, Route15
-	region_map_entry  0,  0, 1, 1, Route16
-	region_map_entry  0,  0, 1, 1, Route17
-	region_map_entry  0,  0, 1, 1, Route18
-	region_map_entry  0,  0, 1, 1, Route19
-	region_map_entry  0,  0, 1, 1, Route20
-	region_map_entry  0,  0, 1, 1, Route21
-	region_map_entry  0,  0, 1, 1, Route22
-	region_map_entry  0,  0, 1, 1, Route23
-	region_map_entry  0,  0, 1, 1, Route24
-	region_map_entry  0,  0, 1, 1, Route25
-	region_map_entry  0,  0, 1, 1, ViridianForest
-	region_map_entry  0,  0, 1, 1, MtMoon
-	region_map_entry  0,  0, 1, 1, SSAnne
-	region_map_entry  0,  0, 1, 1, UndergroundPath
-	region_map_entry  0,  0, 1, 1, UndergroundPath2
-	region_map_entry  0,  0, 1, 1, DiglettsCave
-	region_map_entry  0,  0, 1, 1, KantoVictoryRoad
-	region_map_entry  0,  0, 1, 1, RocketHideout
-	region_map_entry  0,  0, 1, 1, SilphCo
-	region_map_entry  0,  0, 1, 1, PokemonMansion
-	region_map_entry  0,  0, 1, 1, KantoSafariZone
-	region_map_entry  0,  0, 1, 1, PokemonLeague
-	region_map_entry  0,  0, 1, 1, RockTunnel
-	region_map_entry  0,  0, 1, 1, SeafoamIslands
-	region_map_entry  0,  0, 1, 1, PokemonTower
-	region_map_entry  0,  0, 1, 1, CeruleanCave
-	region_map_entry  0,  0, 1, 1, PowerPlant
-	region_map_entry  0,  0, 1, 1, OneIsland
-	region_map_entry  0,  0, 1, 1, TwoIsland
-	region_map_entry  0,  0, 1, 1, ThreeIsland
-	region_map_entry  0,  0, 1, 1, FourIsland
-	region_map_entry  0,  0, 1, 1, FiveIsland
-	region_map_entry  0,  0, 1, 1, SevenIsland
-	region_map_entry  0,  0, 1, 1, SixIsland
-	region_map_entry  0,  0, 1, 1, KindleRoad
-	region_map_entry  0,  0, 1, 1, TreasureBeach
-	region_map_entry  0,  0, 1, 1, CapeBrink
-	region_map_entry  0,  0, 1, 1, BondBridge
-	region_map_entry  0,  0, 1, 1, ThreeIslePort
-	region_map_entry  0,  0, 1, 1, SeviiIsle6
-	region_map_entry  0,  0, 1, 1, SeviiIsle7
-	region_map_entry  0,  0, 1, 1, SeviiIsle8
-	region_map_entry  0,  0, 1, 1, SeviiIsle9
-	region_map_entry  0,  0, 1, 1, ResortGorgeous
-	region_map_entry  0,  0, 1, 1, WaterLabyrinth
-	region_map_entry  0,  0, 1, 1, FiveIsleMeadow
-	region_map_entry  0,  0, 1, 1, MemorialPillar
-	region_map_entry  0,  0, 1, 1, OutcastIsland
-	region_map_entry  0,  0, 1, 1, GreenPath
-	region_map_entry  0,  0, 1, 1, WaterPath
-	region_map_entry  0,  0, 1, 1, RuinValley
-	region_map_entry  0,  0, 1, 1, TrainerTower
-	region_map_entry  0,  0, 1, 1, CanyonEntrance
-	region_map_entry  0,  0, 1, 1, SevaultCanyon
-	region_map_entry  0,  0, 1, 1, TanobyRuins
-	region_map_entry  0,  0, 1, 1, SeviiIsle22
-	region_map_entry  0,  0, 1, 1, SeviiIsle23
-	region_map_entry  0,  0, 1, 1, SeviiIsle24
-	region_map_entry  0,  0, 1, 1, NavelRock
-	region_map_entry  0,  0, 1, 1, MtEmber
-	region_map_entry  0,  0, 1, 1, BerryForest
-	region_map_entry  0,  0, 1, 1, IcefallCave
-	region_map_entry  0,  0, 1, 1, RocketWarehouse
-	region_map_entry  0,  0, 1, 1, TrainerTower2
-	region_map_entry  0,  0, 1, 1, DottedHole
-	region_map_entry  0,  0, 1, 1, LostCave
-	region_map_entry  0,  0, 1, 1, PatternBush
-	region_map_entry  0,  0, 1, 1, AlteringCave
-	region_map_entry  0,  0, 1, 1, TanobyChambers
-	region_map_entry  0,  0, 1, 1, ThreeIslePath
-	region_map_entry  0,  0, 1, 1, TanobyKey
-	region_map_entry  0,  0, 1, 1, BirthIsland
-	region_map_entry  0,  0, 1, 1, MoneanChamber
-	region_map_entry  0,  0, 1, 1, LiptooChamber
-	region_map_entry  0,  0, 1, 1, WeepthChamber
-	region_map_entry  0,  0, 1, 1, DilfordChamber
-	region_map_entry  0,  0, 1, 1, ScufibChamber
-	region_map_entry  0,  0, 1, 1, RixyChamber
-	region_map_entry  0,  0, 1, 1, ViapoisChamber
-	region_map_entry  0,  0, 1, 1, EmberSpa
-	region_map_entry  0,  0, 1, 1, SpecialArea
-	region_map_entry 19,  3, 1, 1, AquaHideout
-	region_map_entry  6,  3, 1, 1, MagmaHideout
-	region_map_entry  8,  2, 1, 1, MirageTower
-	region_map_entry  0,  0, 1, 1, BirthIsland
-	region_map_entry  0,  0, 1, 1, FarawayIsland
-	region_map_entry 22, 12, 1, 1, ArtisanCave
-	region_map_entry  0,  0, 1, 1, MarineCave
-	region_map_entry  0,  0, 1, 1, Underwater
-	region_map_entry  0,  0, 1, 1, TerraCave
-	region_map_entry  0, 10, 1, 3, Underwater
-	region_map_entry 24,  3, 2, 2, Underwater
-	region_map_entry 24, 10, 2, 1, Underwater
-	region_map_entry  2,  0, 1, 1, DesertUnderpass
-	region_map_entry  6,  8, 1, 1, AlteringCave
-	region_map_entry  0,  0, 1, 1, NavelRock
-	region_map_entry  8,  4, 1, 1, TrainerHill
diff --git a/include/data/region_map/region_map_entries.h b/include/data/region_map/region_map_entries.h
new file mode 100644
index 000000000..73599c704
--- /dev/null
+++ b/include/data/region_map/region_map_entries.h
@@ -0,0 +1,421 @@
+#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
+#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
+
+static const u8 gMapName_LittlerootTown[] = _("LITTLEROOT TOWN");
+static const u8 gMapName_OldaleTown[] = _("OLDALE TOWN");
+static const u8 gMapName_DewfordTown[] = _("DEWFORD TOWN");
+static const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE TOWN");
+static const u8 gMapName_FallarborTown[] = _("FALLARBOR TOWN");
+static const u8 gMapName_VerdanturfTown[] = _("VERDANTURF TOWN");
+static const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN");
+static const u8 gMapName_PetalburgCity[] = _("PETALBURG CITY");
+static const u8 gMapName_SlateportCity[] = _("SLATEPORT CITY");
+static const u8 gMapName_MauvilleCity[] = _("MAUVILLE CITY");
+static const u8 gMapName_RustboroCity[] = _("RUSTBORO CITY");
+static const u8 gMapName_FortreeCity[] = _("FORTREE CITY");
+static const u8 gMapName_LilycoveCity[] = _("LILYCOVE CITY");
+static const u8 gMapName_MossdeepCity[] = _("MOSSDEEP CITY");
+static const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS CITY");
+static const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE CITY");
+static const u8 gMapName_Route101[] = _("ROUTE 101");
+static const u8 gMapName_Route102[] = _("ROUTE 102");
+static const u8 gMapName_Route103[] = _("ROUTE 103");
+static const u8 gMapName_Route104[] = _("ROUTE 104");
+static const u8 gMapName_Route105[] = _("ROUTE 105");
+static const u8 gMapName_Route106[] = _("ROUTE 106");
+static const u8 gMapName_Route107[] = _("ROUTE 107");
+static const u8 gMapName_Route108[] = _("ROUTE 108");
+static const u8 gMapName_Route109[] = _("ROUTE 109");
+static const u8 gMapName_Route110[] = _("ROUTE 110");
+static const u8 gMapName_Route111[] = _("ROUTE 111");
+static const u8 gMapName_Route112[] = _("ROUTE 112");
+static const u8 gMapName_Route113[] = _("ROUTE 113");
+static const u8 gMapName_Route114[] = _("ROUTE 114");
+static const u8 gMapName_Route115[] = _("ROUTE 115");
+static const u8 gMapName_Route116[] = _("ROUTE 116");
+static const u8 gMapName_Route117[] = _("ROUTE 117");
+static const u8 gMapName_Route118[] = _("ROUTE 118");
+static const u8 gMapName_Route119[] = _("ROUTE 119");
+static const u8 gMapName_Route120[] = _("ROUTE 120");
+static const u8 gMapName_Route121[] = _("ROUTE 121");
+static const u8 gMapName_Route122[] = _("ROUTE 122");
+static const u8 gMapName_Route123[] = _("ROUTE 123");
+static const u8 gMapName_Route124[] = _("ROUTE 124");
+static const u8 gMapName_Route125[] = _("ROUTE 125");
+static const u8 gMapName_Route126[] = _("ROUTE 126");
+static const u8 gMapName_Route127[] = _("ROUTE 127");
+static const u8 gMapName_Route128[] = _("ROUTE 128");
+static const u8 gMapName_Route129[] = _("ROUTE 129");
+static const u8 gMapName_Route130[] = _("ROUTE 130");
+static const u8 gMapName_Route131[] = _("ROUTE 131");
+static const u8 gMapName_Route132[] = _("ROUTE 132");
+static const u8 gMapName_Route133[] = _("ROUTE 133");
+static const u8 gMapName_Route134[] = _("ROUTE 134");
+static const u8 gMapName_Underwater[] = _("UNDERWATER");
+static const u8 gMapName_GraniteCave[] = _("GRANITE CAVE");
+static const u8 gMapName_MtChimney[] = _("MT. CHIMNEY");
+static const u8 gMapName_SafariZone[] = _("SAFARI ZONE");
+static const u8 gMapName_BattleFrontier[] = _("BATTLE FRONTIER");
+static const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS");
+static const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
+static const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP");
+static const u8 gMapName_NewMauville[] = _("NEW MAUVILLE");
+static const u8 gMapName_MeteorFalls[] = _("METEOR FALLS");
+static const u8 gMapName_MtPyre[] = _("MT. PYRE");
+// This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
+// hideout in Emerald with their own new region map entries, and this name
+// doesn't seem to be used anymore.
+static const u8 gMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT");
+static const u8 gMapName_ShoalCave[] = _("SHOAL CAVE");
+static const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
+static const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD");
+static const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND");
+static const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
+static const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
+static const u8 gMapName_FieryPath[] = _("FIERY PATH");
+static const u8 gMapName_JaggedPass[] = _("JAGGED PASS");
+static const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER");
+static const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB");
+static const u8 gMapName_IslandCave[] = _("ISLAND CAVE");
+static const u8 gMapName_DesertRuins[] = _("DESERT RUINS");
+static const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB");
+static const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
+static const u8 gMapName_SkyPillar[] = _("SKY PILLAR");
+static const u8 gMapName_SecretBase[] = _("SECRET BASE");
+static const u8 gMapName_None[] = _("");
+static const u8 gMapName_PalletTown[] = _("PALLET TOWN");
+static const u8 gMapName_ViridianCity[] = _("VIRIDIAN CITY");
+static const u8 gMapName_PewterCity[] = _("PEWTER CITY");
+static const u8 gMapName_CeruleanCity[] = _("CERULEAN CITY");
+static const u8 gMapName_LavenderTown[] = _("LAVENDER TOWN");
+static const u8 gMapName_VermilionCity[] = _("VERMILION CITY");
+static const u8 gMapName_CeladonCity[] = _("CELADON CITY");
+static const u8 gMapName_FuchsiaCity[] = _("FUCHSIA CITY");
+static const u8 gMapName_CinnabarIsland[] = _("CINNABAR ISLAND");
+static const u8 gMapName_IndigoPlateau[] = _("INDIGO PLATEAU");
+static const u8 gMapName_SaffronCity[] = _("SAFFRON CITY");
+static const u8 gMapName_Route4[] = _("ROUTE 4");
+static const u8 gMapName_Route10[] = _("ROUTE 10");
+static const u8 gMapName_Route1[] = _("ROUTE 1");
+static const u8 gMapName_Route2[] = _("ROUTE 2");
+static const u8 gMapName_Route3[] = _("ROUTE 3");
+static const u8 gMapName_Route4_2[] = _("ROUTE 4");
+static const u8 gMapName_Route5[] = _("ROUTE 5");
+static const u8 gMapName_Route6[] = _("ROUTE 6");
+static const u8 gMapName_Route7[] = _("ROUTE 7");
+static const u8 gMapName_Route8[] = _("ROUTE 8");
+static const u8 gMapName_Route9[] = _("ROUTE 9");
+static const u8 gMapName_Route10_2[] = _("ROUTE 10");
+static const u8 gMapName_Route11[] = _("ROUTE 11");
+static const u8 gMapName_Route12[] = _("ROUTE 12");
+static const u8 gMapName_Route13[] = _("ROUTE 13");
+static const u8 gMapName_Route14[] = _("ROUTE 14");
+static const u8 gMapName_Route15[] = _("ROUTE 15");
+static const u8 gMapName_Route16[] = _("ROUTE 16");
+static const u8 gMapName_Route17[] = _("ROUTE 17");
+static const u8 gMapName_Route18[] = _("ROUTE 18");
+static const u8 gMapName_Route19[] = _("ROUTE 19");
+static const u8 gMapName_Route20[] = _("ROUTE 20");
+static const u8 gMapName_Route21[] = _("ROUTE 21");
+static const u8 gMapName_Route22[] = _("ROUTE 22");
+static const u8 gMapName_Route23[] = _("ROUTE 23");
+static const u8 gMapName_Route24[] = _("ROUTE 24");
+static const u8 gMapName_Route25[] = _("ROUTE 25");
+static const u8 gMapName_ViridianForest[] = _("VIRIDIAN FOREST");
+static const u8 gMapName_MtMoon[] = _("MT. MOON");
+static const u8 gMapName_SSAnne[] = _("S.S. ANNE");
+static const u8 gMapName_UndergroundPath[] = _("UNDERGROUND PATH");
+static const u8 gMapName_UndergroundPath2[] = _("UNDERGROUND PATH");
+static const u8 gMapName_DiglettsCave[] = _("DIGLETT’S CAVE");
+static const u8 gMapName_KantoVictoryRoad[] = _("VICTORY ROAD");
+static const u8 gMapName_RocketHideout[] = _("ROCKET HIDEOUT");
+static const u8 gMapName_SilphCo[] = _("SILPH CO.");
+static const u8 gMapName_PokemonMansion[] = _("POKéMON MANSION");
+static const u8 gMapName_KantoSafariZone[] = _("SAFARI ZONE");
+static const u8 gMapName_PokemonLeague[] = _("POKéMON LEAGUE");
+static const u8 gMapName_RockTunnel[] = _("ROCK TUNNEL");
+static const u8 gMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS");
+static const u8 gMapName_PokemonTower[] = _("POKéMON TOWER");
+static const u8 gMapName_CeruleanCave[] = _("CERULEAN CAVE");
+static const u8 gMapName_PowerPlant[] = _("POWER PLANT");
+static const u8 gMapName_OneIsland[] = _("ONE ISLAND");
+static const u8 gMapName_TwoIsland[] = _("TWO ISLAND");
+static const u8 gMapName_ThreeIsland[] = _("THREE ISLAND");
+static const u8 gMapName_FourIsland[] = _("FOUR ISLAND");
+static const u8 gMapName_FiveIsland[] = _("FIVE ISLAND");
+static const u8 gMapName_SevenIsland[] = _("SEVEN ISLAND");
+static const u8 gMapName_SixIsland[] = _("SIX ISLAND");
+static const u8 gMapName_KindleRoad[] = _("KINDLE ROAD");
+static const u8 gMapName_TreasureBeach[] = _("TREASURE BEACH");
+static const u8 gMapName_CapeBrink[] = _("CAPE BRINK");
+static const u8 gMapName_BondBridge[] = _("BOND BRIDGE");
+static const u8 gMapName_ThreeIslePort[] = _("THREE ISLE PORT");
+static const u8 gMapName_SeviiIsle6[] = _("SEVII ISLE 6");
+static const u8 gMapName_SeviiIsle7[] = _("SEVII ISLE 7");
+static const u8 gMapName_SeviiIsle8[] = _("SEVII ISLE 8");
+static const u8 gMapName_SeviiIsle9[] = _("SEVII ISLE 9");
+static const u8 gMapName_ResortGorgeous[] = _("RESORT GORGEOUS");
+static const u8 gMapName_WaterLabyrinth[] = _("WATER LABYRINTH");
+static const u8 gMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW");
+static const u8 gMapName_MemorialPillar[] = _("MEMORIAL PILLAR");
+static const u8 gMapName_OutcastIsland[] = _("OUTCAST ISLAND");
+static const u8 gMapName_GreenPath[] = _("GREEN PATH");
+static const u8 gMapName_WaterPath[] = _("WATER PATH");
+static const u8 gMapName_RuinValley[] = _("RUIN VALLEY");
+static const u8 gMapName_TrainerTower[] = _("TRAINER TOWER");
+static const u8 gMapName_CanyonEntrance[] = _("CANYON ENTRANCE");
+static const u8 gMapName_SevaultCanyon[] = _("SEVAULT CANYON");
+static const u8 gMapName_TanobyRuins[] = _("TANOBY RUINS");
+static const u8 gMapName_SeviiIsle22[] = _("SEVII ISLE 22");
+static const u8 gMapName_SeviiIsle23[] = _("SEVII ISLE 23");
+static const u8 gMapName_SeviiIsle24[] = _("SEVII ISLE 24");
+static const u8 gMapName_NavelRock[] = _("NAVEL ROCK");
+static const u8 gMapName_MtEmber[] = _("MT. EMBER");
+static const u8 gMapName_BerryForest[] = _("BERRY FOREST");
+static const u8 gMapName_IcefallCave[] = _("ICEFALL CAVE");
+static const u8 gMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE");
+static const u8 gMapName_TrainerTower2[] = _("TRAINER TOWER");
+static const u8 gMapName_DottedHole[] = _("DOTTED HOLE");
+static const u8 gMapName_LostCave[] = _("LOST CAVE");
+static const u8 gMapName_PatternBush[] = _("PATTERN BUSH");
+static const u8 gMapName_AlteringCave[] = _("ALTERING CAVE");
+static const u8 gMapName_TanobyChambers[] = _("TANOBY CHAMBERS");
+static const u8 gMapName_ThreeIslePath[] = _("THREE ISLE PATH");
+static const u8 gMapName_TanobyKey[] = _("TANOBY KEY");
+static const u8 gMapName_BirthIsland[] = _("BIRTH ISLAND");
+static const u8 gMapName_MoneanChamber[] = _("MONEAN CHAMBER");
+static const u8 gMapName_LiptooChamber[] = _("LIPTOO CHAMBER");
+static const u8 gMapName_WeepthChamber[] = _("WEEPTH CHAMBER");
+static const u8 gMapName_DilfordChamber[] = _("DILFORD CHAMBER");
+static const u8 gMapName_ScufibChamber[] = _("SCUFIB CHAMBER");
+static const u8 gMapName_RixyChamber[] = _("RIXY CHAMBER");
+static const u8 gMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER");
+static const u8 gMapName_EmberSpa[] = _("EMBER SPA");
+static const u8 gMapName_SpecialArea[] = _("SPECIAL AREA");
+static const u8 gMapName_AquaHideout[] = _("AQUA HIDEOUT");
+static const u8 gMapName_MagmaHideout[] = _("MAGMA HIDEOUT");
+static const u8 gMapName_MirageTower[] = _("MIRAGE TOWER");
+static const u8 gMapName_FarawayIsland[] = _("FARAWAY ISLAND");
+static const u8 gMapName_ArtisanCave[] = _("ARTISAN CAVE");
+static const u8 gMapName_MarineCave[] = _("MARINE CAVE");
+static const u8 gMapName_TerraCave[] = _("TERRA CAVE");
+static const u8 gMapName_DesertUnderpass[] = _("DESERT UNDERPASS");
+static const u8 gMapName_TrainerHill[] = _("TRAINER HILL");
+
+const struct RegionMapLocation gRegionMapEntries[] = {
+    { 4, 11, 1, 1, gMapName_LittlerootTown},
+    { 4,  9, 1, 1, gMapName_OldaleTown},
+    { 2, 14, 1, 1, gMapName_DewfordTown},
+    { 5,  3, 1, 1, gMapName_LavaridgeTown},
+    { 3,  0, 1, 1, gMapName_FallarborTown},
+    { 4,  6, 1, 1, gMapName_VerdanturfTown},
+    {17, 10, 1, 1, gMapName_PacifidlogTown},
+    { 1,  9, 1, 1, gMapName_PetalburgCity},
+    { 8, 10, 1, 2, gMapName_SlateportCity},
+    { 8,  6, 2, 1, gMapName_MauvilleCity},
+    { 0,  5, 1, 2, gMapName_RustboroCity},
+    {12,  0, 1, 1, gMapName_FortreeCity},
+    {18,  3, 2, 1, gMapName_LilycoveCity},
+    {24,  5, 2, 1, gMapName_MossdeepCity},
+    {21,  7, 1, 1, gMapName_SootopolisCity},
+    {27,  8, 1, 2, gMapName_EverGrandeCity},
+    { 4, 10, 1, 1, gMapName_Route101},
+    { 2,  9, 2, 1, gMapName_Route102},
+    { 4,  8, 4, 1, gMapName_Route103},
+    { 0,  7, 1, 3, gMapName_Route104},
+    { 0, 10, 1, 3, gMapName_Route105},
+    { 0, 13, 2, 1, gMapName_Route106},
+    { 3, 14, 3, 1, gMapName_Route107},
+    { 6, 14, 2, 1, gMapName_Route108},
+    { 8, 12, 1, 3, gMapName_Route109},
+    { 8,  7, 1, 3, gMapName_Route110},
+    { 8,  0, 1, 6, gMapName_Route111},
+    { 6,  3, 2, 1, gMapName_Route112},
+    { 4,  0, 4, 1, gMapName_Route113},
+    { 1,  0, 2, 3, gMapName_Route114},
+    { 0,  2, 1, 3, gMapName_Route115},
+    { 1,  5, 4, 1, gMapName_Route116},
+    { 5,  6, 3, 1, gMapName_Route117},
+    {10,  6, 2, 1, gMapName_Route118},
+    {11,  0, 1, 6, gMapName_Route119},
+    {13,  0, 1, 4, gMapName_Route120},
+    {14,  3, 4, 1, gMapName_Route121},
+    {16,  4, 1, 2, gMapName_Route122},
+    {12,  6, 5, 1, gMapName_Route123},
+    {20,  3, 4, 3, gMapName_Route124},
+    {24,  3, 2, 2, gMapName_Route125},
+    {20,  6, 3, 3, gMapName_Route126},
+    {23,  6, 3, 3, gMapName_Route127},
+    {23,  9, 4, 1, gMapName_Route128},
+    {24, 10, 2, 1, gMapName_Route129},
+    {21, 10, 3, 1, gMapName_Route130},
+    {18, 10, 3, 1, gMapName_Route131},
+    {15, 10, 2, 1, gMapName_Route132},
+    {12, 10, 3, 1, gMapName_Route133},
+    { 9, 10, 3, 1, gMapName_Route134},
+    {20,  3, 4, 3, gMapName_Underwater},
+    {20,  6, 3, 3, gMapName_Underwater},
+    {23,  6, 3, 3, gMapName_Underwater},
+    {23,  9, 4, 1, gMapName_Underwater},
+    {21,  7, 1, 1, gMapName_Underwater},
+    { 1, 13, 1, 1, gMapName_GraniteCave},
+    { 6,  2, 1, 1, gMapName_MtChimney},
+    {16,  2, 1, 1, gMapName_SafariZone},
+    {22, 12, 1, 1, gMapName_BattleFrontier},
+    { 0,  8, 1, 1, gMapName_PetalburgWoods},
+    { 2,  5, 1, 1, gMapName_RusturfTunnel},
+    { 6, 14, 1, 1, gMapName_AbandonedShip},
+    { 8,  7, 1, 1, gMapName_NewMauville},
+    { 0,  3, 1, 1, gMapName_MeteorFalls},
+    { 1,  2, 1, 1, gMapName_MeteorFalls},
+    {16,  4, 1, 1, gMapName_MtPyre},
+    {19,  3, 1, 1, gMapName_AquaHideoutOld},
+    {24,  4, 1, 1, gMapName_ShoalCave},
+    {24,  9, 1, 1, gMapName_SeafloorCavern},
+    {24,  9, 1, 1, gMapName_Underwater},
+    {27,  9, 1, 1, gMapName_VictoryRoad},
+    {17, 10, 1, 1, gMapName_MirageIsland},
+    {21,  7, 1, 1, gMapName_CaveOfOrigin},
+    {12, 14, 1, 1, gMapName_SouthernIsland},
+    { 6,  3, 1, 1, gMapName_FieryPath},
+    { 7,  3, 1, 1, gMapName_FieryPath},
+    { 6,  3, 1, 1, gMapName_JaggedPass},
+    { 7,  2, 1, 1, gMapName_JaggedPass},
+    {11, 10, 1, 1, gMapName_SealedChamber},
+    {11, 10, 1, 1, gMapName_Underwater},
+    {13,  0, 1, 1, gMapName_ScorchedSlab},
+    { 0, 10, 1, 1, gMapName_IslandCave},
+    { 8,  3, 1, 1, gMapName_DesertRuins},
+    {13,  2, 1, 1, gMapName_AncientTomb},
+    { 0,  0, 1, 1, gMapName_InsideOfTruck},
+    {19, 10, 1, 1, gMapName_SkyPillar},
+    { 0,  0, 1, 1, gMapName_SecretBase},
+    { 0,  0, 1, 1, gMapName_None},
+    { 0,  0, 1, 1, gMapName_PalletTown},
+    { 0,  0, 1, 1, gMapName_ViridianCity},
+    { 0,  0, 1, 1, gMapName_PewterCity},
+    { 0,  0, 1, 1, gMapName_CeruleanCity},
+    { 0,  0, 1, 1, gMapName_LavenderTown},
+    { 0,  0, 1, 1, gMapName_VermilionCity},
+    { 0,  0, 1, 1, gMapName_CeladonCity},
+    { 0,  0, 1, 1, gMapName_FuchsiaCity},
+    { 0,  0, 1, 1, gMapName_CinnabarIsland},
+    { 0,  0, 1, 1, gMapName_IndigoPlateau},
+    { 0,  0, 1, 1, gMapName_SaffronCity},
+    { 0,  0, 1, 1, gMapName_Route4},
+    { 0,  0, 1, 1, gMapName_Route10},
+    { 0,  0, 1, 1, gMapName_Route1},
+    { 0,  0, 1, 1, gMapName_Route2},
+    { 0,  0, 1, 1, gMapName_Route3},
+    { 0,  0, 1, 1, gMapName_Route4_2},
+    { 0,  0, 1, 1, gMapName_Route5},
+    { 0,  0, 1, 1, gMapName_Route6},
+    { 0,  0, 1, 1, gMapName_Route7},
+    { 0,  0, 1, 1, gMapName_Route8},
+    { 0,  0, 1, 1, gMapName_Route9},
+    { 0,  0, 1, 1, gMapName_Route10_2},
+    { 0,  0, 1, 1, gMapName_Route11},
+    { 0,  0, 1, 1, gMapName_Route12},
+    { 0,  0, 1, 1, gMapName_Route13},
+    { 0,  0, 1, 1, gMapName_Route14},
+    { 0,  0, 1, 1, gMapName_Route15},
+    { 0,  0, 1, 1, gMapName_Route16},
+    { 0,  0, 1, 1, gMapName_Route17},
+    { 0,  0, 1, 1, gMapName_Route18},
+    { 0,  0, 1, 1, gMapName_Route19},
+    { 0,  0, 1, 1, gMapName_Route20},
+    { 0,  0, 1, 1, gMapName_Route21},
+    { 0,  0, 1, 1, gMapName_Route22},
+    { 0,  0, 1, 1, gMapName_Route23},
+    { 0,  0, 1, 1, gMapName_Route24},
+    { 0,  0, 1, 1, gMapName_Route25},
+    { 0,  0, 1, 1, gMapName_ViridianForest},
+    { 0,  0, 1, 1, gMapName_MtMoon},
+    { 0,  0, 1, 1, gMapName_SSAnne},
+    { 0,  0, 1, 1, gMapName_UndergroundPath},
+    { 0,  0, 1, 1, gMapName_UndergroundPath2},
+    { 0,  0, 1, 1, gMapName_DiglettsCave},
+    { 0,  0, 1, 1, gMapName_KantoVictoryRoad},
+    { 0,  0, 1, 1, gMapName_RocketHideout},
+    { 0,  0, 1, 1, gMapName_SilphCo},
+    { 0,  0, 1, 1, gMapName_PokemonMansion},
+    { 0,  0, 1, 1, gMapName_KantoSafariZone},
+    { 0,  0, 1, 1, gMapName_PokemonLeague},
+    { 0,  0, 1, 1, gMapName_RockTunnel},
+    { 0,  0, 1, 1, gMapName_SeafoamIslands},
+    { 0,  0, 1, 1, gMapName_PokemonTower},
+    { 0,  0, 1, 1, gMapName_CeruleanCave},
+    { 0,  0, 1, 1, gMapName_PowerPlant},
+    { 0,  0, 1, 1, gMapName_OneIsland},
+    { 0,  0, 1, 1, gMapName_TwoIsland},
+    { 0,  0, 1, 1, gMapName_ThreeIsland},
+    { 0,  0, 1, 1, gMapName_FourIsland},
+    { 0,  0, 1, 1, gMapName_FiveIsland},
+    { 0,  0, 1, 1, gMapName_SevenIsland},
+    { 0,  0, 1, 1, gMapName_SixIsland},
+    { 0,  0, 1, 1, gMapName_KindleRoad},
+    { 0,  0, 1, 1, gMapName_TreasureBeach},
+    { 0,  0, 1, 1, gMapName_CapeBrink},
+    { 0,  0, 1, 1, gMapName_BondBridge},
+    { 0,  0, 1, 1, gMapName_ThreeIslePort},
+    { 0,  0, 1, 1, gMapName_SeviiIsle6},
+    { 0,  0, 1, 1, gMapName_SeviiIsle7},
+    { 0,  0, 1, 1, gMapName_SeviiIsle8},
+    { 0,  0, 1, 1, gMapName_SeviiIsle9},
+    { 0,  0, 1, 1, gMapName_ResortGorgeous},
+    { 0,  0, 1, 1, gMapName_WaterLabyrinth},
+    { 0,  0, 1, 1, gMapName_FiveIsleMeadow},
+    { 0,  0, 1, 1, gMapName_MemorialPillar},
+    { 0,  0, 1, 1, gMapName_OutcastIsland},
+    { 0,  0, 1, 1, gMapName_GreenPath},
+    { 0,  0, 1, 1, gMapName_WaterPath},
+    { 0,  0, 1, 1, gMapName_RuinValley},
+    { 0,  0, 1, 1, gMapName_TrainerTower},
+    { 0,  0, 1, 1, gMapName_CanyonEntrance},
+    { 0,  0, 1, 1, gMapName_SevaultCanyon},
+    { 0,  0, 1, 1, gMapName_TanobyRuins},
+    { 0,  0, 1, 1, gMapName_SeviiIsle22},
+    { 0,  0, 1, 1, gMapName_SeviiIsle23},
+    { 0,  0, 1, 1, gMapName_SeviiIsle24},
+    { 0,  0, 1, 1, gMapName_NavelRock},
+    { 0,  0, 1, 1, gMapName_MtEmber},
+    { 0,  0, 1, 1, gMapName_BerryForest},
+    { 0,  0, 1, 1, gMapName_IcefallCave},
+    { 0,  0, 1, 1, gMapName_RocketWarehouse},
+    { 0,  0, 1, 1, gMapName_TrainerTower2},
+    { 0,  0, 1, 1, gMapName_DottedHole},
+    { 0,  0, 1, 1, gMapName_LostCave},
+    { 0,  0, 1, 1, gMapName_PatternBush},
+    { 0,  0, 1, 1, gMapName_AlteringCave},
+    { 0,  0, 1, 1, gMapName_TanobyChambers},
+    { 0,  0, 1, 1, gMapName_ThreeIslePath},
+    { 0,  0, 1, 1, gMapName_TanobyKey},
+    { 0,  0, 1, 1, gMapName_BirthIsland},
+    { 0,  0, 1, 1, gMapName_MoneanChamber},
+    { 0,  0, 1, 1, gMapName_LiptooChamber},
+    { 0,  0, 1, 1, gMapName_WeepthChamber},
+    { 0,  0, 1, 1, gMapName_DilfordChamber},
+    { 0,  0, 1, 1, gMapName_ScufibChamber},
+    { 0,  0, 1, 1, gMapName_RixyChamber},
+    { 0,  0, 1, 1, gMapName_ViapoisChamber},
+    { 0,  0, 1, 1, gMapName_EmberSpa},
+    { 0,  0, 1, 1, gMapName_SpecialArea},
+    {19,  3, 1, 1, gMapName_AquaHideout},
+    { 6,  3, 1, 1, gMapName_MagmaHideout},
+    { 8,  2, 1, 1, gMapName_MirageTower},
+    { 0,  0, 1, 1, gMapName_BirthIsland},
+    { 0,  0, 1, 1, gMapName_FarawayIsland},
+    {22, 12, 1, 1, gMapName_ArtisanCave},
+    { 0,  0, 1, 1, gMapName_MarineCave},
+    { 0,  0, 1, 1, gMapName_Underwater},
+    { 0,  0, 1, 1, gMapName_TerraCave},
+    { 0, 10, 1, 3, gMapName_Underwater},
+    {24,  3, 2, 2, gMapName_Underwater},
+    {24, 10, 2, 1, gMapName_Underwater},
+    { 2,  0, 1, 1, gMapName_DesertUnderpass},
+    { 6,  8, 1, 1, gMapName_AlteringCave},
+    { 0,  0, 1, 1, gMapName_NavelRock},
+    { 8,  4, 1, 1, gMapName_TrainerHill}
+};
+
+#endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
diff --git a/src/region_map.c b/src/region_map.c
index 92f902fe1..bc7e78c6b 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -106,8 +106,26 @@ static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/
 static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
 static const u8 sRegionMapPlayerIcon_MayGfx[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
 
-extern const u8 gUnknown_085A096C[];
-extern const struct RegionMapLocation gRegionMapEntries[];
+static const u8 sRegionMap_MapSectionLayout[] = {
+    MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_ROUTE_114, MAPSEC_FALLARBOR_TOWN, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_FORTREE_CITY, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_115, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SAFARI_ZONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LAVARIDGE_TOWN, MAPSEC_ROUTE_112, MAPSEC_ROUTE_112, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_LILYCOVE_CITY, MAPSEC_LILYCOVE_CITY, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_RUSTBORO_CITY, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_MOSSDEEP_CITY, MAPSEC_MOSSDEEP_CITY, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_RUSTBORO_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_VERDANTURF_TOWN, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_MAUVILLE_CITY, MAPSEC_MAUVILLE_CITY, MAPSEC_ROUTE_118, MAPSEC_ROUTE_118, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_SOOTOPOLIS_CITY, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_EVER_GRANDE_CITY,
+    MAPSEC_ROUTE_104, MAPSEC_PETALBURG_CITY, MAPSEC_ROUTE_102, MAPSEC_ROUTE_102, MAPSEC_OLDALE_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_EVER_GRANDE_CITY,
+    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_101, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_132, MAPSEC_ROUTE_132, MAPSEC_PACIFIDLOG_TOWN, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_129, MAPSEC_ROUTE_129, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LITTLEROOT_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_BATTLE_FRONTIER, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_NONE, MAPSEC_NONE, MAPSEC_DEWFORD_TOWN, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_108, MAPSEC_ROUTE_108, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SOUTHERN_ISLAND, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE
+};
+
+#include "data/region_map/region_map_entries.h"
+
 extern const u16 gUnknown_085A1B24[][2];
 extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B8A[];
@@ -601,7 +619,7 @@ static u16 GetRegionMapSectionIdAt_Internal(u16 x, u16 y)
     }
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
-    return gUnknown_085A096C[x + y * MAP_WIDTH];
+    return sRegionMap_MapSectionLayout[x + y * MAP_WIDTH];
 }
 
 static void RegionMap_InitializeStateBasedOnPlayerLocation(void)