diff --git a/include/constants/.gitignore b/include/constants/.gitignore
index 90e7a74404..3cf23a061d 100644
--- a/include/constants/.gitignore
+++ b/include/constants/.gitignore
@@ -1,3 +1,4 @@
 # Will be moved to build/ eventually
 map_groups.h
 layouts.h
+region_map_sections.h
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
deleted file mode 100644
index 4fa9378f52..0000000000
--- a/include/constants/region_map_sections.h
+++ /dev/null
@@ -1,214 +0,0 @@
-#ifndef GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
-#define GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
-
-#define MAPSEC_LITTLEROOT_TOWN              0x00
-#define MAPSEC_OLDALE_TOWN                  0x01
-#define MAPSEC_DEWFORD_TOWN                 0x02
-#define MAPSEC_LAVARIDGE_TOWN               0x03
-#define MAPSEC_FALLARBOR_TOWN               0x04
-#define MAPSEC_VERDANTURF_TOWN              0x05
-#define MAPSEC_PACIFIDLOG_TOWN              0x06
-#define MAPSEC_PETALBURG_CITY               0x07
-#define MAPSEC_SLATEPORT_CITY               0x08
-#define MAPSEC_MAUVILLE_CITY                0x09
-#define MAPSEC_RUSTBORO_CITY                0x0A
-#define MAPSEC_FORTREE_CITY                 0x0B
-#define MAPSEC_LILYCOVE_CITY                0x0C
-#define MAPSEC_MOSSDEEP_CITY                0x0D
-#define MAPSEC_SOOTOPOLIS_CITY              0x0E
-#define MAPSEC_EVER_GRANDE_CITY             0x0F
-#define MAPSEC_ROUTE_101                    0x10
-#define MAPSEC_ROUTE_102                    0x11
-#define MAPSEC_ROUTE_103                    0x12
-#define MAPSEC_ROUTE_104                    0x13
-#define MAPSEC_ROUTE_105                    0x14
-#define MAPSEC_ROUTE_106                    0x15
-#define MAPSEC_ROUTE_107                    0x16
-#define MAPSEC_ROUTE_108                    0x17
-#define MAPSEC_ROUTE_109                    0x18
-#define MAPSEC_ROUTE_110                    0x19
-#define MAPSEC_ROUTE_111                    0x1A
-#define MAPSEC_ROUTE_112                    0x1B
-#define MAPSEC_ROUTE_113                    0x1C
-#define MAPSEC_ROUTE_114                    0x1D
-#define MAPSEC_ROUTE_115                    0x1E
-#define MAPSEC_ROUTE_116                    0x1F
-#define MAPSEC_ROUTE_117                    0x20
-#define MAPSEC_ROUTE_118                    0x21
-#define MAPSEC_ROUTE_119                    0x22
-#define MAPSEC_ROUTE_120                    0x23
-#define MAPSEC_ROUTE_121                    0x24
-#define MAPSEC_ROUTE_122                    0x25
-#define MAPSEC_ROUTE_123                    0x26
-#define MAPSEC_ROUTE_124                    0x27
-#define MAPSEC_ROUTE_125                    0x28
-#define MAPSEC_ROUTE_126                    0x29
-#define MAPSEC_ROUTE_127                    0x2A
-#define MAPSEC_ROUTE_128                    0x2B
-#define MAPSEC_ROUTE_129                    0x2C
-#define MAPSEC_ROUTE_130                    0x2D
-#define MAPSEC_ROUTE_131                    0x2E
-#define MAPSEC_ROUTE_132                    0x2F
-#define MAPSEC_ROUTE_133                    0x30
-#define MAPSEC_ROUTE_134                    0x31
-#define MAPSEC_UNDERWATER_124               0x32
-#define MAPSEC_UNDERWATER_125               0x33
-#define MAPSEC_UNDERWATER_126               0x34
-#define MAPSEC_UNDERWATER_127               0x35
-#define MAPSEC_UNDERWATER_SOOTOPOLIS        0x36
-#define MAPSEC_GRANITE_CAVE                 0x37
-#define MAPSEC_MT_CHIMNEY                   0x38
-#define MAPSEC_SAFARI_ZONE                  0x39
-#define MAPSEC_BATTLE_FRONTIER              0x3A
-#define MAPSEC_PETALBURG_WOODS              0x3B
-#define MAPSEC_RUSTURF_TUNNEL               0x3C
-#define MAPSEC_ABANDONED_SHIP               0x3D
-#define MAPSEC_NEW_MAUVILLE                 0x3E
-#define MAPSEC_METEOR_FALLS                 0x3F
-#define MAPSEC_METEOR_FALLS2                0x40
-#define MAPSEC_MT_PYRE                      0x41
-#define MAPSEC_AQUA_HIDEOUT_OLD             0x42
-#define MAPSEC_SHOAL_CAVE                   0x43
-#define MAPSEC_SEAFLOOR_CAVERN              0x44
-#define MAPSEC_UNDERWATER_128               0x45
-#define MAPSEC_VICTORY_ROAD                 0x46
-#define MAPSEC_MIRAGE_ISLAND                0x47
-#define MAPSEC_CAVE_OF_ORIGIN               0x48
-#define MAPSEC_SOUTHERN_ISLAND              0x49
-#define MAPSEC_FIERY_PATH                   0x4A
-#define MAPSEC_FIERY_PATH2                  0x4B
-#define MAPSEC_JAGGED_PASS                  0x4C
-#define MAPSEC_JAGGED_PASS2                 0x4D
-#define MAPSEC_SEALED_CHAMBER               0x4E
-#define MAPSEC_UNDERWATER_SEALED_CHAMBER    0x4F
-#define MAPSEC_SCORCHED_SLAB                0x50
-#define MAPSEC_ISLAND_CAVE                  0x51
-#define MAPSEC_DESERT_RUINS                 0x52
-#define MAPSEC_ANCIENT_TOMB                 0x53
-#define MAPSEC_INSIDE_OF_TRUCK              0x54
-#define MAPSEC_SKY_PILLAR                   0x55
-#define MAPSEC_SECRET_BASE                  0x56
-#define MAPSEC_DYNAMIC                      0x57
-
-#define MAPSECS_KANTO                       0x58
-
-#define MAPSEC_PALLET_TOWN                  0x58
-#define MAPSEC_VIRIDIAN_CITY                0x59
-#define MAPSEC_PEWTER_CITY                  0x5A
-#define MAPSEC_CERULEAN_CITY                0x5B
-#define MAPSEC_LAVENDER_TOWN                0x5C
-#define MAPSEC_VERMILION_CITY               0x5D
-#define MAPSEC_CELADON_CITY                 0x5E
-#define MAPSEC_FUCHSIA_CITY                 0x5F
-#define MAPSEC_CINNABAR_ISLAND              0x60
-#define MAPSEC_INDIGO_PLATEAU               0x61
-#define MAPSEC_SAFFRON_CITY                 0x62
-#define MAPSEC_ROUTE_4_POKECENTER           0x63
-#define MAPSEC_ROUTE_10_POKECENTER          0x64
-#define MAPSEC_ROUTE_1                      0x65
-#define MAPSEC_ROUTE_2                      0x66
-#define MAPSEC_ROUTE_3                      0x67
-#define MAPSEC_ROUTE_4                      0x68
-#define MAPSEC_ROUTE_5                      0x69
-#define MAPSEC_ROUTE_6                      0x6A
-#define MAPSEC_ROUTE_7                      0x6B
-#define MAPSEC_ROUTE_8                      0x6C
-#define MAPSEC_ROUTE_9                      0x6D
-#define MAPSEC_ROUTE_10                     0x6E
-#define MAPSEC_ROUTE_11                     0x6F
-#define MAPSEC_ROUTE_12                     0x70
-#define MAPSEC_ROUTE_13                     0x71
-#define MAPSEC_ROUTE_14                     0x72
-#define MAPSEC_ROUTE_15                     0x73
-#define MAPSEC_ROUTE_16                     0x74
-#define MAPSEC_ROUTE_17                     0x75
-#define MAPSEC_ROUTE_18                     0x76
-#define MAPSEC_ROUTE_19                     0x77
-#define MAPSEC_ROUTE_20                     0x78
-#define MAPSEC_ROUTE_21                     0x79
-#define MAPSEC_ROUTE_22                     0x7A
-#define MAPSEC_ROUTE_23                     0x7B
-#define MAPSEC_ROUTE_24                     0x7C
-#define MAPSEC_ROUTE_25                     0x7D
-#define MAPSEC_VIRIDIAN_FOREST              0x7E
-#define MAPSEC_MT_MOON                      0x7F
-#define MAPSEC_S_S_ANNE                     0x80
-#define MAPSEC_UNDERGROUND_PATH             0x81
-#define MAPSEC_UNDERGROUND_PATH_2           0x82
-#define MAPSEC_DIGLETTS_CAVE                0x83
-#define MAPSEC_KANTO_VICTORY_ROAD           0x84
-#define MAPSEC_ROCKET_HIDEOUT               0x85
-#define MAPSEC_SILPH_CO                     0x86
-#define MAPSEC_POKEMON_MANSION              0x87
-#define MAPSEC_KANTO_SAFARI_ZONE            0x88
-#define MAPSEC_POKEMON_LEAGUE               0x89
-#define MAPSEC_ROCK_TUNNEL                  0x8A
-#define MAPSEC_SEAFOAM_ISLANDS              0x8B
-#define MAPSEC_POKEMON_TOWER                0x8C
-#define MAPSEC_CERULEAN_CAVE                0x8D
-#define MAPSEC_POWER_PLANT                  0x8E
-
-#define MAPSECS_SEVII_123                   0x8F
-
-#define MAPSEC_ONE_ISLAND                   0x8F
-#define MAPSEC_TWO_ISLAND                   0x90
-#define MAPSEC_THREE_ISLAND                 0x91
-#define MAPSEC_FOUR_ISLAND                  0x92
-#define MAPSEC_FIVE_ISLAND                  0x93
-#define MAPSEC_SEVEN_ISLAND                 0x94
-#define MAPSEC_SIX_ISLAND                   0x95
-#define MAPSEC_KINDLE_ROAD                  0x96
-#define MAPSEC_TREASURE_BEACH               0x97
-#define MAPSEC_CAPE_BRINK                   0x98
-#define MAPSEC_BOND_BRIDGE                  0x99
-#define MAPSEC_THREE_ISLE_PORT              0x9A
-#define MAPSEC_SEVII_ISLE_6                 0x9B
-#define MAPSEC_SEVII_ISLE_7                 0x9C
-#define MAPSEC_SEVII_ISLE_8                 0x9D
-#define MAPSEC_SEVII_ISLE_9                 0x9E
-#define MAPSEC_RESORT_GORGEOUS              0x9F
-#define MAPSEC_WATER_LABYRINTH              0xA0
-#define MAPSEC_FIVE_ISLE_MEADOW             0xA1
-#define MAPSEC_MEMORIAL_PILLAR              0xA2
-#define MAPSEC_OUTCAST_ISLAND               0xA3
-#define MAPSEC_GREEN_PATH                   0xA4
-#define MAPSEC_WATER_PATH                   0xA5
-#define MAPSEC_RUIN_VALLEY                  0xA6
-#define MAPSEC_TRAINER_TOWER                0xA7
-#define MAPSEC_CANYON_ENTRANCE              0xA8
-#define MAPSEC_SEVAULT_CANYON               0xA9
-#define MAPSEC_TANOBY_RUINS                 0xAA
-#define MAPSEC_SEVII_ISLE_22                0xAB
-#define MAPSEC_SEVII_ISLE_23                0xAC
-#define MAPSEC_SEVII_ISLE_24                0xAD
-#define MAPSEC_NAVEL_ROCK                   0xAE
-#define MAPSEC_MT_EMBER                     0xAF
-#define MAPSEC_BERRY_FOREST                 0xB0
-#define MAPSEC_ICEFALL_CAVE                 0xB1
-#define MAPSEC_ROCKET_WAREHOUSE             0xB2
-#define MAPSEC_TRAINER_TOWER_2              0xB3
-#define MAPSEC_DOTTED_HOLE                  0xB4
-#define MAPSEC_LOST_CAVE                    0xB5
-#define MAPSEC_PATTERN_BUSH                 0xB6
-#define MAPSEC_ALTERING_CAVE                0xB7
-#define MAPSEC_TANOBY_CHAMBERS              0xB8
-#define MAPSEC_THREE_ISLE_PATH              0xB9
-#define MAPSEC_TANOBY_KEY                   0xBA
-#define MAPSEC_BIRTH_ISLAND                 0xBB
-#define MAPSEC_MONEAN_CHAMBER               0xBC
-#define MAPSEC_LIPTOO_CHAMBER               0xBD
-#define MAPSEC_WEEPTH_CHAMBER               0xBE
-#define MAPSEC_DILFORD_CHAMBER              0xBF
-#define MAPSEC_SCUFIB_CHAMBER               0xC0
-#define MAPSEC_RIXY_CHAMBER                 0xC1
-#define MAPSEC_VIAPOIS_CHAMBER              0xC2
-#define MAPSEC_EMBER_SPA                    0xC3
-#define MAPSEC_SPECIAL_AREA                 0xC4
-#define MAPSEC_NONE                         0xC5
-#define MAPSEC_COUNT                        0xC6
-
-#define METLOC_SPECIAL_EGG                  0xFD
-#define METLOC_IN_GAME_TRADE                0xFE
-#define METLOC_FATEFUL_ENCOUNTER            0xFF
-
-#endif //GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
diff --git a/json_data_rules.mk b/json_data_rules.mk
index f3a04660cc..65c4ee44e0 100644
--- a/json_data_rules.mk
+++ b/json_data_rules.mk
@@ -19,6 +19,10 @@ $(DATA_SRC_SUBDIR)/region_map/region_map_entry_strings.h: $(DATA_SRC_SUBDIR)/reg
 
 $(C_BUILDDIR)/region_map.o: c_dep += $(DATA_SRC_SUBDIR)/region_map/region_map_entry_strings.h
 
+AUTO_GEN_TARGETS += include/constants/region_map_sections.h
+include/constants/region_map_sections.h: $(DATA_SRC_SUBDIR)/region_map/region_map_sections.json $(DATA_SRC_SUBDIR)/region_map/region_map_sections.constants.json.txt
+	$(JSONPROC) $^ $@
+
 AUTO_GEN_TARGETS += $(DATA_SRC_SUBDIR)/items.h
 $(DATA_SRC_SUBDIR)/items.h: $(DATA_SRC_SUBDIR)/items.json $(DATA_SRC_SUBDIR)/items.json.txt
 	$(JSONPROC) $^ $@
diff --git a/src/data/region_map/region_map_sections.constants.json.txt b/src/data/region_map/region_map_sections.constants.json.txt
new file mode 100644
index 0000000000..eeddea6aea
--- /dev/null
+++ b/src/data/region_map/region_map_sections.constants.json.txt
@@ -0,0 +1,24 @@
+{{ doNotModifyHeader }}
+#ifndef GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
+#define GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
+
+enum {
+## for map_section in map_sections
+    {{ map_section.id }},
+## endfor
+    MAPSEC_NONE,
+    MAPSEC_COUNT
+};
+
+// Values before KANTO_MAPSEC_START are assumed to have no data.
+#define KANTO_MAPSEC_START   MAPSEC_PALLET_TOWN
+
+// Values starting from SEVII_MAPSEC_START are assumed to have data in sSeviiMapsecs.
+#define SEVII_MAPSEC_START   MAPSEC_ONE_ISLAND
+
+// Special location IDs that use the same value space as MAPSECs.
+#define METLOC_SPECIAL_EGG         0xFD
+#define METLOC_IN_GAME_TRADE       0xFE
+#define METLOC_FATEFUL_ENCOUNTER   0xFF
+
+#endif // GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
diff --git a/src/data/region_map/region_map_sections.entries.json.txt b/src/data/region_map/region_map_sections.entries.json.txt
index 7cce3705cf..fc5fee9154 100644
--- a/src/data/region_map/region_map_sections.entries.json.txt
+++ b/src/data/region_map/region_map_sections.entries.json.txt
@@ -3,24 +3,30 @@
 #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
 
 ## for map_section in map_sections
-{% if isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.map_section) }}{% endif %}
+{% if existsIn(map_section, "name") and isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.id) }}{% endif %}
 ## endfor
 
 static const u8 *const sMapNames[] = {
 ## for map_section in map_sections
-    [{{ map_section.map_section }} - MAPSECS_KANTO] = sMapsecName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %},
+{% if existsIn(map_section, "name") %}
+    [{{ map_section.id }} - KANTO_MAPSEC_START] = sMapsecName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %},
+{% endif %}
 ## endfor
 };
 
 static const u16 sMapSectionTopLeftCorners[MAPSEC_COUNT][2] = {
 ## for map_section in map_sections
-    [{{ map_section.map_section }} - MAPSECS_KANTO] = { {{ map_section.x }}, {{ map_section.y }} },
+{% if existsIn(map_section, "x") and existsIn(map_section, "y") %}
+    [{{ map_section.id }} - KANTO_MAPSEC_START] = { {{ map_section.x }}, {{ map_section.y }} },
+{% endif %}
 ## endfor
 };
 
 static const u16 sMapSectionDimensions[MAPSEC_COUNT][2] = {
 ## for map_section in map_sections
-    [{{ map_section.map_section }} - MAPSECS_KANTO] = { {{ map_section.width }}, {{ map_section.height }} },
+{% if existsIn(map_section, "width") and existsIn(map_section, "height") %}
+    [{{ map_section.id }} - KANTO_MAPSEC_START] = { {{ map_section.width }}, {{ map_section.height }} },
+{% endif %}
 ## endfor
 };
 
diff --git a/src/data/region_map/region_map_sections.json b/src/data/region_map/region_map_sections.json
index 63947d4f02..601bff65d4 100644
--- a/src/data/region_map/region_map_sections.json
+++ b/src/data/region_map/region_map_sections.json
@@ -1,7 +1,271 @@
 {
   "map_sections": [
     {
-      "map_section": "MAPSEC_PALLET_TOWN",
+      "id": "MAPSEC_LITTLEROOT_TOWN"
+    },
+    {
+      "id": "MAPSEC_OLDALE_TOWN"
+    },
+    {
+      "id": "MAPSEC_DEWFORD_TOWN"
+    },
+    {
+      "id": "MAPSEC_LAVARIDGE_TOWN"
+    },
+    {
+      "id": "MAPSEC_FALLARBOR_TOWN"
+    },
+    {
+      "id": "MAPSEC_VERDANTURF_TOWN"
+    },
+    {
+      "id": "MAPSEC_PACIFIDLOG_TOWN"
+    },
+    {
+      "id": "MAPSEC_PETALBURG_CITY"
+    },
+    {
+      "id": "MAPSEC_SLATEPORT_CITY"
+    },
+    {
+      "id": "MAPSEC_MAUVILLE_CITY"
+    },
+    {
+      "id": "MAPSEC_RUSTBORO_CITY"
+    },
+    {
+      "id": "MAPSEC_FORTREE_CITY"
+    },
+    {
+      "id": "MAPSEC_LILYCOVE_CITY"
+    },
+    {
+      "id": "MAPSEC_MOSSDEEP_CITY"
+    },
+    {
+      "id": "MAPSEC_SOOTOPOLIS_CITY"
+    },
+    {
+      "id": "MAPSEC_EVER_GRANDE_CITY"
+    },
+    {
+      "id": "MAPSEC_ROUTE_101"
+    },
+    {
+      "id": "MAPSEC_ROUTE_102"
+    },
+    {
+      "id": "MAPSEC_ROUTE_103"
+    },
+    {
+      "id": "MAPSEC_ROUTE_104"
+    },
+    {
+      "id": "MAPSEC_ROUTE_105"
+    },
+    {
+      "id": "MAPSEC_ROUTE_106"
+    },
+    {
+      "id": "MAPSEC_ROUTE_107"
+    },
+    {
+      "id": "MAPSEC_ROUTE_108"
+    },
+    {
+      "id": "MAPSEC_ROUTE_109"
+    },
+    {
+      "id": "MAPSEC_ROUTE_110"
+    },
+    {
+      "id": "MAPSEC_ROUTE_111"
+    },
+    {
+      "id": "MAPSEC_ROUTE_112"
+    },
+    {
+      "id": "MAPSEC_ROUTE_113"
+    },
+    {
+      "id": "MAPSEC_ROUTE_114"
+    },
+    {
+      "id": "MAPSEC_ROUTE_115"
+    },
+    {
+      "id": "MAPSEC_ROUTE_116"
+    },
+    {
+      "id": "MAPSEC_ROUTE_117"
+    },
+    {
+      "id": "MAPSEC_ROUTE_118"
+    },
+    {
+      "id": "MAPSEC_ROUTE_119"
+    },
+    {
+      "id": "MAPSEC_ROUTE_120"
+    },
+    {
+      "id": "MAPSEC_ROUTE_121"
+    },
+    {
+      "id": "MAPSEC_ROUTE_122"
+    },
+    {
+      "id": "MAPSEC_ROUTE_123"
+    },
+    {
+      "id": "MAPSEC_ROUTE_124"
+    },
+    {
+      "id": "MAPSEC_ROUTE_125"
+    },
+    {
+      "id": "MAPSEC_ROUTE_126"
+    },
+    {
+      "id": "MAPSEC_ROUTE_127"
+    },
+    {
+      "id": "MAPSEC_ROUTE_128"
+    },
+    {
+      "id": "MAPSEC_ROUTE_129"
+    },
+    {
+      "id": "MAPSEC_ROUTE_130"
+    },
+    {
+      "id": "MAPSEC_ROUTE_131"
+    },
+    {
+      "id": "MAPSEC_ROUTE_132"
+    },
+    {
+      "id": "MAPSEC_ROUTE_133"
+    },
+    {
+      "id": "MAPSEC_ROUTE_134"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_124"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_125"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_126"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_127"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_SOOTOPOLIS"
+    },
+    {
+      "id": "MAPSEC_GRANITE_CAVE"
+    },
+    {
+      "id": "MAPSEC_MT_CHIMNEY"
+    },
+    {
+      "id": "MAPSEC_SAFARI_ZONE"
+    },
+    {
+      "id": "MAPSEC_BATTLE_FRONTIER"
+    },
+    {
+      "id": "MAPSEC_PETALBURG_WOODS"
+    },
+    {
+      "id": "MAPSEC_RUSTURF_TUNNEL"
+    },
+    {
+      "id": "MAPSEC_ABANDONED_SHIP"
+    },
+    {
+      "id": "MAPSEC_NEW_MAUVILLE"
+    },
+    {
+      "id": "MAPSEC_METEOR_FALLS"
+    },
+    {
+      "id": "MAPSEC_METEOR_FALLS2"
+    },
+    {
+      "id": "MAPSEC_MT_PYRE"
+    },
+    {
+      "id": "MAPSEC_AQUA_HIDEOUT_OLD"
+    },
+    {
+      "id": "MAPSEC_SHOAL_CAVE"
+    },
+    {
+      "id": "MAPSEC_SEAFLOOR_CAVERN"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_128"
+    },
+    {
+      "id": "MAPSEC_VICTORY_ROAD"
+    },
+    {
+      "id": "MAPSEC_MIRAGE_ISLAND"
+    },
+    {
+      "id": "MAPSEC_CAVE_OF_ORIGIN"
+    },
+    {
+      "id": "MAPSEC_SOUTHERN_ISLAND"
+    },
+    {
+      "id": "MAPSEC_FIERY_PATH"
+    },
+    {
+      "id": "MAPSEC_FIERY_PATH2"
+    },
+    {
+      "id": "MAPSEC_JAGGED_PASS"
+    },
+    {
+      "id": "MAPSEC_JAGGED_PASS2"
+    },
+    {
+      "id": "MAPSEC_SEALED_CHAMBER"
+    },
+    {
+      "id": "MAPSEC_UNDERWATER_SEALED_CHAMBER"
+    },
+    {
+      "id": "MAPSEC_SCORCHED_SLAB"
+    },
+    {
+      "id": "MAPSEC_ISLAND_CAVE"
+    },
+    {
+      "id": "MAPSEC_DESERT_RUINS"
+    },
+    {
+      "id": "MAPSEC_ANCIENT_TOMB"
+    },
+    {
+      "id": "MAPSEC_INSIDE_OF_TRUCK"
+    },
+    {
+      "id": "MAPSEC_SKY_PILLAR"
+    },
+    {
+      "id": "MAPSEC_SECRET_BASE"
+    },
+    {
+      "id": "MAPSEC_DYNAMIC"
+    },
+    {
+      "id": "MAPSEC_PALLET_TOWN",
       "name": "PALLET TOWN",
       "x": 4,
       "y": 11,
@@ -9,7 +273,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VIRIDIAN_CITY",
+      "id": "MAPSEC_VIRIDIAN_CITY",
       "name": "VIRIDIAN CITY",
       "x": 4,
       "y": 8,
@@ -17,7 +281,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PEWTER_CITY",
+      "id": "MAPSEC_PEWTER_CITY",
       "name": "PEWTER CITY",
       "x": 4,
       "y": 4,
@@ -25,7 +289,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CERULEAN_CITY",
+      "id": "MAPSEC_CERULEAN_CITY",
       "name": "CERULEAN CITY",
       "x": 14,
       "y": 3,
@@ -33,7 +297,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LAVENDER_TOWN",
+      "id": "MAPSEC_LAVENDER_TOWN",
       "name": "LAVENDER TOWN",
       "x": 18,
       "y": 6,
@@ -41,7 +305,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VERMILION_CITY",
+      "id": "MAPSEC_VERMILION_CITY",
       "name": "VERMILION CITY",
       "x": 14,
       "y": 9,
@@ -49,7 +313,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CELADON_CITY",
+      "id": "MAPSEC_CELADON_CITY",
       "name": "CELADON CITY",
       "x": 11,
       "y": 6,
@@ -57,7 +321,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FUCHSIA_CITY",
+      "id": "MAPSEC_FUCHSIA_CITY",
       "name": "FUCHSIA CITY",
       "x": 12,
       "y": 12,
@@ -65,7 +329,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CINNABAR_ISLAND",
+      "id": "MAPSEC_CINNABAR_ISLAND",
       "name": "CINNABAR ISLAND",
       "x": 4,
       "y": 14,
@@ -73,7 +337,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_INDIGO_PLATEAU",
+      "id": "MAPSEC_INDIGO_PLATEAU",
       "name": "INDIGO PLATEAU",
       "x": 2,
       "y": 3,
@@ -81,7 +345,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SAFFRON_CITY",
+      "id": "MAPSEC_SAFFRON_CITY",
       "name": "SAFFRON CITY",
       "x": 14,
       "y": 6,
@@ -89,7 +353,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_4_POKECENTER",
+      "id": "MAPSEC_ROUTE_4_POKECENTER",
       "name": "ROUTE 4",
       "name_clone": true,
       "x": 8,
@@ -98,7 +362,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_10_POKECENTER",
+      "id": "MAPSEC_ROUTE_10_POKECENTER",
       "name": "ROUTE 10",
       "name_clone": true,
       "x": 18,
@@ -107,7 +371,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_1",
+      "id": "MAPSEC_ROUTE_1",
       "name": "ROUTE 1",
       "x": 4,
       "y": 9,
@@ -115,7 +379,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_2",
+      "id": "MAPSEC_ROUTE_2",
       "name": "ROUTE 2",
       "x": 4,
       "y": 5,
@@ -123,7 +387,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_3",
+      "id": "MAPSEC_ROUTE_3",
       "name": "ROUTE 3",
       "x": 5,
       "y": 4,
@@ -131,7 +395,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_4",
+      "id": "MAPSEC_ROUTE_4",
       "name": "ROUTE 4",
       "x": 8,
       "y": 3,
@@ -139,7 +403,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_5",
+      "id": "MAPSEC_ROUTE_5",
       "name": "ROUTE 5",
       "x": 14,
       "y": 4,
@@ -147,7 +411,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_6",
+      "id": "MAPSEC_ROUTE_6",
       "name": "ROUTE 6",
       "x": 14,
       "y": 7,
@@ -155,7 +419,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_7",
+      "id": "MAPSEC_ROUTE_7",
       "name": "ROUTE 7",
       "x": 12,
       "y": 6,
@@ -163,7 +427,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_8",
+      "id": "MAPSEC_ROUTE_8",
       "name": "ROUTE 8",
       "x": 15,
       "y": 6,
@@ -171,7 +435,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_9",
+      "id": "MAPSEC_ROUTE_9",
       "name": "ROUTE 9",
       "x": 15,
       "y": 3,
@@ -179,7 +443,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_10",
+      "id": "MAPSEC_ROUTE_10",
       "name": "ROUTE 10",
       "x": 18,
       "y": 3,
@@ -187,7 +451,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_11",
+      "id": "MAPSEC_ROUTE_11",
       "name": "ROUTE 11",
       "x": 15,
       "y": 9,
@@ -195,7 +459,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_12",
+      "id": "MAPSEC_ROUTE_12",
       "name": "ROUTE 12",
       "x": 18,
       "y": 7,
@@ -203,7 +467,7 @@
       "height": 5
     },
     {
-      "map_section": "MAPSEC_ROUTE_13",
+      "id": "MAPSEC_ROUTE_13",
       "name": "ROUTE 13",
       "x": 16,
       "y": 11,
@@ -211,7 +475,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_14",
+      "id": "MAPSEC_ROUTE_14",
       "name": "ROUTE 14",
       "x": 15,
       "y": 11,
@@ -219,7 +483,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_15",
+      "id": "MAPSEC_ROUTE_15",
       "name": "ROUTE 15",
       "x": 13,
       "y": 12,
@@ -227,7 +491,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_16",
+      "id": "MAPSEC_ROUTE_16",
       "name": "ROUTE 16",
       "x": 7,
       "y": 6,
@@ -235,7 +499,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_17",
+      "id": "MAPSEC_ROUTE_17",
       "name": "ROUTE 17",
       "x": 7,
       "y": 7,
@@ -243,7 +507,7 @@
       "height": 5
     },
     {
-      "map_section": "MAPSEC_ROUTE_18",
+      "id": "MAPSEC_ROUTE_18",
       "name": "ROUTE 18",
       "x": 7,
       "y": 12,
@@ -251,7 +515,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_19",
+      "id": "MAPSEC_ROUTE_19",
       "name": "ROUTE 19",
       "x": 12,
       "y": 13,
@@ -259,7 +523,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_20",
+      "id": "MAPSEC_ROUTE_20",
       "name": "ROUTE 20",
       "x": 5,
       "y": 14,
@@ -267,7 +531,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_21",
+      "id": "MAPSEC_ROUTE_21",
       "name": "ROUTE 21",
       "x": 4,
       "y": 12,
@@ -275,7 +539,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_22",
+      "id": "MAPSEC_ROUTE_22",
       "name": "ROUTE 22",
       "x": 2,
       "y": 8,
@@ -283,7 +547,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_23",
+      "id": "MAPSEC_ROUTE_23",
       "name": "ROUTE 23",
       "x": 2,
       "y": 4,
@@ -291,7 +555,7 @@
       "height": 4
     },
     {
-      "map_section": "MAPSEC_ROUTE_24",
+      "id": "MAPSEC_ROUTE_24",
       "name": "ROUTE 24",
       "x": 14,
       "y": 1,
@@ -299,7 +563,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_25",
+      "id": "MAPSEC_ROUTE_25",
       "name": "ROUTE 25",
       "x": 15,
       "y": 1,
@@ -307,7 +571,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VIRIDIAN_FOREST",
+      "id": "MAPSEC_VIRIDIAN_FOREST",
       "name": "VIRIDIAN FOREST",
       "x": 0,
       "y": 0,
@@ -315,7 +579,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MT_MOON",
+      "id": "MAPSEC_MT_MOON",
       "name": "MT. MOON",
       "x": 0,
       "y": 0,
@@ -323,7 +587,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_S_S_ANNE",
+      "id": "MAPSEC_S_S_ANNE",
       "name": "S.S. ANNE",
       "x": 0,
       "y": 0,
@@ -331,7 +595,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERGROUND_PATH",
+      "id": "MAPSEC_UNDERGROUND_PATH",
       "name": "UNDERGROUND PATH",
       "x": 0,
       "y": 0,
@@ -339,7 +603,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERGROUND_PATH_2",
+      "id": "MAPSEC_UNDERGROUND_PATH_2",
       "name": "UNDERGROUND PATH",
       "name_clone": true,
       "x": 0,
@@ -348,7 +612,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DIGLETTS_CAVE",
+      "id": "MAPSEC_DIGLETTS_CAVE",
       "name": "DIGLETT'S CAVE",
       "x": 0,
       "y": 0,
@@ -356,7 +620,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_KANTO_VICTORY_ROAD",
+      "id": "MAPSEC_KANTO_VICTORY_ROAD",
       "name": "VICTORY ROAD",
       "x": 0,
       "y": 0,
@@ -364,7 +628,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROCKET_HIDEOUT",
+      "id": "MAPSEC_ROCKET_HIDEOUT",
       "name": "ROCKET HIDEOUT",
       "x": 0,
       "y": 0,
@@ -372,7 +636,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SILPH_CO",
+      "id": "MAPSEC_SILPH_CO",
       "name": "SILPH CO.",
       "x": 0,
       "y": 0,
@@ -380,7 +644,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POKEMON_MANSION",
+      "id": "MAPSEC_POKEMON_MANSION",
       "name": "POKéMON MANSION",
       "x": 0,
       "y": 0,
@@ -388,7 +652,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+      "id": "MAPSEC_KANTO_SAFARI_ZONE",
       "name": "SAFARI ZONE",
       "x": 0,
       "y": 0,
@@ -396,7 +660,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POKEMON_LEAGUE",
+      "id": "MAPSEC_POKEMON_LEAGUE",
       "name": "POKéMON LEAGUE",
       "x": 0,
       "y": 0,
@@ -404,7 +668,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROCK_TUNNEL",
+      "id": "MAPSEC_ROCK_TUNNEL",
       "name": "ROCK TUNNEL",
       "x": 0,
       "y": 0,
@@ -412,7 +676,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEAFOAM_ISLANDS",
+      "id": "MAPSEC_SEAFOAM_ISLANDS",
       "name": "SEAFOAM ISLANDS",
       "x": 0,
       "y": 0,
@@ -420,7 +684,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POKEMON_TOWER",
+      "id": "MAPSEC_POKEMON_TOWER",
       "name": "POKéMON TOWER",
       "x": 0,
       "y": 0,
@@ -428,7 +692,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CERULEAN_CAVE",
+      "id": "MAPSEC_CERULEAN_CAVE",
       "name": "CERULEAN CAVE",
       "x": 0,
       "y": 0,
@@ -436,7 +700,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POWER_PLANT",
+      "id": "MAPSEC_POWER_PLANT",
       "name": "POWER PLANT",
       "x": 0,
       "y": 0,
@@ -444,7 +708,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ONE_ISLAND",
+      "id": "MAPSEC_ONE_ISLAND",
       "name": "ONE ISLAND",
       "x": 1,
       "y": 8,
@@ -452,7 +716,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TWO_ISLAND",
+      "id": "MAPSEC_TWO_ISLAND",
       "name": "TWO ISLAND",
       "x": 9,
       "y": 9,
@@ -460,7 +724,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_THREE_ISLAND",
+      "id": "MAPSEC_THREE_ISLAND",
       "name": "THREE ISLAND",
       "x": 18,
       "y": 12,
@@ -468,7 +732,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FOUR_ISLAND",
+      "id": "MAPSEC_FOUR_ISLAND",
       "name": "FOUR ISLAND",
       "x": 3,
       "y": 4,
@@ -476,7 +740,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FIVE_ISLAND",
+      "id": "MAPSEC_FIVE_ISLAND",
       "name": "FIVE ISLAND",
       "x": 16,
       "y": 11,
@@ -484,7 +748,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVEN_ISLAND",
+      "id": "MAPSEC_SEVEN_ISLAND",
       "name": "SEVEN ISLAND",
       "x": 5,
       "y": 8,
@@ -492,7 +756,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SIX_ISLAND",
+      "id": "MAPSEC_SIX_ISLAND",
       "name": "SIX ISLAND",
       "x": 17,
       "y": 5,
@@ -500,7 +764,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_KINDLE_ROAD",
+      "id": "MAPSEC_KINDLE_ROAD",
       "name": "KINDLE ROAD",
       "x": 2,
       "y": 3,
@@ -508,7 +772,7 @@
       "height": 6
     },
     {
-      "map_section": "MAPSEC_TREASURE_BEACH",
+      "id": "MAPSEC_TREASURE_BEACH",
       "name": "TREASURE BEACH",
       "x": 1,
       "y": 9,
@@ -516,7 +780,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_CAPE_BRINK",
+      "id": "MAPSEC_CAPE_BRINK",
       "name": "CAPE BRINK",
       "x": 9,
       "y": 7,
@@ -524,7 +788,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_BOND_BRIDGE",
+      "id": "MAPSEC_BOND_BRIDGE",
       "name": "BOND BRIDGE",
       "x": 13,
       "y": 12,
@@ -532,7 +796,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_THREE_ISLE_PORT",
+      "id": "MAPSEC_THREE_ISLE_PORT",
       "name": "THREE ISLE PORT",
       "x": 18,
       "y": 13,
@@ -540,7 +804,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_6",
+      "id": "MAPSEC_SEVII_ISLE_6",
       "name": "SEVII ISLE 6",
       "x": 4,
       "y": 3,
@@ -548,7 +812,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_7",
+      "id": "MAPSEC_SEVII_ISLE_7",
       "name": "SEVII ISLE 7",
       "x": 5,
       "y": 4,
@@ -556,7 +820,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_8",
+      "id": "MAPSEC_SEVII_ISLE_8",
       "name": "SEVII ISLE 8",
       "x": 1,
       "y": 4,
@@ -564,7 +828,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_9",
+      "id": "MAPSEC_SEVII_ISLE_9",
       "name": "SEVII ISLE 9",
       "x": 4,
       "y": 5,
@@ -572,7 +836,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_RESORT_GORGEOUS",
+      "id": "MAPSEC_RESORT_GORGEOUS",
       "name": "RESORT GORGEOUS",
       "x": 16,
       "y": 9,
@@ -580,7 +844,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_WATER_LABYRINTH",
+      "id": "MAPSEC_WATER_LABYRINTH",
       "name": "WATER LABYRINTH",
       "x": 14,
       "y": 10,
@@ -588,7 +852,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FIVE_ISLE_MEADOW",
+      "id": "MAPSEC_FIVE_ISLE_MEADOW",
       "name": "FIVE ISLE MEADOW",
       "x": 17,
       "y": 10,
@@ -596,7 +860,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_MEMORIAL_PILLAR",
+      "id": "MAPSEC_MEMORIAL_PILLAR",
       "name": "MEMORIAL PILLAR",
       "x": 18,
       "y": 12,
@@ -604,7 +868,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_OUTCAST_ISLAND",
+      "id": "MAPSEC_OUTCAST_ISLAND",
       "name": "OUTCAST ISLAND",
       "x": 15,
       "y": 0,
@@ -612,7 +876,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_GREEN_PATH",
+      "id": "MAPSEC_GREEN_PATH",
       "name": "GREEN PATH",
       "x": 15,
       "y": 3,
@@ -620,7 +884,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_WATER_PATH",
+      "id": "MAPSEC_WATER_PATH",
       "name": "WATER PATH",
       "x": 18,
       "y": 3,
@@ -628,7 +892,7 @@
       "height": 5
     },
     {
-      "map_section": "MAPSEC_RUIN_VALLEY",
+      "id": "MAPSEC_RUIN_VALLEY",
       "name": "RUIN VALLEY",
       "x": 16,
       "y": 7,
@@ -636,7 +900,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_TRAINER_TOWER",
+      "id": "MAPSEC_TRAINER_TOWER",
       "name": "TRAINER TOWER",
       "x": 5,
       "y": 6,
@@ -644,7 +908,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_CANYON_ENTRANCE",
+      "id": "MAPSEC_CANYON_ENTRANCE",
       "name": "CANYON ENTRANCE",
       "x": 5,
       "y": 9,
@@ -652,7 +916,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVAULT_CANYON",
+      "id": "MAPSEC_SEVAULT_CANYON",
       "name": "SEVAULT CANYON",
       "x": 6,
       "y": 9,
@@ -660,7 +924,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_TANOBY_RUINS",
+      "id": "MAPSEC_TANOBY_RUINS",
       "name": "TANOBY RUINS",
       "x": 3,
       "y": 12,
@@ -668,7 +932,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_22",
+      "id": "MAPSEC_SEVII_ISLE_22",
       "name": "SEVII ISLE 22",
       "x": 9,
       "y": 12,
@@ -676,7 +940,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_23",
+      "id": "MAPSEC_SEVII_ISLE_23",
       "name": "SEVII ISLE 23",
       "x": 3,
       "y": 14,
@@ -684,7 +948,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_24",
+      "id": "MAPSEC_SEVII_ISLE_24",
       "name": "SEVII ISLE 24",
       "x": 2,
       "y": 12,
@@ -692,7 +956,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_NAVEL_ROCK",
+      "id": "MAPSEC_NAVEL_ROCK",
       "name": "NAVEL ROCK",
       "x": 10,
       "y": 8,
@@ -700,7 +964,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MT_EMBER",
+      "id": "MAPSEC_MT_EMBER",
       "name": "MT. EMBER",
       "x": 0,
       "y": 0,
@@ -708,7 +972,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BERRY_FOREST",
+      "id": "MAPSEC_BERRY_FOREST",
       "name": "BERRY FOREST",
       "x": 0,
       "y": 0,
@@ -716,7 +980,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ICEFALL_CAVE",
+      "id": "MAPSEC_ICEFALL_CAVE",
       "name": "ICEFALL CAVE",
       "x": 0,
       "y": 0,
@@ -724,7 +988,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROCKET_WAREHOUSE",
+      "id": "MAPSEC_ROCKET_WAREHOUSE",
       "name": "ROCKET WAREHOUSE",
       "x": 0,
       "y": 0,
@@ -732,7 +996,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TRAINER_TOWER_2",
+      "id": "MAPSEC_TRAINER_TOWER_2",
       "name": "TRAINER TOWER",
       "name_clone": true,
       "x": 0,
@@ -741,7 +1005,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DOTTED_HOLE",
+      "id": "MAPSEC_DOTTED_HOLE",
       "name": "DOTTED HOLE",
       "x": 0,
       "y": 0,
@@ -749,7 +1013,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LOST_CAVE",
+      "id": "MAPSEC_LOST_CAVE",
       "name": "LOST CAVE",
       "x": 0,
       "y": 0,
@@ -757,7 +1021,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PATTERN_BUSH",
+      "id": "MAPSEC_PATTERN_BUSH",
       "name": "PATTERN BUSH",
       "x": 0,
       "y": 0,
@@ -765,7 +1029,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ALTERING_CAVE",
+      "id": "MAPSEC_ALTERING_CAVE",
       "name": "ALTERING CAVE",
       "x": 0,
       "y": 0,
@@ -773,7 +1037,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TANOBY_CHAMBERS",
+      "id": "MAPSEC_TANOBY_CHAMBERS",
       "name": "TANOBY CHAMBERS",
       "x": 0,
       "y": 0,
@@ -781,7 +1045,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_THREE_ISLE_PATH",
+      "id": "MAPSEC_THREE_ISLE_PATH",
       "name": "THREE ISLE PATH",
       "x": 0,
       "y": 0,
@@ -789,7 +1053,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TANOBY_KEY",
+      "id": "MAPSEC_TANOBY_KEY",
       "name": "TANOBY KEY",
       "x": 0,
       "y": 0,
@@ -797,7 +1061,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BIRTH_ISLAND",
+      "id": "MAPSEC_BIRTH_ISLAND",
       "name": "BIRTH ISLAND",
       "x": 18,
       "y": 13,
@@ -805,7 +1069,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MONEAN_CHAMBER",
+      "id": "MAPSEC_MONEAN_CHAMBER",
       "name": "MONEAN CHAMBER",
       "x": 0,
       "y": 0,
@@ -813,7 +1077,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LIPTOO_CHAMBER",
+      "id": "MAPSEC_LIPTOO_CHAMBER",
       "name": "LIPTOO CHAMBER",
       "x": 0,
       "y": 0,
@@ -821,7 +1085,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_WEEPTH_CHAMBER",
+      "id": "MAPSEC_WEEPTH_CHAMBER",
       "name": "WEEPTH CHAMBER",
       "x": 0,
       "y": 0,
@@ -829,7 +1093,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DILFORD_CHAMBER",
+      "id": "MAPSEC_DILFORD_CHAMBER",
       "name": "DILFORD CHAMBER",
       "x": 0,
       "y": 0,
@@ -837,7 +1101,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SCUFIB_CHAMBER",
+      "id": "MAPSEC_SCUFIB_CHAMBER",
       "name": "SCUFIB CHAMBER",
       "x": 0,
       "y": 0,
@@ -845,7 +1109,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_RIXY_CHAMBER",
+      "id": "MAPSEC_RIXY_CHAMBER",
       "name": "RIXY CHAMBER",
       "x": 0,
       "y": 0,
@@ -853,7 +1117,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VIAPOIS_CHAMBER",
+      "id": "MAPSEC_VIAPOIS_CHAMBER",
       "name": "VIAPOIS CHAMBER",
       "x": 0,
       "y": 0,
@@ -861,7 +1125,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_EMBER_SPA",
+      "id": "MAPSEC_EMBER_SPA",
       "name": "EMBER SPA",
       "x": 0,
       "y": 0,
@@ -869,7 +1133,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SPECIAL_AREA",
+      "id": "MAPSEC_SPECIAL_AREA",
       "name": "CELADON DEPT.",
       "x": 0,
       "y": 0,
diff --git a/src/data/region_map/region_map_sections.strings.json.txt b/src/data/region_map/region_map_sections.strings.json.txt
index c81a10419a..31a28c8f68 100644
--- a/src/data/region_map/region_map_sections.strings.json.txt
+++ b/src/data/region_map/region_map_sections.strings.json.txt
@@ -3,16 +3,18 @@
 #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRY_STRINGS_H
 
 ## for map_section in map_sections
-{% if isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.map_section) }}{% endif %}
+{% if existsIn(map_section, "name") and isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.id) }}{% endif %}
 ## endfor
 
 ## for map_section in map_sections
-{% if getVar(map_section.name) == map_section.map_section %}
+{% if existsIn(map_section, "name") %}
+{% if getVar(map_section.name) == map_section.id %}
 static const u8 sMapsecName_{{ cleanString(map_section.name) }}[] = _("{{ map_section.name }}");
 {% endif %}
 {% if existsIn(map_section, "name_clone") %}
 static const u8 sMapsecName_{{ cleanString(map_section.name) }}_Clone[] = _("{{ map_section.name }}");
 {% endif %}
+{% endif %}
 ## endfor
 
 #endif // GUARD_DATA_REGION_MAP_REGION_MAP_ENTRY_STRINGS_H
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 2ff2483b1c..b3e3c7763d 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -5212,7 +5212,7 @@ static bool32 CurrentMonIsFromGBA(void)
 
 static bool32 MapSecIsInKantoOrSevii(u8 mapSec)
 {
-    if (mapSec >= MAPSECS_KANTO && mapSec < MAPSEC_NONE)
+    if (mapSec >= KANTO_MAPSEC_START && mapSec < MAPSEC_NONE)
         return TRUE;
     return FALSE;
 }
diff --git a/src/region_map.c b/src/region_map.c
index 2703278752..baa0d45a3d 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -826,114 +826,114 @@ static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_CO
 #include "data/region_map/region_map_layout_sevii_67.h"
 
 static const u8 sMapFlyDestinations[][3] = {
-    [MAPSEC_PALLET_TOWN         - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_PALLET_TOWN},
-    [MAPSEC_VIRIDIAN_CITY       - MAPSECS_KANTO] = {MAP(MAP_VIRIDIAN_CITY),                         HEAL_LOCATION_VIRIDIAN_CITY},
-    [MAPSEC_PEWTER_CITY         - MAPSECS_KANTO] = {MAP(MAP_PEWTER_CITY),                           HEAL_LOCATION_PEWTER_CITY},
-    [MAPSEC_CERULEAN_CITY       - MAPSECS_KANTO] = {MAP(MAP_CERULEAN_CITY),                         HEAL_LOCATION_CERULEAN_CITY},
-    [MAPSEC_LAVENDER_TOWN       - MAPSECS_KANTO] = {MAP(MAP_LAVENDER_TOWN),                         HEAL_LOCATION_LAVENDER_TOWN},
-    [MAPSEC_VERMILION_CITY      - MAPSECS_KANTO] = {MAP(MAP_VERMILION_CITY),                        HEAL_LOCATION_VERMILION_CITY},
-    [MAPSEC_CELADON_CITY        - MAPSECS_KANTO] = {MAP(MAP_CELADON_CITY),                          HEAL_LOCATION_CELADON_CITY},
-    [MAPSEC_FUCHSIA_CITY        - MAPSECS_KANTO] = {MAP(MAP_FUCHSIA_CITY),                          HEAL_LOCATION_FUCHSIA_CITY},
-    [MAPSEC_CINNABAR_ISLAND     - MAPSECS_KANTO] = {MAP(MAP_CINNABAR_ISLAND),                       HEAL_LOCATION_CINNABAR_ISLAND},
-    [MAPSEC_INDIGO_PLATEAU      - MAPSECS_KANTO] = {MAP(MAP_INDIGO_PLATEAU_EXTERIOR),               HEAL_LOCATION_INDIGO_PLATEAU},
-    [MAPSEC_SAFFRON_CITY        - MAPSECS_KANTO] = {MAP(MAP_SAFFRON_CITY),                          HEAL_LOCATION_SAFFRON_CITY},
-    [MAPSEC_ROUTE_4_POKECENTER  - MAPSECS_KANTO] = {MAP(MAP_ROUTE4),                                HEAL_LOCATION_ROUTE4},
-    [MAPSEC_ROUTE_10_POKECENTER - MAPSECS_KANTO] = {MAP(MAP_ROUTE10),                               HEAL_LOCATION_ROUTE10},
-    [MAPSEC_ROUTE_1             - MAPSECS_KANTO] = {MAP(MAP_ROUTE1),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_2             - MAPSECS_KANTO] = {MAP(MAP_ROUTE2),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_3             - MAPSECS_KANTO] = {MAP(MAP_ROUTE3),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_4             - MAPSECS_KANTO] = {MAP(MAP_ROUTE4),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_5             - MAPSECS_KANTO] = {MAP(MAP_ROUTE5),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_6             - MAPSECS_KANTO] = {MAP(MAP_ROUTE6),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_7             - MAPSECS_KANTO] = {MAP(MAP_ROUTE7),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_8             - MAPSECS_KANTO] = {MAP(MAP_ROUTE8),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_9             - MAPSECS_KANTO] = {MAP(MAP_ROUTE9),                                HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_10            - MAPSECS_KANTO] = {MAP(MAP_ROUTE10),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_11            - MAPSECS_KANTO] = {MAP(MAP_ROUTE11),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_12            - MAPSECS_KANTO] = {MAP(MAP_ROUTE12),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_13            - MAPSECS_KANTO] = {MAP(MAP_ROUTE13),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_14            - MAPSECS_KANTO] = {MAP(MAP_ROUTE14),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_15            - MAPSECS_KANTO] = {MAP(MAP_ROUTE15),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_16            - MAPSECS_KANTO] = {MAP(MAP_ROUTE16),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_17            - MAPSECS_KANTO] = {MAP(MAP_ROUTE17),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_18            - MAPSECS_KANTO] = {MAP(MAP_ROUTE18),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_19            - MAPSECS_KANTO] = {MAP(MAP_ROUTE19),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_20            - MAPSECS_KANTO] = {MAP(MAP_ROUTE20),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_21            - MAPSECS_KANTO] = {MAP(MAP_ROUTE21_NORTH),                         HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_22            - MAPSECS_KANTO] = {MAP(MAP_ROUTE22),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_23            - MAPSECS_KANTO] = {MAP(MAP_ROUTE23),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_24            - MAPSECS_KANTO] = {MAP(MAP_ROUTE24),                               HEAL_LOCATION_NONE},
-    [MAPSEC_ROUTE_25            - MAPSECS_KANTO] = {MAP(MAP_ROUTE25),                               HEAL_LOCATION_NONE},
-    [MAPSEC_VIRIDIAN_FOREST     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_MT_MOON             - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_S_S_ANNE            - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_UNDERGROUND_PATH    - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_UNDERGROUND_PATH_2  - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_DIGLETTS_CAVE       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_KANTO_VICTORY_ROAD  - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_ROCKET_HIDEOUT      - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_SILPH_CO            - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_POKEMON_MANSION     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_KANTO_SAFARI_ZONE   - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_POKEMON_LEAGUE      - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_ROCK_TUNNEL         - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_SEAFOAM_ISLANDS     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_POKEMON_TOWER       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_CERULEAN_CAVE       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_POWER_PLANT         - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_ONE_ISLAND          - MAPSECS_KANTO] = {MAP(MAP_ONE_ISLAND),                            HEAL_LOCATION_ONE_ISLAND},
-    [MAPSEC_TWO_ISLAND          - MAPSECS_KANTO] = {MAP(MAP_TWO_ISLAND),                            HEAL_LOCATION_TWO_ISLAND},
-    [MAPSEC_THREE_ISLAND        - MAPSECS_KANTO] = {MAP(MAP_THREE_ISLAND),                          HEAL_LOCATION_THREE_ISLAND},
-    [MAPSEC_FOUR_ISLAND         - MAPSECS_KANTO] = {MAP(MAP_FOUR_ISLAND),                           HEAL_LOCATION_FOUR_ISLAND},
-    [MAPSEC_FIVE_ISLAND         - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND),                           HEAL_LOCATION_FIVE_ISLAND},
-    [MAPSEC_SEVEN_ISLAND        - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND),                          HEAL_LOCATION_SEVEN_ISLAND},
-    [MAPSEC_SIX_ISLAND          - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND),                            HEAL_LOCATION_SIX_ISLAND},
-    [MAPSEC_KINDLE_ROAD         - MAPSECS_KANTO] = {MAP(MAP_ONE_ISLAND_KINDLE_ROAD),                HEAL_LOCATION_NONE},
-    [MAPSEC_TREASURE_BEACH      - MAPSECS_KANTO] = {MAP(MAP_ONE_ISLAND_TREASURE_BEACH),             HEAL_LOCATION_NONE},
-    [MAPSEC_CAPE_BRINK          - MAPSECS_KANTO] = {MAP(MAP_TWO_ISLAND_CAPE_BRINK),                 HEAL_LOCATION_NONE},
-    [MAPSEC_BOND_BRIDGE         - MAPSECS_KANTO] = {MAP(MAP_THREE_ISLAND_BOND_BRIDGE),              HEAL_LOCATION_NONE},
-    [MAPSEC_THREE_ISLE_PORT     - MAPSECS_KANTO] = {MAP(MAP_THREE_ISLAND_PORT),                     HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_6        - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_6),                HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_7        - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_7),                HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_8        - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_8),                HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_9        - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_9),                HEAL_LOCATION_NONE},
-    [MAPSEC_RESORT_GORGEOUS     - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS),           HEAL_LOCATION_NONE},
-    [MAPSEC_WATER_LABYRINTH     - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH),           HEAL_LOCATION_NONE},
-    [MAPSEC_FIVE_ISLE_MEADOW    - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_MEADOW),                    HEAL_LOCATION_NONE},
-    [MAPSEC_MEMORIAL_PILLAR     - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR),           HEAL_LOCATION_NONE},
-    [MAPSEC_OUTCAST_ISLAND      - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND),             HEAL_LOCATION_NONE},
-    [MAPSEC_GREEN_PATH          - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_GREEN_PATH),                 HEAL_LOCATION_NONE},
-    [MAPSEC_WATER_PATH          - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_WATER_PATH),                 HEAL_LOCATION_NONE},
-    [MAPSEC_RUIN_VALLEY         - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_RUIN_VALLEY),                HEAL_LOCATION_NONE},
-    [MAPSEC_TRAINER_TOWER       - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER),            HEAL_LOCATION_NONE},
-    [MAPSEC_CANYON_ENTRANCE     - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE),  HEAL_LOCATION_NONE},
-    [MAPSEC_SEVAULT_CANYON      - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON),           HEAL_LOCATION_NONE},
-    [MAPSEC_TANOBY_RUINS        - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS),             HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_22       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_23       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_SEVII_ISLE_24       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_NAVEL_ROCK          - MAPSECS_KANTO] = {MAP(MAP_NAVEL_ROCK_EXTERIOR),                   HEAL_LOCATION_NONE},
-    [MAPSEC_MT_EMBER            - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_BERRY_FOREST        - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_ICEFALL_CAVE        - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_ROCKET_WAREHOUSE    - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_TRAINER_TOWER_2     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_DOTTED_HOLE         - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_LOST_CAVE           - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_PATTERN_BUSH        - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_ALTERING_CAVE       - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_TANOBY_CHAMBERS     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_THREE_ISLE_PATH     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_TANOBY_KEY          - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_BIRTH_ISLAND        - MAPSECS_KANTO] = {MAP(MAP_BIRTH_ISLAND_EXTERIOR),                 HEAL_LOCATION_NONE},
-    [MAPSEC_MONEAN_CHAMBER      - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_LIPTOO_CHAMBER      - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_WEEPTH_CHAMBER      - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_DILFORD_CHAMBER     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_SCUFIB_CHAMBER      - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_RIXY_CHAMBER        - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_VIAPOIS_CHAMBER     - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
-    [MAPSEC_EMBER_SPA           - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_PALLET_TOWN         - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_PALLET_TOWN},
+    [MAPSEC_VIRIDIAN_CITY       - KANTO_MAPSEC_START] = {MAP(MAP_VIRIDIAN_CITY),                         HEAL_LOCATION_VIRIDIAN_CITY},
+    [MAPSEC_PEWTER_CITY         - KANTO_MAPSEC_START] = {MAP(MAP_PEWTER_CITY),                           HEAL_LOCATION_PEWTER_CITY},
+    [MAPSEC_CERULEAN_CITY       - KANTO_MAPSEC_START] = {MAP(MAP_CERULEAN_CITY),                         HEAL_LOCATION_CERULEAN_CITY},
+    [MAPSEC_LAVENDER_TOWN       - KANTO_MAPSEC_START] = {MAP(MAP_LAVENDER_TOWN),                         HEAL_LOCATION_LAVENDER_TOWN},
+    [MAPSEC_VERMILION_CITY      - KANTO_MAPSEC_START] = {MAP(MAP_VERMILION_CITY),                        HEAL_LOCATION_VERMILION_CITY},
+    [MAPSEC_CELADON_CITY        - KANTO_MAPSEC_START] = {MAP(MAP_CELADON_CITY),                          HEAL_LOCATION_CELADON_CITY},
+    [MAPSEC_FUCHSIA_CITY        - KANTO_MAPSEC_START] = {MAP(MAP_FUCHSIA_CITY),                          HEAL_LOCATION_FUCHSIA_CITY},
+    [MAPSEC_CINNABAR_ISLAND     - KANTO_MAPSEC_START] = {MAP(MAP_CINNABAR_ISLAND),                       HEAL_LOCATION_CINNABAR_ISLAND},
+    [MAPSEC_INDIGO_PLATEAU      - KANTO_MAPSEC_START] = {MAP(MAP_INDIGO_PLATEAU_EXTERIOR),               HEAL_LOCATION_INDIGO_PLATEAU},
+    [MAPSEC_SAFFRON_CITY        - KANTO_MAPSEC_START] = {MAP(MAP_SAFFRON_CITY),                          HEAL_LOCATION_SAFFRON_CITY},
+    [MAPSEC_ROUTE_4_POKECENTER  - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE4),                                HEAL_LOCATION_ROUTE4},
+    [MAPSEC_ROUTE_10_POKECENTER - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE10),                               HEAL_LOCATION_ROUTE10},
+    [MAPSEC_ROUTE_1             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE1),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_2             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE2),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_3             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE3),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_4             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE4),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_5             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE5),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_6             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE6),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_7             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE7),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_8             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE8),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_9             - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE9),                                HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_10            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE10),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_11            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE11),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_12            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE12),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_13            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE13),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_14            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE14),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_15            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE15),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_16            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE16),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_17            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE17),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_18            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE18),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_19            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE19),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_20            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE20),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_21            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE21_NORTH),                         HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_22            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE22),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_23            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE23),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_24            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE24),                               HEAL_LOCATION_NONE},
+    [MAPSEC_ROUTE_25            - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE25),                               HEAL_LOCATION_NONE},
+    [MAPSEC_VIRIDIAN_FOREST     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_MT_MOON             - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_S_S_ANNE            - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_UNDERGROUND_PATH    - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_UNDERGROUND_PATH_2  - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_DIGLETTS_CAVE       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_KANTO_VICTORY_ROAD  - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_ROCKET_HIDEOUT      - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_SILPH_CO            - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_POKEMON_MANSION     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_KANTO_SAFARI_ZONE   - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_POKEMON_LEAGUE      - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_ROCK_TUNNEL         - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_SEAFOAM_ISLANDS     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_POKEMON_TOWER       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_CERULEAN_CAVE       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_POWER_PLANT         - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_ONE_ISLAND          - KANTO_MAPSEC_START] = {MAP(MAP_ONE_ISLAND),                            HEAL_LOCATION_ONE_ISLAND},
+    [MAPSEC_TWO_ISLAND          - KANTO_MAPSEC_START] = {MAP(MAP_TWO_ISLAND),                            HEAL_LOCATION_TWO_ISLAND},
+    [MAPSEC_THREE_ISLAND        - KANTO_MAPSEC_START] = {MAP(MAP_THREE_ISLAND),                          HEAL_LOCATION_THREE_ISLAND},
+    [MAPSEC_FOUR_ISLAND         - KANTO_MAPSEC_START] = {MAP(MAP_FOUR_ISLAND),                           HEAL_LOCATION_FOUR_ISLAND},
+    [MAPSEC_FIVE_ISLAND         - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND),                           HEAL_LOCATION_FIVE_ISLAND},
+    [MAPSEC_SEVEN_ISLAND        - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND),                          HEAL_LOCATION_SEVEN_ISLAND},
+    [MAPSEC_SIX_ISLAND          - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND),                            HEAL_LOCATION_SIX_ISLAND},
+    [MAPSEC_KINDLE_ROAD         - KANTO_MAPSEC_START] = {MAP(MAP_ONE_ISLAND_KINDLE_ROAD),                HEAL_LOCATION_NONE},
+    [MAPSEC_TREASURE_BEACH      - KANTO_MAPSEC_START] = {MAP(MAP_ONE_ISLAND_TREASURE_BEACH),             HEAL_LOCATION_NONE},
+    [MAPSEC_CAPE_BRINK          - KANTO_MAPSEC_START] = {MAP(MAP_TWO_ISLAND_CAPE_BRINK),                 HEAL_LOCATION_NONE},
+    [MAPSEC_BOND_BRIDGE         - KANTO_MAPSEC_START] = {MAP(MAP_THREE_ISLAND_BOND_BRIDGE),              HEAL_LOCATION_NONE},
+    [MAPSEC_THREE_ISLE_PORT     - KANTO_MAPSEC_START] = {MAP(MAP_THREE_ISLAND_PORT),                     HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_6        - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_6),                HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_7        - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_7),                HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_8        - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_8),                HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_9        - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_9),                HEAL_LOCATION_NONE},
+    [MAPSEC_RESORT_GORGEOUS     - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS),           HEAL_LOCATION_NONE},
+    [MAPSEC_WATER_LABYRINTH     - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH),           HEAL_LOCATION_NONE},
+    [MAPSEC_FIVE_ISLE_MEADOW    - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_MEADOW),                    HEAL_LOCATION_NONE},
+    [MAPSEC_MEMORIAL_PILLAR     - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR),           HEAL_LOCATION_NONE},
+    [MAPSEC_OUTCAST_ISLAND      - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND),             HEAL_LOCATION_NONE},
+    [MAPSEC_GREEN_PATH          - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_GREEN_PATH),                 HEAL_LOCATION_NONE},
+    [MAPSEC_WATER_PATH          - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_WATER_PATH),                 HEAL_LOCATION_NONE},
+    [MAPSEC_RUIN_VALLEY         - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_RUIN_VALLEY),                HEAL_LOCATION_NONE},
+    [MAPSEC_TRAINER_TOWER       - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER),            HEAL_LOCATION_NONE},
+    [MAPSEC_CANYON_ENTRANCE     - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE),  HEAL_LOCATION_NONE},
+    [MAPSEC_SEVAULT_CANYON      - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON),           HEAL_LOCATION_NONE},
+    [MAPSEC_TANOBY_RUINS        - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS),             HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_22       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_23       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_SEVII_ISLE_24       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_NAVEL_ROCK          - KANTO_MAPSEC_START] = {MAP(MAP_NAVEL_ROCK_EXTERIOR),                   HEAL_LOCATION_NONE},
+    [MAPSEC_MT_EMBER            - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_BERRY_FOREST        - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_ICEFALL_CAVE        - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_ROCKET_WAREHOUSE    - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_TRAINER_TOWER_2     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_DOTTED_HOLE         - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_LOST_CAVE           - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_PATTERN_BUSH        - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_ALTERING_CAVE       - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_TANOBY_CHAMBERS     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_THREE_ISLE_PATH     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_TANOBY_KEY          - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_BIRTH_ISLAND        - KANTO_MAPSEC_START] = {MAP(MAP_BIRTH_ISLAND_EXTERIOR),                 HEAL_LOCATION_NONE},
+    [MAPSEC_MONEAN_CHAMBER      - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_LIPTOO_CHAMBER      - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_WEEPTH_CHAMBER      - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_DILFORD_CHAMBER     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_SCUFIB_CHAMBER      - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_RIXY_CHAMBER        - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_VIAPOIS_CHAMBER     - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
+    [MAPSEC_EMBER_SPA           - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN),                           HEAL_LOCATION_NONE},
 };
 
 static void RegionMap_DarkenPalette(u16 *pal, u16 size, u16 tint)
@@ -1029,7 +1029,7 @@ static void InitRegionMapType(void)
         sRegionMap->permissions[MAPPERM_HAS_SWITCH_BUTTON] = FALSE;
     region = REGIONMAP_KANTO;
     j = REGIONMAP_KANTO;
-    if (gMapHeader.regionMapSectionId >= MAPSECS_SEVII_123)
+    if (gMapHeader.regionMapSectionId >= SEVII_MAPSEC_START)
     {
         // Mapsec is in Sevii Islands, determine which map to use
         while (region == REGIONMAP_KANTO)
@@ -1470,7 +1470,7 @@ static void DisplayCurrentDungeonName(void)
     mapsecId = GetDungeonMapsecUnderCursor();
     if (mapsecId != MAPSEC_NONE)
     {
-         descOffset = mapsecId - MAPSECS_KANTO;
+         descOffset = mapsecId - KANTO_MAPSEC_START;
          SetDispCnt(1, FALSE);
          sRegionMap->dungeonWinTop = TRUE;
          sRegionMap->dungeonWinLeft = StringLength(sMapNames[descOffset]);
@@ -3154,7 +3154,7 @@ static void GetPlayerPositionOnRegionMap(void)
         break;
     }
 
-    sMapCursor->selectedMapsec -= MAPSECS_KANTO;
+    sMapCursor->selectedMapsec -= KANTO_MAPSEC_START;
     divisor = width / sMapSectionDimensions[sMapCursor->selectedMapsec][0];
     if (divisor == 0)
         divisor = 1;
@@ -3803,7 +3803,7 @@ u8 *GetMapName(u8 *dst0, u16 mapsec, u16 fill)
     u8 *dst;
     u16 i;
     u16 idx;
-    if ((idx = mapsec - MAPSECS_KANTO) <= MAPSEC_SPECIAL_AREA - MAPSECS_KANTO)
+    if ((idx = mapsec - KANTO_MAPSEC_START) <= MAPSEC_SPECIAL_AREA - KANTO_MAPSEC_START)
     {
         if (IsCeladonDeptStoreMapsec(mapsec) == TRUE)
             dst = StringCopy(dst0, sMapsecName_CELADON_DEPT_);
@@ -4022,7 +4022,7 @@ static void FreeFlyMap(u8 taskId)
 
 static void SetFlyWarpDestination(u16 mapsec)
 {
-    u16 idx = mapsec - MAPSECS_KANTO;
+    u16 idx = mapsec - KANTO_MAPSEC_START;
     if (sMapFlyDestinations[idx][2])
     {
         SetWarpDestinationToHealLocation(sMapFlyDestinations[idx][2]);