From bb75b1ad17ac1c1826d18e372cc5bac66f19dd24 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 23 Nov 2020 10:45:00 -0300 Subject: [PATCH] A few evolution updates - Changed the Eevee->Leafeon evo method from EVO_MAP to EVO_ITEM, which is more accurate in comparison as of Gen. 8 since we still don't have the actual evo method implemented. - Changed the Eevee->Glaceon evo method for the same reason. - Added Vikavolt's Thunder Stone based evolution as a second option. --- src/data/pokemon/evolution.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index a6b850925d..fc8d38d0d2 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -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, MAPSEC_PETALBURG_WOODS, SPECIES_LEAFEON}, - {EVO_MAP, MAPSEC_SHOAL_CAVE, SPECIES_GLACEON}, + {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON}, + {EVO_ITEM, ITEM_ICE_STONE, 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}}, @@ -422,7 +422,8 @@ 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, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}}, + [SPECIES_CHARJABUG] = {{EVO_MAP, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}, + {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT}}, [SPECIES_CRABRAWLER] = {{EVO_MAP, 67, SPECIES_CRABOMINABLE}}, [SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE}}, [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC},