From b5be823e3b4c4b084dbf91dde527452eaf860159 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Fri, 18 Aug 2023 17:59:52 -0400 Subject: [PATCH] gen 9 forms (learnsets still missing) --- sound/cry_tables.inc | 85 ++++++- .../pokemon/form_species_table_pointers.h | 29 +++ src/data/pokemon/form_species_tables.h | 52 ++++ src/data/pokemon_graphics/front_pic_anims.h | 230 ++++++++++-------- src/data/text/species_names.h | 24 ++ 5 files changed, 313 insertions(+), 107 deletions(-) diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index d5714614dc..119472d75b 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -2234,9 +2234,47 @@ gCryTable:: cry Cry_Unown .endif .if P_GEN_9_POKEMON == TRUE - + @ Oinkologne + cry Cry_Oinkologne + @ Maushold + cry Cry_Maushold + @ Squawkabilly + cry Cry_Squawkabilly + cry Cry_Squawkabilly + cry Cry_Squawkabilly + @ Palafin + cry Cry_Palafin + @ Tatsugiri + cry Cry_Tatsugiri + cry Cry_Tatsugiri + @ Dudunsparce + cry Cry_Dudunsparce + @ Gimmighoul + cry Cry_Gimmighoul + @ Tauros-Paldea + cry Cry_Tauros + cry Cry_Tauros .else - + @ Oinkologne + cry Cry_Unown + @ Maushold + cry Cry_Unown + @ Squawkabilly + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Palafin + cry Cry_Unown + @ Tatsugiri + cry Cry_Unown + cry Cry_Unown + @ Dudunsparce + cry Cry_Unown + @ Gimmighoul + cry Cry_Unown + @ Tauros-Paldea + cry Cry_Unown + cry Cry_Unown .endif .align 2 @@ -4420,3 +4458,46 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown .endif +.if P_GEN_9_POKEMON == TRUE + @ Oinkologne + cry_reverse Cry_Oinkologne + @ Maushold + cry_reverse Cry_Maushold + @ Squawkabilly + cry_reverse Cry_Squawkabilly + cry_reverse Cry_Squawkabilly + cry_reverse Cry_Squawkabilly + @ Palafin + cry_reverse Cry_Palafin + @ Tatsugiri + cry_reverse Cry_Tatsugiri + cry_reverse Cry_Tatsugiri + @ Dudunsparce + cry_reverse Cry_Dudunsparce + @ Gimmighoul + cry_reverse Cry_Gimmighoul + @ Tauros-Paldea + cry_reverse Cry_Tauros + cry_reverse Cry_Tauros +.else + @ Oinkologne + cry_reverse Cry_Unown + @ Maushold + cry_reverse Cry_Unown + @ Squawkabilly + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + @ Palafin + cry_reverse Cry_Unown + @ Tatsugiri + cry_reverse Cry_Unown + cry_reverse Cry_Unown + @ Dudunsparce + cry_reverse Cry_Unown + @ Gimmighoul + cry_reverse Cry_Unown + @ Tauros-Paldea + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 6be4b96138..2fe3402bfe 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -39,6 +39,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_KANGASKHAN] = sKangaskhanFormSpeciesIdTable, [SPECIES_MR_MIME] = sMrMimeFormSpeciesIdTable, [SPECIES_PINSIR] = sPinsirFormSpeciesIdTable, + [SPECIES_TAUROS] = sTaurosFormSpeciesIdTable, [SPECIES_GYARADOS] = sGyaradosFormSpeciesIdTable, [SPECIES_AERODACTYL] = sAerodactylFormSpeciesIdTable, [SPECIES_ARTICUNO] = sArticunoFormSpeciesIdTable, @@ -48,6 +49,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TYPHLOSION] = sTyphlosionFormSpeciesIdTable, [SPECIES_PICHU] = sPichuFormSpeciesIdTable, [SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable, + [SPECIES_WOOPER] = sWooperFormSpeciesIdTable, [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, @@ -172,6 +174,15 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable, [SPECIES_BASCULEGION] = sBasculegionFormSpeciesIdTable, +#endif +#if P_GEN_9_POKEMON == TRUE + [SPECIES_OINKOLOGNE] = sOinkologneFormSpeciesIdTable, + [SPECIES_MAUSHOLD] = sMausholdFormSpeciesIdTable, + [SPECIES_SQUAWKABILLY] = sSquawkabillyFormSpeciesIdTable, + [SPECIES_PALAFIN] = sPalafinFormSpeciesIdTable, + [SPECIES_TATSUGIRI] = sTatsugiriFormSpeciesIdTable, + [SPECIES_DUDUNSPARCE] = sDudunsparceFormSpeciesIdTable, + [SPECIES_GIMMIGHOUL] = sGimmighoulFormSpeciesIdTable, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, @@ -295,6 +306,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, #endif + [SPECIES_WOOPER_PALDEAN] = sWooperFormSpeciesIdTable, + [SPECIES_TAUROS_PALDEAN] = sTaurosFormSpeciesIdTable, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, @@ -595,9 +608,25 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_BASCULEGION_FEMALE] = sBasculegionFormSpeciesIdTable, #endif #if P_GEN_9_POKEMON == TRUE + // Oinkologne + [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFormSpeciesIdTable, + // Maushold + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdFormSpeciesIdTable, // Squawkabilly [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, + // Palafin + [SPECIES_PALAFIN_HERO] = sPalafinFormSpeciesIdTable, + // Tatsugiri + [SPECIES_TATSUGIRI_DROOPY] = sTatsugiriFormSpeciesIdTable, + [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriFormSpeciesIdTable, + // Dudunsparce + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceFormSpeciesIdTable, + // Gimmighoul + [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulFormSpeciesIdTable, #endif + // Tauros-Paldea + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosFormSpeciesIdTable, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosFormSpeciesIdTable, }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 5cecd96272..5306338659 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -248,6 +248,14 @@ static const u16 sPinsirFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sTaurosFormSpeciesIdTable[] = { + SPECIES_TAUROS, + SPECIES_TAUROS_PALDEAN, + SPECIES_TAUROS_PALDEAN_BLAZE_BREED, + SPECIES_TAUROS_PALDEAN_AQUA_BREED, + FORM_SPECIES_END, +}; + static const u16 sGyaradosFormSpeciesIdTable[] = { SPECIES_GYARADOS, SPECIES_GYARADOS_MEGA, @@ -303,6 +311,12 @@ static const u16 sAmpharosFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sWooperFormSpeciesIdTable[] = { + SPECIES_WOOPER, + SPECIES_WOOPER_PALDEAN, + FORM_SPECIES_END, +}; + static const u16 sSlowkingFormSpeciesIdTable[] = { SPECIES_SLOWKING, SPECIES_SLOWKING_GALARIAN, @@ -1150,6 +1164,20 @@ static const u16 sBasculegionFormSpeciesIdTable[] = { SPECIES_BASCULEGION_FEMALE, FORM_SPECIES_END, }; +#endif + +#if P_GEN_9_POKEMON == TRUE +static const u16 sOinkologneFormSpeciesIdTable[] = { + SPECIES_OINKOLOGNE, + SPECIES_OINKOLOGNE_FEMALE, + FORM_SPECIES_END, +}; + +static const u16 sMausholdFormSpeciesIdTable[] = { + SPECIES_MAUSHOLD, + SPECIES_MAUSHOLD_FAMILY_OF_THREE, + FORM_SPECIES_END, +}; static const u16 sSquawkabillyFormSpeciesIdTable[] = { SPECIES_SQUAWKABILLY, @@ -1159,4 +1187,28 @@ static const u16 sSquawkabillyFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sPalafinFormSpeciesIdTable[] = { + SPECIES_PALAFIN, + SPECIES_PALAFIN_HERO, + FORM_SPECIES_END, +}; + +static const u16 sTatsugiriFormSpeciesIdTable[] = { + SPECIES_TATSUGIRI, + SPECIES_TATSUGIRI_DROOPY, + SPECIES_TATSUGIRI_STRETCHY, + FORM_SPECIES_END, +}; + +static const u16 sDudunsparceFormSpeciesIdTable[] = { + SPECIES_DUDUNSPARCE, + SPECIES_DUDUNSPARCE_THREE_SEGMENT, + FORM_SPECIES_END, +}; + +static const u16 sGimmighoulFormSpeciesIdTable[] = { + SPECIES_GIMMIGHOUL, + SPECIES_GIMMIGHOUL_ROAMING, + FORM_SPECIES_END, +}; #endif diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index ba7b833afa..122b367248 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -10168,6 +10168,8 @@ static const union AnimCmd sAnim_DecidueyeHisuian_1[] = ANIMCMD_END, }; #endif +PLACEHOLDER_ANIM_SINGLE_FRAME(WooperPaldean); +PLACEHOLDER_ANIM_SINGLE_FRAME(TaurosPaldean); static const union AnimCmd sAnim_PikachuCosplay_1[] = { @@ -11823,6 +11825,8 @@ SINGLE_ANIMATION(AvaluggHisuian); #if P_GEN_7_POKEMON == TRUE SINGLE_ANIMATION(DecidueyeHisuian); #endif +SINGLE_ANIMATION(WooperPaldean); +SINGLE_ANIMATION(TaurosPaldean); SINGLE_ANIMATION(PikachuCosplay); SINGLE_ANIMATION(PikachuRockStar); SINGLE_ANIMATION(PikachuBelle); @@ -12794,6 +12798,113 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_SNEASLER] = sAnims_Sneasler, [SPECIES_OVERQWIL] = sAnims_Overqwil, [SPECIES_ENAMORUS] = sAnims_Enamorus, +#endif +#if P_GEN_9_POKEMON == TRUE + [SPECIES_SPRIGATITO] = sAnims_Sprigatito, + [SPECIES_FLORAGATO] = sAnims_Floragato, + [SPECIES_MEOWSCARADA] = sAnims_Meowscarada, + [SPECIES_FUECOCO] = sAnims_Fuecoco, + [SPECIES_CROCALOR] = sAnims_Crocalor, + [SPECIES_SKELEDIRGE] = sAnims_Skeledirge, + [SPECIES_QUAXLY] = sAnims_Quaxly, + [SPECIES_QUAXWELL] = sAnims_Quaxwell, + [SPECIES_QUAQUAVAL] = sAnims_Quaquaval, + [SPECIES_LECHONK] = sAnims_Lechonk, + [SPECIES_OINKOLOGNE] = sAnims_Oinkologne, + [SPECIES_TAROUNTULA] = sAnims_Tarountula, + [SPECIES_SPIDOPS] = sAnims_Spidops, + [SPECIES_NYMBLE] = sAnims_Nymble, + [SPECIES_LOKIX] = sAnims_Lokix, + [SPECIES_PAWMI] = sAnims_Pawmi, + [SPECIES_PAWMO] = sAnims_Pawmo, + [SPECIES_PAWMOT] = sAnims_Pawmot, + [SPECIES_TANDEMAUS] = sAnims_Tandemaus, + [SPECIES_MAUSHOLD] = sAnims_Maushold, + [SPECIES_FIDOUGH] = sAnims_Fidough, + [SPECIES_DACHSBUN] = sAnims_Dachsbun, + [SPECIES_SMOLIV] = sAnims_Smoliv, + [SPECIES_DOLLIV] = sAnims_Dolliv, + [SPECIES_ARBOLIVA] = sAnims_Arboliva, + [SPECIES_SQUAWKABILLY] = sAnims_Squawkabilly, + [SPECIES_NACLI] = sAnims_Nacli, + [SPECIES_NACLSTACK] = sAnims_Naclstack, + [SPECIES_GARGANACL] = sAnims_Garganacl, + [SPECIES_CHARCADET] = sAnims_Charcadet, + [SPECIES_ARMAROUGE] = sAnims_Armarouge, + [SPECIES_CERULEDGE] = sAnims_Ceruledge, + [SPECIES_TADBULB] = sAnims_Tadbulb, + [SPECIES_BELLIBOLT] = sAnims_Bellibolt, + [SPECIES_WATTREL] = sAnims_Wattrel, + [SPECIES_KILOWATTREL] = sAnims_Kilowattrel, + [SPECIES_MASCHIFF] = sAnims_Maschiff, + [SPECIES_MABOSSTIFF] = sAnims_Mabosstiff, + [SPECIES_SHROODLE] = sAnims_Shroodle, + [SPECIES_GRAFAIAI] = sAnims_Grafaiai, + [SPECIES_BRAMBLIN] = sAnims_Bramblin, + [SPECIES_BRAMBLEGHAST] = sAnims_Brambleghast, + [SPECIES_TOEDSCOOL] = sAnims_Toedscool, + [SPECIES_TOEDSCRUEL] = sAnims_Toedscruel, + [SPECIES_KLAWF] = sAnims_Klawf, + [SPECIES_CAPSAKID] = sAnims_Capsakid, + [SPECIES_SCOVILLAIN] = sAnims_Scovillain, + [SPECIES_RELLOR] = sAnims_Rellor, + [SPECIES_RABSCA] = sAnims_Rabsca, + [SPECIES_FLITTLE] = sAnims_Flittle, + [SPECIES_ESPATHRA] = sAnims_Espathra, + [SPECIES_TINKATINK] = sAnims_Tinkatink, + [SPECIES_TINKATUFF] = sAnims_Tinkatuff, + [SPECIES_TINKATON] = sAnims_Tinkaton, + [SPECIES_WIGLETT] = sAnims_Wiglett, + [SPECIES_WUGTRIO] = sAnims_Wugtrio, + [SPECIES_BOMBIRDIER] = sAnims_Bombirdier, + [SPECIES_FINIZEN] = sAnims_Finizen, + [SPECIES_PALAFIN] = sAnims_Palafin, + [SPECIES_VAROOM] = sAnims_Varoom, + [SPECIES_REVAVROOM] = sAnims_Revavroom, + [SPECIES_CYCLIZAR] = sAnims_Cyclizar, + [SPECIES_ORTHWORM] = sAnims_Orthworm, + [SPECIES_GLIMMET] = sAnims_Glimmet, + [SPECIES_GLIMMORA] = sAnims_Glimmora, + [SPECIES_GREAVARD] = sAnims_Greavard, + [SPECIES_HOUNDSTONE] = sAnims_Houndstone, + [SPECIES_FLAMIGO] = sAnims_Flamigo, + [SPECIES_CETODDLE] = sAnims_Cetoddle, + [SPECIES_CETITAN] = sAnims_Cetitan, + [SPECIES_VELUZA] = sAnims_Veluza, + [SPECIES_DONDOZO] = sAnims_Dondozo, + [SPECIES_TATSUGIRI] = sAnims_Tatsugiri, + [SPECIES_ANNIHILAPE] = sAnims_Annihilape, + [SPECIES_CLODSIRE] = sAnims_Clodsire, + [SPECIES_FARIGIRAF] = sAnims_Farigiraf, + [SPECIES_DUDUNSPARCE] = sAnims_Dudunsparce, + [SPECIES_KINGAMBIT] = sAnims_Kingambit, + [SPECIES_GREAT_TUSK] = sAnims_GreatTusk, + [SPECIES_SCREAM_TAIL] = sAnims_ScreamTail, + [SPECIES_BRUTE_BONNET] = sAnims_BruteBonnet, + [SPECIES_FLUTTER_MANE] = sAnims_FlutterMane, + [SPECIES_SLITHER_WING] = sAnims_SlitherWing, + [SPECIES_SANDY_SHOCKS] = sAnims_SandyShocks, + [SPECIES_IRON_TREADS] = sAnims_IronTreads, + [SPECIES_IRON_BUNDLE] = sAnims_IronBundle, + [SPECIES_IRON_HANDS] = sAnims_IronHands, + [SPECIES_IRON_JUGULIS] = sAnims_IronJugulis, + [SPECIES_IRON_MOTH] = sAnims_IronMoth, + [SPECIES_IRON_THORNS] = sAnims_IronThorns, + [SPECIES_FRIGIBAX] = sAnims_Frigibax, + [SPECIES_ARCTIBAX] = sAnims_Arctibax, + [SPECIES_BAXCALIBUR] = sAnims_Baxcalibur, + [SPECIES_GIMMIGHOUL] = sAnims_Gimmighoul, + [SPECIES_GHOLDENGO] = sAnims_Gholdengo, + [SPECIES_WO_CHIEN] = sAnims_WoChien, + [SPECIES_CHIEN_PAO] = sAnims_ChienPao, + [SPECIES_TING_LU] = sAnims_TingLu, + [SPECIES_CHI_YU] = sAnims_ChiYu, + [SPECIES_ROARING_MOON] = sAnims_RoaringMoon, + [SPECIES_IRON_VALIANT] = sAnims_IronValiant, + [SPECIES_KORAIDON] = sAnims_Koraidon, + [SPECIES_MIRAIDON] = sAnims_Miraidon, + [SPECIES_WALKING_WAKE] = sAnims_WalkingWake, + [SPECIES_IRON_LEAVES] = sAnims_IronLeaves, #endif // Mega/Primal Forms [SPECIES_VENUSAUR_MEGA] = sAnims_VenusaurMega, @@ -12917,6 +13028,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_DECIDUEYE_HISUIAN] = sAnims_DecidueyeHisuian, #endif // Ungrouped + [SPECIES_WOOPER_PALDEAN] = sAnims_WooperPaldean, + [SPECIES_TAUROS_PALDEAN] = sAnims_TaurosPaldean, [SPECIES_PIKACHU_COSPLAY] = sAnims_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = sAnims_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = sAnims_PikachuBelle, @@ -13154,111 +13267,18 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_SPRIGATITO] = sAnims_Sprigatito, - [SPECIES_FLORAGATO] = sAnims_Floragato, - [SPECIES_MEOWSCARADA] = sAnims_Meowscarada, - [SPECIES_FUECOCO] = sAnims_Fuecoco, - [SPECIES_CROCALOR] = sAnims_Crocalor, - [SPECIES_SKELEDIRGE] = sAnims_Skeledirge, - [SPECIES_QUAXLY] = sAnims_Quaxly, - [SPECIES_QUAXWELL] = sAnims_Quaxwell, - [SPECIES_QUAQUAVAL] = sAnims_Quaquaval, - [SPECIES_LECHONK] = sAnims_Lechonk, - [SPECIES_OINKOLOGNE] = sAnims_Oinkologne, - [SPECIES_TAROUNTULA] = sAnims_Tarountula, - [SPECIES_SPIDOPS] = sAnims_Spidops, - [SPECIES_NYMBLE] = sAnims_Nymble, - [SPECIES_LOKIX] = sAnims_Lokix, - [SPECIES_PAWMI] = sAnims_Pawmi, - [SPECIES_PAWMO] = sAnims_Pawmo, - [SPECIES_PAWMOT] = sAnims_Pawmot, - [SPECIES_TANDEMAUS] = sAnims_Tandemaus, - [SPECIES_MAUSHOLD] = sAnims_Maushold, - [SPECIES_FIDOUGH] = sAnims_Fidough, - [SPECIES_DACHSBUN] = sAnims_Dachsbun, - [SPECIES_SMOLIV] = sAnims_Smoliv, - [SPECIES_DOLLIV] = sAnims_Dolliv, - [SPECIES_ARBOLIVA] = sAnims_Arboliva, - [SPECIES_SQUAWKABILLY] = sAnims_Squawkabilly, - [SPECIES_NACLI] = sAnims_Nacli, - [SPECIES_NACLSTACK] = sAnims_Naclstack, - [SPECIES_GARGANACL] = sAnims_Garganacl, - [SPECIES_CHARCADET] = sAnims_Charcadet, - [SPECIES_ARMAROUGE] = sAnims_Armarouge, - [SPECIES_CERULEDGE] = sAnims_Ceruledge, - [SPECIES_TADBULB] = sAnims_Tadbulb, - [SPECIES_BELLIBOLT] = sAnims_Bellibolt, - [SPECIES_WATTREL] = sAnims_Wattrel, - [SPECIES_KILOWATTREL] = sAnims_Kilowattrel, - [SPECIES_MASCHIFF] = sAnims_Maschiff, - [SPECIES_MABOSSTIFF] = sAnims_Mabosstiff, - [SPECIES_SHROODLE] = sAnims_Shroodle, - [SPECIES_GRAFAIAI] = sAnims_Grafaiai, - [SPECIES_BRAMBLIN] = sAnims_Bramblin, - [SPECIES_BRAMBLEGHAST] = sAnims_Brambleghast, - [SPECIES_TOEDSCOOL] = sAnims_Toedscool, - [SPECIES_TOEDSCRUEL] = sAnims_Toedscruel, - [SPECIES_KLAWF] = sAnims_Klawf, - [SPECIES_CAPSAKID] = sAnims_Capsakid, - [SPECIES_SCOVILLAIN] = sAnims_Scovillain, - [SPECIES_RELLOR] = sAnims_Rellor, - [SPECIES_RABSCA] = sAnims_Rabsca, - [SPECIES_FLITTLE] = sAnims_Flittle, - [SPECIES_ESPATHRA] = sAnims_Espathra, - [SPECIES_TINKATINK] = sAnims_Tinkatink, - [SPECIES_TINKATUFF] = sAnims_Tinkatuff, - [SPECIES_TINKATON] = sAnims_Tinkaton, - [SPECIES_WIGLETT] = sAnims_Wiglett, - [SPECIES_WUGTRIO] = sAnims_Wugtrio, - [SPECIES_BOMBIRDIER] = sAnims_Bombirdier, - [SPECIES_FINIZEN] = sAnims_Finizen, - [SPECIES_PALAFIN] = sAnims_Palafin, - [SPECIES_VAROOM] = sAnims_Varoom, - [SPECIES_REVAVROOM] = sAnims_Revavroom, - [SPECIES_CYCLIZAR] = sAnims_Cyclizar, - [SPECIES_ORTHWORM] = sAnims_Orthworm, - [SPECIES_GLIMMET] = sAnims_Glimmet, - [SPECIES_GLIMMORA] = sAnims_Glimmora, - [SPECIES_GREAVARD] = sAnims_Greavard, - [SPECIES_HOUNDSTONE] = sAnims_Houndstone, - [SPECIES_FLAMIGO] = sAnims_Flamigo, - [SPECIES_CETODDLE] = sAnims_Cetoddle, - [SPECIES_CETITAN] = sAnims_Cetitan, - [SPECIES_VELUZA] = sAnims_Veluza, - [SPECIES_DONDOZO] = sAnims_Dondozo, - [SPECIES_TATSUGIRI] = sAnims_Tatsugiri, - [SPECIES_ANNIHILAPE] = sAnims_Annihilape, - [SPECIES_CLODSIRE] = sAnims_Clodsire, - [SPECIES_FARIGIRAF] = sAnims_Farigiraf, - [SPECIES_DUDUNSPARCE] = sAnims_Dudunsparce, - [SPECIES_KINGAMBIT] = sAnims_Kingambit, - [SPECIES_GREAT_TUSK] = sAnims_GreatTusk, - [SPECIES_SCREAM_TAIL] = sAnims_ScreamTail, - [SPECIES_BRUTE_BONNET] = sAnims_BruteBonnet, - [SPECIES_FLUTTER_MANE] = sAnims_FlutterMane, - [SPECIES_SLITHER_WING] = sAnims_SlitherWing, - [SPECIES_SANDY_SHOCKS] = sAnims_SandyShocks, - [SPECIES_IRON_TREADS] = sAnims_IronTreads, - [SPECIES_IRON_BUNDLE] = sAnims_IronBundle, - [SPECIES_IRON_HANDS] = sAnims_IronHands, - [SPECIES_IRON_JUGULIS] = sAnims_IronJugulis, - [SPECIES_IRON_MOTH] = sAnims_IronMoth, - [SPECIES_IRON_THORNS] = sAnims_IronThorns, - [SPECIES_FRIGIBAX] = sAnims_Frigibax, - [SPECIES_ARCTIBAX] = sAnims_Arctibax, - [SPECIES_BAXCALIBUR] = sAnims_Baxcalibur, - [SPECIES_GIMMIGHOUL] = sAnims_Gimmighoul, - [SPECIES_GHOLDENGO] = sAnims_Gholdengo, - [SPECIES_WO_CHIEN] = sAnims_WoChien, - [SPECIES_CHIEN_PAO] = sAnims_ChienPao, - [SPECIES_TING_LU] = sAnims_TingLu, - [SPECIES_CHI_YU] = sAnims_ChiYu, - [SPECIES_ROARING_MOON] = sAnims_RoaringMoon, - [SPECIES_IRON_VALIANT] = sAnims_IronValiant, - [SPECIES_KORAIDON] = sAnims_Koraidon, - [SPECIES_MIRAIDON] = sAnims_Miraidon, - [SPECIES_WALKING_WAKE] = sAnims_WalkingWake, - [SPECIES_IRON_LEAVES] = sAnims_IronLeaves, + [SPECIES_OINKOLOGNE_FEMALE] = sAnims_Oinkologne, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sAnims_Maushold, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sAnims_Squawkabilly, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sAnims_Squawkabilly, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sAnims_Squawkabilly, + [SPECIES_PALAFIN_HERO] = sAnims_Palafin, + [SPECIES_TATSUGIRI_DROOPY] = sAnims_Tatsugiri, + [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri, + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce, + [SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean, #endif [SPECIES_EGG] = sAnims_Egg, }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index a75906e989..c66a47301d 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1148,6 +1148,8 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), #endif + [SPECIES_WOOPER_PALDEAN] = _("Wooper"), + [SPECIES_TAUROS_PALDEAN] = _("Tauros"), // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), @@ -1445,4 +1447,26 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"), [SPECIES_BASCULEGION_FEMALE] = _("Bsculegion"), #endif +#if P_GEN_9_POKEMON == TRUE + // Oinkologne + [SPECIES_OINKOLOGNE_FEMALE] = _("Oinkologne"), + // Maushold + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = _("Maushold"), + // Squawkabilly + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = _("Squawkabil"), + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = _("Squawkabil"), + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = _("Squawkabil"), + // Palafin + [SPECIES_PALAFIN_HERO] = _("Palafin"), + // Tatsugiri + [SPECIES_TATSUGIRI_DROOPY] = _("Tatsugiri"), + [SPECIES_TATSUGIRI_STRETCHY] = _("Tatsugiri"), + // Dudunsparce + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = _("Dudunsparc"), + // Gimmighoul + [SPECIES_GIMMIGHOUL_ROAMING] = _("Gimmighoul"), +#endif + // Tauros-Paldea + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = _("Tauros"), + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = _("Tauros"), };