atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Evo and form changes

Browse source
This commit is contained in:
kittenchilly 2023-10-24 23:24:43 -05:00 committed by leo60228
parent 3a9172de06
commit 8fefdbe914
No known key found for this signature in database
GPG key ID: 6F3EB461799AD95E
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/data/pokemon/evolution.h
View file

@ -513,7 +513,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_ROLYCOLY] = {{EVO_LEVEL, 18, SPECIES_CARKOL}},
[SPECIES_CARKOL] = {{EVO_LEVEL, 34, SPECIES_COALOSSAL}},
[SPECIES_APPLIN] = {{EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE},
{EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}},
{EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN},
{EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}},
[SPECIES_SILICOBRA] = {{EVO_LEVEL, 36, SPECIES_SANDACONDA}},
[SPECIES_ARROKUDA] = {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA}},
[SPECIES_TOXEL] = {{EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED},
@ -586,6 +587,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_ARCTIBAX] = {{EVO_LEVEL, 54, SPECIES_BAXCALIBUR}},
[SPECIES_GIMMIGHOUL_CHEST] = {{EVO_NONE, 0, SPECIES_GHOLDENGO}},
[SPECIES_GIMMIGHOUL_ROAMING] = {{EVO_NONE, 0, SPECIES_GHOLDENGO}},
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = {{EVO_ITEM, ITEM_UNREMARKABLE_TEACUP, SPECIES_SINISTCHA_UNREMARKABLE}},
[SPECIES_POLTCHAGEIST_ARTISAN] = {{EVO_ITEM, ITEM_MASTERPIECE_TEACUP, SPECIES_SINISTCHA_MASTERPIECE}},
#endif
[SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}},
[SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}},

10
src/data/pokemon/form_change_table_pointers.h
View file

@ -292,4 +292,14 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
[SPECIES_ENAMORUS_INCARNATE] = sEnamorusFormChangeTable,
[SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable,
#endif
#if P_GEN_9_POKEMON == TRUE
[SPECIES_OGERPON_TEAL] = sOgerponFormChangeTable,
[SPECIES_OGERPON_WELLSPRING] = sOgerponFormChangeTable,
[SPECIES_OGERPON_HEARTHFLAME] = sOgerponFormChangeTable,
[SPECIES_OGERPON_CORNERSTONE] = sOgerponFormChangeTable,
[SPECIES_OGERPON_TEAL_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_WELLSPRING_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_HEARTHFLAME_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_CORNERSTONE_TERA] = sOgerponFormChangeTable,
#endif
};

10
src/data/pokemon/form_change_tables.h
View file

@ -607,6 +607,16 @@ static const struct FormChange sEnamorusFormChangeTable[] = {
#endif
#if P_GEN_9_POKEMON == TRUE
static const struct FormChange sOgerponFormChangeTable[] = {
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_TEAL, ITEM_NONE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_WELLSPRING, ITEM_WELLSPRING_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_HEARTHFLAME, ITEM_HEARTHFLAME_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_CORNERSTONE, ITEM_CORNERSTONE_MASK},
{FORM_CHANGE_TERMINATOR},
};
#endif
static const struct FormChange sButterfreeFormChangeTable[] =
{
{FORM_CHANGE_BATTLE_GIGANTAMAX, SPECIES_BUTTERFREE_GIGANTAMAX},