Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-09-07 01:25:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Unbound

Browse Source
This commit is contained in:
Skeli
2021-04-26 15:44:15 -04:00
parent 799d7f6080 34cce5b84f
commit 43c5493680
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Evolution Table.c
View File

@@ -139,10 +139,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_PINSIR] = {{EVO_MEGA, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS, 0}},
[SPECIES_GYARADOS] = {{EVO_MEGA, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}},
[SPECIES_EEVEE] = {{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}, //Overriden by Espeon and Umbreon if need be
{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0},
// [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}},
[SPECIES_EEVEE] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0},
{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON, 0},
{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, TRUE}, //Require high friendship
{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON, 0},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON, 0},
{EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON, 0},