From ed3e2f8e0905fc34a40697ee67b64f97576c5f01 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 23 Oct 2023 12:57:13 -0300 Subject: [PATCH] Gen 9 form order --- include/constants/species.h | 237 +++-- include/graphics.h | 2 +- sound/cry_tables.inc | 900 +++++++++--------- src/data/pokemon/evolution.h | 3 + .../pokemon/form_species_table_pointers.h | 14 +- src/data/pokemon/level_up_learnset_pointers.h | 9 +- .../pokemon/teachable_learnset_pointers.h | 9 +- .../pokemon_graphics/back_pic_coordinates.h | 1 + src/data/pokemon_graphics/footprint_table.h | 4 + src/data/pokemon_graphics/front_pic_anims.h | 8 +- .../pokemon_graphics/front_pic_coordinates.h | 4 + src/data/text/species_names.h | 9 +- src/pokemon.c | 1 + src/pokemon_animation.c | 4 + src/pokemon_icon.c | 2 + src/pokemon_jump.c | 1 + 16 files changed, 591 insertions(+), 617 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index ed8e516110..f281fbc532 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1451,140 +1451,125 @@ #define SPECIES_LECHONK GEN9_START + 10 #define SPECIES_OINKOLOGNE SPECIES_OINKOLOGNE_MALE #define SPECIES_OINKOLOGNE_MALE GEN9_START + 11 -#define SPECIES_TAROUNTULA GEN9_START + 12 -#define SPECIES_SPIDOPS GEN9_START + 13 -#define SPECIES_NYMBLE GEN9_START + 14 -#define SPECIES_LOKIX GEN9_START + 15 -#define SPECIES_PAWMI GEN9_START + 16 -#define SPECIES_PAWMO GEN9_START + 17 -#define SPECIES_PAWMOT GEN9_START + 18 -#define SPECIES_TANDEMAUS GEN9_START + 19 +#define SPECIES_OINKOLOGNE_FEMALE GEN9_START + 12 +#define SPECIES_TAROUNTULA GEN9_START + 13 +#define SPECIES_SPIDOPS GEN9_START + 14 +#define SPECIES_NYMBLE GEN9_START + 15 +#define SPECIES_LOKIX GEN9_START + 16 +#define SPECIES_PAWMI GEN9_START + 17 +#define SPECIES_PAWMO GEN9_START + 18 +#define SPECIES_PAWMOT GEN9_START + 19 +#define SPECIES_TANDEMAUS GEN9_START + 20 #define SPECIES_MAUSHOLD SPECIES_MAUSHOLD_FAMILY_OF_THREE -#define SPECIES_MAUSHOLD_FAMILY_OF_THREE GEN9_START + 20 -#define SPECIES_FIDOUGH GEN9_START + 21 -#define SPECIES_DACHSBUN GEN9_START + 22 -#define SPECIES_SMOLIV GEN9_START + 23 -#define SPECIES_DOLLIV GEN9_START + 24 -#define SPECIES_ARBOLIVA GEN9_START + 25 +#define SPECIES_MAUSHOLD_FAMILY_OF_THREE GEN9_START + 21 +#define SPECIES_MAUSHOLD_FAMILY_OF_FOUR GEN9_START + 22 +#define SPECIES_FIDOUGH GEN9_START + 23 +#define SPECIES_DACHSBUN GEN9_START + 24 +#define SPECIES_SMOLIV GEN9_START + 25 +#define SPECIES_DOLLIV GEN9_START + 26 +#define SPECIES_ARBOLIVA GEN9_START + 27 #define SPECIES_SQUAWKABILLY SPECIES_SQUAWKABILLY_GREEN_PLUMAGE -#define SPECIES_SQUAWKABILLY_GREEN_PLUMAGE GEN9_START + 26 -#define SPECIES_NACLI GEN9_START + 27 -#define SPECIES_NACLSTACK GEN9_START + 28 -#define SPECIES_GARGANACL GEN9_START + 29 -#define SPECIES_CHARCADET GEN9_START + 30 -#define SPECIES_ARMAROUGE GEN9_START + 31 -#define SPECIES_CERULEDGE GEN9_START + 32 -#define SPECIES_TADBULB GEN9_START + 33 -#define SPECIES_BELLIBOLT GEN9_START + 34 -#define SPECIES_WATTREL GEN9_START + 35 -#define SPECIES_KILOWATTREL GEN9_START + 36 -#define SPECIES_MASCHIFF GEN9_START + 37 -#define SPECIES_MABOSSTIFF GEN9_START + 38 -#define SPECIES_SHROODLE GEN9_START + 39 -#define SPECIES_GRAFAIAI GEN9_START + 40 -#define SPECIES_BRAMBLIN GEN9_START + 41 -#define SPECIES_BRAMBLEGHAST GEN9_START + 42 -#define SPECIES_TOEDSCOOL GEN9_START + 43 -#define SPECIES_TOEDSCRUEL GEN9_START + 44 -#define SPECIES_KLAWF GEN9_START + 45 -#define SPECIES_CAPSAKID GEN9_START + 46 -#define SPECIES_SCOVILLAIN GEN9_START + 47 -#define SPECIES_RELLOR GEN9_START + 48 -#define SPECIES_RABSCA GEN9_START + 49 -#define SPECIES_FLITTLE GEN9_START + 50 -#define SPECIES_ESPATHRA GEN9_START + 51 -#define SPECIES_TINKATINK GEN9_START + 52 -#define SPECIES_TINKATUFF GEN9_START + 53 -#define SPECIES_TINKATON GEN9_START + 54 -#define SPECIES_WIGLETT GEN9_START + 55 -#define SPECIES_WUGTRIO GEN9_START + 56 -#define SPECIES_BOMBIRDIER GEN9_START + 57 -#define SPECIES_FINIZEN GEN9_START + 58 +#define SPECIES_SQUAWKABILLY_GREEN_PLUMAGE GEN9_START + 28 +#define SPECIES_SQUAWKABILLY_BLUE_PLUMAGE GEN9_START + 29 +#define SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE GEN9_START + 30 +#define SPECIES_SQUAWKABILLY_WHITE_PLUMAGE GEN9_START + 31 +#define SPECIES_NACLI GEN9_START + 32 +#define SPECIES_NACLSTACK GEN9_START + 33 +#define SPECIES_GARGANACL GEN9_START + 34 +#define SPECIES_CHARCADET GEN9_START + 35 +#define SPECIES_ARMAROUGE GEN9_START + 36 +#define SPECIES_CERULEDGE GEN9_START + 37 +#define SPECIES_TADBULB GEN9_START + 38 +#define SPECIES_BELLIBOLT GEN9_START + 39 +#define SPECIES_WATTREL GEN9_START + 40 +#define SPECIES_KILOWATTREL GEN9_START + 41 +#define SPECIES_MASCHIFF GEN9_START + 42 +#define SPECIES_MABOSSTIFF GEN9_START + 43 +#define SPECIES_SHROODLE GEN9_START + 44 +#define SPECIES_GRAFAIAI GEN9_START + 45 +#define SPECIES_BRAMBLIN GEN9_START + 46 +#define SPECIES_BRAMBLEGHAST GEN9_START + 47 +#define SPECIES_TOEDSCOOL GEN9_START + 48 +#define SPECIES_TOEDSCRUEL GEN9_START + 49 +#define SPECIES_KLAWF GEN9_START + 50 +#define SPECIES_CAPSAKID GEN9_START + 51 +#define SPECIES_SCOVILLAIN GEN9_START + 52 +#define SPECIES_RELLOR GEN9_START + 53 +#define SPECIES_RABSCA GEN9_START + 54 +#define SPECIES_FLITTLE GEN9_START + 55 +#define SPECIES_ESPATHRA GEN9_START + 56 +#define SPECIES_TINKATINK GEN9_START + 57 +#define SPECIES_TINKATUFF GEN9_START + 58 +#define SPECIES_TINKATON GEN9_START + 59 +#define SPECIES_WIGLETT GEN9_START + 60 +#define SPECIES_WUGTRIO GEN9_START + 61 +#define SPECIES_BOMBIRDIER GEN9_START + 62 +#define SPECIES_FINIZEN GEN9_START + 63 #define SPECIES_PALAFIN SPECIES_PALAFIN_ZERO -#define SPECIES_PALAFIN_ZERO GEN9_START + 59 -#define SPECIES_VAROOM GEN9_START + 60 -#define SPECIES_REVAVROOM GEN9_START + 61 -#define SPECIES_CYCLIZAR GEN9_START + 62 -#define SPECIES_ORTHWORM GEN9_START + 63 -#define SPECIES_GLIMMET GEN9_START + 64 -#define SPECIES_GLIMMORA GEN9_START + 65 -#define SPECIES_GREAVARD GEN9_START + 66 -#define SPECIES_HOUNDSTONE GEN9_START + 67 -#define SPECIES_FLAMIGO GEN9_START + 68 -#define SPECIES_CETODDLE GEN9_START + 69 -#define SPECIES_CETITAN GEN9_START + 70 -#define SPECIES_VELUZA GEN9_START + 71 -#define SPECIES_DONDOZO GEN9_START + 72 +#define SPECIES_PALAFIN_ZERO GEN9_START + 64 +#define SPECIES_PALAFIN_HERO GEN9_START + 65 +#define SPECIES_VAROOM GEN9_START + 66 +#define SPECIES_REVAVROOM GEN9_START + 67 +#define SPECIES_CYCLIZAR GEN9_START + 68 +#define SPECIES_ORTHWORM GEN9_START + 69 +#define SPECIES_GLIMMET GEN9_START + 70 +#define SPECIES_GLIMMORA GEN9_START + 71 +#define SPECIES_GREAVARD GEN9_START + 72 +#define SPECIES_HOUNDSTONE GEN9_START + 73 +#define SPECIES_FLAMIGO GEN9_START + 74 +#define SPECIES_CETODDLE GEN9_START + 75 +#define SPECIES_CETITAN GEN9_START + 76 +#define SPECIES_VELUZA GEN9_START + 77 +#define SPECIES_DONDOZO GEN9_START + 78 #define SPECIES_TATSUGIRI SPECIES_TATSUGIRI_CURLY -#define SPECIES_TATSUGIRI_CURLY GEN9_START + 73 -#define SPECIES_ANNIHILAPE GEN9_START + 74 -#define SPECIES_CLODSIRE GEN9_START + 75 -#define SPECIES_FARIGIRAF GEN9_START + 76 +#define SPECIES_TATSUGIRI_CURLY GEN9_START + 79 +#define SPECIES_TATSUGIRI_DROOPY GEN9_START + 80 +#define SPECIES_TATSUGIRI_STRETCHY GEN9_START + 81 +#define SPECIES_ANNIHILAPE GEN9_START + 82 +#define SPECIES_CLODSIRE GEN9_START + 83 +#define SPECIES_FARIGIRAF GEN9_START + 84 #define SPECIES_DUDUNSPARCE SPECIES_DUDUNSPARCE_TWO_SEGMENT -#define SPECIES_DUDUNSPARCE_TWO_SEGMENT GEN9_START + 77 -#define SPECIES_KINGAMBIT GEN9_START + 78 -#define SPECIES_GREAT_TUSK GEN9_START + 79 -#define SPECIES_SCREAM_TAIL GEN9_START + 80 -#define SPECIES_BRUTE_BONNET GEN9_START + 81 -#define SPECIES_FLUTTER_MANE GEN9_START + 82 -#define SPECIES_SLITHER_WING GEN9_START + 83 -#define SPECIES_SANDY_SHOCKS GEN9_START + 84 -#define SPECIES_IRON_TREADS GEN9_START + 85 -#define SPECIES_IRON_BUNDLE GEN9_START + 86 -#define SPECIES_IRON_HANDS GEN9_START + 87 -#define SPECIES_IRON_JUGULIS GEN9_START + 88 -#define SPECIES_IRON_MOTH GEN9_START + 89 -#define SPECIES_IRON_THORNS GEN9_START + 90 -#define SPECIES_FRIGIBAX GEN9_START + 91 -#define SPECIES_ARCTIBAX GEN9_START + 92 -#define SPECIES_BAXCALIBUR GEN9_START + 93 +#define SPECIES_DUDUNSPARCE_TWO_SEGMENT GEN9_START + 85 +#define SPECIES_DUDUNSPARCE_THREE_SEGMENT GEN9_START + 86 +#define SPECIES_KINGAMBIT GEN9_START + 87 +#define SPECIES_GREAT_TUSK GEN9_START + 88 +#define SPECIES_SCREAM_TAIL GEN9_START + 89 +#define SPECIES_BRUTE_BONNET GEN9_START + 90 +#define SPECIES_FLUTTER_MANE GEN9_START + 91 +#define SPECIES_SLITHER_WING GEN9_START + 92 +#define SPECIES_SANDY_SHOCKS GEN9_START + 93 +#define SPECIES_IRON_TREADS GEN9_START + 94 +#define SPECIES_IRON_BUNDLE GEN9_START + 95 +#define SPECIES_IRON_HANDS GEN9_START + 96 +#define SPECIES_IRON_JUGULIS GEN9_START + 97 +#define SPECIES_IRON_MOTH GEN9_START + 98 +#define SPECIES_IRON_THORNS GEN9_START + 99 +#define SPECIES_FRIGIBAX GEN9_START + 100 +#define SPECIES_ARCTIBAX GEN9_START + 101 +#define SPECIES_BAXCALIBUR GEN9_START + 102 #define SPECIES_GIMMIGHOUL SPECIES_GIMMIGHOUL_CHEST -#define SPECIES_GIMMIGHOUL_CHEST GEN9_START + 94 -#define SPECIES_GHOLDENGO GEN9_START + 95 -#define SPECIES_WO_CHIEN GEN9_START + 96 -#define SPECIES_CHIEN_PAO GEN9_START + 97 -#define SPECIES_TING_LU GEN9_START + 98 -#define SPECIES_CHI_YU GEN9_START + 99 -#define SPECIES_ROARING_MOON GEN9_START + 100 -#define SPECIES_IRON_VALIANT GEN9_START + 101 -#define SPECIES_KORAIDON GEN9_START + 102 -#define SPECIES_MIRAIDON GEN9_START + 103 -#define SPECIES_WALKING_WAKE GEN9_START + 104 -#define SPECIES_IRON_LEAVES GEN9_START + 105 - -// Oinkologne -#define SPECIES_OINKOLOGNE_FEMALE GEN9_START + 106 - -// Maushold -#define SPECIES_MAUSHOLD_FAMILY_OF_FOUR GEN9_START + 107 - -// Squawkabilly -#define SPECIES_SQUAWKABILLY_BLUE_PLUMAGE GEN9_START + 108 -#define SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE GEN9_START + 109 -#define SPECIES_SQUAWKABILLY_WHITE_PLUMAGE GEN9_START + 110 - -// Palafin -#define SPECIES_PALAFIN_HERO GEN9_START + 111 - -// Tatsugiri -#define SPECIES_TATSUGIRI_DROOPY GEN9_START + 112 -#define SPECIES_TATSUGIRI_STRETCHY GEN9_START + 113 - -// Dudunsparce -#define SPECIES_DUDUNSPARCE_THREE_SEGMENT GEN9_START + 114 - -// Gimmighoul -#define SPECIES_GIMMIGHOUL_ROAMING GEN9_START + 115 - -// Tauros-Paldea -#define SPECIES_TAUROS_PALDEAN_COMBAT_BREED GEN9_START + 116 -#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED GEN9_START + 117 -#define SPECIES_TAUROS_PALDEAN_AQUA_BREED GEN9_START + 118 - +#define SPECIES_GIMMIGHOUL_CHEST GEN9_START + 103 +#define SPECIES_GIMMIGHOUL_ROAMING GEN9_START + 104 +#define SPECIES_GHOLDENGO GEN9_START + 105 +#define SPECIES_WO_CHIEN GEN9_START + 106 +#define SPECIES_CHIEN_PAO GEN9_START + 107 +#define SPECIES_TING_LU GEN9_START + 108 +#define SPECIES_CHI_YU GEN9_START + 109 +#define SPECIES_ROARING_MOON GEN9_START + 110 +#define SPECIES_IRON_VALIANT GEN9_START + 111 +#define SPECIES_KORAIDON GEN9_START + 112 +#define SPECIES_MIRAIDON GEN9_START + 113 // Paldean Forms -#define SPECIES_WOOPER_PALDEAN GEN9_START + 119 +#define SPECIES_TAUROS_PALDEAN_COMBAT_BREED GEN9_START + 114 +#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED GEN9_START + 115 +#define SPECIES_TAUROS_PALDEAN_AQUA_BREED GEN9_START + 116 +#define SPECIES_WOOPER_PALDEAN GEN9_START + 117 +// Scarlet and Violet 1.2.0 +#define SPECIES_WALKING_WAKE GEN9_START + 118 +#define SPECIES_IRON_LEAVES GEN9_START + 119 -#define GIGANTAMAX_START SPECIES_WOOPER_PALDEAN + +#define GIGANTAMAX_START SPECIES_IRON_LEAVES // Gigantamax Forms #define SPECIES_VENUSAUR_GIGANTAMAX GIGANTAMAX_START + 1 diff --git a/include/graphics.h b/include/graphics.h index 0ed86d48c0..6681f3a5e8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -314,7 +314,7 @@ extern const u32 gMonFrontPic_WooperPaldean[]; extern const u32 gMonPalette_WooperPaldean[]; extern const u32 gMonBackPic_WooperPaldean[]; extern const u32 gMonShinyPalette_WooperPaldean[]; -extern const u8 gMonIcon_WooperPaldean[]; +//extern const u8 gMonIcon_WooperPaldean[]; extern const u8 gMonFootprint_WooperPaldean[]; extern const u32 gMonFrontPic_Quagsire[]; extern const u32 gMonFrontPic_QuagsireF[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 5b4de7a9e7..bdbf11cc4f 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -2124,258 +2124,246 @@ gCryTable:: cry Cry_Unown .endif .if P_GEN_9_POKEMON == TRUE - cry Cry_Sprigatito - cry Cry_Floragato - cry Cry_Meowscarada - cry Cry_Fuecoco - cry Cry_Crocalor - cry Cry_Skeledirge - cry Cry_Quaxly - cry Cry_Quaxwell - cry Cry_Quaquaval - cry Cry_Lechonk - cry Cry_Oinkologne - cry Cry_Tarountula - cry Cry_Spidops - cry Cry_Nymble - cry Cry_Lokix - cry Cry_Pawmi - cry Cry_Pawmo - cry Cry_Pawmot - cry Cry_Tandemaus - cry Cry_Maushold - cry Cry_Fidough - cry Cry_Dachsbun - cry Cry_Smoliv - cry Cry_Dolliv - cry Cry_Arboliva - cry Cry_Squawkabilly - cry Cry_Nacli - cry Cry_Naclstack - cry Cry_Garganacl - cry Cry_Charcadet - cry Cry_Armarouge - cry Cry_Ceruledge - cry Cry_Tadbulb - cry Cry_Bellibolt - cry Cry_Wattrel - cry Cry_Kilowattrel - cry Cry_Maschiff - cry Cry_Mabosstiff - cry Cry_Shroodle - cry Cry_Grafaiai - cry Cry_Bramblin - cry Cry_Brambleghast - cry Cry_Toedscool - cry Cry_Toedscruel - cry Cry_Klawf - cry Cry_Capsakid - cry Cry_Scovillain - cry Cry_Rellor - cry Cry_Rabsca - cry Cry_Flittle - cry Cry_Espathra - cry Cry_Tinkatink - cry Cry_Tinkatuff - cry Cry_Tinkaton - cry Cry_Wiglett - cry Cry_Wugtrio - cry Cry_Bombirdier - cry Cry_Finizen - cry Cry_Palafin - cry Cry_Varoom - cry Cry_Revavroom - cry Cry_Cyclizar - cry Cry_Orthworm - cry Cry_Glimmet - cry Cry_Glimmora - cry Cry_Greavard - cry Cry_Houndstone - cry Cry_Flamigo - cry Cry_Cetoddle - cry Cry_Cetitan - cry Cry_Veluza - cry Cry_Dondozo - cry Cry_Tatsugiri - cry Cry_Annihilape - cry Cry_Clodsire - cry Cry_Farigiraf - cry Cry_Dudunsparce - cry Cry_Kingambit - cry Cry_GreatTusk - cry Cry_ScreamTail - cry Cry_BruteBonnet - cry Cry_FlutterMane - cry Cry_SlitherWing - cry Cry_SandyShocks - cry Cry_IronTreads - cry Cry_IronBundle - cry Cry_IronHands - cry Cry_IronJugulis - cry Cry_IronMoth - cry Cry_IronThorns - cry Cry_Frigibax - cry Cry_Arctibax - cry Cry_Baxcalibur - cry Cry_Gimmighoul - cry Cry_Gholdengo - cry Cry_WoChien - cry Cry_ChienPao - cry Cry_TingLu - cry Cry_ChiYu - cry Cry_RoaringMoon - cry Cry_IronValiant - cry Cry_Koraidon - cry Cry_Miraidon - cry Cry_Unown //Cry_WalkingWake - cry Cry_Unown //Cry_IronLeaves - @ Oinkologne + cry Cry_Sprigatito + cry Cry_Floragato + cry Cry_Meowscarada + cry Cry_Fuecoco + cry Cry_Crocalor + cry Cry_Skeledirge + cry Cry_Quaxly + cry Cry_Quaxwell + cry Cry_Quaquaval + cry Cry_Lechonk cry Cry_Oinkologne - @ Maushold + cry Cry_Oinkologne + cry Cry_Tarountula + cry Cry_Spidops + cry Cry_Nymble + cry Cry_Lokix + cry Cry_Pawmi + cry Cry_Pawmo + cry Cry_Pawmot + cry Cry_Tandemaus cry Cry_Maushold - @ Squawkabilly + cry Cry_Maushold + cry Cry_Fidough + cry Cry_Dachsbun + cry Cry_Smoliv + cry Cry_Dolliv + cry Cry_Arboliva cry Cry_Squawkabilly cry Cry_Squawkabilly cry Cry_Squawkabilly - @ Palafin + cry Cry_Squawkabilly + cry Cry_Nacli + cry Cry_Naclstack + cry Cry_Garganacl + cry Cry_Charcadet + cry Cry_Armarouge + cry Cry_Ceruledge + cry Cry_Tadbulb + cry Cry_Bellibolt + cry Cry_Wattrel + cry Cry_Kilowattrel + cry Cry_Maschiff + cry Cry_Mabosstiff + cry Cry_Shroodle + cry Cry_Grafaiai + cry Cry_Bramblin + cry Cry_Brambleghast + cry Cry_Toedscool + cry Cry_Toedscruel + cry Cry_Klawf + cry Cry_Capsakid + cry Cry_Scovillain + cry Cry_Rellor + cry Cry_Rabsca + cry Cry_Flittle + cry Cry_Espathra + cry Cry_Tinkatink + cry Cry_Tinkatuff + cry Cry_Tinkaton + cry Cry_Wiglett + cry Cry_Wugtrio + cry Cry_Bombirdier + cry Cry_Finizen cry Cry_Palafin - @ Tatsugiri + cry Cry_Palafin + cry Cry_Varoom + cry Cry_Revavroom + cry Cry_Cyclizar + cry Cry_Orthworm + cry Cry_Glimmet + cry Cry_Glimmora + cry Cry_Greavard + cry Cry_Houndstone + cry Cry_Flamigo + cry Cry_Cetoddle + cry Cry_Cetitan + cry Cry_Veluza + cry Cry_Dondozo cry Cry_Tatsugiri cry Cry_Tatsugiri - @ Dudunsparce + cry Cry_Tatsugiri + cry Cry_Annihilape + cry Cry_Clodsire + cry Cry_Farigiraf cry Cry_Dudunsparce - @ Gimmighoul + cry Cry_Dudunsparce + cry Cry_Kingambit + cry Cry_GreatTusk + cry Cry_ScreamTail + cry Cry_BruteBonnet + cry Cry_FlutterMane + cry Cry_SlitherWing + cry Cry_SandyShocks + cry Cry_IronTreads + cry Cry_IronBundle + cry Cry_IronHands + cry Cry_IronJugulis + cry Cry_IronMoth + cry Cry_IronThorns + cry Cry_Frigibax + cry Cry_Arctibax + cry Cry_Baxcalibur cry Cry_Gimmighoul + cry Cry_Gimmighoul + cry Cry_Gholdengo + cry Cry_WoChien + cry Cry_ChienPao + cry Cry_TingLu + cry Cry_ChiYu + cry Cry_RoaringMoon + cry Cry_IronValiant + cry Cry_Koraidon + cry Cry_Miraidon .else - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - cry Cry_Unown - @ 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 + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown cry Cry_Unown .endif -@ Tauros-Paldea - cry Cry_Tauros - cry Cry_Tauros @ Paldean Forms - cry Cry_Wooper cry Cry_Tauros + cry Cry_Tauros + cry Cry_Tauros + cry Cry_Wooper +.if P_GEN_9_POKEMON == TRUE + cry Cry_Unown //Cry_WalkingWake + cry Cry_Unown //Cry_IronLeaves +.else + cry Cry_Unown + cry Cry_Unown +.endif @ Gigantamax Forms cry Cry_Venusaur cry Cry_Charizard @@ -4513,258 +4501,246 @@ gCryTable_Reverse:: cry_reverse Cry_Unown .endif .if P_GEN_9_POKEMON == TRUE - cry_reverse Cry_Sprigatito - cry_reverse Cry_Floragato - cry_reverse Cry_Meowscarada - cry_reverse Cry_Fuecoco - cry_reverse Cry_Crocalor - cry_reverse Cry_Skeledirge - cry_reverse Cry_Quaxly - cry_reverse Cry_Quaxwell - cry_reverse Cry_Quaquaval - cry_reverse Cry_Lechonk - cry_reverse Cry_Oinkologne - cry_reverse Cry_Tarountula - cry_reverse Cry_Spidops - cry_reverse Cry_Nymble - cry_reverse Cry_Lokix - cry_reverse Cry_Pawmi - cry_reverse Cry_Pawmo - cry_reverse Cry_Pawmot - cry_reverse Cry_Tandemaus - cry_reverse Cry_Maushold - cry_reverse Cry_Fidough - cry_reverse Cry_Dachsbun - cry_reverse Cry_Smoliv - cry_reverse Cry_Dolliv - cry_reverse Cry_Arboliva - cry_reverse Cry_Squawkabilly - cry_reverse Cry_Nacli - cry_reverse Cry_Naclstack - cry_reverse Cry_Garganacl - cry_reverse Cry_Charcadet - cry_reverse Cry_Armarouge - cry_reverse Cry_Ceruledge - cry_reverse Cry_Tadbulb - cry_reverse Cry_Bellibolt - cry_reverse Cry_Wattrel - cry_reverse Cry_Kilowattrel - cry_reverse Cry_Maschiff - cry_reverse Cry_Mabosstiff - cry_reverse Cry_Shroodle - cry_reverse Cry_Grafaiai - cry_reverse Cry_Bramblin - cry_reverse Cry_Brambleghast - cry_reverse Cry_Toedscool - cry_reverse Cry_Toedscruel - cry_reverse Cry_Klawf - cry_reverse Cry_Capsakid - cry_reverse Cry_Scovillain - cry_reverse Cry_Rellor - cry_reverse Cry_Rabsca - cry_reverse Cry_Flittle - cry_reverse Cry_Espathra - cry_reverse Cry_Tinkatink - cry_reverse Cry_Tinkatuff - cry_reverse Cry_Tinkaton - cry_reverse Cry_Wiglett - cry_reverse Cry_Wugtrio - cry_reverse Cry_Bombirdier - cry_reverse Cry_Finizen - cry_reverse Cry_Palafin - cry_reverse Cry_Varoom - cry_reverse Cry_Revavroom - cry_reverse Cry_Cyclizar - cry_reverse Cry_Orthworm - cry_reverse Cry_Glimmet - cry_reverse Cry_Glimmora - cry_reverse Cry_Greavard - cry_reverse Cry_Houndstone - cry_reverse Cry_Flamigo - cry_reverse Cry_Cetoddle - cry_reverse Cry_Cetitan - cry_reverse Cry_Veluza - cry_reverse Cry_Dondozo - cry_reverse Cry_Tatsugiri - cry_reverse Cry_Annihilape - cry_reverse Cry_Clodsire - cry_reverse Cry_Farigiraf - cry_reverse Cry_Dudunsparce - cry_reverse Cry_Kingambit - cry_reverse Cry_GreatTusk - cry_reverse Cry_ScreamTail - cry_reverse Cry_BruteBonnet - cry_reverse Cry_FlutterMane - cry_reverse Cry_SlitherWing - cry_reverse Cry_SandyShocks - cry_reverse Cry_IronTreads - cry_reverse Cry_IronBundle - cry_reverse Cry_IronHands - cry_reverse Cry_IronJugulis - cry_reverse Cry_IronMoth - cry_reverse Cry_IronThorns - cry_reverse Cry_Frigibax - cry_reverse Cry_Arctibax - cry_reverse Cry_Baxcalibur - cry_reverse Cry_Gimmighoul - cry_reverse Cry_Gholdengo - cry_reverse Cry_WoChien - cry_reverse Cry_ChienPao - cry_reverse Cry_TingLu - cry_reverse Cry_ChiYu - cry_reverse Cry_RoaringMoon - cry_reverse Cry_IronValiant - cry_reverse Cry_Koraidon - cry_reverse Cry_Miraidon - cry_reverse Cry_Unown - cry_reverse Cry_Unown - @ Oinkologne + cry_reverse Cry_Sprigatito + cry_reverse Cry_Floragato + cry_reverse Cry_Meowscarada + cry_reverse Cry_Fuecoco + cry_reverse Cry_Crocalor + cry_reverse Cry_Skeledirge + cry_reverse Cry_Quaxly + cry_reverse Cry_Quaxwell + cry_reverse Cry_Quaquaval + cry_reverse Cry_Lechonk cry_reverse Cry_Oinkologne - @ Maushold + cry_reverse Cry_Oinkologne + cry_reverse Cry_Tarountula + cry_reverse Cry_Spidops + cry_reverse Cry_Nymble + cry_reverse Cry_Lokix + cry_reverse Cry_Pawmi + cry_reverse Cry_Pawmo + cry_reverse Cry_Pawmot + cry_reverse Cry_Tandemaus cry_reverse Cry_Maushold - @ Squawkabilly + cry_reverse Cry_Maushold + cry_reverse Cry_Fidough + cry_reverse Cry_Dachsbun + cry_reverse Cry_Smoliv + cry_reverse Cry_Dolliv + cry_reverse Cry_Arboliva cry_reverse Cry_Squawkabilly cry_reverse Cry_Squawkabilly cry_reverse Cry_Squawkabilly - @ Palafin + cry_reverse Cry_Squawkabilly + cry_reverse Cry_Nacli + cry_reverse Cry_Naclstack + cry_reverse Cry_Garganacl + cry_reverse Cry_Charcadet + cry_reverse Cry_Armarouge + cry_reverse Cry_Ceruledge + cry_reverse Cry_Tadbulb + cry_reverse Cry_Bellibolt + cry_reverse Cry_Wattrel + cry_reverse Cry_Kilowattrel + cry_reverse Cry_Maschiff + cry_reverse Cry_Mabosstiff + cry_reverse Cry_Shroodle + cry_reverse Cry_Grafaiai + cry_reverse Cry_Bramblin + cry_reverse Cry_Brambleghast + cry_reverse Cry_Toedscool + cry_reverse Cry_Toedscruel + cry_reverse Cry_Klawf + cry_reverse Cry_Capsakid + cry_reverse Cry_Scovillain + cry_reverse Cry_Rellor + cry_reverse Cry_Rabsca + cry_reverse Cry_Flittle + cry_reverse Cry_Espathra + cry_reverse Cry_Tinkatink + cry_reverse Cry_Tinkatuff + cry_reverse Cry_Tinkaton + cry_reverse Cry_Wiglett + cry_reverse Cry_Wugtrio + cry_reverse Cry_Bombirdier + cry_reverse Cry_Finizen cry_reverse Cry_Palafin - @ Tatsugiri + cry_reverse Cry_Palafin + cry_reverse Cry_Varoom + cry_reverse Cry_Revavroom + cry_reverse Cry_Cyclizar + cry_reverse Cry_Orthworm + cry_reverse Cry_Glimmet + cry_reverse Cry_Glimmora + cry_reverse Cry_Greavard + cry_reverse Cry_Houndstone + cry_reverse Cry_Flamigo + cry_reverse Cry_Cetoddle + cry_reverse Cry_Cetitan + cry_reverse Cry_Veluza + cry_reverse Cry_Dondozo cry_reverse Cry_Tatsugiri cry_reverse Cry_Tatsugiri - @ Dudunsparce + cry_reverse Cry_Tatsugiri + cry_reverse Cry_Annihilape + cry_reverse Cry_Clodsire + cry_reverse Cry_Farigiraf cry_reverse Cry_Dudunsparce - @ Gimmighoul + cry_reverse Cry_Dudunsparce + cry_reverse Cry_Kingambit + cry_reverse Cry_GreatTusk + cry_reverse Cry_ScreamTail + cry_reverse Cry_BruteBonnet + cry_reverse Cry_FlutterMane + cry_reverse Cry_SlitherWing + cry_reverse Cry_SandyShocks + cry_reverse Cry_IronTreads + cry_reverse Cry_IronBundle + cry_reverse Cry_IronHands + cry_reverse Cry_IronJugulis + cry_reverse Cry_IronMoth + cry_reverse Cry_IronThorns + cry_reverse Cry_Frigibax + cry_reverse Cry_Arctibax + cry_reverse Cry_Baxcalibur cry_reverse Cry_Gimmighoul + cry_reverse Cry_Gimmighoul + cry_reverse Cry_Gholdengo + cry_reverse Cry_WoChien + cry_reverse Cry_ChienPao + cry_reverse Cry_TingLu + cry_reverse Cry_ChiYu + cry_reverse Cry_RoaringMoon + cry_reverse Cry_IronValiant + cry_reverse Cry_Koraidon + cry_reverse Cry_Miraidon .else - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - cry_reverse Cry_Unown - @ 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 + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown cry_reverse Cry_Unown .endif -@ Tauros-Paldea - cry_reverse Cry_Tauros - cry_reverse Cry_Tauros @ Paldean Forms - cry_reverse Cry_Wooper cry_reverse Cry_Tauros + cry_reverse Cry_Tauros + cry_reverse Cry_Tauros + cry_reverse Cry_Wooper +.if P_GEN_9_POKEMON == TRUE + cry_reverse Cry_Unown //Cry_WalkingWake + cry_reverse Cry_Unown //Cry_IronLeaves +.else + cry_reverse Cry_Unown + cry_reverse Cry_Unown +.endif @ Gigantamax Forms cry_reverse Cry_Venusaur cry_reverse Cry_Charizard diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index d9490413a3..7a3d05624d 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -161,6 +161,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}}, #endif [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, +#if P_GEN_9_POKEMON == TRUE + [SPECIES_WOOPER_PALDEAN] = {{EVO_LEVEL, 20, SPECIES_CLODSIRE}}, +#endif #if P_GEN_4_POKEMON == TRUE [SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}}, [SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index acda1aeeab..e3ef8aa2bd 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -40,6 +40,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_MR_MIME] = sMrMimeFormSpeciesIdTable, [SPECIES_PINSIR] = sPinsirFormSpeciesIdTable, [SPECIES_TAUROS] = sTaurosFormSpeciesIdTable, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosFormSpeciesIdTable, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosFormSpeciesIdTable, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosFormSpeciesIdTable, [SPECIES_GYARADOS] = sGyaradosFormSpeciesIdTable, [SPECIES_AERODACTYL] = sAerodactylFormSpeciesIdTable, [SPECIES_ARTICUNO] = sArticunoFormSpeciesIdTable, @@ -50,6 +53,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_PICHU] = sPichuFormSpeciesIdTable, [SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable, [SPECIES_WOOPER] = sWooperFormSpeciesIdTable, + [SPECIES_WOOPER_PALDEAN] = sWooperFormSpeciesIdTable, [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, @@ -192,6 +196,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = sDudunsparceFormSpeciesIdTable, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceFormSpeciesIdTable, [SPECIES_GIMMIGHOUL_CHEST] = sGimmighoulFormSpeciesIdTable, + [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulFormSpeciesIdTable, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, @@ -315,8 +320,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, #endif - [SPECIES_WOOPER_PALDEAN] = sWooperFormSpeciesIdTable, - [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosFormSpeciesIdTable, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, @@ -651,11 +654,4 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuFormSpeciesIdTable, #endif -#if P_GEN_9_POKEMON == TRUE - // 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/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index a6eaf8c9b4..c47da2ff5f 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -129,6 +129,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MAGMAR] = sMagmarLevelUpLearnset, [SPECIES_PINSIR] = sPinsirLevelUpLearnset, [SPECIES_TAUROS] = sTaurosLevelUpLearnset, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosPaldeanCombatBreedLevelUpLearnset, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedLevelUpLearnset, [SPECIES_MAGIKARP] = sMagikarpLevelUpLearnset, [SPECIES_GYARADOS] = sGyaradosLevelUpLearnset, [SPECIES_LAPRAS] = sLaprasLevelUpLearnset, @@ -195,6 +198,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SUNFLORA] = sSunfloraLevelUpLearnset, [SPECIES_YANMA] = sYanmaLevelUpLearnset, [SPECIES_WOOPER] = sWooperLevelUpLearnset, + [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanLevelUpLearnset, [SPECIES_QUAGSIRE] = sQuagsireLevelUpLearnset, [SPECIES_ESPEON] = sEspeonLevelUpLearnset, [SPECIES_UMBREON] = sUmbreonLevelUpLearnset, @@ -1155,8 +1159,6 @@ 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_COMBAT_BREED] = sTaurosPaldeanCombatBreedLevelUpLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, @@ -1491,7 +1493,4 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeStyleLevelUpLearnset, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif - // Tauros-Paldea - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedLevelUpLearnset, }; diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 71ce5dcaeb..a6eb3b5e0f 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -129,6 +129,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MAGMAR] = sMagmarTeachableLearnset, [SPECIES_PINSIR] = sPinsirTeachableLearnset, [SPECIES_TAUROS] = sTaurosTeachableLearnset, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosPaldeanCombatBreedTeachableLearnset, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedTeachableLearnset, [SPECIES_MAGIKARP] = sMagikarpTeachableLearnset, [SPECIES_GYARADOS] = sGyaradosTeachableLearnset, [SPECIES_LAPRAS] = sLaprasTeachableLearnset, @@ -195,6 +198,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_SUNFLORA] = sSunfloraTeachableLearnset, [SPECIES_YANMA] = sYanmaTeachableLearnset, [SPECIES_WOOPER] = sWooperTeachableLearnset, + [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanTeachableLearnset, [SPECIES_QUAGSIRE] = sQuagsireTeachableLearnset, [SPECIES_ESPEON] = sEspeonTeachableLearnset, [SPECIES_UMBREON] = sUmbreonTeachableLearnset, @@ -1155,8 +1159,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianTeachableLearnset, #endif - [SPECIES_WOOPER_PALDEAN] = sWooperPaldeanTeachableLearnset, - [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sTaurosPaldeanCombatBreedTeachableLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuTeachableLearnset, @@ -1491,7 +1493,4 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeStyleTeachableLearnset, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif - // Tauros-Paldea - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedTeachableLearnset, }; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index a6dcecb9eb..bb2c5dd2a6 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1008,6 +1008,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 725962e06f..9bddc74b61 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -129,6 +129,9 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = gMonFootprint_Magmar, [SPECIES_PINSIR] = gMonFootprint_Pinsir, [SPECIES_TAUROS] = gMonFootprint_Tauros, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = gMonFootprint_Tauros, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = gMonFootprint_Tauros, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = gMonFootprint_Tauros, [SPECIES_MAGIKARP] = gMonFootprint_Magikarp, [SPECIES_GYARADOS] = gMonFootprint_Gyarados, [SPECIES_LAPRAS] = gMonFootprint_Lapras, @@ -195,6 +198,7 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = gMonFootprint_Sunflora, [SPECIES_YANMA] = gMonFootprint_Yanma, [SPECIES_WOOPER] = gMonFootprint_Wooper, + [SPECIES_WOOPER_PALDEAN] = gMonFootprint_Wooper, [SPECIES_QUAGSIRE] = gMonFootprint_Quagsire, [SPECIES_ESPEON] = gMonFootprint_Espeon, [SPECIES_UMBREON] = gMonFootprint_Umbreon, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index c99cd446b3..7b02eb29b8 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -12236,6 +12236,9 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = sAnims_Magmar, [SPECIES_PINSIR] = sAnims_Pinsir, [SPECIES_TAUROS] = sAnims_Tauros, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sAnims_TaurosPaldean, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean, [SPECIES_MAGIKARP] = sAnims_Magikarp, [SPECIES_GYARADOS] = sAnims_Gyarados, [SPECIES_LAPRAS] = sAnims_Lapras, @@ -12303,6 +12306,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = sAnims_Sunflora, [SPECIES_YANMA] = sAnims_Yanma, [SPECIES_WOOPER] = sAnims_Wooper, + [SPECIES_WOOPER_PALDEAN] = sAnims_WooperPaldean, [SPECIES_QUAGSIRE] = sAnims_Quagsire, [SPECIES_ESPEON] = sAnims_Espeon, [SPECIES_UMBREON] = sAnims_Umbreon, @@ -13264,8 +13268,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_DECIDUEYE_HISUIAN] = sAnims_DecidueyeHisuian, #endif // Ungrouped - [SPECIES_WOOPER_PALDEAN] = sAnims_WooperPaldean, - [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = sAnims_TaurosPaldean, [SPECIES_PIKACHU_COSPLAY] = sAnims_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = sAnims_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = sAnims_PikachuBelle, @@ -13502,8 +13504,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_ENAMORUS_THERIAN] = sAnims_EnamorusTherian, [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, #endif - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean, [SPECIES_VENUSAUR_GIGANTAMAX] = sAnims_VenusaurGigantamax, [SPECIES_CHARIZARD_GIGANTAMAX] = sAnims_CharizardGigantamax, [SPECIES_BLASTOISE_GIGANTAMAX] = sAnims_BlastoiseGigantamax, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index f1b260508b..dd0a04d997 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -133,6 +133,9 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MAGMAR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_PINSIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_TAUROS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_MAGIKARP] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_GYARADOS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_LAPRAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -933,6 +936,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index c3dbbcebe1..219f0b1467 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -128,6 +128,9 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MAGMAR] = _("Magmar"), [SPECIES_PINSIR] = _("Pinsir"), [SPECIES_TAUROS] = _("Tauros"), + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = _("Tauros"), + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = _("Tauros"), + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = _("Tauros"), [SPECIES_MAGIKARP] = _("Magikarp"), [SPECIES_GYARADOS] = _("Gyarados"), [SPECIES_LAPRAS] = _("Lapras"), @@ -194,6 +197,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SUNFLORA] = _("Sunflora"), [SPECIES_YANMA] = _("Yanma"), [SPECIES_WOOPER] = _("Wooper"), + [SPECIES_WOOPER_PALDEAN] = _("Wooper"), [SPECIES_QUAGSIRE] = _("Quagsire"), [SPECIES_ESPEON] = _("Espeon"), [SPECIES_UMBREON] = _("Umbreon"), @@ -1158,8 +1162,6 @@ 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_COMBAT_BREED] = _("Tauros"), // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), @@ -1493,7 +1495,4 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), #endif - // Tauros-Paldea - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = _("Tauros"), - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = _("Tauros"), }; diff --git a/src/pokemon.c b/src/pokemon.c index 7e3c671ef4..8c689a4161 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2331,6 +2331,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_SUNFLORA - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_YANMA - 1] = ANIM_FIGURE_8, [SPECIES_WOOPER - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_WOOPER_PALDEAN - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_QUAGSIRE - 1] = ANIM_H_STRETCH, [SPECIES_ESPEON - 1] = ANIM_GROW_VIBRATE, [SPECIES_UMBREON - 1] = ANIM_V_SHAKE, diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 1070c22aa8..d1ecc8c2ea 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -343,6 +343,9 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_MAGMAR] = BACK_ANIM_SHAKE_GLOW_RED, [SPECIES_PINSIR] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_TAUROS] = BACK_ANIM_V_SHAKE_LOW, + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = BACK_ANIM_V_SHAKE_LOW, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = BACK_ANIM_V_SHAKE_LOW, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = BACK_ANIM_V_SHAKE_LOW, [SPECIES_MAGIKARP] = BACK_ANIM_CONCAVE_ARC_LARGE, [SPECIES_GYARADOS] = BACK_ANIM_V_SHAKE, [SPECIES_LAPRAS] = BACK_ANIM_SHAKE_GLOW_BLUE, @@ -411,6 +414,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_SUNFLORA] = BACK_ANIM_H_SLIDE, [SPECIES_YANMA] = BACK_ANIM_CONVEX_DOUBLE_ARC, [SPECIES_WOOPER] = BACK_ANIM_V_STRETCH, + [SPECIES_WOOPER_PALDEAN] = BACK_ANIM_V_STRETCH, [SPECIES_QUAGSIRE] = BACK_ANIM_H_SLIDE, [SPECIES_ESPEON] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_UMBREON] = BACK_ANIM_SHRINK_GROW_VIBRATE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 0f26175536..d07f16c662 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -224,6 +224,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = gMonIcon_Sunflora, [SPECIES_YANMA] = gMonIcon_Yanma, [SPECIES_WOOPER] = gMonIcon_Wooper, + //[SPECIES_WOOPER_PALDEAN] = gMonIcon_WooperPaldean, [SPECIES_QUAGSIRE] = gMonIcon_Quagsire, [SPECIES_ESPEON] = gMonIcon_Espeon, [SPECIES_UMBREON] = gMonIcon_Umbreon, @@ -1666,6 +1667,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_SUNFLORA] = 1, [SPECIES_YANMA] = 1, [SPECIES_WOOPER] = 0, + [SPECIES_WOOPER_PALDEAN] = 0, [SPECIES_QUAGSIRE] = 0, [SPECIES_ESPEON] = 2, [SPECIES_UMBREON] = 0, diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index bbbffba4b3..12b3b35c7f 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -492,6 +492,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_MARILL, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SUNKERN, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_WOOPER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_WOOPER_PALDEAN, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_PINECO, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SNUBBULL, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_SHUCKLE, .jumpType = JUMP_TYPE_SLOW, },