From d93668480ff3f33e1e3e7e9c852b51ebaca6ba3e Mon Sep 17 00:00:00 2001 From: Skeli Date: Mon, 26 Apr 2021 15:37:34 -0400 Subject: [PATCH 1/2] Fix Sylveon Evolution --- src/Evolution Table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 9b9a865..2d5d5e3 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -126,9 +126,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [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_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}, From 34cce5b84f06086df023ce14a6b7e752a8240bd9 Mon Sep 17 00:00:00 2001 From: Skeli Date: Mon, 26 Apr 2021 15:38:34 -0400 Subject: [PATCH 2/2] Fix Lycanroc Evolution --- src/Evolution Table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 2d5d5e3..5b2e8cd 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -549,9 +549,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_CRABRAWLER] = {{EVO_MAP, MAPSEC_ICEFALL_CAVE, SPECIES_CRABOMINABLE, 0}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE, 0}}, [SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE, 0}}, - [SPECIES_ROCKRUFF] = {{EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}, //5 PM - 7:59 PM - {EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0}, - {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}}, + [SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0}, + {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}, + {EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}}, //5 PM - 7:59 PM [SPECIES_MAREANIE] = {{EVO_LEVEL, 38, SPECIES_TOXAPEX, 0}}, [SPECIES_MUDBRAY] = {{EVO_LEVEL, 30, SPECIES_MUDSDALE, 0}}, [SPECIES_DEWPIDER] = {{EVO_LEVEL, 22, SPECIES_ARAQUANID, 0}},