From 79fd77a3e3fee6b0bc794563e2244bacf9823c25 Mon Sep 17 00:00:00 2001 From: Skeli Date: Tue, 25 Feb 2020 21:14:56 +0200 Subject: [PATCH] Fix Some Incorrect Evolution Items --- src/Evolution Table.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 2c3a7e6..59f3716 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -96,8 +96,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY, 0}}, [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING, 0}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON, 0}}, - [SPECIES_RHYDON] = {{EVO_ITEM, ITEM_BIG_NUGGET, SPECIES_RHYPERIOR, 0}, - {EVO_TRADE_ITEM, ITEM_BIG_NUGGET, SPECIES_RHYPERIOR, 0}}, + [SPECIES_RHYDON] = {{EVO_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR, 0}, + {EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR, 0}}, [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY, 0}}, [SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENTPOWER, SPECIES_TANGROWTH, 0}}, [SPECIES_KANGASKHAN] = {{EVO_MEGA, ITEM_KANGASKHANITE, SPECIES_KANGASKHAN_MEGA, MEGA_VARIANT_STANDARD}}, @@ -110,8 +110,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR, 0}}, [SPECIES_ELECTABUZZ] = {{EVO_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE, 0}, {EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE, 0}}, - [SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_PEARL_STRING, SPECIES_MAGMORTAR, 0}, - {EVO_ITEM, ITEM_PEARL_STRING, SPECIES_MAGMORTAR, 0}}, + [SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_MAGMIRIZER, SPECIES_MAGMORTAR, 0}, + {EVO_ITEM, ITEM_MAGMIRIZER, SPECIES_MAGMORTAR, 0}}, [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}}, @@ -220,8 +220,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH, 0}}, [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT, 0}}, [SPECIES_FEEBAS] = {{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0}, - {EVO_ITEM, ITEM_NONE, SPECIES_MILOTIC, 0}, - {EVO_TRADE_ITEM, ITEM_NONE, SPECIES_MILOTIC, 0}}, + {EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0}, + {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0}}, [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO, 0}}, [SPECIES_SHARPEDO] = {{EVO_MEGA, ITEM_SHARPEDONITE, SPECIES_SHARPEDO_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA, 0}}, @@ -435,10 +435,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = {EVO_FEMALE_LEVEL, 25, SPECIES_MEOWSTIC_FEMALE, 0}}, [SPECIES_HONEDGE] = {{EVO_LEVEL, 35, SPECIES_DOUBLADE, 0}}, [SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH, 0}}, - [SPECIES_SPRITZEE] = {{EVO_ITEM, ITEM_NONE, SPECIES_AROMATISSE, 0}, - {EVO_TRADE_ITEM, ITEM_NONE, SPECIES_AROMATISSE, 0}}, - [SPECIES_SWIRLIX] = {{EVO_ITEM, ITEM_NONE, SPECIES_SLURPUFF, 0}, - {EVO_TRADE_ITEM, ITEM_NONE, SPECIES_SLURPUFF, 0}}, + [SPECIES_SPRITZEE] = {{EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE, 0}, + {EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE, 0}}, + [SPECIES_SWIRLIX] = {{EVO_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF, 0}, + {EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF, 0}}, [SPECIES_INKAY] = {{EVO_LEVEL, 30, SPECIES_MALAMAR, 0}}, [SPECIES_BINACLE] = {{EVO_LEVEL, 39, SPECIES_BARBARACLE, 0}}, [SPECIES_SKRELP] = {{EVO_LEVEL, 48, SPECIES_DRAGALGE, 0}},