Add Different A-Raichu Method

-Using a Thunder Stone while standing on the shore evolves it
-Not supported by the public CFRU as of this commit
This commit is contained in:
Skeli
2021-10-14 17:15:29 -04:00
parent 31e75f6a26
commit b38179f647
2 changed files with 6 additions and 3 deletions

View File

@@ -47,7 +47,8 @@ enum EvolutionMethods
EVO_CRITICAL_HIT, // successfully land 3 critical hits in one battle
EVO_NATURE_HIGH, // evolution based on high key nature at a certain level
EVO_NATURE_LOW, // evolution based on low key nature at a certain level
EVO_DAMAGE_LOCATION // recieve 49+ damage in battle without fainting, walk to specific tile
EVO_DAMAGE_LOCATION, // recieve 49+ damage in battle without fainting, walk to specific tile
EVO_ITEM_LOCATION, // Stand on a tile with a certain behaviour and use an item on a Pokemon
};
#define EVO_GIGANTAMAX 0xFD
@@ -61,5 +62,7 @@ enum MegaEvoVariants
MEGA_VARIANT_ULTRA_BURST, //Necrozma
};
#define MB_SHALLOW_WATER 0x17 //For Alolan Raichu
#define MAPSEC_POWER_PLANT 0x8E
#define MAPSEC_ICEFALL_CAVE 0xB1

View File

@@ -33,8 +33,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE, 0}},
[SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW, 0}},
[SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK, 0}},
[SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, 0},
[SPECIES_PIKACHU] = {{EVO_ITEM_LOCATION, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, MB_SHALLOW_WATER},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0},
{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}},
[SPECIES_PIKACHU_SURFING] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}},
[SPECIES_PIKACHU_FLYING] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}},