diff --git a/graphics/pokemon/maushold/back.png b/graphics/pokemon/maushold/back.png index 5f78e7c959..8def92dd59 100644 Binary files a/graphics/pokemon/maushold/back.png and b/graphics/pokemon/maushold/back.png differ diff --git a/graphics/pokemon/maushold/four/back.png b/graphics/pokemon/maushold/four/back.png new file mode 100644 index 0000000000..5f78e7c959 Binary files /dev/null and b/graphics/pokemon/maushold/four/back.png differ diff --git a/graphics/pokemon/maushold/four/front.png b/graphics/pokemon/maushold/four/front.png new file mode 100644 index 0000000000..b5813df9f2 Binary files /dev/null and b/graphics/pokemon/maushold/four/front.png differ diff --git a/graphics/pokemon/maushold/four/icon.png b/graphics/pokemon/maushold/four/icon.png new file mode 100755 index 0000000000..728aca58a1 Binary files /dev/null and b/graphics/pokemon/maushold/four/icon.png differ diff --git a/graphics/pokemon/maushold/front.png b/graphics/pokemon/maushold/front.png index b5813df9f2..aa33ed0d45 100644 Binary files a/graphics/pokemon/maushold/front.png and b/graphics/pokemon/maushold/front.png differ diff --git a/graphics/pokemon/maushold/icon.png b/graphics/pokemon/maushold/icon.png index 728aca58a1..97c2d70826 100755 Binary files a/graphics/pokemon/maushold/icon.png and b/graphics/pokemon/maushold/icon.png differ diff --git a/graphics/pokemon/maushold/three/back.png b/graphics/pokemon/maushold/three/back.png deleted file mode 100644 index 8def92dd59..0000000000 Binary files a/graphics/pokemon/maushold/three/back.png and /dev/null differ diff --git a/graphics/pokemon/maushold/three/front.png b/graphics/pokemon/maushold/three/front.png deleted file mode 100644 index aa33ed0d45..0000000000 Binary files a/graphics/pokemon/maushold/three/front.png and /dev/null differ diff --git a/graphics/pokemon/maushold/three/icon.png b/graphics/pokemon/maushold/three/icon.png deleted file mode 100755 index 97c2d70826..0000000000 Binary files a/graphics/pokemon/maushold/three/icon.png and /dev/null differ diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 83cbab378c..062a0b7211 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -1024,7 +1024,6 @@ enum { NATIONAL_DEX_MIRAIDON, NATIONAL_DEX_WALKING_WAKE, NATIONAL_DEX_IRON_LEAVES, - NATIONAL_DEX_COUNT_ENUM, }; #define KANTO_DEX_COUNT NATIONAL_DEX_MEW diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index f7b51f2ea7..dd1dc0141e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -327,8 +327,7 @@ #define SPECIES_FLAG_ALL_PERFECT_IVS (1 << 8) #define SPECIES_FLAG_CANNOT_BE_TRADED (1 << 9) #define SPECIES_FLAG_ULTRA_BURST (1 << 10) -#define SPECIES_FLAG_GENDER_DIFFERENCE (1 << 11) -#define SPECIES_FLAG_PARADOX (1 << 12) +#define SPECIES_FLAG_PARADOX (1 << 11) #define LEGENDARY_PERFECT_IV_COUNT 3 diff --git a/include/constants/species.h b/include/constants/species.h index 9cc78cf91b..33a3cb3194 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -907,111 +907,6 @@ #define SPECIES_SNEASLER 903 #define SPECIES_OVERQWIL 904 #define SPECIES_ENAMORUS 905 -#define SPECIES_SPRIGATITO 906 -#define SPECIES_FLORAGATO 907 -#define SPECIES_MEOWSCARADA 908 -#define SPECIES_FUECOCO 909 -#define SPECIES_CROCALOR 910 -#define SPECIES_SKELEDIRGE 911 -#define SPECIES_QUAXLY 912 -#define SPECIES_QUAXWELL 913 -#define SPECIES_QUAQUAVAL 914 -#define SPECIES_LECHONK 915 -#define SPECIES_OINKOLOGNE 916 -#define SPECIES_TAROUNTULA 917 -#define SPECIES_SPIDOPS 918 -#define SPECIES_NYMBLE 919 -#define SPECIES_LOKIX 920 -#define SPECIES_PAWMI 921 -#define SPECIES_PAWMO 922 -#define SPECIES_PAWMOT 923 -#define SPECIES_TANDEMAUS 924 -#define SPECIES_MAUSHOLD 925 -#define SPECIES_FIDOUGH 926 -#define SPECIES_DACHSBUN 927 -#define SPECIES_SMOLIV 928 -#define SPECIES_DOLLIV 929 -#define SPECIES_ARBOLIVA 930 -#define SPECIES_SQUAWKABILLY 931 -#define SPECIES_NACLI 932 -#define SPECIES_NACLSTACK 933 -#define SPECIES_GARGANACL 934 -#define SPECIES_CHARCADET 935 -#define SPECIES_ARMAROUGE 936 -#define SPECIES_CERULEDGE 937 -#define SPECIES_TADBULB 938 -#define SPECIES_BELLIBOLT 939 -#define SPECIES_WATTREL 940 -#define SPECIES_KILOWATTREL 941 -#define SPECIES_MASCHIFF 942 -#define SPECIES_MABOSSTIFF 943 -#define SPECIES_SHROODLE 944 -#define SPECIES_GRAFAIAI 945 -#define SPECIES_BRAMBLIN 946 -#define SPECIES_BRAMBLEGHAST 947 -#define SPECIES_TOEDSCOOL 948 -#define SPECIES_TOEDSCRUEL 949 -#define SPECIES_KLAWF 950 -#define SPECIES_CAPSAKID 951 -#define SPECIES_SCOVILLAIN 952 -#define SPECIES_RELLOR 953 -#define SPECIES_RABSCA 954 -#define SPECIES_FLITTLE 955 -#define SPECIES_ESPATHRA 956 -#define SPECIES_TINKATINK 957 -#define SPECIES_TINKATUFF 958 -#define SPECIES_TINKATON 959 -#define SPECIES_WIGLETT 960 -#define SPECIES_WUGTRIO 961 -#define SPECIES_BOMBIRDIER 962 -#define SPECIES_FINIZEN 963 -#define SPECIES_PALAFIN 964 -#define SPECIES_VAROOM 965 -#define SPECIES_REVAVROOM 966 -#define SPECIES_CYCLIZAR 967 -#define SPECIES_ORTHWORM 968 -#define SPECIES_GLIMMET 969 -#define SPECIES_GLIMMORA 970 -#define SPECIES_GREAVARD 971 -#define SPECIES_HOUNDSTONE 972 -#define SPECIES_FLAMIGO 973 -#define SPECIES_CETODDLE 974 -#define SPECIES_CETITAN 975 -#define SPECIES_VELUZA 976 -#define SPECIES_DONDOZO 977 -#define SPECIES_TATSUGIRI 978 -#define SPECIES_ANNIHILAPE 979 -#define SPECIES_CLODSIRE 980 -#define SPECIES_FARIGIRAF 981 -#define SPECIES_DUDUNSPARCE 982 -#define SPECIES_KINGAMBIT 983 -#define SPECIES_GREAT_TUSK 984 -#define SPECIES_SCREAM_TAIL 985 -#define SPECIES_BRUTE_BONNET 986 -#define SPECIES_FLUTTER_MANE 987 -#define SPECIES_SLITHER_WING 988 -#define SPECIES_SANDY_SHOCKS 989 -#define SPECIES_IRON_TREADS 990 -#define SPECIES_IRON_BUNDLE 991 -#define SPECIES_IRON_HANDS 992 -#define SPECIES_IRON_JUGULIS 993 -#define SPECIES_IRON_MOTH 994 -#define SPECIES_IRON_THORNS 995 -#define SPECIES_FRIGIBAX 996 -#define SPECIES_ARCTIBAX 997 -#define SPECIES_BAXCALIBUR 998 -#define SPECIES_GIMMIGHOUL 999 -#define SPECIES_GHOLDENGO 1000 -#define SPECIES_WO_CHIEN 1001 -#define SPECIES_CHIEN_PAO 1002 -#define SPECIES_TING_LU 1003 -#define SPECIES_CHI_YU 1004 -#define SPECIES_ROARING_MOON 1005 -#define SPECIES_IRON_VALIANT 1006 -#define SPECIES_KORAIDON 1007 -#define SPECIES_MIRAIDON 1008 -#define SPECIES_WALKING_WAKE 1009 -#define SPECIES_IRON_LEAVES 1010 // Megas #define SPECIES_VENUSAUR_MEGA FORMS_START + 1 @@ -1480,35 +1375,142 @@ // Basculegion #define SPECIES_BASCULEGION_FEMALE FORMS_START + 331 +#define SPECIES_SPRIGATITO GEN9_START + 1 +#define SPECIES_FLORAGATO GEN9_START + 2 +#define SPECIES_MEOWSCARADA GEN9_START + 3 +#define SPECIES_FUECOCO GEN9_START + 4 +#define SPECIES_CROCALOR GEN9_START + 5 +#define SPECIES_SKELEDIRGE GEN9_START + 6 +#define SPECIES_QUAXLY GEN9_START + 7 +#define SPECIES_QUAXWELL GEN9_START + 8 +#define SPECIES_QUAQUAVAL GEN9_START + 9 +#define SPECIES_LECHONK GEN9_START + 10 +#define SPECIES_OINKOLOGNE 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_MAUSHOLD 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_SQUAWKABILLY 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_PALAFIN 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_TATSUGIRI GEN9_START + 73 +#define SPECIES_ANNIHILAPE GEN9_START + 74 +#define SPECIES_CLODSIRE GEN9_START + 75 +#define SPECIES_FARIGIRAF GEN9_START + 76 +#define SPECIES_DUDUNSPARCE 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_GIMMIGHOUL 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 FORMS_START + 332 +#define SPECIES_OINKOLOGNE_FEMALE GEN9_START + 106 // Maushold -#define SPECIES_MAUSHOLD_FAMILY_OF_THREE FORMS_START + 333 +#define SPECIES_MAUSHOLD_FAMILY_OF_FOUR GEN9_START + 107 // Squawkabilly -#define SPECIES_SQUAWKABILLY_BLUE_PLUMAGE FORMS_START + 334 -#define SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE FORMS_START + 335 -#define SPECIES_SQUAWKABILLY_WHITE_PLUMAGE FORMS_START + 336 +#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 FORMS_START + 337 +#define SPECIES_PALAFIN_HERO GEN9_START + 111 // Tatsugiri -#define SPECIES_TATSUGIRI_DROOPY FORMS_START + 338 -#define SPECIES_TATSUGIRI_STRETCHY FORMS_START + 339 +#define SPECIES_TATSUGIRI_DROOPY GEN9_START + 112 +#define SPECIES_TATSUGIRI_STRETCHY GEN9_START + 113 // Dudunsparce -#define SPECIES_DUDUNSPARCE_THREE_SEGMENT FORMS_START + 340 +#define SPECIES_DUDUNSPARCE_THREE_SEGMENT GEN9_START + 114 // Gimmighoul -#define SPECIES_GIMMIGHOUL_ROAMING FORMS_START + 341 +#define SPECIES_GIMMIGHOUL_ROAMING GEN9_START + 115 // Tauros-Paldea -#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED FORMS_START + 342 -#define SPECIES_TAUROS_PALDEAN_AQUA_BREED FORMS_START + 343 +#define SPECIES_TAUROS_PALDEAN_BLAZE_BREED GEN9_START + 116 +#define SPECIES_TAUROS_PALDEAN_AQUA_BREED GEN9_START + 117 -#define FORMS_START SPECIES_IRON_LEAVES +#define FORMS_START SPECIES_ENAMORUS +#define GEN9_START SPECIES_BASCULEGION_FEMALE #define SPECIES_EGG SPECIES_TAUROS_PALDEAN_AQUA_BREED + 1 #define NUM_SPECIES SPECIES_EGG diff --git a/include/graphics.h b/include/graphics.h index 93339833bc..69a4e0ac85 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -7398,9 +7398,9 @@ extern const u32 gMonBackPic_Maushold[]; extern const u32 gMonShinyPalette_Maushold[]; extern const u8 gMonIcon_Maushold[]; extern const u8 gMonFootprint_Maushold[]; -extern const u32 gMonFrontPic_MausholdThree[]; -extern const u32 gMonBackPic_MausholdThree[]; -extern const u32 gMonIcon_MausholdThree[]; +extern const u32 gMonFrontPic_MausholdFour[]; +extern const u32 gMonBackPic_MausholdFour[]; +extern const u32 gMonIcon_MausholdFour[]; extern const u32 gMonFrontPic_Fidough[]; extern const u32 gMonPalette_Fidough[]; extern const u32 gMonBackPic_Fidough[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 4e0c5dcf91..c9eb9d8a70 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -1438,219 +1438,6 @@ gCryTable:: cry Cry_Unown cry Cry_Unown 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 -.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 .endif @ Megas cry Cry_VenusaurMega @@ -2340,6 +2127,111 @@ 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_Oinkologne @ Maushold @@ -2358,6 +2250,111 @@ gCryTable:: @ Gimmighoul cry Cry_Gimmighoul .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 @@ -3820,219 +3817,6 @@ gCryTable_Reverse:: cry_reverse Cry_Unown cry_reverse Cry_Unown 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 -.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 .endif @ Megas cry_reverse Cry_VenusaurMega @@ -4668,6 +4452,111 @@ 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_Oinkologne @ Maushold @@ -4686,6 +4575,111 @@ gCryTable_Reverse:: @ Gimmighoul cry_reverse Cry_Gimmighoul .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 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 69e7188bbd..351c94d4c7 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7352,9 +7352,9 @@ const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/sh const u8 gMonIcon_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); -const u32 gMonFrontPic_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/three/front.4bpp.lz"); -const u32 gMonBackPic_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/three/back.4bpp.lz"); -const u8 gMonIcon_MausholdThree[] = INCBIN_U8("graphics/pokemon/maushold/three/icon.4bpp"); +const u32 gMonFrontPic_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz"); +const u32 gMonBackPic_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz"); +const u8 gMonIcon_MausholdFour[] = INCBIN_U8("graphics/pokemon/maushold/four/icon.4bpp"); const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/front.4bpp.lz"); const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/normal.gbapal.lz"); diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index fd54b48443..1729ee54e2 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -554,7 +554,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PAWMI] = {{EVO_LEVEL, 18, SPECIES_PAWMO}}, [SPECIES_PAWMO] = {{EVO_NONE, 0, SPECIES_PAWMOT}}, [SPECIES_TANDEMAUS] = {{EVO_NONE, 0, SPECIES_MAUSHOLD}, - {EVO_NONE, 0, SPECIES_MAUSHOLD_FAMILY_OF_THREE}}, + {EVO_NONE, 0, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}}, [SPECIES_FIDOUGH] = {{EVO_LEVEL, 26, SPECIES_DACHSBUN}}, [SPECIES_SMOLIV] = {{EVO_LEVEL, 25, SPECIES_DOLLIV}}, [SPECIES_DOLLIV] = {{EVO_LEVEL, 35, SPECIES_ARBOLIVA}}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 2fe3402bfe..2c2a08de0a 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -611,7 +611,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Oinkologne [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFormSpeciesIdTable, // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdFormSpeciesIdTable, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdFormSpeciesIdTable, // Squawkabilly [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 5306338659..a73311a0ad 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1175,7 +1175,7 @@ static const u16 sOinkologneFormSpeciesIdTable[] = { static const u16 sMausholdFormSpeciesIdTable[] = { SPECIES_MAUSHOLD, - SPECIES_MAUSHOLD_FAMILY_OF_THREE, + SPECIES_MAUSHOLD_FAMILY_OF_FOUR, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 0d57b9150c..241181141b 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1449,7 +1449,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Oinkologne [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleLevelUpLearnset, // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdLevelUpLearnset, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdLevelUpLearnset, // Squawkabilly [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyLevelUpLearnset, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyLevelUpLearnset, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 9d3eff8174..e1977bd1ac 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -25245,7 +25245,7 @@ const struct SpeciesInfo gSpeciesInfo[] = } [SPECIES_MAUSHOLD] = MAUSHOLD_SPECIES_INFO, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = MAUSHOLD_SPECIES_INFO, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = MAUSHOLD_SPECIES_INFO, [SPECIES_FIDOUGH] = { diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 92fcae3899..65606223b4 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -1449,7 +1449,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = // Oinkologne [SPECIES_OINKOLOGNE_FEMALE] = sOinkologneFemaleTeachableLearnset, // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sMausholdTeachableLearnset, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sMausholdTeachableLearnset, // Squawkabilly [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sSquawkabillyTeachableLearnset, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sSquawkabillyTeachableLearnset, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index ed50efcf37..a0b799db02 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -965,7 +965,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index dc5b8a3eb8..01d60dd51e 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1362,7 +1362,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PAWMOT, gMonBackPic_Pawmot), SPECIES_SPRITE(TANDEMAUS, gMonBackPic_Tandemaus), SPECIES_SPRITE(MAUSHOLD, gMonBackPic_Maushold), - SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_THREE, gMonBackPic_MausholdThree), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_FOUR, gMonBackPic_MausholdFour), SPECIES_SPRITE(FIDOUGH, gMonBackPic_Fidough), SPECIES_SPRITE(DACHSBUN, gMonBackPic_Dachsbun), SPECIES_SPRITE(SMOLIV, gMonBackPic_Smoliv), diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 468cd1227f..09c7fd2e4a 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13268,7 +13268,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = #endif #if P_GEN_9_POKEMON == TRUE [SPECIES_OINKOLOGNE_FEMALE] = sAnims_Oinkologne, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = sAnims_Maushold, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = sAnims_Maushold, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = sAnims_Squawkabilly, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = sAnims_Squawkabilly, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = sAnims_Squawkabilly, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index b48fb6f791..2c65949db5 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -942,7 +942,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MAUSHOLD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 6f403b4989..9f341ee2f1 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1360,7 +1360,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(PAWMOT, gMonFrontPic_Pawmot), SPECIES_SPRITE(TANDEMAUS, gMonFrontPic_Tandemaus), SPECIES_SPRITE(MAUSHOLD, gMonFrontPic_Maushold), - SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_THREE, gMonFrontPic_MausholdThree), + SPECIES_SPRITE(MAUSHOLD_FAMILY_OF_FOUR, gMonFrontPic_MausholdFour), SPECIES_SPRITE(FIDOUGH, gMonFrontPic_Fidough), SPECIES_SPRITE(DACHSBUN, gMonFrontPic_Dachsbun), SPECIES_SPRITE(SMOLIV, gMonFrontPic_Smoliv), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 5a631c185a..0796cb9d2e 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1359,7 +1359,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(PAWMOT, gMonPalette_Pawmot), SPECIES_PAL(TANDEMAUS, gMonPalette_Tandemaus), SPECIES_PAL(MAUSHOLD, gMonPalette_Maushold), - SPECIES_PAL(MAUSHOLD_FAMILY_OF_THREE, gMonPalette_Maushold), + SPECIES_PAL(MAUSHOLD_FAMILY_OF_FOUR, gMonPalette_Maushold), SPECIES_PAL(FIDOUGH, gMonPalette_Fidough), SPECIES_PAL(DACHSBUN, gMonPalette_Dachsbun), SPECIES_PAL(SMOLIV, gMonPalette_Smoliv), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 52d74c9194..30b43048a5 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1358,7 +1358,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(PAWMOT, gMonShinyPalette_Pawmot), SPECIES_SHINY_PAL(TANDEMAUS, gMonShinyPalette_Tandemaus), SPECIES_SHINY_PAL(MAUSHOLD, gMonShinyPalette_Maushold), - SPECIES_SHINY_PAL(MAUSHOLD_FAMILY_OF_THREE, gMonShinyPalette_Maushold), + SPECIES_SHINY_PAL(MAUSHOLD_FAMILY_OF_FOUR, gMonShinyPalette_Maushold), SPECIES_SHINY_PAL(FIDOUGH, gMonShinyPalette_Fidough), SPECIES_SHINY_PAL(DACHSBUN, gMonShinyPalette_Dachsbun), SPECIES_SHINY_PAL(SMOLIV, gMonShinyPalette_Smoliv), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index c66a47301d..f0c430908b 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1451,7 +1451,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { // Oinkologne [SPECIES_OINKOLOGNE_FEMALE] = _("Oinkologne"), // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = _("Maushold"), + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = _("Maushold"), // Squawkabilly [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = _("Squawkabil"), [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = _("Squawkabil"), diff --git a/src/pokedex.c b/src/pokedex.c index 3f38fa0625..5e6fca5264 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4146,7 +4146,11 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry) { ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, 4); PrintInfoScreenText(str, 0x60, 0x19); - name = GetSpeciesName(num); + natNum = NationalPokedexNumToSpecies(num); + if (natNum) + name = GetSpeciesName(natNum); + else + name = sText_TenDashes2; PrintInfoScreenText(name, 0x8A, 0x19); } else diff --git a/src/pokemon.c b/src/pokemon.c index 998f6a9163..43e174f0c3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1796,7 +1796,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Oinkologne [SPECIES_OINKOLOGNE_FEMALE - 1] = NATIONAL_DEX_OINKOLOGNE, // Maushold - [SPECIES_MAUSHOLD_FAMILY_OF_THREE - 1] = NATIONAL_DEX_MAUSHOLD, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR - 1] = NATIONAL_DEX_MAUSHOLD, // Squawkabilly [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 5ca5a7ea33..ffe0ff3db9 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1320,7 +1320,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_PAWMOT] = gMonIcon_Pawmot, [SPECIES_TANDEMAUS] = gMonIcon_Tandemaus, [SPECIES_MAUSHOLD] = gMonIcon_Maushold, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonIcon_Maushold, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = gMonIcon_Maushold, [SPECIES_FIDOUGH] = gMonIcon_Fidough, // [SPECIES_DACHSBUN] = gMonIcon_Dachsbun, [SPECIES_SMOLIV] = gMonIcon_Smoliv,