From 05013586d7853b772c414fe5e0f757fcb3ce08f0 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 18:25:28 -0300 Subject: [PATCH] Set the evolution conditions for the Alolan Forms. --- src/data/pokemon/evolution.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index c170c63a4..eeb026490 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -21,7 +21,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, - [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_RAICHU}}, + [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_RAICHU}, + {EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_ALOLAN_RAICHU}}, [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_NONE,/*ITEM_MOON_STONE*/ SPECIES_NIDOQUEEN}}, @@ -72,8 +73,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}}, [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}}, [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}}, - [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_EXEGGUTOR}}, - [SPECIES_CUBONE] = {{EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK}}, + [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_EXEGGUTOR}, + {EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_ALOLAN_EXEGGUTOR}}, + [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}, + {EVO_LEVEL_NIGHT, 28, SPECIES_ALOLAN_MAROWAK}}, [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}}, [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, @@ -448,4 +451,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_COSMOEM] = {{EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}}, [SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_NONE,/*MOVE_DRAGON_PULSE*/ SPECIES_NAGANADEL}}, + + [SPECIES_ALOLAN_RATTATA] = {{EVO_LEVEL_NIGHT, 20, SPECIES_ALOLAN_RATICATE}}, + [SPECIES_ALOLAN_SANDSHREW] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_SANDSLASH}}, + [SPECIES_ALOLAN_VULPIX] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_NINETALES}}, + [SPECIES_ALOLAN_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_ALOLAN_DUGTRIO}}, + [SPECIES_ALOLAN_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_ALOLAN_PERSIAN}}, + [SPECIES_ALOLAN_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_ALOLAN_GRAVELER}}, + [SPECIES_ALOLAN_GRAVELER] = {{EVO_LEVEL, 40, SPECIES_ALOLAN_GOLEM}}, + [SPECIES_ALOLAN_GRIMER] = {{EVO_LEVEL, 38, SPECIES_ALOLAN_MUK}}, };