diff --git a/include/constants/.gitignore b/include/constants/.gitignore
index 761af9db76..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
\ No newline at end of file
+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 5b8029acf5..0000000000
--- a/include/constants/region_map_sections.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#ifndef GUARD_REGIONMAPSEC_H
-#define GUARD_REGIONMAPSEC_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_126               0x33
-#define MAPSEC_UNDERWATER_127               0x34
-#define MAPSEC_UNDERWATER_128               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_SEAFLOOR_CAVERN   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 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 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_FRLG              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_FRLG           0xB7
-#define MAPSEC_TANOBY_CHAMBERS              0xB8
-#define MAPSEC_THREE_ISLE_PATH              0xB9
-#define MAPSEC_TANOBY_KEY                   0xBA
-#define MAPSEC_BIRTH_ISLAND_FRLG            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_AQUA_HIDEOUT                 0xC5
-#define MAPSEC_MAGMA_HIDEOUT                0xC6
-#define MAPSEC_MIRAGE_TOWER                 0xC7
-#define MAPSEC_BIRTH_ISLAND                 0xC8
-#define MAPSEC_FARAWAY_ISLAND               0xC9
-#define MAPSEC_ARTISAN_CAVE                 0xCA
-#define MAPSEC_MARINE_CAVE                  0xCB
-#define MAPSEC_UNDERWATER_MARINE_CAVE       0xCC
-#define MAPSEC_TERRA_CAVE                   0xCD
-#define MAPSEC_UNDERWATER_105               0xCE
-#define MAPSEC_UNDERWATER_125               0xCF
-#define MAPSEC_UNDERWATER_129               0xD0
-#define MAPSEC_DESERT_UNDERPASS             0xD1
-#define MAPSEC_ALTERING_CAVE                0xD2
-#define MAPSEC_NAVEL_ROCK                   0xD3
-#define MAPSEC_TRAINER_HILL                 0xD4
-#define MAPSEC_NONE                         0xD5
-
-#define METLOC_SPECIAL_EGG                  0xFD
-#define METLOC_IN_GAME_TRADE                0xFE
-#define METLOC_FATEFUL_ENCOUNTER            0xFF
-
-#define KANTO_MAPSEC_START  MAPSEC_PALLET_TOWN
-#define KANTO_MAPSEC_END    MAPSEC_SPECIAL_AREA
-#define KANTO_MAPSEC_COUNT (KANTO_MAPSEC_END - KANTO_MAPSEC_START + 1)
-
-#endif //GUARD_REGIONMAPSEC_H
diff --git a/json_data_rules.mk b/json_data_rules.mk
index aa9e5b3a25..5847914c7c 100755
--- a/json_data_rules.mk
+++ b/json_data_rules.mk
@@ -12,3 +12,7 @@ $(DATA_SRC_SUBDIR)/region_map/region_map_entries.h: $(DATA_SRC_SUBDIR)/region_ma
 	$(JSONPROC) $^ $@
 
 $(C_BUILDDIR)/region_map.o: c_dep += $(DATA_SRC_SUBDIR)/region_map/region_map_entries.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) $^ $@
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..340c29b33d
--- /dev/null
+++ b/src/data/region_map/region_map_sections.constants.json.txt
@@ -0,0 +1,22 @@
+{{ 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
+};
+
+// 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
+
+#define KANTO_MAPSEC_START  MAPSEC_PALLET_TOWN
+#define KANTO_MAPSEC_END    MAPSEC_SPECIAL_AREA
+#define KANTO_MAPSEC_COUNT (KANTO_MAPSEC_END - KANTO_MAPSEC_START + 1)
+
+#endif // GUARD_CONSTANTS_REGION_MAP_SECTIONS_H
diff --git a/src/data/region_map/region_map_sections.json b/src/data/region_map/region_map_sections.json
index 8fa0079117..fa7eb5efa4 100644
--- a/src/data/region_map/region_map_sections.json
+++ b/src/data/region_map/region_map_sections.json
@@ -1,7 +1,7 @@
 {
   "map_sections": [
     {
-      "map_section": "MAPSEC_LITTLEROOT_TOWN",
+      "id": "MAPSEC_LITTLEROOT_TOWN",
       "name": "LITTLEROOT TOWN",
       "x": 4,
       "y": 11,
@@ -9,7 +9,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_OLDALE_TOWN",
+      "id": "MAPSEC_OLDALE_TOWN",
       "name": "OLDALE TOWN",
       "x": 4,
       "y": 9,
@@ -17,7 +17,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DEWFORD_TOWN",
+      "id": "MAPSEC_DEWFORD_TOWN",
       "name": "DEWFORD TOWN",
       "x": 2,
       "y": 14,
@@ -25,7 +25,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LAVARIDGE_TOWN",
+      "id": "MAPSEC_LAVARIDGE_TOWN",
       "name": "LAVARIDGE TOWN",
       "x": 5,
       "y": 3,
@@ -33,7 +33,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FALLARBOR_TOWN",
+      "id": "MAPSEC_FALLARBOR_TOWN",
       "name": "FALLARBOR TOWN",
       "x": 3,
       "y": 0,
@@ -41,7 +41,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VERDANTURF_TOWN",
+      "id": "MAPSEC_VERDANTURF_TOWN",
       "name": "VERDANTURF TOWN",
       "x": 4,
       "y": 6,
@@ -49,7 +49,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PACIFIDLOG_TOWN",
+      "id": "MAPSEC_PACIFIDLOG_TOWN",
       "name": "PACIFIDLOG TOWN",
       "x": 17,
       "y": 10,
@@ -57,7 +57,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PETALBURG_CITY",
+      "id": "MAPSEC_PETALBURG_CITY",
       "name": "PETALBURG CITY",
       "x": 1,
       "y": 9,
@@ -65,7 +65,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SLATEPORT_CITY",
+      "id": "MAPSEC_SLATEPORT_CITY",
       "name": "SLATEPORT CITY",
       "x": 8,
       "y": 10,
@@ -73,7 +73,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_MAUVILLE_CITY",
+      "id": "MAPSEC_MAUVILLE_CITY",
       "name": "MAUVILLE CITY",
       "x": 8,
       "y": 6,
@@ -81,7 +81,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_RUSTBORO_CITY",
+      "id": "MAPSEC_RUSTBORO_CITY",
       "name": "RUSTBORO CITY",
       "x": 0,
       "y": 5,
@@ -89,7 +89,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_FORTREE_CITY",
+      "id": "MAPSEC_FORTREE_CITY",
       "name": "FORTREE CITY",
       "x": 12,
       "y": 0,
@@ -97,7 +97,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LILYCOVE_CITY",
+      "id": "MAPSEC_LILYCOVE_CITY",
       "name": "LILYCOVE CITY",
       "x": 18,
       "y": 3,
@@ -105,7 +105,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MOSSDEEP_CITY",
+      "id": "MAPSEC_MOSSDEEP_CITY",
       "name": "MOSSDEEP CITY",
       "x": 24,
       "y": 5,
@@ -113,7 +113,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SOOTOPOLIS_CITY",
+      "id": "MAPSEC_SOOTOPOLIS_CITY",
       "name": "SOOTOPOLIS CITY",
       "x": 21,
       "y": 7,
@@ -121,7 +121,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_EVER_GRANDE_CITY",
+      "id": "MAPSEC_EVER_GRANDE_CITY",
       "name": "EVER GRANDE CITY",
       "x": 27,
       "y": 8,
@@ -129,7 +129,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_101",
+      "id": "MAPSEC_ROUTE_101",
       "name": "ROUTE 101",
       "x": 4,
       "y": 10,
@@ -137,7 +137,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_102",
+      "id": "MAPSEC_ROUTE_102",
       "name": "ROUTE 102",
       "x": 2,
       "y": 9,
@@ -145,7 +145,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_103",
+      "id": "MAPSEC_ROUTE_103",
       "name": "ROUTE 103",
       "x": 4,
       "y": 8,
@@ -153,7 +153,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_104",
+      "id": "MAPSEC_ROUTE_104",
       "name": "ROUTE 104",
       "x": 0,
       "y": 7,
@@ -161,7 +161,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_105",
+      "id": "MAPSEC_ROUTE_105",
       "name": "ROUTE 105",
       "x": 0,
       "y": 10,
@@ -169,7 +169,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_106",
+      "id": "MAPSEC_ROUTE_106",
       "name": "ROUTE 106",
       "x": 0,
       "y": 13,
@@ -177,7 +177,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_107",
+      "id": "MAPSEC_ROUTE_107",
       "name": "ROUTE 107",
       "x": 3,
       "y": 14,
@@ -185,7 +185,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_108",
+      "id": "MAPSEC_ROUTE_108",
       "name": "ROUTE 108",
       "x": 6,
       "y": 14,
@@ -193,7 +193,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_109",
+      "id": "MAPSEC_ROUTE_109",
       "name": "ROUTE 109",
       "x": 8,
       "y": 12,
@@ -201,7 +201,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_110",
+      "id": "MAPSEC_ROUTE_110",
       "name": "ROUTE 110",
       "x": 8,
       "y": 7,
@@ -209,7 +209,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_111",
+      "id": "MAPSEC_ROUTE_111",
       "name": "ROUTE 111",
       "x": 8,
       "y": 0,
@@ -217,7 +217,7 @@
       "height": 6
     },
     {
-      "map_section": "MAPSEC_ROUTE_112",
+      "id": "MAPSEC_ROUTE_112",
       "name": "ROUTE 112",
       "x": 6,
       "y": 3,
@@ -225,7 +225,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_113",
+      "id": "MAPSEC_ROUTE_113",
       "name": "ROUTE 113",
       "x": 4,
       "y": 0,
@@ -233,7 +233,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_114",
+      "id": "MAPSEC_ROUTE_114",
       "name": "ROUTE 114",
       "x": 1,
       "y": 0,
@@ -241,7 +241,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_115",
+      "id": "MAPSEC_ROUTE_115",
       "name": "ROUTE 115",
       "x": 0,
       "y": 2,
@@ -249,7 +249,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_116",
+      "id": "MAPSEC_ROUTE_116",
       "name": "ROUTE 116",
       "x": 1,
       "y": 5,
@@ -257,7 +257,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_117",
+      "id": "MAPSEC_ROUTE_117",
       "name": "ROUTE 117",
       "x": 5,
       "y": 6,
@@ -265,7 +265,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_118",
+      "id": "MAPSEC_ROUTE_118",
       "name": "ROUTE 118",
       "x": 10,
       "y": 6,
@@ -273,7 +273,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_119",
+      "id": "MAPSEC_ROUTE_119",
       "name": "ROUTE 119",
       "x": 11,
       "y": 0,
@@ -281,7 +281,7 @@
       "height": 6
     },
     {
-      "map_section": "MAPSEC_ROUTE_120",
+      "id": "MAPSEC_ROUTE_120",
       "name": "ROUTE 120",
       "x": 13,
       "y": 0,
@@ -289,7 +289,7 @@
       "height": 4
     },
     {
-      "map_section": "MAPSEC_ROUTE_121",
+      "id": "MAPSEC_ROUTE_121",
       "name": "ROUTE 121",
       "x": 14,
       "y": 3,
@@ -297,7 +297,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_122",
+      "id": "MAPSEC_ROUTE_122",
       "name": "ROUTE 122",
       "x": 16,
       "y": 4,
@@ -305,7 +305,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_123",
+      "id": "MAPSEC_ROUTE_123",
       "name": "ROUTE 123",
       "x": 12,
       "y": 6,
@@ -313,7 +313,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_124",
+      "id": "MAPSEC_ROUTE_124",
       "name": "ROUTE 124",
       "x": 20,
       "y": 3,
@@ -321,7 +321,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_125",
+      "id": "MAPSEC_ROUTE_125",
       "name": "ROUTE 125",
       "x": 24,
       "y": 3,
@@ -329,7 +329,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_ROUTE_126",
+      "id": "MAPSEC_ROUTE_126",
       "name": "ROUTE 126",
       "x": 20,
       "y": 6,
@@ -337,7 +337,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_127",
+      "id": "MAPSEC_ROUTE_127",
       "name": "ROUTE 127",
       "x": 23,
       "y": 6,
@@ -345,7 +345,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_ROUTE_128",
+      "id": "MAPSEC_ROUTE_128",
       "name": "ROUTE 128",
       "x": 23,
       "y": 9,
@@ -353,7 +353,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_129",
+      "id": "MAPSEC_ROUTE_129",
       "name": "ROUTE 129",
       "x": 24,
       "y": 10,
@@ -361,7 +361,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_130",
+      "id": "MAPSEC_ROUTE_130",
       "name": "ROUTE 130",
       "x": 21,
       "y": 10,
@@ -369,7 +369,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_131",
+      "id": "MAPSEC_ROUTE_131",
       "name": "ROUTE 131",
       "x": 18,
       "y": 10,
@@ -377,7 +377,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_132",
+      "id": "MAPSEC_ROUTE_132",
       "name": "ROUTE 132",
       "x": 15,
       "y": 10,
@@ -385,7 +385,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_133",
+      "id": "MAPSEC_ROUTE_133",
       "name": "ROUTE 133",
       "x": 12,
       "y": 10,
@@ -393,7 +393,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_134",
+      "id": "MAPSEC_ROUTE_134",
       "name": "ROUTE 134",
       "x": 9,
       "y": 10,
@@ -401,7 +401,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_124",
+      "id": "MAPSEC_UNDERWATER_124",
       "name": "UNDERWATER",
       "x": 20,
       "y": 3,
@@ -409,7 +409,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_126",
+      "id": "MAPSEC_UNDERWATER_126",
       "name": "UNDERWATER",
       "x": 20,
       "y": 6,
@@ -417,7 +417,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_127",
+      "id": "MAPSEC_UNDERWATER_127",
       "name": "UNDERWATER",
       "x": 23,
       "y": 6,
@@ -425,7 +425,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_128",
+      "id": "MAPSEC_UNDERWATER_128",
       "name": "UNDERWATER",
       "x": 23,
       "y": 9,
@@ -433,7 +433,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
+      "id": "MAPSEC_UNDERWATER_SOOTOPOLIS",
       "name": "UNDERWATER",
       "x": 21,
       "y": 7,
@@ -441,7 +441,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_GRANITE_CAVE",
+      "id": "MAPSEC_GRANITE_CAVE",
       "name": "GRANITE CAVE",
       "x": 1,
       "y": 13,
@@ -449,7 +449,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MT_CHIMNEY",
+      "id": "MAPSEC_MT_CHIMNEY",
       "name": "MT. CHIMNEY",
       "x": 6,
       "y": 2,
@@ -457,7 +457,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SAFARI_ZONE",
+      "id": "MAPSEC_SAFARI_ZONE",
       "name": "SAFARI ZONE",
       "x": 16,
       "y": 2,
@@ -465,7 +465,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BATTLE_FRONTIER",
+      "id": "MAPSEC_BATTLE_FRONTIER",
       "name": "BATTLE FRONTIER",
       "x": 22,
       "y": 12,
@@ -473,7 +473,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PETALBURG_WOODS",
+      "id": "MAPSEC_PETALBURG_WOODS",
       "name": "PETALBURG WOODS",
       "x": 0,
       "y": 8,
@@ -481,7 +481,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_RUSTURF_TUNNEL",
+      "id": "MAPSEC_RUSTURF_TUNNEL",
       "name": "RUSTURF TUNNEL",
       "x": 2,
       "y": 5,
@@ -489,7 +489,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ABANDONED_SHIP",
+      "id": "MAPSEC_ABANDONED_SHIP",
       "name": "ABANDONED SHIP",
       "x": 6,
       "y": 14,
@@ -497,7 +497,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_NEW_MAUVILLE",
+      "id": "MAPSEC_NEW_MAUVILLE",
       "name": "NEW MAUVILLE",
       "x": 8,
       "y": 7,
@@ -505,7 +505,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_METEOR_FALLS",
+      "id": "MAPSEC_METEOR_FALLS",
       "name": "METEOR FALLS",
       "x": 0,
       "y": 3,
@@ -513,7 +513,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_METEOR_FALLS2",
+      "id": "MAPSEC_METEOR_FALLS2",
       "name": "METEOR FALLS",
       "x": 1,
       "y": 2,
@@ -521,7 +521,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MT_PYRE",
+      "id": "MAPSEC_MT_PYRE",
       "name": "MT. PYRE",
       "x": 16,
       "y": 4,
@@ -529,7 +529,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_AQUA_HIDEOUT_OLD",
+      "id": "MAPSEC_AQUA_HIDEOUT_OLD",
       "name": "{AQUA} HIDEOUT",
       "name_clone": true,
       "x": 19,
@@ -538,7 +538,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SHOAL_CAVE",
+      "id": "MAPSEC_SHOAL_CAVE",
       "name": "SHOAL CAVE",
       "x": 24,
       "y": 4,
@@ -546,7 +546,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEAFLOOR_CAVERN",
+      "id": "MAPSEC_SEAFLOOR_CAVERN",
       "name": "SEAFLOOR CAVERN",
       "x": 24,
       "y": 9,
@@ -554,7 +554,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_SEAFLOOR_CAVERN",
+      "id": "MAPSEC_UNDERWATER_SEAFLOOR_CAVERN",
       "name": "UNDERWATER",
       "x": 24,
       "y": 9,
@@ -562,7 +562,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VICTORY_ROAD",
+      "id": "MAPSEC_VICTORY_ROAD",
       "name": "VICTORY ROAD",
       "x": 27,
       "y": 9,
@@ -570,7 +570,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MIRAGE_ISLAND",
+      "id": "MAPSEC_MIRAGE_ISLAND",
       "name": "MIRAGE ISLAND",
       "x": 17,
       "y": 10,
@@ -578,7 +578,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CAVE_OF_ORIGIN",
+      "id": "MAPSEC_CAVE_OF_ORIGIN",
       "name": "CAVE OF ORIGIN",
       "x": 21,
       "y": 7,
@@ -586,7 +586,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SOUTHERN_ISLAND",
+      "id": "MAPSEC_SOUTHERN_ISLAND",
       "name": "SOUTHERN ISLAND",
       "x": 12,
       "y": 14,
@@ -594,7 +594,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FIERY_PATH",
+      "id": "MAPSEC_FIERY_PATH",
       "name": "FIERY PATH",
       "x": 6,
       "y": 3,
@@ -602,7 +602,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FIERY_PATH2",
+      "id": "MAPSEC_FIERY_PATH2",
       "name": "FIERY PATH",
       "x": 7,
       "y": 3,
@@ -610,7 +610,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_JAGGED_PASS",
+      "id": "MAPSEC_JAGGED_PASS",
       "name": "JAGGED PASS",
       "x": 6,
       "y": 3,
@@ -618,7 +618,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_JAGGED_PASS2",
+      "id": "MAPSEC_JAGGED_PASS2",
       "name": "JAGGED PASS",
       "x": 7,
       "y": 2,
@@ -626,7 +626,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEALED_CHAMBER",
+      "id": "MAPSEC_SEALED_CHAMBER",
       "name": "SEALED CHAMBER",
       "x": 11,
       "y": 10,
@@ -634,7 +634,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
+      "id": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
       "name": "UNDERWATER",
       "x": 11,
       "y": 10,
@@ -642,7 +642,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SCORCHED_SLAB",
+      "id": "MAPSEC_SCORCHED_SLAB",
       "name": "SCORCHED SLAB",
       "x": 13,
       "y": 0,
@@ -650,7 +650,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ISLAND_CAVE",
+      "id": "MAPSEC_ISLAND_CAVE",
       "name": "ISLAND CAVE",
       "x": 0,
       "y": 10,
@@ -658,7 +658,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DESERT_RUINS",
+      "id": "MAPSEC_DESERT_RUINS",
       "name": "DESERT RUINS",
       "x": 8,
       "y": 3,
@@ -666,7 +666,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ANCIENT_TOMB",
+      "id": "MAPSEC_ANCIENT_TOMB",
       "name": "ANCIENT TOMB",
       "x": 13,
       "y": 2,
@@ -674,7 +674,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_INSIDE_OF_TRUCK",
+      "id": "MAPSEC_INSIDE_OF_TRUCK",
       "name": "INSIDE OF TRUCK",
       "x": 0,
       "y": 0,
@@ -682,7 +682,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SKY_PILLAR",
+      "id": "MAPSEC_SKY_PILLAR",
       "name": "SKY PILLAR",
       "x": 19,
       "y": 10,
@@ -690,7 +690,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SECRET_BASE",
+      "id": "MAPSEC_SECRET_BASE",
       "name": "SECRET BASE",
       "x": 0,
       "y": 0,
@@ -698,7 +698,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DYNAMIC",
+      "id": "MAPSEC_DYNAMIC",
       "name": "",
       "x": 0,
       "y": 0,
@@ -706,7 +706,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PALLET_TOWN",
+      "id": "MAPSEC_PALLET_TOWN",
       "name": "PALLET TOWN",
       "x": 0,
       "y": 0,
@@ -714,7 +714,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VIRIDIAN_CITY",
+      "id": "MAPSEC_VIRIDIAN_CITY",
       "name": "VIRIDIAN CITY",
       "x": 0,
       "y": 0,
@@ -722,7 +722,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PEWTER_CITY",
+      "id": "MAPSEC_PEWTER_CITY",
       "name": "PEWTER CITY",
       "x": 0,
       "y": 0,
@@ -730,7 +730,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CERULEAN_CITY",
+      "id": "MAPSEC_CERULEAN_CITY",
       "name": "CERULEAN CITY",
       "x": 0,
       "y": 0,
@@ -738,7 +738,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LAVENDER_TOWN",
+      "id": "MAPSEC_LAVENDER_TOWN",
       "name": "LAVENDER TOWN",
       "x": 0,
       "y": 0,
@@ -746,7 +746,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VERMILION_CITY",
+      "id": "MAPSEC_VERMILION_CITY",
       "name": "VERMILION CITY",
       "x": 0,
       "y": 0,
@@ -754,7 +754,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CELADON_CITY",
+      "id": "MAPSEC_CELADON_CITY",
       "name": "CELADON CITY",
       "x": 0,
       "y": 0,
@@ -762,7 +762,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FUCHSIA_CITY",
+      "id": "MAPSEC_FUCHSIA_CITY",
       "name": "FUCHSIA CITY",
       "x": 0,
       "y": 0,
@@ -770,7 +770,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CINNABAR_ISLAND",
+      "id": "MAPSEC_CINNABAR_ISLAND",
       "name": "CINNABAR ISLAND",
       "x": 0,
       "y": 0,
@@ -778,7 +778,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_INDIGO_PLATEAU",
+      "id": "MAPSEC_INDIGO_PLATEAU",
       "name": "INDIGO PLATEAU",
       "x": 0,
       "y": 0,
@@ -786,7 +786,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SAFFRON_CITY",
+      "id": "MAPSEC_SAFFRON_CITY",
       "name": "SAFFRON CITY",
       "x": 0,
       "y": 0,
@@ -794,7 +794,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_4_POKECENTER",
+      "id": "MAPSEC_ROUTE_4_POKECENTER",
       "name": "ROUTE 4",
       "name_clone": true,
       "x": 0,
@@ -803,7 +803,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_10_POKECENTER",
+      "id": "MAPSEC_ROUTE_10_POKECENTER",
       "name": "ROUTE 10",
       "name_clone": true,
       "x": 0,
@@ -812,7 +812,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_1",
+      "id": "MAPSEC_ROUTE_1",
       "name": "ROUTE 1",
       "x": 0,
       "y": 0,
@@ -820,7 +820,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_2",
+      "id": "MAPSEC_ROUTE_2",
       "name": "ROUTE 2",
       "x": 0,
       "y": 0,
@@ -828,7 +828,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_3",
+      "id": "MAPSEC_ROUTE_3",
       "name": "ROUTE 3",
       "x": 0,
       "y": 0,
@@ -836,7 +836,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_4",
+      "id": "MAPSEC_ROUTE_4",
       "name": "ROUTE 4",
       "x": 0,
       "y": 0,
@@ -844,7 +844,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_5",
+      "id": "MAPSEC_ROUTE_5",
       "name": "ROUTE 5",
       "x": 0,
       "y": 0,
@@ -852,7 +852,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_6",
+      "id": "MAPSEC_ROUTE_6",
       "name": "ROUTE 6",
       "x": 0,
       "y": 0,
@@ -860,7 +860,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_7",
+      "id": "MAPSEC_ROUTE_7",
       "name": "ROUTE 7",
       "x": 0,
       "y": 0,
@@ -868,7 +868,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_8",
+      "id": "MAPSEC_ROUTE_8",
       "name": "ROUTE 8",
       "x": 0,
       "y": 0,
@@ -876,7 +876,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_9",
+      "id": "MAPSEC_ROUTE_9",
       "name": "ROUTE 9",
       "x": 0,
       "y": 0,
@@ -884,7 +884,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_10",
+      "id": "MAPSEC_ROUTE_10",
       "name": "ROUTE 10",
       "x": 0,
       "y": 0,
@@ -892,7 +892,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_11",
+      "id": "MAPSEC_ROUTE_11",
       "name": "ROUTE 11",
       "x": 0,
       "y": 0,
@@ -900,7 +900,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_12",
+      "id": "MAPSEC_ROUTE_12",
       "name": "ROUTE 12",
       "x": 0,
       "y": 0,
@@ -908,7 +908,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_13",
+      "id": "MAPSEC_ROUTE_13",
       "name": "ROUTE 13",
       "x": 0,
       "y": 0,
@@ -916,7 +916,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_14",
+      "id": "MAPSEC_ROUTE_14",
       "name": "ROUTE 14",
       "x": 0,
       "y": 0,
@@ -924,7 +924,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_15",
+      "id": "MAPSEC_ROUTE_15",
       "name": "ROUTE 15",
       "x": 0,
       "y": 0,
@@ -932,7 +932,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_16",
+      "id": "MAPSEC_ROUTE_16",
       "name": "ROUTE 16",
       "x": 0,
       "y": 0,
@@ -940,7 +940,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_17",
+      "id": "MAPSEC_ROUTE_17",
       "name": "ROUTE 17",
       "x": 0,
       "y": 0,
@@ -948,7 +948,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_18",
+      "id": "MAPSEC_ROUTE_18",
       "name": "ROUTE 18",
       "x": 0,
       "y": 0,
@@ -956,7 +956,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_19",
+      "id": "MAPSEC_ROUTE_19",
       "name": "ROUTE 19",
       "x": 0,
       "y": 0,
@@ -964,7 +964,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_20",
+      "id": "MAPSEC_ROUTE_20",
       "name": "ROUTE 20",
       "x": 0,
       "y": 0,
@@ -972,7 +972,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_21",
+      "id": "MAPSEC_ROUTE_21",
       "name": "ROUTE 21",
       "x": 0,
       "y": 0,
@@ -980,7 +980,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_22",
+      "id": "MAPSEC_ROUTE_22",
       "name": "ROUTE 22",
       "x": 0,
       "y": 0,
@@ -988,7 +988,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_23",
+      "id": "MAPSEC_ROUTE_23",
       "name": "ROUTE 23",
       "x": 0,
       "y": 0,
@@ -996,7 +996,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_24",
+      "id": "MAPSEC_ROUTE_24",
       "name": "ROUTE 24",
       "x": 0,
       "y": 0,
@@ -1004,7 +1004,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROUTE_25",
+      "id": "MAPSEC_ROUTE_25",
       "name": "ROUTE 25",
       "x": 0,
       "y": 0,
@@ -1012,7 +1012,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VIRIDIAN_FOREST",
+      "id": "MAPSEC_VIRIDIAN_FOREST",
       "name": "VIRIDIAN FOREST",
       "x": 0,
       "y": 0,
@@ -1020,7 +1020,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MT_MOON",
+      "id": "MAPSEC_MT_MOON",
       "name": "MT. MOON",
       "x": 0,
       "y": 0,
@@ -1028,7 +1028,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_S_S_ANNE",
+      "id": "MAPSEC_S_S_ANNE",
       "name": "S.S. ANNE",
       "x": 0,
       "y": 0,
@@ -1036,7 +1036,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERGROUND_PATH",
+      "id": "MAPSEC_UNDERGROUND_PATH",
       "name": "UNDERGROUND PATH",
       "x": 0,
       "y": 0,
@@ -1044,7 +1044,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERGROUND_PATH_2",
+      "id": "MAPSEC_UNDERGROUND_PATH_2",
       "name": "UNDERGROUND PATH",
       "name_clone": true,
       "x": 0,
@@ -1053,7 +1053,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DIGLETTS_CAVE",
+      "id": "MAPSEC_DIGLETTS_CAVE",
       "name": "DIGLETT'S CAVE",
       "x": 0,
       "y": 0,
@@ -1061,7 +1061,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_KANTO_VICTORY_ROAD",
+      "id": "MAPSEC_KANTO_VICTORY_ROAD",
       "name": "VICTORY ROAD",
       "name_clone": true,
       "x": 0,
@@ -1070,7 +1070,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROCKET_HIDEOUT",
+      "id": "MAPSEC_ROCKET_HIDEOUT",
       "name": "ROCKET HIDEOUT",
       "x": 0,
       "y": 0,
@@ -1078,7 +1078,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SILPH_CO",
+      "id": "MAPSEC_SILPH_CO",
       "name": "SILPH CO.",
       "x": 0,
       "y": 0,
@@ -1086,7 +1086,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POKEMON_MANSION",
+      "id": "MAPSEC_POKEMON_MANSION",
       "name": "POKéMON MANSION",
       "x": 0,
       "y": 0,
@@ -1094,7 +1094,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+      "id": "MAPSEC_KANTO_SAFARI_ZONE",
       "name": "SAFARI ZONE",
       "name_clone": true,
       "x": 0,
@@ -1103,7 +1103,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POKEMON_LEAGUE",
+      "id": "MAPSEC_POKEMON_LEAGUE",
       "name": "POKéMON LEAGUE",
       "x": 0,
       "y": 0,
@@ -1111,7 +1111,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROCK_TUNNEL",
+      "id": "MAPSEC_ROCK_TUNNEL",
       "name": "ROCK TUNNEL",
       "x": 0,
       "y": 0,
@@ -1119,7 +1119,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEAFOAM_ISLANDS",
+      "id": "MAPSEC_SEAFOAM_ISLANDS",
       "name": "SEAFOAM ISLANDS",
       "x": 0,
       "y": 0,
@@ -1127,7 +1127,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POKEMON_TOWER",
+      "id": "MAPSEC_POKEMON_TOWER",
       "name": "POKéMON TOWER",
       "x": 0,
       "y": 0,
@@ -1135,7 +1135,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CERULEAN_CAVE",
+      "id": "MAPSEC_CERULEAN_CAVE",
       "name": "CERULEAN CAVE",
       "x": 0,
       "y": 0,
@@ -1143,7 +1143,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_POWER_PLANT",
+      "id": "MAPSEC_POWER_PLANT",
       "name": "POWER PLANT",
       "x": 0,
       "y": 0,
@@ -1151,7 +1151,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ONE_ISLAND",
+      "id": "MAPSEC_ONE_ISLAND",
       "name": "ONE ISLAND",
       "x": 0,
       "y": 0,
@@ -1159,7 +1159,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TWO_ISLAND",
+      "id": "MAPSEC_TWO_ISLAND",
       "name": "TWO ISLAND",
       "x": 0,
       "y": 0,
@@ -1167,7 +1167,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_THREE_ISLAND",
+      "id": "MAPSEC_THREE_ISLAND",
       "name": "THREE ISLAND",
       "x": 0,
       "y": 0,
@@ -1175,7 +1175,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FOUR_ISLAND",
+      "id": "MAPSEC_FOUR_ISLAND",
       "name": "FOUR ISLAND",
       "x": 0,
       "y": 0,
@@ -1183,7 +1183,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FIVE_ISLAND",
+      "id": "MAPSEC_FIVE_ISLAND",
       "name": "FIVE ISLAND",
       "x": 0,
       "y": 0,
@@ -1191,7 +1191,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVEN_ISLAND",
+      "id": "MAPSEC_SEVEN_ISLAND",
       "name": "SEVEN ISLAND",
       "x": 0,
       "y": 0,
@@ -1199,7 +1199,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SIX_ISLAND",
+      "id": "MAPSEC_SIX_ISLAND",
       "name": "SIX ISLAND",
       "x": 0,
       "y": 0,
@@ -1207,7 +1207,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_KINDLE_ROAD",
+      "id": "MAPSEC_KINDLE_ROAD",
       "name": "KINDLE ROAD",
       "x": 0,
       "y": 0,
@@ -1215,7 +1215,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TREASURE_BEACH",
+      "id": "MAPSEC_TREASURE_BEACH",
       "name": "TREASURE BEACH",
       "x": 0,
       "y": 0,
@@ -1223,7 +1223,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CAPE_BRINK",
+      "id": "MAPSEC_CAPE_BRINK",
       "name": "CAPE BRINK",
       "x": 0,
       "y": 0,
@@ -1231,7 +1231,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BOND_BRIDGE",
+      "id": "MAPSEC_BOND_BRIDGE",
       "name": "BOND BRIDGE",
       "x": 0,
       "y": 0,
@@ -1239,7 +1239,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_THREE_ISLE_PORT",
+      "id": "MAPSEC_THREE_ISLE_PORT",
       "name": "THREE ISLE PORT",
       "x": 0,
       "y": 0,
@@ -1247,7 +1247,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_6",
+      "id": "MAPSEC_SEVII_ISLE_6",
       "name": "SEVII ISLE 6",
       "x": 0,
       "y": 0,
@@ -1255,7 +1255,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_7",
+      "id": "MAPSEC_SEVII_ISLE_7",
       "name": "SEVII ISLE 7",
       "x": 0,
       "y": 0,
@@ -1263,7 +1263,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_8",
+      "id": "MAPSEC_SEVII_ISLE_8",
       "name": "SEVII ISLE 8",
       "x": 0,
       "y": 0,
@@ -1271,7 +1271,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_9",
+      "id": "MAPSEC_SEVII_ISLE_9",
       "name": "SEVII ISLE 9",
       "x": 0,
       "y": 0,
@@ -1279,7 +1279,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_RESORT_GORGEOUS",
+      "id": "MAPSEC_RESORT_GORGEOUS",
       "name": "RESORT GORGEOUS",
       "x": 0,
       "y": 0,
@@ -1287,7 +1287,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_WATER_LABYRINTH",
+      "id": "MAPSEC_WATER_LABYRINTH",
       "name": "WATER LABYRINTH",
       "x": 0,
       "y": 0,
@@ -1295,7 +1295,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FIVE_ISLE_MEADOW",
+      "id": "MAPSEC_FIVE_ISLE_MEADOW",
       "name": "FIVE ISLE MEADOW",
       "x": 0,
       "y": 0,
@@ -1303,7 +1303,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MEMORIAL_PILLAR",
+      "id": "MAPSEC_MEMORIAL_PILLAR",
       "name": "MEMORIAL PILLAR",
       "x": 0,
       "y": 0,
@@ -1311,7 +1311,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_OUTCAST_ISLAND",
+      "id": "MAPSEC_OUTCAST_ISLAND",
       "name": "OUTCAST ISLAND",
       "x": 0,
       "y": 0,
@@ -1319,7 +1319,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_GREEN_PATH",
+      "id": "MAPSEC_GREEN_PATH",
       "name": "GREEN PATH",
       "x": 0,
       "y": 0,
@@ -1327,7 +1327,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_WATER_PATH",
+      "id": "MAPSEC_WATER_PATH",
       "name": "WATER PATH",
       "x": 0,
       "y": 0,
@@ -1335,7 +1335,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_RUIN_VALLEY",
+      "id": "MAPSEC_RUIN_VALLEY",
       "name": "RUIN VALLEY",
       "x": 0,
       "y": 0,
@@ -1343,7 +1343,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TRAINER_TOWER",
+      "id": "MAPSEC_TRAINER_TOWER",
       "name": "TRAINER TOWER",
       "x": 0,
       "y": 0,
@@ -1351,7 +1351,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_CANYON_ENTRANCE",
+      "id": "MAPSEC_CANYON_ENTRANCE",
       "name": "CANYON ENTRANCE",
       "x": 0,
       "y": 0,
@@ -1359,7 +1359,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVAULT_CANYON",
+      "id": "MAPSEC_SEVAULT_CANYON",
       "name": "SEVAULT CANYON",
       "x": 0,
       "y": 0,
@@ -1367,7 +1367,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TANOBY_RUINS",
+      "id": "MAPSEC_TANOBY_RUINS",
       "name": "TANOBY RUINS",
       "x": 0,
       "y": 0,
@@ -1375,7 +1375,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_22",
+      "id": "MAPSEC_SEVII_ISLE_22",
       "name": "SEVII ISLE 22",
       "x": 0,
       "y": 0,
@@ -1383,7 +1383,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_23",
+      "id": "MAPSEC_SEVII_ISLE_23",
       "name": "SEVII ISLE 23",
       "x": 0,
       "y": 0,
@@ -1391,7 +1391,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SEVII_ISLE_24",
+      "id": "MAPSEC_SEVII_ISLE_24",
       "name": "SEVII ISLE 24",
       "x": 0,
       "y": 0,
@@ -1399,7 +1399,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_NAVEL_ROCK_FRLG",
+      "id": "MAPSEC_NAVEL_ROCK_FRLG",
       "name": "NAVEL ROCK",
       "x": 0,
       "y": 0,
@@ -1407,7 +1407,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MT_EMBER",
+      "id": "MAPSEC_MT_EMBER",
       "name": "MT. EMBER",
       "x": 0,
       "y": 0,
@@ -1415,7 +1415,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BERRY_FOREST",
+      "id": "MAPSEC_BERRY_FOREST",
       "name": "BERRY FOREST",
       "x": 0,
       "y": 0,
@@ -1423,7 +1423,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ICEFALL_CAVE",
+      "id": "MAPSEC_ICEFALL_CAVE",
       "name": "ICEFALL CAVE",
       "x": 0,
       "y": 0,
@@ -1431,7 +1431,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ROCKET_WAREHOUSE",
+      "id": "MAPSEC_ROCKET_WAREHOUSE",
       "name": "ROCKET WAREHOUSE",
       "x": 0,
       "y": 0,
@@ -1439,7 +1439,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TRAINER_TOWER_2",
+      "id": "MAPSEC_TRAINER_TOWER_2",
       "name": "TRAINER TOWER",
       "name_clone": true,
       "x": 0,
@@ -1448,7 +1448,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DOTTED_HOLE",
+      "id": "MAPSEC_DOTTED_HOLE",
       "name": "DOTTED HOLE",
       "x": 0,
       "y": 0,
@@ -1456,7 +1456,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LOST_CAVE",
+      "id": "MAPSEC_LOST_CAVE",
       "name": "LOST CAVE",
       "x": 0,
       "y": 0,
@@ -1464,7 +1464,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_PATTERN_BUSH",
+      "id": "MAPSEC_PATTERN_BUSH",
       "name": "PATTERN BUSH",
       "x": 0,
       "y": 0,
@@ -1472,7 +1472,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ALTERING_CAVE_FRLG",
+      "id": "MAPSEC_ALTERING_CAVE_FRLG",
       "name": "ALTERING CAVE",
       "x": 0,
       "y": 0,
@@ -1480,7 +1480,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TANOBY_CHAMBERS",
+      "id": "MAPSEC_TANOBY_CHAMBERS",
       "name": "TANOBY CHAMBERS",
       "x": 0,
       "y": 0,
@@ -1488,7 +1488,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_THREE_ISLE_PATH",
+      "id": "MAPSEC_THREE_ISLE_PATH",
       "name": "THREE ISLE PATH",
       "x": 0,
       "y": 0,
@@ -1496,7 +1496,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TANOBY_KEY",
+      "id": "MAPSEC_TANOBY_KEY",
       "name": "TANOBY KEY",
       "x": 0,
       "y": 0,
@@ -1504,7 +1504,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BIRTH_ISLAND_FRLG",
+      "id": "MAPSEC_BIRTH_ISLAND_FRLG",
       "name": "BIRTH ISLAND",
       "x": 0,
       "y": 0,
@@ -1512,7 +1512,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MONEAN_CHAMBER",
+      "id": "MAPSEC_MONEAN_CHAMBER",
       "name": "MONEAN CHAMBER",
       "x": 0,
       "y": 0,
@@ -1520,7 +1520,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_LIPTOO_CHAMBER",
+      "id": "MAPSEC_LIPTOO_CHAMBER",
       "name": "LIPTOO CHAMBER",
       "x": 0,
       "y": 0,
@@ -1528,7 +1528,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_WEEPTH_CHAMBER",
+      "id": "MAPSEC_WEEPTH_CHAMBER",
       "name": "WEEPTH CHAMBER",
       "x": 0,
       "y": 0,
@@ -1536,7 +1536,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DILFORD_CHAMBER",
+      "id": "MAPSEC_DILFORD_CHAMBER",
       "name": "DILFORD CHAMBER",
       "x": 0,
       "y": 0,
@@ -1544,7 +1544,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SCUFIB_CHAMBER",
+      "id": "MAPSEC_SCUFIB_CHAMBER",
       "name": "SCUFIB CHAMBER",
       "x": 0,
       "y": 0,
@@ -1552,7 +1552,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_RIXY_CHAMBER",
+      "id": "MAPSEC_RIXY_CHAMBER",
       "name": "RIXY CHAMBER",
       "x": 0,
       "y": 0,
@@ -1560,7 +1560,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_VIAPOIS_CHAMBER",
+      "id": "MAPSEC_VIAPOIS_CHAMBER",
       "name": "VIAPOIS CHAMBER",
       "x": 0,
       "y": 0,
@@ -1568,7 +1568,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_EMBER_SPA",
+      "id": "MAPSEC_EMBER_SPA",
       "name": "EMBER SPA",
       "x": 0,
       "y": 0,
@@ -1576,7 +1576,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_SPECIAL_AREA",
+      "id": "MAPSEC_SPECIAL_AREA",
       "name": "SPECIAL AREA",
       "x": 0,
       "y": 0,
@@ -1584,7 +1584,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_AQUA_HIDEOUT",
+      "id": "MAPSEC_AQUA_HIDEOUT",
       "name": "AQUA HIDEOUT",
       "x": 19,
       "y": 3,
@@ -1592,7 +1592,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MAGMA_HIDEOUT",
+      "id": "MAPSEC_MAGMA_HIDEOUT",
       "name": "MAGMA HIDEOUT",
       "x": 6,
       "y": 3,
@@ -1600,7 +1600,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MIRAGE_TOWER",
+      "id": "MAPSEC_MIRAGE_TOWER",
       "name": "MIRAGE TOWER",
       "x": 8,
       "y": 2,
@@ -1608,7 +1608,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_BIRTH_ISLAND",
+      "id": "MAPSEC_BIRTH_ISLAND",
       "name": "BIRTH ISLAND",
       "x": 0,
       "y": 0,
@@ -1616,7 +1616,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_FARAWAY_ISLAND",
+      "id": "MAPSEC_FARAWAY_ISLAND",
       "name": "FARAWAY ISLAND",
       "x": 0,
       "y": 0,
@@ -1624,7 +1624,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ARTISAN_CAVE",
+      "id": "MAPSEC_ARTISAN_CAVE",
       "name": "ARTISAN CAVE",
       "x": 22,
       "y": 12,
@@ -1632,7 +1632,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_MARINE_CAVE",
+      "id": "MAPSEC_MARINE_CAVE",
       "name": "MARINE CAVE",
       "x": 0,
       "y": 0,
@@ -1640,7 +1640,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_MARINE_CAVE",
+      "id": "MAPSEC_UNDERWATER_MARINE_CAVE",
       "name": "UNDERWATER",
       "x": 0,
       "y": 0,
@@ -1648,7 +1648,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TERRA_CAVE",
+      "id": "MAPSEC_TERRA_CAVE",
       "name": "TERRA CAVE",
       "x": 0,
       "y": 0,
@@ -1656,7 +1656,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_105",
+      "id": "MAPSEC_UNDERWATER_105",
       "name": "UNDERWATER",
       "x": 0,
       "y": 10,
@@ -1664,7 +1664,7 @@
       "height": 3
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_125",
+      "id": "MAPSEC_UNDERWATER_125",
       "name": "UNDERWATER",
       "x": 24,
       "y": 3,
@@ -1672,7 +1672,7 @@
       "height": 2
     },
     {
-      "map_section": "MAPSEC_UNDERWATER_129",
+      "id": "MAPSEC_UNDERWATER_129",
       "name": "UNDERWATER",
       "x": 24,
       "y": 10,
@@ -1680,7 +1680,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_DESERT_UNDERPASS",
+      "id": "MAPSEC_DESERT_UNDERPASS",
       "name": "DESERT UNDERPASS",
       "x": 2,
       "y": 0,
@@ -1688,7 +1688,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_ALTERING_CAVE",
+      "id": "MAPSEC_ALTERING_CAVE",
       "name": "ALTERING CAVE",
       "x": 6,
       "y": 8,
@@ -1696,7 +1696,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_NAVEL_ROCK",
+      "id": "MAPSEC_NAVEL_ROCK",
       "name": "NAVEL ROCK",
       "x": 0,
       "y": 0,
@@ -1704,7 +1704,7 @@
       "height": 1
     },
     {
-      "map_section": "MAPSEC_TRAINER_HILL",
+      "id": "MAPSEC_TRAINER_HILL",
       "name": "TRAINER HILL",
       "x": 8,
       "y": 4,
diff --git a/src/data/region_map/region_map_sections.json.txt b/src/data/region_map/region_map_sections.json.txt
index e9c372cb54..b73f992d6d 100644
--- a/src/data/region_map/region_map_sections.json.txt
+++ b/src/data/region_map/region_map_sections.json.txt
@@ -3,21 +3,25 @@
 #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
 
 ## 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 sMapName_{{ cleanString(map_section.name) }}[] = _("{{ map_section.name }}");
 {% endif %}
 {% if existsIn(map_section, "name_clone") %}
 static const u8 sMapName_{{ cleanString(map_section.name) }}_Clone[] = _("{{ map_section.name }}");
 {% endif %}
+{% endif %}
 ## endfor
 
 const struct RegionMapLocation gRegionMapEntries[] = {
 ## for map_section in map_sections
-    [{{ map_section.map_section }}] = { {{ map_section.x }}, {{ map_section.y }}, {{ map_section.width }}, {{ map_section.height }}, sMapName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %} },
+{% if existsIn(map_section, "x") and existsIn(map_section, "y") and existsIn(map_section, "width") and existsIn(map_section, "height") and existsIn(map_section, "name") %}
+    [{{ map_section.id }}] = { {{ map_section.x }}, {{ map_section.y }}, {{ map_section.width }}, {{ map_section.height }}, sMapName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %} },
+{% endif %}
 ## endfor
 };