Merge branch 'master' into link

2 files changed, 1609 insertions, 410 deletions

diff --git a/include/data/pokedex_orders.h b/include/data/pokedex_orders.h
new file mode 100644
index 000000000..61fbd289c
--- /dev/null
+++ b/include/data/pokedex_orders.h
@@ -0,0 +1,1199 @@
+#ifndef GUARD_DATA_POKEDEX_ORDERS
+#define GUARD_DATA_POKEDEX_ORDERS
+
+const u16 gPokedexOrder_Alphabetical[] =
+{
+    387,
+    388,
+    389,
+    390,
+    391,
+    392,
+    393,
+    394,
+    395,
+    396,
+    397,
+    398,
+    399,
+    400,
+    401,
+    402,
+    403,
+    404,
+    405,
+    406,
+    407,
+    408,
+    409,
+    410,
+    411,
+     63,  // Abra
+    359,  // Absol
+    142,  // Aerodactyl
+    306,  // Aggron
+    190,  // Aipom
+     65,  // Alakazam
+    334,  // Altaria
+    181,  // Ampharos
+    347,  // Anorith
+     24,  // Arbok
+     59,  // Arcanine
+    168,  // Ariados
+    348,  // Armaldo
+    304,  // Aron
+    144,  // Articuno
+    184,  // Azumarill
+    298,  // Azurill
+    371,  // Bagon
+    343,  // Baltoy
+    354,  // Banette
+    339,  // Barboach
+    153,  // Bayleef
+    267,  // Beautifly
+     15,  // Beedrill
+    374,  // Beldum
+    182,  // Bellossom
+     69,  // Bellsprout
+      9,  // Blastoise
+    257,  // Blaziken
+    242,  // Blissey
+    286,  // Breloom
+      1,  // Bulbasaur
+     12,  // Butterfree
+    331,  // Cacnea
+    332,  // Cacturne
+    323,  // Camerupt
+    318,  // Carvanha
+    268,  // Cascoon
+    351,  // Castform
+     10,  // Caterpie
+    251,  // Celebi
+    113,  // Chansey
+      6,  // Charizard
+      4,  // Charmander
+      5,  // Charmeleon
+    152,  // Chikorita
+    358,  // Chimecho
+    170,  // Chinchou
+    366,  // Clamperl
+    344,  // Claydol
+     36,  // Clefable
+     35,  // Clefairy
+    173,  // Cleffa
+     91,  // Cloyster
+    256,  // Combusken
+    341,  // Corphish
+    222,  // Corsola
+    346,  // Cradily
+    342,  // Crawdaunt
+    169,  // Crobat
+    159,  // Croconaw
+    104,  // Cubone
+    155,  // Cyndaquil
+    301,  // Delcatty
+    225,  // Delibird
+    386,  // Deoxys
+     87,  // Dewgong
+     50,  // Diglett
+    132,  // Ditto
+     85,  // Dodrio
+     84,  // Doduo
+    232,  // Donphan
+    148,  // Dragonair
+    149,  // Dragonite
+    147,  // Dratini
+     96,  // Drowzee
+     51,  // Dugtrio
+    206,  // Dunsparce
+    356,  // Dusclops
+    355,  // Duskull
+    269,  // Dustox
+    133,  // Eevee
+     23,  // Ekans
+    125,  // Electabuzz
+    309,  // Electrike
+    101,  // Electrode
+    239,  // Elekid
+    244,  // Entei
+    196,  // Espeon
+    102,  // Exeggcute
+    103,  // Exeggutor
+    295,  // Exploud
+     83,  // Farfetch'd
+     22,  // Fearow
+    349,  // Feebas
+    160,  // Feraligatr
+    180,  // Flaaffy
+    136,  // Flareon
+    330,  // Flygon
+    205,  // Forretress
+    162,  // Furret
+    282,  // Gardevoir
+     92,  // Gastly
+     94,  // Gengar
+     74,  // Geodude
+    203,  // Girafarig
+    362,  // Glalie
+    207,  // Gligar
+     44,  // Gloom
+     42,  // Golbat
+    118,  // Goldeen
+     55,  // Golduck
+     76,  // Golem
+    368,  // Gorebyss
+    210,  // Granbull
+     75,  // Graveler
+     88,  // Grimer
+    383,  // Groudon
+    253,  // Grovyle
+     58,  // Growlithe
+    326,  // Grumpig
+    316,  // Gulpin
+    130,  // Gyarados
+    297,  // Hariyama
+     93,  // Haunter
+    214,  // Heracross
+    107,  // Hitmonchan
+    106,  // Hitmonlee
+    237,  // Hitmontop
+    250,  // Ho-Oh
+    163,  // Hoothoot
+    187,  // Hoppip
+    116,  // Horsea
+    229,  // Houndoom
+    228,  // Houndour
+    367,  // Huntail
+     97,  // Hypno
+    174,  // Igglybuff
+    314,  // Illumise
+      2,  // Ivysaur
+     39,  // Jigglypuff
+    385,  // Jirachi
+    135,  // Jolteon
+    189,  // Jumpluff
+    124,  // Jynx
+    140,  // Kabuto
+    141,  // Kabutops
+     64,  // Kadabra
+     14,  // Kakuna
+    115,  // Kangaskhan
+    352,  // Kecleon
+    230,  // Kingdra
+     99,  // Kingler
+    281,  // Kirlia
+    109,  // Koffing
+     98,  // Krabby
+    382,  // Kyogre
+    305,  // Lairon
+    171,  // Lanturn
+    131,  // Lapras
+    246,  // Larvitar
+    380,  // Latias
+    381,  // Latios
+    166,  // Ledian
+    165,  // Ledyba
+    108,  // Lickitung
+    345,  // Lileep
+    264,  // Linoone
+    271,  // Lombre
+    270,  // Lotad
+    294,  // Loudred
+    272,  // Ludicolo
+    249,  // Lugia
+    337,  // Lunatone
+    370,  // Luvdisc
+     68,  // Machamp
+     67,  // Machoke
+     66,  // Machop
+    240,  // Magby
+    219,  // Magcargo
+    129,  // Magikarp
+    126,  // Magmar
+     81,  // Magnemite
+     82,  // Magneton
+    296,  // Makuhita
+    310,  // Manectric
+     56,  // Mankey
+    226,  // Mantine
+    179,  // Mareep
+    183,  // Marill
+    105,  // Marowak
+    259,  // Marshtomp
+    284,  // Masquerain
+    303,  // Mawile
+    308,  // Medicham
+    307,  // Meditite
+    154,  // Meganium
+     52,  // Meowth
+    376,  // Metagross
+    375,  // Metang
+     11,  // Metapod
+    151,  // Mew
+    150,  // Mewtwo
+    262,  // Mightyena
+    350,  // Milotic
+    241,  // Miltank
+    312,  // Minun
+    200,  // Misdreavus
+    146,  // Moltres
+    122,  // Mr. mime
+    258,  // Mudkip
+     89,  // Muk
+    198,  // Murkrow
+    177,  // Natu
+     34,  // Nidoking
+     31,  // Nidoqueen
+     29,  // Nidoran?
+     32,  // Nidoran?
+     30,  // Nidorina
+     33,  // Nidorino
+    290,  // Nincada
+     38,  // Ninetales
+    291,  // Ninjask
+    164,  // Noctowl
+    299,  // Nosepass
+    322,  // Numel
+    274,  // Nuzleaf
+    224,  // Octillery
+     43,  // Oddish
+    138,  // Omanyte
+    139,  // Omastar
+     95,  // Onix
+     46,  // Paras
+     47,  // Parasect
+    279,  // Pelipper
+     53,  // Persian
+    231,  // Phanpy
+    172,  // Pichu
+     18,  // Pidgeot
+     17,  // Pidgeotto
+     16,  // Pidgey
+     25,  // Pikachu
+    221,  // Piloswine
+    204,  // Pineco
+    127,  // Pinsir
+    311,  // Plusle
+    186,  // Politoed
+     60,  // Poliwag
+     61,  // Poliwhirl
+     62,  // Poliwrath
+     77,  // Ponyta
+    261,  // Poochyena
+    137,  // Porygon
+    233,  // Porygon2
+     57,  // Primeape
+     54,  // Psyduck
+    247,  // Pupitar
+    195,  // Quagsire
+    156,  // Quilava
+    211,  // Qwilfish
+     26,  // Raichu
+    243,  // Raikou
+    280,  // Ralts
+     78,  // Rapidash
+     20,  // Raticate
+     19,  // Rattata
+    384,  // Rayquaza
+    378,  // Regice
+    377,  // Regirock
+    379,  // Registeel
+    369,  // Relicanth
+    223,  // Remoraid
+    112,  // Rhydon
+    111,  // Rhyhorn
+    315,  // Roselia
+    302,  // Sableye
+    373,  // Salamence
+     27,  // Sandshrew
+     28,  // Sandslash
+    254,  // Sceptile
+    212,  // Scizor
+    123,  // Scyther
+    117,  // Seadra
+    119,  // Seaking
+    364,  // Sealeo
+    273,  // Seedot
+     86,  // Seel
+    161,  // Sentret
+    336,  // Seviper
+    319,  // Sharpedo
+    292,  // Shedinja
+    372,  // Shelgon
+     90,  // Shellder
+    275,  // Shiftry
+    285,  // Shroomish
+    213,  // Shuckle
+    353,  // Shuppet
+    266,  // Silcoon
+    227,  // Skarmory
+    188,  // Skiploom
+    300,  // Skitty
+    289,  // Slaking
+    287,  // Slakoth
+     80,  // Slowbro
+    199,  // Slowking
+     79,  // Slowpoke
+    218,  // Slugma
+    235,  // Smeargle
+    238,  // Smoochum
+    215,  // Sneasel
+    143,  // Snorlax
+    361,  // Snorunt
+    209,  // Snubbull
+    338,  // Solrock
+     21,  // Spearow
+    363,  // Spheal
+    167,  // Spinarak
+    327,  // Spinda
+    325,  // Spoink
+      7,  // Squirtle
+    234,  // Stantler
+    121,  // Starmie
+    120,  // Staryu
+    208,  // Steelix
+    185,  // Sudowoodo
+    245,  // Suicune
+    192,  // Sunflora
+    191,  // Sunkern
+    283,  // Surskit
+    333,  // Swablu
+    317,  // Swalot
+    260,  // Swampert
+    277,  // Swellow
+    220,  // Swinub
+    276,  // Taillow
+    114,  // Tangela
+    128,  // Tauros
+    216,  // Teddiursa
+     72,  // Tentacool
+     73,  // Tentacruel
+    175,  // Togepi
+    176,  // Togetic
+    255,  // Torchic
+    324,  // Torkoal
+    158,  // Totodile
+    328,  // Trapinch
+    252,  // Treecko
+    357,  // Tropius
+    157,  // Typhlosion
+    248,  // Tyranitar
+    236,  // Tyrogue
+    197,  // Umbreon
+    201,  // Unown
+    217,  // Ursaring
+    134,  // Vaporeon
+     49,  // Venomoth
+     48,  // Venonat
+      3,  // Venusaur
+    329,  // Vibrava
+     71,  // Victreebel
+    288,  // Vigoroth
+     45,  // Vileplume
+    313,  // Volbeat
+    100,  // Voltorb
+     37,  // Vulpix
+    320,  // Wailmer
+    321,  // Wailord
+    365,  // Walrein
+      8,  // Wartortle
+     13,  // Weedle
+     70,  // Weepinbell
+    110,  // Weezing
+    340,  // Whiscash
+    293,  // Whismur
+     40,  // Wigglytuff
+    278,  // Wingull
+    202,  // Wobbuffet
+    194,  // Wooper
+    265,  // Wurmple
+    360,  // Wynaut
+    178,  // Xatu
+    193,  // Yanma
+    335,  // Zangoose
+    145,  // Zapdos
+    263,  // Zigzagoon
+     41,  // Zubat
+};
+
+const u16 gPokedexOrder_Weight[] =
+{
+     92,  // Gastly
+     93,  // Haunter
+    187,  // Hoppip
+     50,  // Diglett
+    351,  // Castform
+    109,  // Koffing
+    174,  // Igglybuff
+    200,  // Misdreavus
+    358,  // Chimecho
+    188,  // Skiploom
+    385,  // Jirachi
+    333,  // Swablu
+    292,  // Shedinja
+    175,  // Togepi
+    283,  // Surskit
+     16,  // Pidgey
+    191,  // Sunkern
+    339,  // Barboach
+    172,  // Pichu
+    298,  // Azurill
+    315,  // Roselia
+    177,  // Natu
+     21,  // Spearow
+    198,  // Murkrow
+    353,  // Shuppet
+    276,  // Taillow
+    102,  // Exeggcute
+    255,  // Torchic
+    270,  // Lotad
+     10,  // Caterpie
+    189,  // Jumpluff
+    173,  // Cleffa
+     13,  // Weedle
+    176,  // Togetic
+    147,  // Dratini
+     19,  // Rattata
+    284,  // Masquerain
+    265,  // Wurmple
+    211,  // Qwilfish
+    151,  // Mew
+     90,  // Shellder
+    273,  // Seedot
+    132,  // Ditto
+     69,  // Bellsprout
+    311,  // Plusle
+     52,  // Meowth
+    312,  // Minun
+    285,  // Shroomish
+    251,  // Celebi
+    222,  // Corsola
+    252,  // Treecko
+    327,  // Spinda
+    201,  // Unown
+     46,  // Paras
+     43,  // Oddish
+     39,  // Jigglypuff
+    290,  // Nincada
+    182,  // Bellossom
+     81,  // Magnemite
+     25,  // Pikachu
+    238,  // Smoochum
+    161,  // Sentret
+     70,  // Weepinbell
+    152,  // Chikorita
+    220,  // Swinub
+    133,  // Eevee
+     98,  // Krabby
+    104,  // Cubone
+    280,  // Ralts
+      1,  // Bulbasaur
+     23,  // Ekans
+     29,  // Nidoran?
+    204,  // Pineco
+    349,  // Feebas
+    138,  // Omanyte
+     41,  // Zubat
+     35,  // Clefairy
+    258,  // Mudkip
+    209,  // Snubbull
+    179,  // Mareep
+    155,  // Cyndaquil
+    116,  // Horsea
+      4,  // Charmander
+    192,  // Sunflora
+    183,  // Marill
+    194,  // Wooper
+    167,  // Spinarak
+     44,  // Gloom
+    370,  // Luvdisc
+    216,  // Teddiursa
+     32,  // Nidoran?
+      7,  // Squirtle
+    278,  // Wingull
+    158,  // Totodile
+    110,  // Weezing
+     37,  // Vulpix
+     11,  // Metapod
+    266,  // Silcoon
+    129,  // Magikarp
+     14,  // Kakuna
+    316,  // Gulpin
+    100,  // Voltorb
+    165,  // Ledyba
+    228,  // Houndour
+    300,  // Skitty
+    302,  // Sableye
+    307,  // Meditite
+    341,  // Corphish
+    190,  // Aipom
+    268,  // Cascoon
+    303,  // Mawile
+    140,  // Kabuto
+     40,  // Wigglytuff
+     27,  // Sandshrew
+    223,  // Remoraid
+    291,  // Ninjask
+    170,  // Chinchou
+     60,  // Poliwag
+    347,  // Anorith
+     49,  // Venomoth
+    354,  // Banette
+      2,  // Ivysaur
+    180,  // Flaaffy
+    261,  // Poochyena
+    360,  // Wynaut
+    206,  // Dunsparce
+    178,  // Xatu
+    355,  // Duskull
+     83,  // Farfetch'd
+    328,  // Trapinch
+    118,  // Goldeen
+    309,  // Electrike
+    329,  // Vibrava
+     71,  // Victreebel
+    153,  // Bayleef
+    225,  // Delibird
+    293,  // Whismur
+    148,  // Dragonair
+    361,  // Snorunt
+    263,  // Zigzagoon
+    314,  // Illumise
+    313,  // Volbeat
+     20,  // Raticate
+     45,  // Vileplume
+    156,  // Quilava
+      5,  // Charmeleon
+     58,  // Growlithe
+    256,  // Combusken
+     66,  // Machop
+     63,  // Abra
+     33,  // Nidorino
+     54,  // Psyduck
+    277,  // Swellow
+     38,  // Ninetales
+     30,  // Nidorina
+     61,  // Poliwhirl
+     74,  // Geodude
+    281,  // Kirlia
+    213,  // Shuckle
+    334,  // Altaria
+    318,  // Carvanha
+    236,  // Tyrogue
+    163,  // Hoothoot
+    240,  // Magby
+    343,  // Baltoy
+    253,  // Grovyle
+    352,  // Kecleon
+    171,  // Lanturn
+      8,  // Wartortle
+    368,  // Gorebyss
+    369,  // Relicanth
+    239,  // Elekid
+    340,  // Whiscash
+    345,  // Lileep
+    322,  // Numel
+    287,  // Slakoth
+    135,  // Jolteon
+    159,  // Croconaw
+    136,  // Flareon
+    117,  // Seadra
+    196,  // Espeon
+    367,  // Huntail
+    197,  // Umbreon
+    259,  // Marshtomp
+    274,  // Nuzleaf
+    215,  // Sneasel
+     56,  // Mankey
+    279,  // Pelipper
+    267,  // Beautifly
+    224,  // Octillery
+    184,  // Azumarill
+    202,  // Wobbuffet
+    134,  // Vaporeon
+     28,  // Sandslash
+     47,  // Parasect
+     15,  // Beedrill
+     89,  // Muk
+     17,  // Pidgeotto
+     88,  // Grimer
+     26,  // Raichu
+     77,  // Ponyta
+    125,  // Electabuzz
+     48,  // Venonat
+    325,  // Spoink
+    356,  // Dusclops
+    308,  // Medicham
+    269,  // Dustox
+     53,  // Persian
+     12,  // Butterfree
+     57,  // Primeape
+     96,  // Drowzee
+    162,  // Furret
+    233,  // Porygon2
+    271,  // Lombre
+    264,  // Linoone
+    301,  // Delcatty
+    342,  // Crawdaunt
+     51,  // Dugtrio
+    168,  // Ariados
+    231,  // Phanpy
+    186,  // Politoed
+    120,  // Staryu
+    113,  // Chansey
+    139,  // Omastar
+    114,  // Tangela
+    218,  // Slugma
+    229,  // Houndoom
+    166,  // Ledian
+     79,  // Slowpoke
+    137,  // Porygon
+    262,  // Mightyena
+    193,  // Yanma
+     22,  // Fearow
+    185,  // Sudowoodo
+    119,  // Seaking
+    286,  // Breloom
+     84,  // Doduo
+     18,  // Pidgeot
+    363,  // Spheal
+     36,  // Clefable
+    380,  // Latias
+    310,  // Manectric
+    335,  // Zangoose
+    141,  // Kabutops
+     94,  // Gengar
+    294,  // Loudred
+    124,  // Jynx
+    164,  // Noctowl
+    203,  // Girafarig
+    371,  // Bagon
+    126,  // Magmar
+    105,  // Marowak
+     72,  // Tentacool
+    288,  // Vigoroth
+    242,  // Blissey
+    359,  // Absol
+     65,  // Alakazam
+    237,  // Hitmontop
+    282,  // Gardevoir
+    210,  // Granbull
+    106,  // Hitmonlee
+    107,  // Hitmonchan
+    227,  // Skarmory
+    331,  // Cacnea
+    257,  // Blaziken
+    254,  // Sceptile
+    336,  // Seviper
+    366,  // Clamperl
+    145,  // Zapdos
+    214,  // Heracross
+     62,  // Poliwrath
+    122,  // Mr. mime
+    127,  // Pinsir
+    272,  // Ludicolo
+     73,  // Tentacruel
+     42,  // Golbat
+    219,  // Magcargo
+    144,  // Articuno
+    221,  // Piloswine
+    123,  // Scyther
+     64,  // Kadabra
+    235,  // Smeargle
+    142,  // Aerodactyl
+    275,  // Shiftry
+     99,  // Kingler
+     31,  // Nidoqueen
+     82,  // Magneton
+    304,  // Aron
+    381,  // Latios
+    146,  // Moltres
+    346,  // Cradily
+    386,  // Deoxys
+    181,  // Ampharos
+     34,  // Nidoking
+    207,  // Gligar
+     24,  // Arbok
+    108,  // Lickitung
+    101,  // Electrode
+    348,  // Armaldo
+     67,  // Machoke
+    234,  // Stantler
+    326,  // Grumpig
+    246,  // Larvitar
+    169,  // Crobat
+    195,  // Quagsire
+    241,  // Miltank
+     97,  // Hypno
+     55,  // Golduck
+    332,  // Cacturne
+     80,  // Slowbro
+    157,  // Typhlosion
+    199,  // Slowking
+    115,  // Kangaskhan
+    121,  // Starmie
+    317,  // Swalot
+    324,  // Torkoal
+    260,  // Swampert
+    330,  // Flygon
+    295,  // Exploud
+     85,  // Dodrio
+      9,  // Blastoise
+    296,  // Makuhita
+    364,  // Sealeo
+    128,  // Tauros
+    319,  // Sharpedo
+    160,  // Feraligatr
+     86,  // Seel
+      6,  // Charizard
+     78,  // Rapidash
+    374,  // Beldum
+    299,  // Nosepass
+      3,  // Venusaur
+    357,  // Tropius
+    154,  // Meganium
+    373,  // Salamence
+     75,  // Graveler
+    344,  // Claydol
+    372,  // Shelgon
+    111,  // Rhyhorn
+    212,  // Scizor
+     87,  // Dewgong
+    112,  // Rhydon
+    232,  // Donphan
+    103,  // Exeggutor
+    305,  // Lairon
+    150,  // Mewtwo
+    217,  // Ursaring
+    205,  // Forretress
+     68,  // Machamp
+    320,  // Wailmer
+    289,  // Slaking
+     91,  // Cloyster
+    365,  // Walrein
+    247,  // Pupitar
+    230,  // Kingdra
+    338,  // Solrock
+     59,  // Arcanine
+    350,  // Milotic
+    337,  // Lunatone
+    378,  // Regice
+    243,  // Raikou
+    245,  // Suicune
+    244,  // Entei
+    250,  // Ho-Oh
+    248,  // Tyranitar
+    375,  // Metang
+    379,  // Registeel
+    384,  // Rayquaza
+     95,  // Onix
+    149,  // Dragonite
+    249,  // Lugia
+    131,  // Lapras
+    323,  // Camerupt
+    226,  // Mantine
+    377,  // Regirock
+    130,  // Gyarados
+    297,  // Hariyama
+    362,  // Glalie
+     76,  // Golem
+    382,  // Kyogre
+    306,  // Aggron
+    321,  // Wailord
+    208,  // Steelix
+    143,  // Snorlax
+    376,  // Metagross
+    383,  // Groudon
+};
+
+const u16 gPokedexOrder_Height[] =
+{
+     50,  // Diglett
+    298,  // Azurill
+    177,  // Natu
+     13,  // Weedle
+    172,  // Pichu
+    173,  // Cleffa
+    175,  // Togepi
+    351,  // Castform
+    174,  // Igglybuff
+     10,  // Caterpie
+    276,  // Taillow
+    132,  // Ditto
+    133,  // Eevee
+    315,  // Roselia
+     21,  // Spearow
+     16,  // Pidgey
+    191,  // Sunkern
+     90,  // Shellder
+     19,  // Rattata
+     81,  // Magnemite
+     46,  // Paras
+    265,  // Wurmple
+    385,  // Jirachi
+    104,  // Cubone
+    258,  // Mudkip
+    194,  // Wooper
+    116,  // Horsea
+     52,  // Meowth
+     29,  // Nidoran?
+    220,  // Swinub
+    151,  // Mew
+    333,  // Swablu
+    304,  // Aron
+    311,  // Plusle
+    312,  // Minun
+    102,  // Exeggcute
+     25,  // Pikachu
+    182,  // Bellossom
+    316,  // Gulpin
+    263,  // Zigzagoon
+    285,  // Shroomish
+    138,  // Omanyte
+    331,  // Cacnea
+     98,  // Krabby
+    280,  // Ralts
+    187,  // Hoppip
+    255,  // Torchic
+    366,  // Clamperl
+     74,  // Geodude
+    183,  // Marill
+    339,  // Barboach
+    238,  // Smoochum
+    100,  // Voltorb
+    290,  // Nincada
+    302,  // Sableye
+    198,  // Murkrow
+    211,  // Qwilfish
+      7,  // Squirtle
+    252,  // Treecko
+    343,  // Baltoy
+     43,  // Oddish
+    270,  // Lotad
+     39,  // Jigglypuff
+    283,  // Surskit
+    155,  // Cyndaquil
+    140,  // Kabuto
+    264,  // Linoone
+    324,  // Torkoal
+     32,  // Nidoran?
+    167,  // Spinarak
+     56,  // Mankey
+    273,  // Seedot
+    261,  // Poochyena
+    231,  // Phanpy
+    201,  // Unown
+    170,  // Chinchou
+    233,  // Porygon2
+     60,  // Poliwag
+    371,  // Bagon
+    349,  // Feebas
+    353,  // Shuppet
+    158,  // Totodile
+    251,  // Celebi
+    360,  // Wynaut
+     27,  // Sandshrew
+    358,  // Chimecho
+    370,  // Luvdisc
+    228,  // Houndour
+    266,  // Silcoon
+    309,  // Electrike
+      4,  // Charmander
+    307,  // Meditite
+    278,  // Wingull
+    223,  // Remoraid
+    341,  // Corphish
+    222,  // Corsola
+    314,  // Illumise
+    209,  // Snubbull
+     37,  // Vulpix
+    246,  // Larvitar
+    374,  // Beldum
+    293,  // Whismur
+    204,  // Pineco
+    239,  // Elekid
+     35,  // Clefairy
+    213,  // Shuckle
+    216,  // Teddiursa
+     14,  // Kakuna
+    300,  // Skitty
+    176,  // Togetic
+    118,  // Goldeen
+    303,  // Mawile
+    179,  // Mareep
+    188,  // Skiploom
+    109,  // Koffing
+     51,  // Dugtrio
+    268,  // Cascoon
+    322,  // Numel
+    347,  // Anorith
+    313,  // Volbeat
+    163,  // Hoothoot
+    328,  // Trapinch
+    325,  // Spoink
+     11,  // Metapod
+     69,  // Bellsprout
+    361,  // Snorunt
+     20,  // Raticate
+    259,  // Marshtomp
+    277,  // Swellow
+    240,  // Magby
+     58,  // Growlithe
+    200,  // Misdreavus
+      1,  // Bulbasaur
+    236,  // Tyrogue
+    218,  // Slugma
+    287,  // Slakoth
+    281,  // Kirlia
+    190,  // Aipom
+    135,  // Jolteon
+     30,  // Nidorina
+    184,  // Azumarill
+    292,  // Shedinja
+     66,  // Machop
+    291,  // Ninjask
+    284,  // Masquerain
+    355,  // Duskull
+    192,  // Sunflora
+    189,  // Jumpluff
+    120,  // Staryu
+    180,  // Flaaffy
+    363,  // Spheal
+     54,  // Psyduck
+    219,  // Magcargo
+     83,  // Farfetch'd
+     41,  // Zubat
+    137,  // Porygon
+    161,  // Sentret
+    318,  // Carvanha
+     44,  // Gloom
+     26,  // Raichu
+    129,  // Magikarp
+    215,  // Sneasel
+    305,  // Lairon
+    256,  // Combusken
+    224,  // Octillery
+     33,  // Nidorino
+    136,  // Flareon
+    225,  // Delibird
+     72,  // Tentacool
+     63,  // Abra
+    253,  // Grovyle
+    340,  // Whiscash
+    156,  // Quilava
+    196,  // Espeon
+     88,  // Grimer
+    152,  // Chikorita
+    326,  // Grumpig
+    299,  // Nosepass
+     53,  // Persian
+    262,  // Mightyena
+     48,  // Venonat
+     82,  // Magneton
+     77,  // Ponyta
+    296,  // Makuhita
+    337,  // Lunatone
+     28,  // Sandslash
+     96,  // Drowzee
+    114,  // Tangela
+     57,  // Primeape
+    165,  // Ledyba
+     40,  // Wigglytuff
+     47,  // Parasect
+    139,  // Omastar
+    294,  // Loudred
+      8,  // Wartortle
+     75,  // Graveler
+    197,  // Umbreon
+    345,  // Lileep
+     61,  // Poliwhirl
+    134,  // Vaporeon
+     15,  // Beedrill
+    105,  // Marowak
+     70,  // Weepinbell
+    369,  // Relicanth
+    111,  // Rhyhorn
+      2,  // Ivysaur
+    352,  // Kecleon
+    274,  // Nuzleaf
+    267,  // Beautifly
+     17,  // Pidgeotto
+    168,  // Ariados
+     86,  // Seel
+    186,  // Politoed
+    159,  // Croconaw
+    113,  // Chansey
+    354,  // Banette
+    232,  // Donphan
+    121,  // Starmie
+      5,  // Charmeleon
+    221,  // Piloswine
+     12,  // Butterfree
+    329,  // Vibrava
+    125,  // Electabuzz
+    342,  // Crawdaunt
+    301,  // Delcatty
+    334,  // Altaria
+    372,  // Shelgon
+     38,  // Ninetales
+    207,  // Gligar
+    364,  // Sealeo
+    327,  // Spinda
+    247,  // Pupitar
+     79,  // Slowpoke
+    338,  // Solrock
+    241,  // Miltank
+     22,  // Fearow
+     45,  // Vileplume
+     89,  // Muk
+    205,  // Forretress
+    185,  // Sudowoodo
+    359,  // Absol
+    193,  // Yanma
+    269,  // Dustox
+    108,  // Lickitung
+    235,  // Smeargle
+    171,  // Lanturn
+    101,  // Electrode
+    271,  // Lombre
+    286,  // Breloom
+    153,  // Bayleef
+    117,  // Seadra
+    110,  // Weezing
+    279,  // Pelipper
+    375,  // Metang
+     31,  // Nidoqueen
+    332,  // Cacturne
+    275,  // Shiftry
+    308,  // Medicham
+    335,  // Zangoose
+    141,  // Kabutops
+     99,  // Kingler
+     64,  // Kadabra
+    119,  // Seaking
+     36,  // Clefable
+    126,  // Magmar
+    202,  // Wobbuffet
+     92,  // Gastly
+    122,  // Mr. mime
+     62,  // Poliwrath
+    128,  // Tauros
+    380,  // Latias
+    181,  // Ampharos
+    288,  // Vigoroth
+    166,  // Ledian
+     76,  // Golem
+    365,  // Walrein
+     84,  // Doduo
+    229,  // Houndoom
+     34,  // Nidoking
+    124,  // Jynx
+    107,  // Hitmonchan
+    234,  // Stantler
+    210,  // Granbull
+    237,  // Hitmontop
+    195,  // Quagsire
+    344,  // Claydol
+    260,  // Swampert
+    242,  // Blissey
+    272,  // Ludicolo
+    295,  // Exploud
+    206,  // Dunsparce
+    127,  // Pinsir
+     91,  // Cloyster
+     67,  // Machoke
+    203,  // Girafarig
+     18,  // Pidgeot
+    178,  // Xatu
+    346,  // Cradily
+    106,  // Hitmonlee
+     49,  // Venomoth
+     94,  // Gengar
+    214,  // Heracross
+    362,  // Glalie
+    123,  // Scyther
+    373,  // Salamence
+    310,  // Manectric
+    348,  // Armaldo
+     65,  // Alakazam
+     97,  // Hypno
+    164,  // Noctowl
+     73,  // Tentacruel
+    356,  // Dusclops
+    145,  // Zapdos
+     42,  // Golbat
+    376,  // Metagross
+    282,  // Gardevoir
+      9,  // Blastoise
+     80,  // Slowbro
+     93,  // Haunter
+     68,  // Machamp
+    377,  // Regirock
+    317,  // Swalot
+    254,  // Sceptile
+    227,  // Skarmory
+     55,  // Golduck
+    386,  // Deoxys
+     71,  // Victreebel
+     78,  // Rapidash
+      6,  // Charizard
+    367,  // Huntail
+     87,  // Dewgong
+    144,  // Articuno
+    157,  // Typhlosion
+    142,  // Aerodactyl
+    368,  // Gorebyss
+    217,  // Ursaring
+    154,  // Meganium
+    378,  // Regice
+    212,  // Scizor
+    230,  // Kingdra
+    147,  // Dratini
+     85,  // Dodrio
+    319,  // Sharpedo
+    169,  // Crobat
+    162,  // Furret
+     59,  // Arcanine
+    243,  // Raikou
+    257,  // Blaziken
+    323,  // Camerupt
+    112,  // Rhydon
+    379,  // Registeel
+     23,  // Ekans
+    330,  // Flygon
+    357,  // Tropius
+    381,  // Latios
+    245,  // Suicune
+    146,  // Moltres
+      3,  // Venusaur
+    103,  // Exeggutor
+    199,  // Slowking
+    248,  // Tyranitar
+    289,  // Slaking
+    320,  // Wailmer
+    150,  // Mewtwo
+    306,  // Aggron
+    143,  // Snorlax
+    226,  // Mantine
+    244,  // Entei
+    149,  // Dragonite
+    115,  // Kangaskhan
+    297,  // Hariyama
+    160,  // Feraligatr
+    131,  // Lapras
+    336,  // Seviper
+     24,  // Arbok
+    383,  // Groudon
+    250,  // Ho-Oh
+    148,  // Dragonair
+    382,  // Kyogre
+    249,  // Lugia
+    350,  // Milotic
+    130,  // Gyarados
+    384,  // Rayquaza
+     95,  // Onix
+    208,  // Steelix
+    321,  // Wailord
+};
+
+#endif // GUARD_DATA_POKEDEX_ORDERS
diff --git a/include/data/region_map/region_map_entries.h b/include/data/region_map/region_map_entries.h
index 73599c704..9c7e3f2fc 100644
--- a/include/data/region_map/region_map_entries.h
+++ b/include/data/region_map/region_map_entries.h
@@ -1,421 +1,421 @@
 #ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
 #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
 
-static const u8 gMapName_LittlerootTown[] = _("LITTLEROOT TOWN");
-static const u8 gMapName_OldaleTown[] = _("OLDALE TOWN");
-static const u8 gMapName_DewfordTown[] = _("DEWFORD TOWN");
-static const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE TOWN");
-static const u8 gMapName_FallarborTown[] = _("FALLARBOR TOWN");
-static const u8 gMapName_VerdanturfTown[] = _("VERDANTURF TOWN");
-static const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN");
-static const u8 gMapName_PetalburgCity[] = _("PETALBURG CITY");
-static const u8 gMapName_SlateportCity[] = _("SLATEPORT CITY");
-static const u8 gMapName_MauvilleCity[] = _("MAUVILLE CITY");
-static const u8 gMapName_RustboroCity[] = _("RUSTBORO CITY");
-static const u8 gMapName_FortreeCity[] = _("FORTREE CITY");
-static const u8 gMapName_LilycoveCity[] = _("LILYCOVE CITY");
-static const u8 gMapName_MossdeepCity[] = _("MOSSDEEP CITY");
-static const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS CITY");
-static const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE CITY");
-static const u8 gMapName_Route101[] = _("ROUTE 101");
-static const u8 gMapName_Route102[] = _("ROUTE 102");
-static const u8 gMapName_Route103[] = _("ROUTE 103");
-static const u8 gMapName_Route104[] = _("ROUTE 104");
-static const u8 gMapName_Route105[] = _("ROUTE 105");
-static const u8 gMapName_Route106[] = _("ROUTE 106");
-static const u8 gMapName_Route107[] = _("ROUTE 107");
-static const u8 gMapName_Route108[] = _("ROUTE 108");
-static const u8 gMapName_Route109[] = _("ROUTE 109");
-static const u8 gMapName_Route110[] = _("ROUTE 110");
-static const u8 gMapName_Route111[] = _("ROUTE 111");
-static const u8 gMapName_Route112[] = _("ROUTE 112");
-static const u8 gMapName_Route113[] = _("ROUTE 113");
-static const u8 gMapName_Route114[] = _("ROUTE 114");
-static const u8 gMapName_Route115[] = _("ROUTE 115");
-static const u8 gMapName_Route116[] = _("ROUTE 116");
-static const u8 gMapName_Route117[] = _("ROUTE 117");
-static const u8 gMapName_Route118[] = _("ROUTE 118");
-static const u8 gMapName_Route119[] = _("ROUTE 119");
-static const u8 gMapName_Route120[] = _("ROUTE 120");
-static const u8 gMapName_Route121[] = _("ROUTE 121");
-static const u8 gMapName_Route122[] = _("ROUTE 122");
-static const u8 gMapName_Route123[] = _("ROUTE 123");
-static const u8 gMapName_Route124[] = _("ROUTE 124");
-static const u8 gMapName_Route125[] = _("ROUTE 125");
-static const u8 gMapName_Route126[] = _("ROUTE 126");
-static const u8 gMapName_Route127[] = _("ROUTE 127");
-static const u8 gMapName_Route128[] = _("ROUTE 128");
-static const u8 gMapName_Route129[] = _("ROUTE 129");
-static const u8 gMapName_Route130[] = _("ROUTE 130");
-static const u8 gMapName_Route131[] = _("ROUTE 131");
-static const u8 gMapName_Route132[] = _("ROUTE 132");
-static const u8 gMapName_Route133[] = _("ROUTE 133");
-static const u8 gMapName_Route134[] = _("ROUTE 134");
-static const u8 gMapName_Underwater[] = _("UNDERWATER");
-static const u8 gMapName_GraniteCave[] = _("GRANITE CAVE");
-static const u8 gMapName_MtChimney[] = _("MT. CHIMNEY");
-static const u8 gMapName_SafariZone[] = _("SAFARI ZONE");
-static const u8 gMapName_BattleFrontier[] = _("BATTLE FRONTIER");
-static const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS");
-static const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
-static const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP");
-static const u8 gMapName_NewMauville[] = _("NEW MAUVILLE");
-static const u8 gMapName_MeteorFalls[] = _("METEOR FALLS");
-static const u8 gMapName_MtPyre[] = _("MT. PYRE");
+static const u8 sMapName_LittlerootTown[] = _("LITTLEROOT TOWN");
+static const u8 sMapName_OldaleTown[] = _("OLDALE TOWN");
+static const u8 sMapName_DewfordTown[] = _("DEWFORD TOWN");
+static const u8 sMapName_LavaridgeTown[] = _("LAVARIDGE TOWN");
+static const u8 sMapName_FallarborTown[] = _("FALLARBOR TOWN");
+static const u8 sMapName_VerdanturfTown[] = _("VERDANTURF TOWN");
+static const u8 sMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN");
+static const u8 sMapName_PetalburgCity[] = _("PETALBURG CITY");
+static const u8 sMapName_SlateportCity[] = _("SLATEPORT CITY");
+static const u8 sMapName_MauvilleCity[] = _("MAUVILLE CITY");
+static const u8 sMapName_RustboroCity[] = _("RUSTBORO CITY");
+static const u8 sMapName_FortreeCity[] = _("FORTREE CITY");
+static const u8 sMapName_LilycoveCity[] = _("LILYCOVE CITY");
+static const u8 sMapName_MossdeepCity[] = _("MOSSDEEP CITY");
+static const u8 sMapName_SootopolisCity[] = _("SOOTOPOLIS CITY");
+static const u8 sMapName_EverGrandeCity[] = _("EVER GRANDE CITY");
+static const u8 sMapName_Route101[] = _("ROUTE 101");
+static const u8 sMapName_Route102[] = _("ROUTE 102");
+static const u8 sMapName_Route103[] = _("ROUTE 103");
+static const u8 sMapName_Route104[] = _("ROUTE 104");
+static const u8 sMapName_Route105[] = _("ROUTE 105");
+static const u8 sMapName_Route106[] = _("ROUTE 106");
+static const u8 sMapName_Route107[] = _("ROUTE 107");
+static const u8 sMapName_Route108[] = _("ROUTE 108");
+static const u8 sMapName_Route109[] = _("ROUTE 109");
+static const u8 sMapName_Route110[] = _("ROUTE 110");
+static const u8 sMapName_Route111[] = _("ROUTE 111");
+static const u8 sMapName_Route112[] = _("ROUTE 112");
+static const u8 sMapName_Route113[] = _("ROUTE 113");
+static const u8 sMapName_Route114[] = _("ROUTE 114");
+static const u8 sMapName_Route115[] = _("ROUTE 115");
+static const u8 sMapName_Route116[] = _("ROUTE 116");
+static const u8 sMapName_Route117[] = _("ROUTE 117");
+static const u8 sMapName_Route118[] = _("ROUTE 118");
+static const u8 sMapName_Route119[] = _("ROUTE 119");
+static const u8 sMapName_Route120[] = _("ROUTE 120");
+static const u8 sMapName_Route121[] = _("ROUTE 121");
+static const u8 sMapName_Route122[] = _("ROUTE 122");
+static const u8 sMapName_Route123[] = _("ROUTE 123");
+static const u8 sMapName_Route124[] = _("ROUTE 124");
+static const u8 sMapName_Route125[] = _("ROUTE 125");
+static const u8 sMapName_Route126[] = _("ROUTE 126");
+static const u8 sMapName_Route127[] = _("ROUTE 127");
+static const u8 sMapName_Route128[] = _("ROUTE 128");
+static const u8 sMapName_Route129[] = _("ROUTE 129");
+static const u8 sMapName_Route130[] = _("ROUTE 130");
+static const u8 sMapName_Route131[] = _("ROUTE 131");
+static const u8 sMapName_Route132[] = _("ROUTE 132");
+static const u8 sMapName_Route133[] = _("ROUTE 133");
+static const u8 sMapName_Route134[] = _("ROUTE 134");
+static const u8 sMapName_Underwater[] = _("UNDERWATER");
+static const u8 sMapName_GraniteCave[] = _("GRANITE CAVE");
+static const u8 sMapName_MtChimney[] = _("MT. CHIMNEY");
+static const u8 sMapName_SafariZone[] = _("SAFARI ZONE");
+static const u8 sMapName_BattleFrontier[] = _("BATTLE FRONTIER");
+static const u8 sMapName_PetalburgWoods[] = _("PETALBURG WOODS");
+static const u8 sMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
+static const u8 sMapName_AbandonedShip[] = _("ABANDONED SHIP");
+static const u8 sMapName_NewMauville[] = _("NEW MAUVILLE");
+static const u8 sMapName_MeteorFalls[] = _("METEOR FALLS");
+static const u8 sMapName_MtPyre[] = _("MT. PYRE");
 // This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
 // hideout in Emerald with their own new region map entries, and this name
 // doesn't seem to be used anymore.
-static const u8 gMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT");
-static const u8 gMapName_ShoalCave[] = _("SHOAL CAVE");
-static const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
-static const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD");
-static const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND");
-static const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
-static const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
-static const u8 gMapName_FieryPath[] = _("FIERY PATH");
-static const u8 gMapName_JaggedPass[] = _("JAGGED PASS");
-static const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER");
-static const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB");
-static const u8 gMapName_IslandCave[] = _("ISLAND CAVE");
-static const u8 gMapName_DesertRuins[] = _("DESERT RUINS");
-static const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB");
-static const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
-static const u8 gMapName_SkyPillar[] = _("SKY PILLAR");
-static const u8 gMapName_SecretBase[] = _("SECRET BASE");
-static const u8 gMapName_None[] = _("");
-static const u8 gMapName_PalletTown[] = _("PALLET TOWN");
-static const u8 gMapName_ViridianCity[] = _("VIRIDIAN CITY");
-static const u8 gMapName_PewterCity[] = _("PEWTER CITY");
-static const u8 gMapName_CeruleanCity[] = _("CERULEAN CITY");
-static const u8 gMapName_LavenderTown[] = _("LAVENDER TOWN");
-static const u8 gMapName_VermilionCity[] = _("VERMILION CITY");
-static const u8 gMapName_CeladonCity[] = _("CELADON CITY");
-static const u8 gMapName_FuchsiaCity[] = _("FUCHSIA CITY");
-static const u8 gMapName_CinnabarIsland[] = _("CINNABAR ISLAND");
-static const u8 gMapName_IndigoPlateau[] = _("INDIGO PLATEAU");
-static const u8 gMapName_SaffronCity[] = _("SAFFRON CITY");
-static const u8 gMapName_Route4[] = _("ROUTE 4");
-static const u8 gMapName_Route10[] = _("ROUTE 10");
-static const u8 gMapName_Route1[] = _("ROUTE 1");
-static const u8 gMapName_Route2[] = _("ROUTE 2");
-static const u8 gMapName_Route3[] = _("ROUTE 3");
-static const u8 gMapName_Route4_2[] = _("ROUTE 4");
-static const u8 gMapName_Route5[] = _("ROUTE 5");
-static const u8 gMapName_Route6[] = _("ROUTE 6");
-static const u8 gMapName_Route7[] = _("ROUTE 7");
-static const u8 gMapName_Route8[] = _("ROUTE 8");
-static const u8 gMapName_Route9[] = _("ROUTE 9");
-static const u8 gMapName_Route10_2[] = _("ROUTE 10");
-static const u8 gMapName_Route11[] = _("ROUTE 11");
-static const u8 gMapName_Route12[] = _("ROUTE 12");
-static const u8 gMapName_Route13[] = _("ROUTE 13");
-static const u8 gMapName_Route14[] = _("ROUTE 14");
-static const u8 gMapName_Route15[] = _("ROUTE 15");
-static const u8 gMapName_Route16[] = _("ROUTE 16");
-static const u8 gMapName_Route17[] = _("ROUTE 17");
-static const u8 gMapName_Route18[] = _("ROUTE 18");
-static const u8 gMapName_Route19[] = _("ROUTE 19");
-static const u8 gMapName_Route20[] = _("ROUTE 20");
-static const u8 gMapName_Route21[] = _("ROUTE 21");
-static const u8 gMapName_Route22[] = _("ROUTE 22");
-static const u8 gMapName_Route23[] = _("ROUTE 23");
-static const u8 gMapName_Route24[] = _("ROUTE 24");
-static const u8 gMapName_Route25[] = _("ROUTE 25");
-static const u8 gMapName_ViridianForest[] = _("VIRIDIAN FOREST");
-static const u8 gMapName_MtMoon[] = _("MT. MOON");
-static const u8 gMapName_SSAnne[] = _("S.S. ANNE");
-static const u8 gMapName_UndergroundPath[] = _("UNDERGROUND PATH");
-static const u8 gMapName_UndergroundPath2[] = _("UNDERGROUND PATH");
-static const u8 gMapName_DiglettsCave[] = _("DIGLETT’S CAVE");
-static const u8 gMapName_KantoVictoryRoad[] = _("VICTORY ROAD");
-static const u8 gMapName_RocketHideout[] = _("ROCKET HIDEOUT");
-static const u8 gMapName_SilphCo[] = _("SILPH CO.");
-static const u8 gMapName_PokemonMansion[] = _("POKéMON MANSION");
-static const u8 gMapName_KantoSafariZone[] = _("SAFARI ZONE");
-static const u8 gMapName_PokemonLeague[] = _("POKéMON LEAGUE");
-static const u8 gMapName_RockTunnel[] = _("ROCK TUNNEL");
-static const u8 gMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS");
-static const u8 gMapName_PokemonTower[] = _("POKéMON TOWER");
-static const u8 gMapName_CeruleanCave[] = _("CERULEAN CAVE");
-static const u8 gMapName_PowerPlant[] = _("POWER PLANT");
-static const u8 gMapName_OneIsland[] = _("ONE ISLAND");
-static const u8 gMapName_TwoIsland[] = _("TWO ISLAND");
-static const u8 gMapName_ThreeIsland[] = _("THREE ISLAND");
-static const u8 gMapName_FourIsland[] = _("FOUR ISLAND");
-static const u8 gMapName_FiveIsland[] = _("FIVE ISLAND");
-static const u8 gMapName_SevenIsland[] = _("SEVEN ISLAND");
-static const u8 gMapName_SixIsland[] = _("SIX ISLAND");
-static const u8 gMapName_KindleRoad[] = _("KINDLE ROAD");
-static const u8 gMapName_TreasureBeach[] = _("TREASURE BEACH");
-static const u8 gMapName_CapeBrink[] = _("CAPE BRINK");
-static const u8 gMapName_BondBridge[] = _("BOND BRIDGE");
-static const u8 gMapName_ThreeIslePort[] = _("THREE ISLE PORT");
-static const u8 gMapName_SeviiIsle6[] = _("SEVII ISLE 6");
-static const u8 gMapName_SeviiIsle7[] = _("SEVII ISLE 7");
-static const u8 gMapName_SeviiIsle8[] = _("SEVII ISLE 8");
-static const u8 gMapName_SeviiIsle9[] = _("SEVII ISLE 9");
-static const u8 gMapName_ResortGorgeous[] = _("RESORT GORGEOUS");
-static const u8 gMapName_WaterLabyrinth[] = _("WATER LABYRINTH");
-static const u8 gMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW");
-static const u8 gMapName_MemorialPillar[] = _("MEMORIAL PILLAR");
-static const u8 gMapName_OutcastIsland[] = _("OUTCAST ISLAND");
-static const u8 gMapName_GreenPath[] = _("GREEN PATH");
-static const u8 gMapName_WaterPath[] = _("WATER PATH");
-static const u8 gMapName_RuinValley[] = _("RUIN VALLEY");
-static const u8 gMapName_TrainerTower[] = _("TRAINER TOWER");
-static const u8 gMapName_CanyonEntrance[] = _("CANYON ENTRANCE");
-static const u8 gMapName_SevaultCanyon[] = _("SEVAULT CANYON");
-static const u8 gMapName_TanobyRuins[] = _("TANOBY RUINS");
-static const u8 gMapName_SeviiIsle22[] = _("SEVII ISLE 22");
-static const u8 gMapName_SeviiIsle23[] = _("SEVII ISLE 23");
-static const u8 gMapName_SeviiIsle24[] = _("SEVII ISLE 24");
-static const u8 gMapName_NavelRock[] = _("NAVEL ROCK");
-static const u8 gMapName_MtEmber[] = _("MT. EMBER");
-static const u8 gMapName_BerryForest[] = _("BERRY FOREST");
-static const u8 gMapName_IcefallCave[] = _("ICEFALL CAVE");
-static const u8 gMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE");
-static const u8 gMapName_TrainerTower2[] = _("TRAINER TOWER");
-static const u8 gMapName_DottedHole[] = _("DOTTED HOLE");
-static const u8 gMapName_LostCave[] = _("LOST CAVE");
-static const u8 gMapName_PatternBush[] = _("PATTERN BUSH");
-static const u8 gMapName_AlteringCave[] = _("ALTERING CAVE");
-static const u8 gMapName_TanobyChambers[] = _("TANOBY CHAMBERS");
-static const u8 gMapName_ThreeIslePath[] = _("THREE ISLE PATH");
-static const u8 gMapName_TanobyKey[] = _("TANOBY KEY");
-static const u8 gMapName_BirthIsland[] = _("BIRTH ISLAND");
-static const u8 gMapName_MoneanChamber[] = _("MONEAN CHAMBER");
-static const u8 gMapName_LiptooChamber[] = _("LIPTOO CHAMBER");
-static const u8 gMapName_WeepthChamber[] = _("WEEPTH CHAMBER");
-static const u8 gMapName_DilfordChamber[] = _("DILFORD CHAMBER");
-static const u8 gMapName_ScufibChamber[] = _("SCUFIB CHAMBER");
-static const u8 gMapName_RixyChamber[] = _("RIXY CHAMBER");
-static const u8 gMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER");
-static const u8 gMapName_EmberSpa[] = _("EMBER SPA");
-static const u8 gMapName_SpecialArea[] = _("SPECIAL AREA");
-static const u8 gMapName_AquaHideout[] = _("AQUA HIDEOUT");
-static const u8 gMapName_MagmaHideout[] = _("MAGMA HIDEOUT");
-static const u8 gMapName_MirageTower[] = _("MIRAGE TOWER");
-static const u8 gMapName_FarawayIsland[] = _("FARAWAY ISLAND");
-static const u8 gMapName_ArtisanCave[] = _("ARTISAN CAVE");
-static const u8 gMapName_MarineCave[] = _("MARINE CAVE");
-static const u8 gMapName_TerraCave[] = _("TERRA CAVE");
-static const u8 gMapName_DesertUnderpass[] = _("DESERT UNDERPASS");
-static const u8 gMapName_TrainerHill[] = _("TRAINER HILL");
+static const u8 sMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT");
+static const u8 sMapName_ShoalCave[] = _("SHOAL CAVE");
+static const u8 sMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
+static const u8 sMapName_VictoryRoad[] = _("VICTORY ROAD");
+static const u8 sMapName_MirageIsland[] = _("MIRAGE ISLAND");
+static const u8 sMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
+static const u8 sMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
+static const u8 sMapName_FieryPath[] = _("FIERY PATH");
+static const u8 sMapName_JaggedPass[] = _("JAGGED PASS");
+static const u8 sMapName_SealedChamber[] = _("SEALED CHAMBER");
+static const u8 sMapName_ScorchedSlab[] = _("SCORCHED SLAB");
+static const u8 sMapName_IslandCave[] = _("ISLAND CAVE");
+static const u8 sMapName_DesertRuins[] = _("DESERT RUINS");
+static const u8 sMapName_AncientTomb[] = _("ANCIENT TOMB");
+static const u8 sMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
+static const u8 sMapName_SkyPillar[] = _("SKY PILLAR");
+static const u8 sMapName_SecretBase[] = _("SECRET BASE");
+static const u8 sMapName_None[] = _("");
+static const u8 sMapName_PalletTown[] = _("PALLET TOWN");
+static const u8 sMapName_ViridianCity[] = _("VIRIDIAN CITY");
+static const u8 sMapName_PewterCity[] = _("PEWTER CITY");
+static const u8 sMapName_CeruleanCity[] = _("CERULEAN CITY");
+static const u8 sMapName_LavenderTown[] = _("LAVENDER TOWN");
+static const u8 sMapName_VermilionCity[] = _("VERMILION CITY");
+static const u8 sMapName_CeladonCity[] = _("CELADON CITY");
+static const u8 sMapName_FuchsiaCity[] = _("FUCHSIA CITY");
+static const u8 sMapName_CinnabarIsland[] = _("CINNABAR ISLAND");
+static const u8 sMapName_IndigoPlateau[] = _("INDIGO PLATEAU");
+static const u8 sMapName_SaffronCity[] = _("SAFFRON CITY");
+static const u8 sMapName_Route4[] = _("ROUTE 4");
+static const u8 sMapName_Route10[] = _("ROUTE 10");
+static const u8 sMapName_Route1[] = _("ROUTE 1");
+static const u8 sMapName_Route2[] = _("ROUTE 2");
+static const u8 sMapName_Route3[] = _("ROUTE 3");
+static const u8 sMapName_Route4_2[] = _("ROUTE 4");
+static const u8 sMapName_Route5[] = _("ROUTE 5");
+static const u8 sMapName_Route6[] = _("ROUTE 6");
+static const u8 sMapName_Route7[] = _("ROUTE 7");
+static const u8 sMapName_Route8[] = _("ROUTE 8");
+static const u8 sMapName_Route9[] = _("ROUTE 9");
+static const u8 sMapName_Route10_2[] = _("ROUTE 10");
+static const u8 sMapName_Route11[] = _("ROUTE 11");
+static const u8 sMapName_Route12[] = _("ROUTE 12");
+static const u8 sMapName_Route13[] = _("ROUTE 13");
+static const u8 sMapName_Route14[] = _("ROUTE 14");
+static const u8 sMapName_Route15[] = _("ROUTE 15");
+static const u8 sMapName_Route16[] = _("ROUTE 16");
+static const u8 sMapName_Route17[] = _("ROUTE 17");
+static const u8 sMapName_Route18[] = _("ROUTE 18");
+static const u8 sMapName_Route19[] = _("ROUTE 19");
+static const u8 sMapName_Route20[] = _("ROUTE 20");
+static const u8 sMapName_Route21[] = _("ROUTE 21");
+static const u8 sMapName_Route22[] = _("ROUTE 22");
+static const u8 sMapName_Route23[] = _("ROUTE 23");
+static const u8 sMapName_Route24[] = _("ROUTE 24");
+static const u8 sMapName_Route25[] = _("ROUTE 25");
+static const u8 sMapName_ViridianForest[] = _("VIRIDIAN FOREST");
+static const u8 sMapName_MtMoon[] = _("MT. MOON");
+static const u8 sMapName_SSAnne[] = _("S.S. ANNE");
+static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH");
+static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH");
+static const u8 sMapName_DiglettsCave[] = _("DIGLETT’S CAVE");
+static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD");
+static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT");
+static const u8 sMapName_SilphCo[] = _("SILPH CO.");
+static const u8 sMapName_PokemonMansion[] = _("POKéMON MANSION");
+static const u8 sMapName_KantoSafariZone[] = _("SAFARI ZONE");
+static const u8 sMapName_PokemonLeague[] = _("POKéMON LEAGUE");
+static const u8 sMapName_RockTunnel[] = _("ROCK TUNNEL");
+static const u8 sMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS");
+static const u8 sMapName_PokemonTower[] = _("POKéMON TOWER");
+static const u8 sMapName_CeruleanCave[] = _("CERULEAN CAVE");
+static const u8 sMapName_PowerPlant[] = _("POWER PLANT");
+static const u8 sMapName_OneIsland[] = _("ONE ISLAND");
+static const u8 sMapName_TwoIsland[] = _("TWO ISLAND");
+static const u8 sMapName_ThreeIsland[] = _("THREE ISLAND");
+static const u8 sMapName_FourIsland[] = _("FOUR ISLAND");
+static const u8 sMapName_FiveIsland[] = _("FIVE ISLAND");
+static const u8 sMapName_SevenIsland[] = _("SEVEN ISLAND");
+static const u8 sMapName_SixIsland[] = _("SIX ISLAND");
+static const u8 sMapName_KindleRoad[] = _("KINDLE ROAD");
+static const u8 sMapName_TreasureBeach[] = _("TREASURE BEACH");
+static const u8 sMapName_CapeBrink[] = _("CAPE BRINK");
+static const u8 sMapName_BondBridge[] = _("BOND BRIDGE");
+static const u8 sMapName_ThreeIslePort[] = _("THREE ISLE PORT");
+static const u8 sMapName_SeviiIsle6[] = _("SEVII ISLE 6");
+static const u8 sMapName_SeviiIsle7[] = _("SEVII ISLE 7");
+static const u8 sMapName_SeviiIsle8[] = _("SEVII ISLE 8");
+static const u8 sMapName_SeviiIsle9[] = _("SEVII ISLE 9");
+static const u8 sMapName_ResortGorgeous[] = _("RESORT GORGEOUS");
+static const u8 sMapName_WaterLabyrinth[] = _("WATER LABYRINTH");
+static const u8 sMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW");
+static const u8 sMapName_MemorialPillar[] = _("MEMORIAL PILLAR");
+static const u8 sMapName_OutcastIsland[] = _("OUTCAST ISLAND");
+static const u8 sMapName_GreenPath[] = _("GREEN PATH");
+static const u8 sMapName_WaterPath[] = _("WATER PATH");
+static const u8 sMapName_RuinValley[] = _("RUIN VALLEY");
+static const u8 sMapName_TrainerTower[] = _("TRAINER TOWER");
+static const u8 sMapName_CanyonEntrance[] = _("CANYON ENTRANCE");
+static const u8 sMapName_SevaultCanyon[] = _("SEVAULT CANYON");
+static const u8 sMapName_TanobyRuins[] = _("TANOBY RUINS");
+static const u8 sMapName_SeviiIsle22[] = _("SEVII ISLE 22");
+static const u8 sMapName_SeviiIsle23[] = _("SEVII ISLE 23");
+static const u8 sMapName_SeviiIsle24[] = _("SEVII ISLE 24");
+static const u8 sMapName_NavelRock[] = _("NAVEL ROCK");
+static const u8 sMapName_MtEmber[] = _("MT. EMBER");
+static const u8 sMapName_BerryForest[] = _("BERRY FOREST");
+static const u8 sMapName_IcefallCave[] = _("ICEFALL CAVE");
+static const u8 sMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE");
+static const u8 sMapName_TrainerTower2[] = _("TRAINER TOWER");
+static const u8 sMapName_DottedHole[] = _("DOTTED HOLE");
+static const u8 sMapName_LostCave[] = _("LOST CAVE");
+static const u8 sMapName_PatternBush[] = _("PATTERN BUSH");
+static const u8 sMapName_AlteringCave[] = _("ALTERING CAVE");
+static const u8 sMapName_TanobyChambers[] = _("TANOBY CHAMBERS");
+static const u8 sMapName_ThreeIslePath[] = _("THREE ISLE PATH");
+static const u8 sMapName_TanobyKey[] = _("TANOBY KEY");
+static const u8 sMapName_BirthIsland[] = _("BIRTH ISLAND");
+static const u8 sMapName_MoneanChamber[] = _("MONEAN CHAMBER");
+static const u8 sMapName_LiptooChamber[] = _("LIPTOO CHAMBER");
+static const u8 sMapName_WeepthChamber[] = _("WEEPTH CHAMBER");
+static const u8 sMapName_DilfordChamber[] = _("DILFORD CHAMBER");
+static const u8 sMapName_ScufibChamber[] = _("SCUFIB CHAMBER");
+static const u8 sMapName_RixyChamber[] = _("RIXY CHAMBER");
+static const u8 sMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER");
+static const u8 sMapName_EmberSpa[] = _("EMBER SPA");
+static const u8 sMapName_SpecialArea[] = _("SPECIAL AREA");
+static const u8 sMapName_AquaHideout[] = _("AQUA HIDEOUT");
+static const u8 sMapName_MagmaHideout[] = _("MAGMA HIDEOUT");
+static const u8 sMapName_MirageTower[] = _("MIRAGE TOWER");
+static const u8 sMapName_FarawayIsland[] = _("FARAWAY ISLAND");
+static const u8 sMapName_ArtisanCave[] = _("ARTISAN CAVE");
+static const u8 sMapName_MarineCave[] = _("MARINE CAVE");
+static const u8 sMapName_TerraCave[] = _("TERRA CAVE");
+static const u8 sMapName_DesertUnderpass[] = _("DESERT UNDERPASS");
+static const u8 sMapName_TrainerHill[] = _("TRAINER HILL");
 
 const struct RegionMapLocation gRegionMapEntries[] = {
-    { 4, 11, 1, 1, gMapName_LittlerootTown},
-    { 4,  9, 1, 1, gMapName_OldaleTown},
-    { 2, 14, 1, 1, gMapName_DewfordTown},
-    { 5,  3, 1, 1, gMapName_LavaridgeTown},
-    { 3,  0, 1, 1, gMapName_FallarborTown},
-    { 4,  6, 1, 1, gMapName_VerdanturfTown},
-    {17, 10, 1, 1, gMapName_PacifidlogTown},
-    { 1,  9, 1, 1, gMapName_PetalburgCity},
-    { 8, 10, 1, 2, gMapName_SlateportCity},
-    { 8,  6, 2, 1, gMapName_MauvilleCity},
-    { 0,  5, 1, 2, gMapName_RustboroCity},
-    {12,  0, 1, 1, gMapName_FortreeCity},
-    {18,  3, 2, 1, gMapName_LilycoveCity},
-    {24,  5, 2, 1, gMapName_MossdeepCity},
-    {21,  7, 1, 1, gMapName_SootopolisCity},
-    {27,  8, 1, 2, gMapName_EverGrandeCity},
-    { 4, 10, 1, 1, gMapName_Route101},
-    { 2,  9, 2, 1, gMapName_Route102},
-    { 4,  8, 4, 1, gMapName_Route103},
-    { 0,  7, 1, 3, gMapName_Route104},
-    { 0, 10, 1, 3, gMapName_Route105},
-    { 0, 13, 2, 1, gMapName_Route106},
-    { 3, 14, 3, 1, gMapName_Route107},
-    { 6, 14, 2, 1, gMapName_Route108},
-    { 8, 12, 1, 3, gMapName_Route109},
-    { 8,  7, 1, 3, gMapName_Route110},
-    { 8,  0, 1, 6, gMapName_Route111},
-    { 6,  3, 2, 1, gMapName_Route112},
-    { 4,  0, 4, 1, gMapName_Route113},
-    { 1,  0, 2, 3, gMapName_Route114},
-    { 0,  2, 1, 3, gMapName_Route115},
-    { 1,  5, 4, 1, gMapName_Route116},
-    { 5,  6, 3, 1, gMapName_Route117},
-    {10,  6, 2, 1, gMapName_Route118},
-    {11,  0, 1, 6, gMapName_Route119},
-    {13,  0, 1, 4, gMapName_Route120},
-    {14,  3, 4, 1, gMapName_Route121},
-    {16,  4, 1, 2, gMapName_Route122},
-    {12,  6, 5, 1, gMapName_Route123},
-    {20,  3, 4, 3, gMapName_Route124},
-    {24,  3, 2, 2, gMapName_Route125},
-    {20,  6, 3, 3, gMapName_Route126},
-    {23,  6, 3, 3, gMapName_Route127},
-    {23,  9, 4, 1, gMapName_Route128},
-    {24, 10, 2, 1, gMapName_Route129},
-    {21, 10, 3, 1, gMapName_Route130},
-    {18, 10, 3, 1, gMapName_Route131},
-    {15, 10, 2, 1, gMapName_Route132},
-    {12, 10, 3, 1, gMapName_Route133},
-    { 9, 10, 3, 1, gMapName_Route134},
-    {20,  3, 4, 3, gMapName_Underwater},
-    {20,  6, 3, 3, gMapName_Underwater},
-    {23,  6, 3, 3, gMapName_Underwater},
-    {23,  9, 4, 1, gMapName_Underwater},
-    {21,  7, 1, 1, gMapName_Underwater},
-    { 1, 13, 1, 1, gMapName_GraniteCave},
-    { 6,  2, 1, 1, gMapName_MtChimney},
-    {16,  2, 1, 1, gMapName_SafariZone},
-    {22, 12, 1, 1, gMapName_BattleFrontier},
-    { 0,  8, 1, 1, gMapName_PetalburgWoods},
-    { 2,  5, 1, 1, gMapName_RusturfTunnel},
-    { 6, 14, 1, 1, gMapName_AbandonedShip},
-    { 8,  7, 1, 1, gMapName_NewMauville},
-    { 0,  3, 1, 1, gMapName_MeteorFalls},
-    { 1,  2, 1, 1, gMapName_MeteorFalls},
-    {16,  4, 1, 1, gMapName_MtPyre},
-    {19,  3, 1, 1, gMapName_AquaHideoutOld},
-    {24,  4, 1, 1, gMapName_ShoalCave},
-    {24,  9, 1, 1, gMapName_SeafloorCavern},
-    {24,  9, 1, 1, gMapName_Underwater},
-    {27,  9, 1, 1, gMapName_VictoryRoad},
-    {17, 10, 1, 1, gMapName_MirageIsland},
-    {21,  7, 1, 1, gMapName_CaveOfOrigin},
-    {12, 14, 1, 1, gMapName_SouthernIsland},
-    { 6,  3, 1, 1, gMapName_FieryPath},
-    { 7,  3, 1, 1, gMapName_FieryPath},
-    { 6,  3, 1, 1, gMapName_JaggedPass},
-    { 7,  2, 1, 1, gMapName_JaggedPass},
-    {11, 10, 1, 1, gMapName_SealedChamber},
-    {11, 10, 1, 1, gMapName_Underwater},
-    {13,  0, 1, 1, gMapName_ScorchedSlab},
-    { 0, 10, 1, 1, gMapName_IslandCave},
-    { 8,  3, 1, 1, gMapName_DesertRuins},
-    {13,  2, 1, 1, gMapName_AncientTomb},
-    { 0,  0, 1, 1, gMapName_InsideOfTruck},
-    {19, 10, 1, 1, gMapName_SkyPillar},
-    { 0,  0, 1, 1, gMapName_SecretBase},
-    { 0,  0, 1, 1, gMapName_None},
-    { 0,  0, 1, 1, gMapName_PalletTown},
-    { 0,  0, 1, 1, gMapName_ViridianCity},
-    { 0,  0, 1, 1, gMapName_PewterCity},
-    { 0,  0, 1, 1, gMapName_CeruleanCity},
-    { 0,  0, 1, 1, gMapName_LavenderTown},
-    { 0,  0, 1, 1, gMapName_VermilionCity},
-    { 0,  0, 1, 1, gMapName_CeladonCity},
-    { 0,  0, 1, 1, gMapName_FuchsiaCity},
-    { 0,  0, 1, 1, gMapName_CinnabarIsland},
-    { 0,  0, 1, 1, gMapName_IndigoPlateau},
-    { 0,  0, 1, 1, gMapName_SaffronCity},
-    { 0,  0, 1, 1, gMapName_Route4},
-    { 0,  0, 1, 1, gMapName_Route10},
-    { 0,  0, 1, 1, gMapName_Route1},
-    { 0,  0, 1, 1, gMapName_Route2},
-    { 0,  0, 1, 1, gMapName_Route3},
-    { 0,  0, 1, 1, gMapName_Route4_2},
-    { 0,  0, 1, 1, gMapName_Route5},
-    { 0,  0, 1, 1, gMapName_Route6},
-    { 0,  0, 1, 1, gMapName_Route7},
-    { 0,  0, 1, 1, gMapName_Route8},
-    { 0,  0, 1, 1, gMapName_Route9},
-    { 0,  0, 1, 1, gMapName_Route10_2},
-    { 0,  0, 1, 1, gMapName_Route11},
-    { 0,  0, 1, 1, gMapName_Route12},
-    { 0,  0, 1, 1, gMapName_Route13},
-    { 0,  0, 1, 1, gMapName_Route14},
-    { 0,  0, 1, 1, gMapName_Route15},
-    { 0,  0, 1, 1, gMapName_Route16},
-    { 0,  0, 1, 1, gMapName_Route17},
-    { 0,  0, 1, 1, gMapName_Route18},
-    { 0,  0, 1, 1, gMapName_Route19},
-    { 0,  0, 1, 1, gMapName_Route20},
-    { 0,  0, 1, 1, gMapName_Route21},
-    { 0,  0, 1, 1, gMapName_Route22},
-    { 0,  0, 1, 1, gMapName_Route23},
-    { 0,  0, 1, 1, gMapName_Route24},
-    { 0,  0, 1, 1, gMapName_Route25},
-    { 0,  0, 1, 1, gMapName_ViridianForest},
-    { 0,  0, 1, 1, gMapName_MtMoon},
-    { 0,  0, 1, 1, gMapName_SSAnne},
-    { 0,  0, 1, 1, gMapName_UndergroundPath},
-    { 0,  0, 1, 1, gMapName_UndergroundPath2},
-    { 0,  0, 1, 1, gMapName_DiglettsCave},
-    { 0,  0, 1, 1, gMapName_KantoVictoryRoad},
-    { 0,  0, 1, 1, gMapName_RocketHideout},
-    { 0,  0, 1, 1, gMapName_SilphCo},
-    { 0,  0, 1, 1, gMapName_PokemonMansion},
-    { 0,  0, 1, 1, gMapName_KantoSafariZone},
-    { 0,  0, 1, 1, gMapName_PokemonLeague},
-    { 0,  0, 1, 1, gMapName_RockTunnel},
-    { 0,  0, 1, 1, gMapName_SeafoamIslands},
-    { 0,  0, 1, 1, gMapName_PokemonTower},
-    { 0,  0, 1, 1, gMapName_CeruleanCave},
-    { 0,  0, 1, 1, gMapName_PowerPlant},
-    { 0,  0, 1, 1, gMapName_OneIsland},
-    { 0,  0, 1, 1, gMapName_TwoIsland},
-    { 0,  0, 1, 1, gMapName_ThreeIsland},
-    { 0,  0, 1, 1, gMapName_FourIsland},
-    { 0,  0, 1, 1, gMapName_FiveIsland},
-    { 0,  0, 1, 1, gMapName_SevenIsland},
-    { 0,  0, 1, 1, gMapName_SixIsland},
-    { 0,  0, 1, 1, gMapName_KindleRoad},
-    { 0,  0, 1, 1, gMapName_TreasureBeach},
-    { 0,  0, 1, 1, gMapName_CapeBrink},
-    { 0,  0, 1, 1, gMapName_BondBridge},
-    { 0,  0, 1, 1, gMapName_ThreeIslePort},
-    { 0,  0, 1, 1, gMapName_SeviiIsle6},
-    { 0,  0, 1, 1, gMapName_SeviiIsle7},
-    { 0,  0, 1, 1, gMapName_SeviiIsle8},
-    { 0,  0, 1, 1, gMapName_SeviiIsle9},
-    { 0,  0, 1, 1, gMapName_ResortGorgeous},
-    { 0,  0, 1, 1, gMapName_WaterLabyrinth},
-    { 0,  0, 1, 1, gMapName_FiveIsleMeadow},
-    { 0,  0, 1, 1, gMapName_MemorialPillar},
-    { 0,  0, 1, 1, gMapName_OutcastIsland},
-    { 0,  0, 1, 1, gMapName_GreenPath},
-    { 0,  0, 1, 1, gMapName_WaterPath},
-    { 0,  0, 1, 1, gMapName_RuinValley},
-    { 0,  0, 1, 1, gMapName_TrainerTower},
-    { 0,  0, 1, 1, gMapName_CanyonEntrance},
-    { 0,  0, 1, 1, gMapName_SevaultCanyon},
-    { 0,  0, 1, 1, gMapName_TanobyRuins},
-    { 0,  0, 1, 1, gMapName_SeviiIsle22},
-    { 0,  0, 1, 1, gMapName_SeviiIsle23},
-    { 0,  0, 1, 1, gMapName_SeviiIsle24},
-    { 0,  0, 1, 1, gMapName_NavelRock},
-    { 0,  0, 1, 1, gMapName_MtEmber},
-    { 0,  0, 1, 1, gMapName_BerryForest},
-    { 0,  0, 1, 1, gMapName_IcefallCave},
-    { 0,  0, 1, 1, gMapName_RocketWarehouse},
-    { 0,  0, 1, 1, gMapName_TrainerTower2},
-    { 0,  0, 1, 1, gMapName_DottedHole},
-    { 0,  0, 1, 1, gMapName_LostCave},
-    { 0,  0, 1, 1, gMapName_PatternBush},
-    { 0,  0, 1, 1, gMapName_AlteringCave},
-    { 0,  0, 1, 1, gMapName_TanobyChambers},
-    { 0,  0, 1, 1, gMapName_ThreeIslePath},
-    { 0,  0, 1, 1, gMapName_TanobyKey},
-    { 0,  0, 1, 1, gMapName_BirthIsland},
-    { 0,  0, 1, 1, gMapName_MoneanChamber},
-    { 0,  0, 1, 1, gMapName_LiptooChamber},
-    { 0,  0, 1, 1, gMapName_WeepthChamber},
-    { 0,  0, 1, 1, gMapName_DilfordChamber},
-    { 0,  0, 1, 1, gMapName_ScufibChamber},
-    { 0,  0, 1, 1, gMapName_RixyChamber},
-    { 0,  0, 1, 1, gMapName_ViapoisChamber},
-    { 0,  0, 1, 1, gMapName_EmberSpa},
-    { 0,  0, 1, 1, gMapName_SpecialArea},
-    {19,  3, 1, 1, gMapName_AquaHideout},
-    { 6,  3, 1, 1, gMapName_MagmaHideout},
-    { 8,  2, 1, 1, gMapName_MirageTower},
-    { 0,  0, 1, 1, gMapName_BirthIsland},
-    { 0,  0, 1, 1, gMapName_FarawayIsland},
-    {22, 12, 1, 1, gMapName_ArtisanCave},
-    { 0,  0, 1, 1, gMapName_MarineCave},
-    { 0,  0, 1, 1, gMapName_Underwater},
-    { 0,  0, 1, 1, gMapName_TerraCave},
-    { 0, 10, 1, 3, gMapName_Underwater},
-    {24,  3, 2, 2, gMapName_Underwater},
-    {24, 10, 2, 1, gMapName_Underwater},
-    { 2,  0, 1, 1, gMapName_DesertUnderpass},
-    { 6,  8, 1, 1, gMapName_AlteringCave},
-    { 0,  0, 1, 1, gMapName_NavelRock},
-    { 8,  4, 1, 1, gMapName_TrainerHill}
+    { 4, 11, 1, 1, sMapName_LittlerootTown},
+    { 4,  9, 1, 1, sMapName_OldaleTown},
+    { 2, 14, 1, 1, sMapName_DewfordTown},
+    { 5,  3, 1, 1, sMapName_LavaridgeTown},
+    { 3,  0, 1, 1, sMapName_FallarborTown},
+    { 4,  6, 1, 1, sMapName_VerdanturfTown},
+    {17, 10, 1, 1, sMapName_PacifidlogTown},
+    { 1,  9, 1, 1, sMapName_PetalburgCity},
+    { 8, 10, 1, 2, sMapName_SlateportCity},
+    { 8,  6, 2, 1, sMapName_MauvilleCity},
+    { 0,  5, 1, 2, sMapName_RustboroCity},
+    {12,  0, 1, 1, sMapName_FortreeCity},
+    {18,  3, 2, 1, sMapName_LilycoveCity},
+    {24,  5, 2, 1, sMapName_MossdeepCity},
+    {21,  7, 1, 1, sMapName_SootopolisCity},
+    {27,  8, 1, 2, sMapName_EverGrandeCity},
+    { 4, 10, 1, 1, sMapName_Route101},
+    { 2,  9, 2, 1, sMapName_Route102},
+    { 4,  8, 4, 1, sMapName_Route103},
+    { 0,  7, 1, 3, sMapName_Route104},
+    { 0, 10, 1, 3, sMapName_Route105},
+    { 0, 13, 2, 1, sMapName_Route106},
+    { 3, 14, 3, 1, sMapName_Route107},
+    { 6, 14, 2, 1, sMapName_Route108},
+    { 8, 12, 1, 3, sMapName_Route109},
+    { 8,  7, 1, 3, sMapName_Route110},
+    { 8,  0, 1, 6, sMapName_Route111},
+    { 6,  3, 2, 1, sMapName_Route112},
+    { 4,  0, 4, 1, sMapName_Route113},
+    { 1,  0, 2, 3, sMapName_Route114},
+    { 0,  2, 1, 3, sMapName_Route115},
+    { 1,  5, 4, 1, sMapName_Route116},
+    { 5,  6, 3, 1, sMapName_Route117},
+    {10,  6, 2, 1, sMapName_Route118},
+    {11,  0, 1, 6, sMapName_Route119},
+    {13,  0, 1, 4, sMapName_Route120},
+    {14,  3, 4, 1, sMapName_Route121},
+    {16,  4, 1, 2, sMapName_Route122},
+    {12,  6, 5, 1, sMapName_Route123},
+    {20,  3, 4, 3, sMapName_Route124},
+    {24,  3, 2, 2, sMapName_Route125},
+    {20,  6, 3, 3, sMapName_Route126},
+    {23,  6, 3, 3, sMapName_Route127},
+    {23,  9, 4, 1, sMapName_Route128},
+    {24, 10, 2, 1, sMapName_Route129},
+    {21, 10, 3, 1, sMapName_Route130},
+    {18, 10, 3, 1, sMapName_Route131},
+    {15, 10, 2, 1, sMapName_Route132},
+    {12, 10, 3, 1, sMapName_Route133},
+    { 9, 10, 3, 1, sMapName_Route134},
+    {20,  3, 4, 3, sMapName_Underwater},
+    {20,  6, 3, 3, sMapName_Underwater},
+    {23,  6, 3, 3, sMapName_Underwater},
+    {23,  9, 4, 1, sMapName_Underwater},
+    {21,  7, 1, 1, sMapName_Underwater},
+    { 1, 13, 1, 1, sMapName_GraniteCave},
+    { 6,  2, 1, 1, sMapName_MtChimney},
+    {16,  2, 1, 1, sMapName_SafariZone},
+    {22, 12, 1, 1, sMapName_BattleFrontier},
+    { 0,  8, 1, 1, sMapName_PetalburgWoods},
+    { 2,  5, 1, 1, sMapName_RusturfTunnel},
+    { 6, 14, 1, 1, sMapName_AbandonedShip},
+    { 8,  7, 1, 1, sMapName_NewMauville},
+    { 0,  3, 1, 1, sMapName_MeteorFalls},
+    { 1,  2, 1, 1, sMapName_MeteorFalls},
+    {16,  4, 1, 1, sMapName_MtPyre},
+    {19,  3, 1, 1, sMapName_AquaHideoutOld},
+    {24,  4, 1, 1, sMapName_ShoalCave},
+    {24,  9, 1, 1, sMapName_SeafloorCavern},
+    {24,  9, 1, 1, sMapName_Underwater},
+    {27,  9, 1, 1, sMapName_VictoryRoad},
+    {17, 10, 1, 1, sMapName_MirageIsland},
+    {21,  7, 1, 1, sMapName_CaveOfOrigin},
+    {12, 14, 1, 1, sMapName_SouthernIsland},
+    { 6,  3, 1, 1, sMapName_FieryPath},
+    { 7,  3, 1, 1, sMapName_FieryPath},
+    { 6,  3, 1, 1, sMapName_JaggedPass},
+    { 7,  2, 1, 1, sMapName_JaggedPass},
+    {11, 10, 1, 1, sMapName_SealedChamber},
+    {11, 10, 1, 1, sMapName_Underwater},
+    {13,  0, 1, 1, sMapName_ScorchedSlab},
+    { 0, 10, 1, 1, sMapName_IslandCave},
+    { 8,  3, 1, 1, sMapName_DesertRuins},
+    {13,  2, 1, 1, sMapName_AncientTomb},
+    { 0,  0, 1, 1, sMapName_InsideOfTruck},
+    {19, 10, 1, 1, sMapName_SkyPillar},
+    { 0,  0, 1, 1, sMapName_SecretBase},
+    { 0,  0, 1, 1, sMapName_None},
+    { 0,  0, 1, 1, sMapName_PalletTown},
+    { 0,  0, 1, 1, sMapName_ViridianCity},
+    { 0,  0, 1, 1, sMapName_PewterCity},
+    { 0,  0, 1, 1, sMapName_CeruleanCity},
+    { 0,  0, 1, 1, sMapName_LavenderTown},
+    { 0,  0, 1, 1, sMapName_VermilionCity},
+    { 0,  0, 1, 1, sMapName_CeladonCity},
+    { 0,  0, 1, 1, sMapName_FuchsiaCity},
+    { 0,  0, 1, 1, sMapName_CinnabarIsland},
+    { 0,  0, 1, 1, sMapName_IndigoPlateau},
+    { 0,  0, 1, 1, sMapName_SaffronCity},
+    { 0,  0, 1, 1, sMapName_Route4},
+    { 0,  0, 1, 1, sMapName_Route10},
+    { 0,  0, 1, 1, sMapName_Route1},
+    { 0,  0, 1, 1, sMapName_Route2},
+    { 0,  0, 1, 1, sMapName_Route3},
+    { 0,  0, 1, 1, sMapName_Route4_2},
+    { 0,  0, 1, 1, sMapName_Route5},
+    { 0,  0, 1, 1, sMapName_Route6},
+    { 0,  0, 1, 1, sMapName_Route7},
+    { 0,  0, 1, 1, sMapName_Route8},
+    { 0,  0, 1, 1, sMapName_Route9},
+    { 0,  0, 1, 1, sMapName_Route10_2},
+    { 0,  0, 1, 1, sMapName_Route11},
+    { 0,  0, 1, 1, sMapName_Route12},
+    { 0,  0, 1, 1, sMapName_Route13},
+    { 0,  0, 1, 1, sMapName_Route14},
+    { 0,  0, 1, 1, sMapName_Route15},
+    { 0,  0, 1, 1, sMapName_Route16},
+    { 0,  0, 1, 1, sMapName_Route17},
+    { 0,  0, 1, 1, sMapName_Route18},
+    { 0,  0, 1, 1, sMapName_Route19},
+    { 0,  0, 1, 1, sMapName_Route20},
+    { 0,  0, 1, 1, sMapName_Route21},
+    { 0,  0, 1, 1, sMapName_Route22},
+    { 0,  0, 1, 1, sMapName_Route23},
+    { 0,  0, 1, 1, sMapName_Route24},
+    { 0,  0, 1, 1, sMapName_Route25},
+    { 0,  0, 1, 1, sMapName_ViridianForest},
+    { 0,  0, 1, 1, sMapName_MtMoon},
+    { 0,  0, 1, 1, sMapName_SSAnne},
+    { 0,  0, 1, 1, sMapName_UndergroundPath},
+    { 0,  0, 1, 1, sMapName_UndergroundPath2},
+    { 0,  0, 1, 1, sMapName_DiglettsCave},
+    { 0,  0, 1, 1, sMapName_KantoVictoryRoad},
+    { 0,  0, 1, 1, sMapName_RocketHideout},
+    { 0,  0, 1, 1, sMapName_SilphCo},
+    { 0,  0, 1, 1, sMapName_PokemonMansion},
+    { 0,  0, 1, 1, sMapName_KantoSafariZone},
+    { 0,  0, 1, 1, sMapName_PokemonLeague},
+    { 0,  0, 1, 1, sMapName_RockTunnel},
+    { 0,  0, 1, 1, sMapName_SeafoamIslands},
+    { 0,  0, 1, 1, sMapName_PokemonTower},
+    { 0,  0, 1, 1, sMapName_CeruleanCave},
+    { 0,  0, 1, 1, sMapName_PowerPlant},
+    { 0,  0, 1, 1, sMapName_OneIsland},
+    { 0,  0, 1, 1, sMapName_TwoIsland},
+    { 0,  0, 1, 1, sMapName_ThreeIsland},
+    { 0,  0, 1, 1, sMapName_FourIsland},
+    { 0,  0, 1, 1, sMapName_FiveIsland},
+    { 0,  0, 1, 1, sMapName_SevenIsland},
+    { 0,  0, 1, 1, sMapName_SixIsland},
+    { 0,  0, 1, 1, sMapName_KindleRoad},
+    { 0,  0, 1, 1, sMapName_TreasureBeach},
+    { 0,  0, 1, 1, sMapName_CapeBrink},
+    { 0,  0, 1, 1, sMapName_BondBridge},
+    { 0,  0, 1, 1, sMapName_ThreeIslePort},
+    { 0,  0, 1, 1, sMapName_SeviiIsle6},
+    { 0,  0, 1, 1, sMapName_SeviiIsle7},
+    { 0,  0, 1, 1, sMapName_SeviiIsle8},
+    { 0,  0, 1, 1, sMapName_SeviiIsle9},
+    { 0,  0, 1, 1, sMapName_ResortGorgeous},
+    { 0,  0, 1, 1, sMapName_WaterLabyrinth},
+    { 0,  0, 1, 1, sMapName_FiveIsleMeadow},
+    { 0,  0, 1, 1, sMapName_MemorialPillar},
+    { 0,  0, 1, 1, sMapName_OutcastIsland},
+    { 0,  0, 1, 1, sMapName_GreenPath},
+    { 0,  0, 1, 1, sMapName_WaterPath},
+    { 0,  0, 1, 1, sMapName_RuinValley},
+    { 0,  0, 1, 1, sMapName_TrainerTower},
+    { 0,  0, 1, 1, sMapName_CanyonEntrance},
+    { 0,  0, 1, 1, sMapName_SevaultCanyon},
+    { 0,  0, 1, 1, sMapName_TanobyRuins},
+    { 0,  0, 1, 1, sMapName_SeviiIsle22},
+    { 0,  0, 1, 1, sMapName_SeviiIsle23},
+    { 0,  0, 1, 1, sMapName_SeviiIsle24},
+    { 0,  0, 1, 1, sMapName_NavelRock},
+    { 0,  0, 1, 1, sMapName_MtEmber},
+    { 0,  0, 1, 1, sMapName_BerryForest},
+    { 0,  0, 1, 1, sMapName_IcefallCave},
+    { 0,  0, 1, 1, sMapName_RocketWarehouse},
+    { 0,  0, 1, 1, sMapName_TrainerTower2},
+    { 0,  0, 1, 1, sMapName_DottedHole},
+    { 0,  0, 1, 1, sMapName_LostCave},
+    { 0,  0, 1, 1, sMapName_PatternBush},
+    { 0,  0, 1, 1, sMapName_AlteringCave},
+    { 0,  0, 1, 1, sMapName_TanobyChambers},
+    { 0,  0, 1, 1, sMapName_ThreeIslePath},
+    { 0,  0, 1, 1, sMapName_TanobyKey},
+    { 0,  0, 1, 1, sMapName_BirthIsland},
+    { 0,  0, 1, 1, sMapName_MoneanChamber},
+    { 0,  0, 1, 1, sMapName_LiptooChamber},
+    { 0,  0, 1, 1, sMapName_WeepthChamber},
+    { 0,  0, 1, 1, sMapName_DilfordChamber},
+    { 0,  0, 1, 1, sMapName_ScufibChamber},
+    { 0,  0, 1, 1, sMapName_RixyChamber},
+    { 0,  0, 1, 1, sMapName_ViapoisChamber},
+    { 0,  0, 1, 1, sMapName_EmberSpa},
+    { 0,  0, 1, 1, sMapName_SpecialArea},
+    {19,  3, 1, 1, sMapName_AquaHideout},
+    { 6,  3, 1, 1, sMapName_MagmaHideout},
+    { 8,  2, 1, 1, sMapName_MirageTower},
+    { 0,  0, 1, 1, sMapName_BirthIsland},
+    { 0,  0, 1, 1, sMapName_FarawayIsland},
+    {22, 12, 1, 1, sMapName_ArtisanCave},
+    { 0,  0, 1, 1, sMapName_MarineCave},
+    { 0,  0, 1, 1, sMapName_Underwater},
+    { 0,  0, 1, 1, sMapName_TerraCave},
+    { 0, 10, 1, 3, sMapName_Underwater},
+    {24,  3, 2, 2, sMapName_Underwater},
+    {24, 10, 2, 1, sMapName_Underwater},
+    { 2,  0, 1, 1, sMapName_DesertUnderpass},
+    { 6,  8, 1, 1, sMapName_AlteringCave},
+    { 0,  0, 1, 1, sMapName_NavelRock},
+    { 8,  4, 1, 1, sMapName_TrainerHill}
 };
 
 #endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H