diff --git a/include/pokemon.h b/include/pokemon.h
index 6c98e0f97..a9ce1d149 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -3,6 +3,7 @@
 
 #include "constants/pokemon.h"
 #include "sprite.h"
+#include "constants/region_map_sections.h"
 
 struct PokemonSubstruct0
 {
diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h
index e515f2117..ef052dd3f 100644
--- a/src/data/pokemon/evolution.h
+++ b/src/data/pokemon/evolution.h
@@ -61,7 +61,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
                             {EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_KINGS_ROCK*/ SPECIES_SLOWKING}},
     [SPECIES_SLOWBRO]	 = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SLOWBRONITE*/ SPECIES_MEGA_SLOWBRO}},
     [SPECIES_MAGNEMITE]	 = {{EVO_LEVEL, 30, SPECIES_MAGNETON}},
-    [SPECIES_MAGNETON]	 = {{EVO_MAP, 62, SPECIES_MAGNEZONE}},
+    [SPECIES_MAGNETON]	 = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}},
     [SPECIES_DODUO]	     = {{EVO_LEVEL, 31, SPECIES_DODRIO}},
     [SPECIES_SEEL]	     = {{EVO_LEVEL, 34, SPECIES_DEWGONG}},
     [SPECIES_GRIMER]	 = {{EVO_LEVEL, 38, SPECIES_MUK}},
@@ -99,8 +99,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
                             {EVO_ITEM, ITEM_NONE,/*ITEM_FIRE_STONE*/ SPECIES_FLAREON},
                             {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON},
                             {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON},
-                            {EVO_MAP, 62, SPECIES_LEAFEON},
-                            {EVO_MAP, 62, SPECIES_GLACEON},
+                            {EVO_MAP, MAPSEC_PETALBURG_WOODS, SPECIES_LEAFEON},
+                            {EVO_MAP, MAPSEC_SHOAL_CAVE, SPECIES_GLACEON},
                             {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON}},
     [SPECIES_PORYGON]	 = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_UP_GRADE*/ SPECIES_PORYGON2}},
     [SPECIES_OMANYTE]	 = {{EVO_LEVEL, 40, SPECIES_OMASTAR}},
@@ -192,7 +192,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
     [SPECIES_WAILMER]	 = {{EVO_LEVEL, 40, SPECIES_WAILORD}},
     [SPECIES_SKITTY]     = {{EVO_ITEM, ITEM_NONE,/*ITEM_MOON_STONE*/ SPECIES_DELCATTY}},
     [SPECIES_BALTOY]	 = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}},
-    [SPECIES_NOSEPASS]	 = {{EVO_MAP, 62, SPECIES_PROBOPASS}},
+    [SPECIES_NOSEPASS]	 = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}},
     [SPECIES_SABLEYE]	 = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SABLENITE*/ SPECIES_MEGA_SABLEYE}},
     [SPECIES_BARBOACH]	 = {{EVO_LEVEL, 30, SPECIES_WHISCASH}},
     [SPECIES_CORPHISH]	 = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}},
@@ -425,7 +425,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_TRUMBEAK]	 = {{EVO_LEVEL, 28, SPECIES_TOUCANNON}},
 	[SPECIES_YUNGOOS]	 = {{EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}},
 	[SPECIES_GRUBBIN]	 = {{EVO_LEVEL, 20, SPECIES_CHARJABUG}},
-	[SPECIES_CHARJABUG]	 = {{EVO_MAP, 62, SPECIES_VIKAVOLT}},
+	[SPECIES_CHARJABUG]	 = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}},
 	[SPECIES_CRABRAWLER] = {{EVO_MAP, 67, SPECIES_CRABOMINABLE}},
 	[SPECIES_CUTIEFLY]	 = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE}},
 	[SPECIES_ROCKRUFF]	 = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC},