Skip to content

Commit 16f4fda

Browse files
committed
Tweaked EVO_MAP evolutions
The EVO_MAP evolution method was using numerical IDs instead of proper labels, which wasn't intuitive. On top of that, there were better maps to choose for some of the species that made use of it.
1 parent 857251d commit 16f4fda

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

include/pokemon.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "constants/pokemon.h"
55
#include "sprite.h"
6+
#include "constants/region_map_sections.h"
67

78
struct PokemonSubstruct0
89
{

src/data/pokemon/evolution.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
6161
{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_KINGS_ROCK*/ SPECIES_SLOWKING}},
6262
[SPECIES_SLOWBRO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SLOWBRONITE*/ SPECIES_MEGA_SLOWBRO}},
6363
[SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}},
64-
[SPECIES_MAGNETON] = {{EVO_MAP, 62, SPECIES_MAGNEZONE}},
64+
[SPECIES_MAGNETON] = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}},
6565
[SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}},
6666
[SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}},
6767
[SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}},
@@ -99,8 +99,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
9999
{EVO_ITEM, ITEM_NONE,/*ITEM_FIRE_STONE*/ SPECIES_FLAREON},
100100
{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON},
101101
{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON},
102-
{EVO_MAP, 62, SPECIES_LEAFEON},
103-
{EVO_MAP, 62, SPECIES_GLACEON},
102+
{EVO_MAP, MAPSEC_PETALBURG_WOODS, SPECIES_LEAFEON},
103+
{EVO_MAP, MAPSEC_SHOAL_CAVE, SPECIES_GLACEON},
104104
{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON}},
105105
[SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_UP_GRADE*/ SPECIES_PORYGON2}},
106106
[SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}},
@@ -192,7 +192,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
192192
[SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}},
193193
[SPECIES_SKITTY] = {{EVO_ITEM, ITEM_NONE,/*ITEM_MOON_STONE*/ SPECIES_DELCATTY}},
194194
[SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}},
195-
[SPECIES_NOSEPASS] = {{EVO_MAP, 62, SPECIES_PROBOPASS}},
195+
[SPECIES_NOSEPASS] = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}},
196196
[SPECIES_SABLEYE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SABLENITE*/ SPECIES_MEGA_SABLEYE}},
197197
[SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}},
198198
[SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}},
@@ -425,7 +425,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
425425
[SPECIES_TRUMBEAK] = {{EVO_LEVEL, 28, SPECIES_TOUCANNON}},
426426
[SPECIES_YUNGOOS] = {{EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}},
427427
[SPECIES_GRUBBIN] = {{EVO_LEVEL, 20, SPECIES_CHARJABUG}},
428-
[SPECIES_CHARJABUG] = {{EVO_MAP, 62, SPECIES_VIKAVOLT}},
428+
[SPECIES_CHARJABUG] = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}},
429429
[SPECIES_CRABRAWLER] = {{EVO_MAP, 67, SPECIES_CRABOMINABLE}},
430430
[SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE}},
431431
[SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC},

0 commit comments

Comments
 (0)