Skip to content

Commit

Permalink
Add Poltchageist family form data (#6163)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bassoonian authored Feb 1, 2025
1 parent 7c6eda2 commit a0097ef
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
14 changes: 14 additions & 0 deletions src/data/pokemon/form_species_tables.h
Original file line number Diff line number Diff line change
Expand Up @@ -2155,6 +2155,20 @@ static const u16 sGimmighoulFormSpeciesIdTable[] = {
};
#endif //P_FAMILY_GIMMIGHOUL

#if P_FAMILY_POLTCHAGEIST
static const u16 sPoltchageistFormSpeciesIdTable[] = {
SPECIES_POLTCHAGEIST_COUNTERFEIT,
SPECIES_POLTCHAGEIST_ARTISAN,
FORM_SPECIES_END,
};

static const u16 sSinistchaFormSpeciesIdTable[] = {
SPECIES_SINISTCHA_UNREMARKABLE,
SPECIES_SINISTCHA_MASTERPIECE,
FORM_SPECIES_END,
};
#endif //P_FAMILY_POLTCHAGEIST

#if P_FAMILY_OGERPON
static const u16 sOgerponFormSpeciesIdTable[] = {
SPECIES_OGERPON_TEAL,
Expand Down
4 changes: 4 additions & 0 deletions src/data/pokemon/species_info/gen_9_families.h
Original file line number Diff line number Diff line change
Expand Up @@ -6986,6 +6986,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.levelUpLearnset = sPoltchageistLevelUpLearnset,
.teachableLearnset = sPoltchageistTeachableLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_UNREMARKABLE_TEACUP, SPECIES_SINISTCHA_UNREMARKABLE}),
.formSpeciesIdTable = sPoltchageistFormSpeciesIdTable,
},
[SPECIES_POLTCHAGEIST_ARTISAN] =
{
Expand Down Expand Up @@ -7048,6 +7049,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.levelUpLearnset = sPoltchageistLevelUpLearnset,
.teachableLearnset = sPoltchageistTeachableLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_MASTERPIECE_TEACUP, SPECIES_SINISTCHA_MASTERPIECE}),
.formSpeciesIdTable = sPoltchageistFormSpeciesIdTable,
},

[SPECIES_SINISTCHA_UNREMARKABLE] =
Expand Down Expand Up @@ -7110,6 +7112,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
)
.levelUpLearnset = sSinistchaLevelUpLearnset,
.teachableLearnset = sSinistchaTeachableLearnset,
.formSpeciesIdTable = sSinistchaFormSpeciesIdTable,
},
[SPECIES_SINISTCHA_MASTERPIECE] =
{
Expand Down Expand Up @@ -7171,6 +7174,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
)
.levelUpLearnset = sSinistchaLevelUpLearnset,
.teachableLearnset = sSinistchaTeachableLearnset,
.formSpeciesIdTable = sSinistchaFormSpeciesIdTable,
},
#endif //P_FAMILY_POLTCHAGEIST

Expand Down

0 comments on commit a0097ef

Please sign in to comment.