From a0097ef395a610b564976ca5c77bfdac96981491 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sat, 1 Feb 2025 21:46:59 +0100 Subject: [PATCH] Add Poltchageist family form data (#6163) --- src/data/pokemon/form_species_tables.h | 14 ++++++++++++++ src/data/pokemon/species_info/gen_9_families.h | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index f2c456021651..ee391a74a00a 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -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, diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 7402619b9a09..d0fa8ab74d44 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -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] = { @@ -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] = @@ -7110,6 +7112,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = ) .levelUpLearnset = sSinistchaLevelUpLearnset, .teachableLearnset = sSinistchaTeachableLearnset, + .formSpeciesIdTable = sSinistchaFormSpeciesIdTable, }, [SPECIES_SINISTCHA_MASTERPIECE] = { @@ -7171,6 +7174,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = ) .levelUpLearnset = sSinistchaLevelUpLearnset, .teachableLearnset = sSinistchaTeachableLearnset, + .formSpeciesIdTable = sSinistchaFormSpeciesIdTable, }, #endif //P_FAMILY_POLTCHAGEIST