From 5e0ff4ab5264b7a5b378417e114b124a75f00f2d Mon Sep 17 00:00:00 2001 From: leo60228 Date: Tue, 22 Aug 2023 16:52:29 -0400 Subject: [PATCH] gen 9 form learnset pointers --- src/data/pokemon/level_up_learnset_pointers.h | 24 +++++++++++++++++++ .../pokemon/teachable_learnset_pointers.h | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index a1186fa10f..81b90d666f 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1145,6 +1145,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, #endif + [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanLevelUpLearnset, + [SPECIES_TAUROS_PALDEAN] = sTaurosPaldeanLevelUpLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, @@ -1443,4 +1445,26 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset, [SPECIES_BASCULEGION_FEMALE] = sBasculegionLevelUpLearnset, #endif +#if P_GEN_9_POKEMON == TRUE + // Oinkologne + [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleLevelUpLearnset, + // Maushold + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdLevelUpLearnset, + // Squawkabilly + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyLevelUpLearnset, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyLevelUpLearnset, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyLevelUpLearnset, + // Palafin + [SPECIES_PALAFIN_HERO] = sPalafinLevelUpLearnset, + // Tatsugiri + [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriLevelUpLearnset, + [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriLevelUpLearnset, + // Dudunsparce + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset, + // Gimmighoul + [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset, + // Tauros-Paldea + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedLevelUpLearnset, +#endif }; diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index ef06239827..20ef74c574 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -1145,6 +1145,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, #endif + [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanTeachableLearnset, + [SPECIES_TAUROS_PALDEAN] = sTaurosPaldeanTeachableLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, @@ -1443,4 +1445,26 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset, [SPECIES_BASCULEGION_FEMALE] = sBasculegionTeachableLearnset, #endif +#if P_GEN_9_POKEMON == TRUE + // Oinkologne + [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleTeachableLearnset, + // Maushold + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdTeachableLearnset, + // Squawkabilly + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyTeachableLearnset, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyTeachableLearnset, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyTeachableLearnset, + // Palafin + [SPECIES_PALAFIN_HERO] = sPalafinTeachableLearnset, + // Tatsugiri + [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriTeachableLearnset, + [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriTeachableLearnset, + // Dudunsparce + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset, + // Gimmighoul + [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset, + // Tauros-Paldea + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedTeachableLearnset, +#endif };