sync region map data formats with pokeemerald

10 files changed, 395 insertions, 337 deletions

diff --git a/src/data/battle_tower/level_100_mons.h b/src/data/battle_tower/level_100_mons.h
index 4f2b711ee..ed7359979 100644
--- a/src/data/battle_tower/level_100_mons.h
+++ b/src/data/battle_tower/level_100_mons.h
@@ -3900,4 +3900,4 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] =
 		.evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
 		.nature = NATURE_HARDY,
 	},
-};
\ No newline at end of file
+};
diff --git a/src/data/graphics.c b/src/data/graphics.c
index 60ba81dab..7aa3a4384 100644
--- a/src/data/graphics.c
+++ b/src/data/graphics.c
@@ -1058,9 +1058,9 @@ const u16 gPokenavMenuOptions2_Pal[] = INCBIN_U16("graphics/pokenav/pokenav2.gba
 const u16 gPokenavMenuOptions3_Pal[] = INCBIN_U16("graphics/pokenav/pokenav3.gbapal");
 const u8 gPokenavHoennMapHeader_Gfx[] = INCBIN_U8("graphics/pokenav/map_header.4bpp.lz");
 const u8 gPokenavHoennMapMisc_Gfx[] = INCBIN_U8("graphics/pokenav/map_misc2.4bpp.lz");
-const u8 gPokenavHoennMapSquares_Gfx[] = INCBIN_U8("graphics/pokenav/map_squares.4bpp.lz");
+const u8 gPokenavHoennMapSquares_Gfx[] = INCBIN_U8("graphics/pokenav/zoom_tiles.4bpp.lz");
 const u16 gPokenavHoennMap1_Pal[] = INCBIN_U16("graphics/pokenav/map_menu.gbapal");
-const u8 gPokenavHoennMapSquares_Pal[] = INCBIN_U8("graphics/pokenav/map_squares.gbapal");
+const u8 gPokenavHoennMapSquares_Pal[] = INCBIN_U8("graphics/pokenav/zoom_tiles.gbapal");
 const u8 gPokenavConditionMenu_Gfx[] = INCBIN_U8("graphics/pokenav/condition_menu.4bpp.lz");
 const u16 gPokenavConditionMenu_Pal[] = INCBIN_U16("graphics/pokenav/condition1.gbapal");
 const u8 gPokenavConditionMenuHeader_Gfx[] = INCBIN_U8("graphics/pokenav/condition_menu_header.4bpp.lz");
diff --git a/src/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h
new file mode 100644
index 000000000..b41d729bf
--- /dev/null
+++ b/src/data/region_map/region_map_entries.h
@@ -0,0 +1,175 @@
+#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
+#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
+
+static const u8 sMapName_LittlerootTown[] = _("LITTLEROOT{NAME_END} TOWN");
+static const u8 sMapName_OldaleTown[] = _("OLDALE{NAME_END} TOWN");
+static const u8 sMapName_DewfordTown[] = _("DEWFORD{NAME_END} TOWN");
+static const u8 sMapName_LavaridgeTown[] = _("LAVARIDGE{NAME_END} TOWN");
+static const u8 sMapName_FallarborTown[] = _("FALLARBOR{NAME_END} TOWN");
+static const u8 sMapName_VerdanturfTown[] = _("VERDANTURF{NAME_END} TOWN");
+static const u8 sMapName_PacifidlogTown[] = _("PACIFIDLOG{NAME_END} TOWN");
+static const u8 sMapName_PetalburgCity[] = _("PETALBURG{NAME_END} CITY");
+static const u8 sMapName_SlateportCity[] = _("SLATEPORT{NAME_END} CITY");
+static const u8 sMapName_MauvilleCity[] = _("MAUVILLE{NAME_END} CITY");
+static const u8 sMapName_RustboroCity[] = _("RUSTBORO{NAME_END} CITY");
+static const u8 sMapName_FortreeCity[] = _("FORTREE{NAME_END} CITY");
+static const u8 sMapName_LilycoveCity[] = _("LILYCOVE{NAME_END} CITY");
+static const u8 sMapName_MossdeepCity[] = _("MOSSDEEP{NAME_END} CITY");
+static const u8 sMapName_SootopolisCity[] = _("SOOTOPOLIS{NAME_END} CITY");
+static const u8 sMapName_EverGrandeCity[] = _("EVER GRANDE{NAME_END} CITY");
+static const u8 sMapName_Route101[] = _("ROUTE 101");
+static const u8 sMapName_Route102[] = _("ROUTE 102");
+static const u8 sMapName_Route103[] = _("ROUTE 103");
+static const u8 sMapName_Route104[] = _("ROUTE 104");
+static const u8 sMapName_Route105[] = _("ROUTE 105");
+static const u8 sMapName_Route106[] = _("ROUTE 106");
+static const u8 sMapName_Route107[] = _("ROUTE 107");
+static const u8 sMapName_Route108[] = _("ROUTE 108");
+static const u8 sMapName_Route109[] = _("ROUTE 109");
+static const u8 sMapName_Route110[] = _("ROUTE 110");
+static const u8 sMapName_Route111[] = _("ROUTE 111");
+static const u8 sMapName_Route112[] = _("ROUTE 112");
+static const u8 sMapName_Route113[] = _("ROUTE 113");
+static const u8 sMapName_Route114[] = _("ROUTE 114");
+static const u8 sMapName_Route115[] = _("ROUTE 115");
+static const u8 sMapName_Route116[] = _("ROUTE 116");
+static const u8 sMapName_Route117[] = _("ROUTE 117");
+static const u8 sMapName_Route118[] = _("ROUTE 118");
+static const u8 sMapName_Route119[] = _("ROUTE 119");
+static const u8 sMapName_Route120[] = _("ROUTE 120");
+static const u8 sMapName_Route121[] = _("ROUTE 121");
+static const u8 sMapName_Route122[] = _("ROUTE 122");
+static const u8 sMapName_Route123[] = _("ROUTE 123");
+static const u8 sMapName_Route124[] = _("ROUTE 124");
+static const u8 sMapName_Route125[] = _("ROUTE 125");
+static const u8 sMapName_Route126[] = _("ROUTE 126");
+static const u8 sMapName_Route127[] = _("ROUTE 127");
+static const u8 sMapName_Route128[] = _("ROUTE 128");
+static const u8 sMapName_Route129[] = _("ROUTE 129");
+static const u8 sMapName_Route130[] = _("ROUTE 130");
+static const u8 sMapName_Route131[] = _("ROUTE 131");
+static const u8 sMapName_Route132[] = _("ROUTE 132");
+static const u8 sMapName_Route133[] = _("ROUTE 133");
+static const u8 sMapName_Route134[] = _("ROUTE 134");
+static const u8 sMapName_Underwater[] = _("UNDERWATER");
+static const u8 sMapName_GraniteCave[] = _("GRANITE CAVE");
+static const u8 sMapName_MtChimney[] = _("MT. CHIMNEY");
+static const u8 sMapName_SafariZone[] = _("SAFARI ZONE");
+static const u8 sMapName_BattleTower[] = _("BATTLE TOWER");
+static const u8 sMapName_PetalburgWoods[] = _("PETALBURG WOODS");
+static const u8 sMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
+static const u8 sMapName_AbandonedShip[] = _("ABANDONED SHIP");
+static const u8 sMapName_NewMauville[] = _("NEW MAUVILLE");
+static const u8 sMapName_MeteorFalls[] = _("METEOR FALLS");
+static const u8 sMapName_MtPyre[] = _("MT. PYRE");
+static const u8 sMapName_EvilTeamHideout[] = _("{EVIL_TEAM} HIDEOUT");
+static const u8 sMapName_ShoalCave[] = _("SHOAL CAVE");
+static const u8 sMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
+static const u8 sMapName_VictoryRoad[] = _("VICTORY ROAD");
+static const u8 sMapName_MirageIsland[] = _("MIRAGE ISLAND");
+static const u8 sMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
+static const u8 sMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
+static const u8 sMapName_FieryPath[] = _("FIERY PATH");
+static const u8 sMapName_JaggedPass[] = _("JAGGED PASS");
+static const u8 sMapName_SealedChamber[] = _("SEALED CHAMBER");
+static const u8 sMapName_ScorchedSlab[] = _("SCORCHED SLAB");
+static const u8 sMapName_IslandCave[] = _("ISLAND CAVE");
+static const u8 sMapName_DesertRuins[] = _("DESERT RUINS");
+static const u8 sMapName_AncientTomb[] = _("ANCIENT TOMB");
+static const u8 sMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
+static const u8 sMapName_SkyPillar[] = _("SKY PILLAR");
+static const u8 sMapName_SecretBase[] = _("SECRET BASE");
+static const u8 sMapName_None[] = _("");
+
+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_TOWER]              = {22, 12, 1, 1, sMapName_BattleTower},
+    [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_FALLS_2]            = { 1,  2, 1, 1, sMapName_MeteorFalls},
+    [MAPSEC_MT_PYRE]                   = {16,  4, 1, 1, sMapName_MtPyre},
+    [MAPSEC_EVIL_TEAM_HIDEOUT]         = {19,  3, 1, 1, sMapName_EvilTeamHideout},
+    [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_PATH_2]              = { 7,  3, 1, 1, sMapName_FieryPath},
+    [MAPSEC_JAGGED_PASS]               = { 6,  3, 1, 1, sMapName_JaggedPass},
+    [MAPSEC_JAGGED_PASS_2]             = { 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},
+};
+
+#endif // GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
diff --git a/src/data/region_map/region_map_entries_de.h b/src/data/region_map/region_map_entries_de.h
new file mode 100644
index 000000000..935db1446
--- /dev/null
+++ b/src/data/region_map/region_map_entries_de.h
@@ -0,0 +1,175 @@
+#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
+#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
+
+static const u8 sMapName_LittlerootTown[] = _("WURZELHEIM");
+static const u8 sMapName_OldaleTown[] = _("ROSALTSTADT");
+static const u8 sMapName_DewfordTown[] = _("FAUSTAUHAVEN");
+static const u8 sMapName_LavaridgeTown[] = _("BAD LAVASTADT");
+static const u8 sMapName_FallarborTown[] = _("LAUBWECHSEL{NAME_END}FELD");
+static const u8 sMapName_VerdanturfTown[] = _("WIESENFLUR");
+static const u8 sMapName_PacifidlogTown[] = _("FLOSSBRUNN");
+static const u8 sMapName_PetalburgCity[] = _("BLÜTENBURG{NAME_END} CITY");
+static const u8 sMapName_SlateportCity[] = _("GRAPHITPORT{NAME_END} CITY");
+static const u8 sMapName_MauvilleCity[] = _("MALVENFROH{NAME_END} CITY");
+static const u8 sMapName_RustboroCity[] = _("METAROST{NAME_END} CITY");
+static const u8 sMapName_FortreeCity[] = _("BAUMHAUSEN{NAME_END} CITY");
+static const u8 sMapName_LilycoveCity[] = _("SEEGRASULB{NAME_END} CITY");
+static const u8 sMapName_MossdeepCity[] = _("MOOSBACH{NAME_END} CITY");
+static const u8 sMapName_SootopolisCity[] = _("XENEROVILLE");
+static const u8 sMapName_EverGrandeCity[] = _("PRACHTPOLIS{NAME_END} CITY");
+static const u8 sMapName_Route101[] = _("ROUTE 101");
+static const u8 sMapName_Route102[] = _("ROUTE 102");
+static const u8 sMapName_Route103[] = _("ROUTE 103");
+static const u8 sMapName_Route104[] = _("ROUTE 104");
+static const u8 sMapName_Route105[] = _("ROUTE 105");
+static const u8 sMapName_Route106[] = _("ROUTE 106");
+static const u8 sMapName_Route107[] = _("ROUTE 107");
+static const u8 sMapName_Route108[] = _("ROUTE 108");
+static const u8 sMapName_Route109[] = _("ROUTE 109");
+static const u8 sMapName_Route110[] = _("ROUTE 110");
+static const u8 sMapName_Route111[] = _("ROUTE 111");
+static const u8 sMapName_Route112[] = _("ROUTE 112");
+static const u8 sMapName_Route113[] = _("ROUTE 113");
+static const u8 sMapName_Route114[] = _("ROUTE 114");
+static const u8 sMapName_Route115[] = _("ROUTE 115");
+static const u8 sMapName_Route116[] = _("ROUTE 116");
+static const u8 sMapName_Route117[] = _("ROUTE 117");
+static const u8 sMapName_Route118[] = _("ROUTE 118");
+static const u8 sMapName_Route119[] = _("ROUTE 119");
+static const u8 sMapName_Route120[] = _("ROUTE 120");
+static const u8 sMapName_Route121[] = _("ROUTE 121");
+static const u8 sMapName_Route122[] = _("ROUTE 122");
+static const u8 sMapName_Route123[] = _("ROUTE 123");
+static const u8 sMapName_Route124[] = _("ROUTE 124");
+static const u8 sMapName_Route125[] = _("ROUTE 125");
+static const u8 sMapName_Route126[] = _("ROUTE 126");
+static const u8 sMapName_Route127[] = _("ROUTE 127");
+static const u8 sMapName_Route128[] = _("ROUTE 128");
+static const u8 sMapName_Route129[] = _("ROUTE 129");
+static const u8 sMapName_Route130[] = _("ROUTE 130");
+static const u8 sMapName_Route131[] = _("ROUTE 131");
+static const u8 sMapName_Route132[] = _("ROUTE 132");
+static const u8 sMapName_Route133[] = _("ROUTE 133");
+static const u8 sMapName_Route134[] = _("ROUTE 134");
+static const u8 sMapName_Underwater[] = _("UNTERWASSER");
+static const u8 sMapName_GraniteCave[] = _("GRANITHÖHLE");
+static const u8 sMapName_MtChimney[] = _("SCHLOTBERG");
+static const u8 sMapName_SafariZone[] = _("SAFARI-ZONE");
+static const u8 sMapName_BattleTower[] = _("DUELLTURM");
+static const u8 sMapName_PetalburgWoods[] = _("BLÜTENBURGWALD");
+static const u8 sMapName_RusturfTunnel[] = _("METAFLURTUNNEL");
+static const u8 sMapName_AbandonedShip[] = _("SCHIFFSWRACK");
+static const u8 sMapName_NewMauville[] = _("NEU MALVENFROH");
+static const u8 sMapName_MeteorFalls[] = _("METEORFÄLLE");
+static const u8 sMapName_MtPyre[] = _("PYROBERG");
+static const u8 sMapName_EvilTeamHideout[] = _("{EVIL_TEAM}s VERSTECK");
+static const u8 sMapName_ShoalCave[] = _("KÜSTENHÖHLE");
+static const u8 sMapName_SeafloorCavern[] = _("TIEFSEEHÖHLE");
+static const u8 sMapName_VictoryRoad[] = _("SIEGESSTRASSE");
+static const u8 sMapName_MirageIsland[] = _("WUNDEREILAND");
+static const u8 sMapName_CaveOfOrigin[] = _("URZEITHÖHLE");
+static const u8 sMapName_SouthernIsland[] = _("INSEL IM SÜDEN");
+static const u8 sMapName_FieryPath[] = _("FEURIGER PFAD");
+static const u8 sMapName_JaggedPass[] = _("STEILPASS");
+static const u8 sMapName_SealedChamber[] = _("SIEGELKAMMER");
+static const u8 sMapName_ScorchedSlab[] = _("SONNENGROTTE");
+static const u8 sMapName_IslandCave[] = _("INSELHÖHLE");
+static const u8 sMapName_DesertRuins[] = _("WÜSTENRUINE");
+static const u8 sMapName_AncientTomb[] = _("GRABMAL");
+static const u8 sMapName_InsideOfTruck[] = _("IM MÖBELWAGEN");
+static const u8 sMapName_SkyPillar[] = _("HIMMELTURM");
+static const u8 sMapName_SecretBase[] = _("GEHEIMBASIS");
+static const u8 sMapName_None[] = _("");
+
+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_TOWER]              = {22, 12, 1, 1, sMapName_BattleTower},
+    [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_FALLS_2]            = { 1,  2, 1, 1, sMapName_MeteorFalls},
+    [MAPSEC_MT_PYRE]                   = {16,  4, 1, 1, sMapName_MtPyre},
+    [MAPSEC_EVIL_TEAM_HIDEOUT]         = {19,  3, 1, 1, sMapName_EvilTeamHideout},
+    [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_PATH_2]              = { 7,  3, 1, 1, sMapName_FieryPath},
+    [MAPSEC_JAGGED_PASS]               = { 6,  3, 1, 1, sMapName_JaggedPass},
+    [MAPSEC_JAGGED_PASS_2]             = { 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},
+};
+
+#endif // GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
diff --git a/src/data/region_map_layout.h b/src/data/region_map_layout.h
deleted file mode 100644
index 1bc93cbb3..000000000
--- a/src/data/region_map_layout.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Abbreviated definitions to make the map layout more visual
-#define R(routeNum) MAPSEC_ROUTE_##routeNum
-#define LITT_T      MAPSEC_LITTLEROOT_TOWN
-#define OLDA_T      MAPSEC_OLDALE_TOWN
-#define DEWF_T      MAPSEC_DEWFORD_TOWN
-#define LAVA_T      MAPSEC_LAVARIDGE_TOWN
-#define FALL_T      MAPSEC_FALLARBOR_TOWN
-#define VERD_T      MAPSEC_VERDANTURF_TOWN
-#define PACI_T      MAPSEC_PACIFIDLOG_TOWN
-#define PETA_C      MAPSEC_PETALBURG_CITY
-#define SLAT_C      MAPSEC_SLATEPORT_CITY
-#define MAUV_C      MAPSEC_MAUVILLE_CITY
-#define RUST_C      MAPSEC_RUSTBORO_CITY
-#define FORT_C      MAPSEC_FORTREE_CITY
-#define LILY_C      MAPSEC_LILYCOVE_CITY
-#define MOSS_C      MAPSEC_MOSSDEEP_CITY
-#define SOOT_C      MAPSEC_SOOTOPOLIS_CITY
-#define EVER_C      MAPSEC_EVER_GRANDE_CITY
-#define MTCHIM      MAPSEC_MT_CHIMNEY
-#define SAFARI      MAPSEC_SAFARI_ZONE
-#define BTLTWR      MAPSEC_BATTLE_TOWER
-#define S_ISLD      MAPSEC_SOUTHERN_ISLAND
-#define ______      MAPSEC_NOTHING
-
-static const u8 sRegionMapLayout[] =
-{
-    ______, R(114), R(114), FALL_T, R(113), R(113), R(113), R(113), R(111), ______, ______, R(119), FORT_C, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-    ______, R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-    R(115), R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, SAFARI, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-    R(115), ______, ______, ______, ______, LAVA_T, R(112), R(112), R(111), ______, ______, R(119), ______, R(120), R(121), R(121), R(121), R(121), LILY_C, LILY_C, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______,
-    R(115), ______, ______, ______, ______, ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______,
-    RUST_C, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______,
-    RUST_C, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______,
-    R(104), ______, ______, ______, ______, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), SOOT_C, R(126), R(127), R(127), R(127), ______, ______,
-    R(104), ______, ______, ______, R(103), R(103), R(103), R(103), R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, EVER_C,
-    R(104), PETA_C, R(102), R(102), OLDA_T, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(128), R(128), R(128), R(128), EVER_C,
-    R(105), ______, ______, ______, R(101), ______, ______, ______, SLAT_C, R(134), R(134), R(134), R(133), R(133), R(133), R(132), R(132), PACI_T, R(131), R(131), R(131), R(130), R(130), R(130), R(129), R(129), ______, ______,
-    R(105), ______, ______, ______, LITT_T, ______, ______, ______, SLAT_C, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-    R(105), ______, ______, ______, ______, ______, ______, ______, R(109), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, BTLTWR, ______, ______, ______, ______, ______,
-    R(106), R(106), R(106), ______, ______, ______, ______, ______, R(109), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-    ______, ______, DEWF_T, R(107), R(107), R(107), R(108), R(108), R(109), ______, ______, ______, S_ISLD, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-};
diff --git a/src/data/region_map_names_de.h b/src/data/region_map_names_de.h
deleted file mode 100644
index 10f53c8ba..000000000
--- a/src/data/region_map_names_de.h
+++ /dev/null
@@ -1,79 +0,0 @@
-const u8 gMapName_LittlerootTown[] = _("WURZELHEIM");
-const u8 gMapName_OldaleTown[] = _("ROSALTSTADT");
-const u8 gMapName_DewfordTown[] = _("FAUSTAUHAVEN");
-const u8 gMapName_LavaridgeTown[] = _("BAD LAVASTADT");
-const u8 gMapName_FallarborTown[] = _("LAUBWECHSEL{NAME_END}FELD");
-const u8 gMapName_VerdanturfTown[] = _("WIESENFLUR");
-const u8 gMapName_PacifidlogTown[] = _("FLOSSBRUNN");
-const u8 gMapName_PetalburgCity[] = _("BLÜTENBURG{NAME_END} CITY");
-const u8 gMapName_SlateportCity[] = _("GRAPHITPORT{NAME_END} CITY");
-const u8 gMapName_MauvilleCity[] = _("MALVENFROH{NAME_END} CITY");
-const u8 gMapName_RustboroCity[] = _("METAROST{NAME_END} CITY");
-const u8 gMapName_FortreeCity[] = _("BAUMHAUSEN{NAME_END} CITY");
-const u8 gMapName_LilycoveCity[] = _("SEEGRASULB{NAME_END} CITY");
-const u8 gMapName_MossdeepCity[] = _("MOOSBACH{NAME_END} CITY");
-const u8 gMapName_SootopolisCity[] = _("XENEROVILLE");
-const u8 gMapName_EverGrandeCity[] = _("PRACHTPOLIS{NAME_END} CITY");
-const u8 gMapName_Route101[] = _("ROUTE 101");
-const u8 gMapName_Route102[] = _("ROUTE 102");
-const u8 gMapName_Route103[] = _("ROUTE 103");
-const u8 gMapName_Route104[] = _("ROUTE 104");
-const u8 gMapName_Route105[] = _("ROUTE 105");
-const u8 gMapName_Route106[] = _("ROUTE 106");
-const u8 gMapName_Route107[] = _("ROUTE 107");
-const u8 gMapName_Route108[] = _("ROUTE 108");
-const u8 gMapName_Route109[] = _("ROUTE 109");
-const u8 gMapName_Route110[] = _("ROUTE 110");
-const u8 gMapName_Route111[] = _("ROUTE 111");
-const u8 gMapName_Route112[] = _("ROUTE 112");
-const u8 gMapName_Route113[] = _("ROUTE 113");
-const u8 gMapName_Route114[] = _("ROUTE 114");
-const u8 gMapName_Route115[] = _("ROUTE 115");
-const u8 gMapName_Route116[] = _("ROUTE 116");
-const u8 gMapName_Route117[] = _("ROUTE 117");
-const u8 gMapName_Route118[] = _("ROUTE 118");
-const u8 gMapName_Route119[] = _("ROUTE 119");
-const u8 gMapName_Route120[] = _("ROUTE 120");
-const u8 gMapName_Route121[] = _("ROUTE 121");
-const u8 gMapName_Route122[] = _("ROUTE 122");
-const u8 gMapName_Route123[] = _("ROUTE 123");
-const u8 gMapName_Route124[] = _("ROUTE 124");
-const u8 gMapName_Route125[] = _("ROUTE 125");
-const u8 gMapName_Route126[] = _("ROUTE 126");
-const u8 gMapName_Route127[] = _("ROUTE 127");
-const u8 gMapName_Route128[] = _("ROUTE 128");
-const u8 gMapName_Route129[] = _("ROUTE 129");
-const u8 gMapName_Route130[] = _("ROUTE 130");
-const u8 gMapName_Route131[] = _("ROUTE 131");
-const u8 gMapName_Route132[] = _("ROUTE 132");
-const u8 gMapName_Route133[] = _("ROUTE 133");
-const u8 gMapName_Route134[] = _("ROUTE 134");
-const u8 gMapName_Underwater[] = _("UNTERWASSER");
-const u8 gMapName_GraniteCave[] = _("GRANITHÖHLE");
-const u8 gMapName_MtChimney[] = _("SCHLOTBERG");
-const u8 gMapName_SafariZone[] = _("SAFARI-ZONE");
-const u8 gMapName_BattleTower[] = _("DUELLTURM");
-const u8 gMapName_PetalburgWoods[] = _("BLÜTENBURGWALD");
-const u8 gMapName_RusturfTunnel[] = _("METAFLURTUNNEL");
-const u8 gMapName_AbandonedShip[] = _("SCHIFFSWRACK");
-const u8 gMapName_NewMauville[] = _("NEU MALVENFROH");
-const u8 gMapName_MeteorFalls[] = _("METEORFÄLLE");
-const u8 gMapName_MtPyre[] = _("PYROBERG");
-const u8 gMapName_EvilTeamHideout[] = _("{EVIL_TEAM}s VERSTECK");
-const u8 gMapName_ShoalCave[] = _("KÜSTENHÖHLE");
-const u8 gMapName_SeafloorCavern[] = _("TIEFSEEHÖHLE");
-const u8 gMapName_VictoryRoad[] = _("SIEGESSTRASSE");
-const u8 gMapName_MirageIsland[] = _("WUNDEREILAND");
-const u8 gMapName_CaveOfOrigin[] = _("URZEITHÖHLE");
-const u8 gMapName_SouthernIsland[] = _("INSEL IM SÜDEN");
-const u8 gMapName_FieryPath[] = _("FEURIGER PFAD");
-const u8 gMapName_JaggedPass[] = _("STEILPASS");
-const u8 gMapName_SealedChamber[] = _("SIEGELKAMMER");
-const u8 gMapName_ScorchedSlab[] = _("SONNENGROTTE");
-const u8 gMapName_IslandCave[] = _("INSELHÖHLE");
-const u8 gMapName_DesertRuins[] = _("WÜSTENRUINE");
-const u8 gMapName_AncientTomb[] = _("GRABMAL");
-const u8 gMapName_InsideOfTruck[] = _("IM MÖBELWAGEN");
-const u8 gMapName_SkyPillar[] = _("HIMMELTURM");
-const u8 gMapName_SecretBase[] = _("GEHEIMBASIS");
-const u8 gMapName_None[] = _("");
diff --git a/src/data/region_map_names_en.h b/src/data/region_map_names_en.h
deleted file mode 100644
index 9dde3d71a..000000000
--- a/src/data/region_map_names_en.h
+++ /dev/null
@@ -1,79 +0,0 @@
-const u8 gMapName_LittlerootTown[] = _("LITTLEROOT{NAME_END} TOWN");
-const u8 gMapName_OldaleTown[] = _("OLDALE{NAME_END} TOWN");
-const u8 gMapName_DewfordTown[] = _("DEWFORD{NAME_END} TOWN");
-const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE{NAME_END} TOWN");
-const u8 gMapName_FallarborTown[] = _("FALLARBOR{NAME_END} TOWN");
-const u8 gMapName_VerdanturfTown[] = _("VERDANTURF{NAME_END} TOWN");
-const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG{NAME_END} TOWN");
-const u8 gMapName_PetalburgCity[] = _("PETALBURG{NAME_END} CITY");
-const u8 gMapName_SlateportCity[] = _("SLATEPORT{NAME_END} CITY");
-const u8 gMapName_MauvilleCity[] = _("MAUVILLE{NAME_END} CITY");
-const u8 gMapName_RustboroCity[] = _("RUSTBORO{NAME_END} CITY");
-const u8 gMapName_FortreeCity[] = _("FORTREE{NAME_END} CITY");
-const u8 gMapName_LilycoveCity[] = _("LILYCOVE{NAME_END} CITY");
-const u8 gMapName_MossdeepCity[] = _("MOSSDEEP{NAME_END} CITY");
-const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS{NAME_END} CITY");
-const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE{NAME_END} CITY");
-const u8 gMapName_Route101[] = _("ROUTE 101");
-const u8 gMapName_Route102[] = _("ROUTE 102");
-const u8 gMapName_Route103[] = _("ROUTE 103");
-const u8 gMapName_Route104[] = _("ROUTE 104");
-const u8 gMapName_Route105[] = _("ROUTE 105");
-const u8 gMapName_Route106[] = _("ROUTE 106");
-const u8 gMapName_Route107[] = _("ROUTE 107");
-const u8 gMapName_Route108[] = _("ROUTE 108");
-const u8 gMapName_Route109[] = _("ROUTE 109");
-const u8 gMapName_Route110[] = _("ROUTE 110");
-const u8 gMapName_Route111[] = _("ROUTE 111");
-const u8 gMapName_Route112[] = _("ROUTE 112");
-const u8 gMapName_Route113[] = _("ROUTE 113");
-const u8 gMapName_Route114[] = _("ROUTE 114");
-const u8 gMapName_Route115[] = _("ROUTE 115");
-const u8 gMapName_Route116[] = _("ROUTE 116");
-const u8 gMapName_Route117[] = _("ROUTE 117");
-const u8 gMapName_Route118[] = _("ROUTE 118");
-const u8 gMapName_Route119[] = _("ROUTE 119");
-const u8 gMapName_Route120[] = _("ROUTE 120");
-const u8 gMapName_Route121[] = _("ROUTE 121");
-const u8 gMapName_Route122[] = _("ROUTE 122");
-const u8 gMapName_Route123[] = _("ROUTE 123");
-const u8 gMapName_Route124[] = _("ROUTE 124");
-const u8 gMapName_Route125[] = _("ROUTE 125");
-const u8 gMapName_Route126[] = _("ROUTE 126");
-const u8 gMapName_Route127[] = _("ROUTE 127");
-const u8 gMapName_Route128[] = _("ROUTE 128");
-const u8 gMapName_Route129[] = _("ROUTE 129");
-const u8 gMapName_Route130[] = _("ROUTE 130");
-const u8 gMapName_Route131[] = _("ROUTE 131");
-const u8 gMapName_Route132[] = _("ROUTE 132");
-const u8 gMapName_Route133[] = _("ROUTE 133");
-const u8 gMapName_Route134[] = _("ROUTE 134");
-const u8 gMapName_Underwater[] = _("UNDERWATER");
-const u8 gMapName_GraniteCave[] = _("GRANITE CAVE");
-const u8 gMapName_MtChimney[] = _("MT. CHIMNEY");
-const u8 gMapName_SafariZone[] = _("SAFARI ZONE");
-const u8 gMapName_BattleTower[] = _("BATTLE TOWER");
-const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS");
-const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
-const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP");
-const u8 gMapName_NewMauville[] = _("NEW MAUVILLE");
-const u8 gMapName_MeteorFalls[] = _("METEOR FALLS");
-const u8 gMapName_MtPyre[] = _("MT. PYRE");
-const u8 gMapName_EvilTeamHideout[] = _("{EVIL_TEAM} HIDEOUT");
-const u8 gMapName_ShoalCave[] = _("SHOAL CAVE");
-const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
-const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD");
-const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND");
-const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
-const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
-const u8 gMapName_FieryPath[] = _("FIERY PATH");
-const u8 gMapName_JaggedPass[] = _("JAGGED PASS");
-const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER");
-const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB");
-const u8 gMapName_IslandCave[] = _("ISLAND CAVE");
-const u8 gMapName_DesertRuins[] = _("DESERT RUINS");
-const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB");
-const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
-const u8 gMapName_SkyPillar[] = _("SKY PILLAR");
-const u8 gMapName_SecretBase[] = _("SECRET BASE");
-const u8 gMapName_None[] = _("");
diff --git a/src/landmark.c b/src/landmark.c
index 0572da4ca..520f88718 100644
--- a/src/landmark.c
+++ b/src/landmark.c
@@ -360,7 +360,7 @@ static const struct LandmarkList gLandmarkLists[] =
     {MAPSEC_ROUTE_134, 1, Landmarks_OceanCurrent},
     {MAPSEC_ROUTE_134, 2, Landmarks_Route134_2},
     {MAPSEC_MT_CHIMNEY, 2, Landmarks_MtChimney_2},
-    {MAPSEC_NOTHING, 0, NULL},
+    {MAPSEC_NONE, 0, NULL},
 };
 
 static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id);
@@ -396,7 +396,7 @@ static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id)
 {
     u16 i = 0;
 
-    for (; gLandmarkLists[i].mapSection != MAPSEC_NOTHING; i++)
+    for (; gLandmarkLists[i].mapSection != MAPSEC_NONE; i++)
     {
         if (gLandmarkLists[i].mapSection > mapSection)
             return NULL;
@@ -404,7 +404,7 @@ static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id)
             break;
     }
 
-    if (gLandmarkLists[i].mapSection == MAPSEC_NOTHING)
+    if (gLandmarkLists[i].mapSection == MAPSEC_NONE)
         return NULL;
 
     for (; gLandmarkLists[i].mapSection == mapSection; i++)
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index 76efdf08d..cd697270c 100644
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -98,7 +98,7 @@ static const u16 sFeebasData[][3] = {
 static const u16 sLandmarkData[][2] = {
     {MAPSEC_SKY_PILLAR,      FLAG_LANDMARK_SKY_PILLAR},
     {MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN},
-    {MAPSEC_NOTHING}
+    {MAPSEC_NONE}
 };
 
 static struct PokedexAreaScreenEwramStruct *const gPokedexAreaScreenPtr = &ePokedexAreaScreen;
@@ -302,9 +302,9 @@ static void SetSpecialMapHasMon(u16 mapGroup, u16 mapNum)
     if (gPokedexAreaScreenPtr->numSpecialAreas < 0x20)
     {
         mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
-        if (mapHeader->regionMapSectionId < MAPSEC_NOTHING)
+        if (mapHeader->regionMapSectionId < MAPSEC_NONE)
         {
-            for (i = 0; sLandmarkData[i][0] != MAPSEC_NOTHING; i++)
+            for (i = 0; sLandmarkData[i][0] != MAPSEC_NONE; i++)
             {
                 if (mapHeader->regionMapSectionId == sLandmarkData[i][0] && !FlagGet(sLandmarkData[i][1]))
                     return;
@@ -1348,10 +1348,10 @@ static void CreateAreaMarkerSprites(void)
     for (i = 0; i < gPokedexAreaScreenPtr->numSpecialAreas; i++)
     {
         mapSecId = gPokedexAreaScreenPtr->specialAreaRegionMapSectionIds[i];
-        x = 8 * (gRegionMapLocations[mapSecId].x + 1) + 4;
-        y = 8 * (gRegionMapLocations[mapSecId].y) + 28;
-        x += 4 * (gRegionMapLocations[mapSecId].width - 1);
-        y += 4 * (gRegionMapLocations[mapSecId].height - 1);
+        x = 8 * (gRegionMapEntries[mapSecId].x + 1) + 4;
+        y = 8 * (gRegionMapEntries[mapSecId].y) + 28;
+        x += 4 * (gRegionMapEntries[mapSecId].width - 1);
+        y += 4 * (gRegionMapEntries[mapSecId].height - 1);
         spriteId = CreateSprite(&sAreaMarkerSpriteTemplate, x, y, 0);
         if (spriteId != MAX_SPRITES)
         {
diff --git a/src/region_map.c b/src/region_map.c
index e9ae4599a..7ec1b1976 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -53,106 +53,14 @@ static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map
 static const u8 sRegionMapBkgnd_ImageLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
 static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
 
-#include "data/region_map_layout.h"
+static const u8 sRegionMapLayout[] = INCBIN_U8("graphics/pokenav/region_map_section_layout.bin");
 
 #if ENGLISH
-#include "data/region_map_names_en.h"
+#include "data/region_map/region_map_entries.h"
 #elif GERMAN
-#include "data/region_map_names_de.h"
+#include "data/region_map/region_map_entries_de.h"
 #endif
 
-const struct RegionMapLocation gRegionMapLocations[] =
-{
-    { 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_BattleTower},
-    { 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_EvilTeamHideout},
-    {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},
-};
-
 static const u16 sUnderwaterMaps[][2] =
 {
     {MAPSEC_UNDERWATER_124,       MAPSEC_ROUTE_124},
@@ -167,7 +75,7 @@ static const u16 sUnderwaterMaps[][2] =
     {MAPSEC_JAGGED_PASS,     MAPSEC_ROUTE_112},
     {MAPSEC_MT_PYRE,           MAPSEC_ROUTE_122},
     {MAPSEC_SKY_PILLAR,        MAPSEC_ROUTE_131},
-    {MAPSEC_NOTHING,              MAPSEC_NOTHING},
+    {MAPSEC_NONE,              MAPSEC_NONE},
 };
 
 static u8 sub_80FAB78(void);
@@ -595,7 +503,7 @@ void RegionMapDefaultZoomOffsetPlayerSprite(s16 a, s16 b)
 static u16 GetRegionMapSectionAt(u16 x, u16 y)
 {
     if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
-        return MAPSEC_NOTHING;
+        return MAPSEC_NONE;
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
     return sRegionMapLayout[x + y * 28];
@@ -683,19 +591,19 @@ static void InitializeCursorPosition(void)
 
     r9 = x;
 
-    r1 = mapWidth / gRegionMapLocations[gRegionMap->mapSectionId].width;
+    r1 = mapWidth / gRegionMapEntries[gRegionMap->mapSectionId].width;
     if (r1 == 0)
         r1 = 1;
     x /= r1;
-    if (x >= gRegionMapLocations[gRegionMap->mapSectionId].width)
-        x = gRegionMapLocations[gRegionMap->mapSectionId].width - 1;
+    if (x >= gRegionMapEntries[gRegionMap->mapSectionId].width)
+        x = gRegionMapEntries[gRegionMap->mapSectionId].width - 1;
 
-    r1 = mapHeight / gRegionMapLocations[gRegionMap->mapSectionId].height;
+    r1 = mapHeight / gRegionMapEntries[gRegionMap->mapSectionId].height;
     if (r1 == 0)
         r1 = 1;
     y /= r1;
-    if (y >= gRegionMapLocations[gRegionMap->mapSectionId].height)
-        y = gRegionMapLocations[gRegionMap->mapSectionId].height - 1;
+    if (y >= gRegionMapEntries[gRegionMap->mapSectionId].height)
+        y = gRegionMapEntries[gRegionMap->mapSectionId].height - 1;
 
     switch (gRegionMap->mapSectionId)
     {
@@ -726,8 +634,8 @@ static void InitializeCursorPosition(void)
             x++;
         break;
     }
-    gRegionMap->cursorPosX = gRegionMapLocations[gRegionMap->mapSectionId].x + x + MAPCURSOR_X_MIN;
-    gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSectionId].y + y + MAPCURSOR_Y_MIN;
+    gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSectionId].x + x + MAPCURSOR_X_MIN;
+    gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSectionId].y + y + MAPCURSOR_Y_MIN;
 }
 
 static void sub_80FB600(void)
@@ -760,32 +668,32 @@ static void sub_80FB600(void)
             u16 r1;
 
             gRegionMap->mapSectionId = mapHeader->regionMapSectionId;
-            r1 = mapHeader->mapLayout->width / gRegionMapLocations[gRegionMap->mapSectionId].width;
+            r1 = mapHeader->mapLayout->width / gRegionMapEntries[gRegionMap->mapSectionId].width;
             if (r1 == 0)
                 r1 = 1;
             x = sp2 / r1;
-            if (x >= gRegionMapLocations[gRegionMap->mapSectionId].width)
-                x = gRegionMapLocations[gRegionMap->mapSectionId].width - 1;
+            if (x >= gRegionMapEntries[gRegionMap->mapSectionId].width)
+                x = gRegionMapEntries[gRegionMap->mapSectionId].width - 1;
 
-            r1 = mapHeader->mapLayout->height / gRegionMapLocations[gRegionMap->mapSectionId].height;
+            r1 = mapHeader->mapLayout->height / gRegionMapEntries[gRegionMap->mapSectionId].height;
             if (r1 == 0)
                 r1 = 1;
             y = sp4 / r1;
-            if (y >= gRegionMapLocations[gRegionMap->mapSectionId].height)
-                y = gRegionMapLocations[gRegionMap->mapSectionId].height - 1;
+            if (y >= gRegionMapEntries[gRegionMap->mapSectionId].height)
+                y = gRegionMapEntries[gRegionMap->mapSectionId].height - 1;
         }
         break;
     }
     gRegionMap->playerIsInCave = FALSE;
-    gRegionMap->cursorPosX = gRegionMapLocations[gRegionMap->mapSectionId].x + x + MAPCURSOR_X_MIN;
-    gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSectionId].y + y + MAPCURSOR_Y_MIN;
+    gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSectionId].x + x + MAPCURSOR_X_MIN;
+    gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSectionId].y + y + MAPCURSOR_Y_MIN;
 }
 
 static u16 sub_80FB758(u16 mapSectionId)
 {
     switch (mapSectionId)
     {
-    case MAPSEC_NOTHING:
+    case MAPSEC_NONE:
         return 0;
     case MAPSEC_LITTLEROOT_TOWN:
         return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3;
@@ -838,7 +746,7 @@ static u16 GetOverworldMapFromUnderwaterMap_(u16 mapSectionId)
 {
     u16 i;
 
-    for (i = 0; sUnderwaterMaps[i][0] != MAPSEC_NOTHING; i++)
+    for (i = 0; sUnderwaterMaps[i][0] != MAPSEC_NONE; i++)
     {
         if (sUnderwaterMaps[i][0] == mapSectionId)
             return sUnderwaterMaps[i][1];
@@ -857,7 +765,7 @@ static void sub_80FBA18(void)
     u16 y;
     u16 i;
 
-    if (gRegionMap->mapSectionId == MAPSEC_NOTHING)
+    if (gRegionMap->mapSectionId == MAPSEC_NONE)
     {
         gRegionMap->everGrandeCityArea = 0;
         return;
@@ -1212,8 +1120,8 @@ const u8 *GetMapSectionName(u8 *dest, u16 mapSectionId, u16 length)
 {
     if (mapSectionId == MAPSEC_SECRET_BASE)
         return GetSecretBaseMapName(dest);
-    if (mapSectionId < MAPSEC_NOTHING)
-        return StringCopy(dest, gRegionMapLocations[mapSectionId].regionMapSectionId);
+    if (mapSectionId < MAPSEC_NONE)
+        return StringCopy(dest, gRegionMapEntries[mapSectionId].regionMapSectionId);
     if (length == 0)
         length = 18;
     return StringFill(dest, CHAR_SPACE, length);
@@ -1242,10 +1150,10 @@ const u8 *CopyLocationName(u8 *dest, u16 mapSectionId)
 
 static void GetRegionMapLocationPosition(u16 mapSectionId, u16 *x, u16 *y, u16 *width, u16 *height)
 {
-    *x = gRegionMapLocations[mapSectionId].x;
-    *y = gRegionMapLocations[mapSectionId].y;
-    *width = gRegionMapLocations[mapSectionId].width;
-    *height = gRegionMapLocations[mapSectionId].height;
+    *x = gRegionMapEntries[mapSectionId].x;
+    *y = gRegionMapEntries[mapSectionId].y;
+    *width = gRegionMapEntries[mapSectionId].width;
+    *height = gRegionMapEntries[mapSectionId].height;
 }
 
 struct UnknownStruct3
@@ -1344,7 +1252,7 @@ static const u16 sSpecialFlyAreas[][2] =
 {
     // flag, mapSectionId
     {FLAG_LANDMARK_BATTLE_TOWER, MAPSEC_BATTLE_TOWER},
-    {0xFFFF, MAPSEC_NOTHING},
+    {0xFFFF, MAPSEC_NONE},
 };
 
 static const struct OamData sFlyTargetOamData =
@@ -1609,7 +1517,7 @@ static void CreateSpecialAreaFlyTargetIcons(void)
 {
     u16 i;
 
-    for (i = 0; sSpecialFlyAreas[i][1] != MAPSEC_NOTHING; i++)
+    for (i = 0; sSpecialFlyAreas[i][1] != MAPSEC_NONE; i++)
     {
         u16 x;
         u16 y;