diff --git a/include/pokedex.h b/include/pokedex.h index fc4b1c6..1ac1dd8 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -917,8 +917,91 @@ enum #define NATIONAL_DEX_MELTAN 808 #define NATIONAL_DEX_MELMETAL 809 -#define FINAL_DEX_ENTRY NATIONAL_DEX_MELMETAL //Not +1 b/c used like this for some asm -#define NATIONAL_DEX_COUNT NATIONAL_DEX_MELMETAL + 1 +//Sword & Shield +#define NATIONAL_DEX_GROOKEY 810 +#define NATIONAL_DEX_THWACKEY 811 +#define NATIONAL_DEX_RILLABOOM 812 +#define NATIONAL_DEX_SCORBUNNY 813 +#define NATIONAL_DEX_RABOOT 814 +#define NATIONAL_DEX_CINDERACE 815 +#define NATIONAL_DEX_SOBBLE 816 +#define NATIONAL_DEX_DRIZZILE 817 +#define NATIONAL_DEX_INTELEON 818 +#define NATIONAL_DEX_SKWOBET 819 +#define NATIONAL_DEX_GREEDENT 820 +#define NATIONAL_DEX_ROOKIDEE 821 +#define NATIONAL_DEX_CORVISQUIRE 822 +#define NATIONAL_DEX_CORVIKNIGHT 823 +#define NATIONAL_DEX_BLIPBUG 824 +#define NATIONAL_DEX_DOTTLER 825 +#define NATIONAL_DEX_ORBEETLE 826 +#define NATIONAL_DEX_NICKIT 827 +#define NATIONAL_DEX_THIEVUL 828 +#define NATIONAL_DEX_GOSSIFLEUR 829 +#define NATIONAL_DEX_ELDEGOSS 830 +#define NATIONAL_DEX_WOOLOO 831 +#define NATIONAL_DEX_DUBWOOL 832 +#define NATIONAL_DEX_CHEWTLE 833 +#define NATIONAL_DEX_DREDNAW 834 +#define NATIONAL_DEX_YAMPER 835 +#define NATIONAL_DEX_BOLTUND 836 +#define NATIONAL_DEX_ROLYCOLY 837 +#define NATIONAL_DEX_CARKOL 838 +#define NATIONAL_DEX_COALOSSAL 839 +#define NATIONAL_DEX_APPLIN 840 +#define NATIONAL_DEX_FLAPPLE 841 +#define NATIONAL_DEX_APPLETUN 842 +#define NATIONAL_DEX_SILICOBRA 843 +#define NATIONAL_DEX_SANDACONDA 844 +#define NATIONAL_DEX_CRAMORANT 845 +#define NATIONAL_DEX_ARROKUDA 846 +#define NATIONAL_DEX_BARRASKEWDA 847 +#define NATIONAL_DEX_TOXEL 848 +#define NATIONAL_DEX_TOXTRICITY 849 +#define NATIONAL_DEX_SIZZLIPEDE 850 +#define NATIONAL_DEX_CENTISKORCH 851 +#define NATIONAL_DEX_CLOBBOPUS 852 +#define NATIONAL_DEX_GRAPPLOCT 853 +#define NATIONAL_DEX_SINISTEA 854 +#define NATIONAL_DEX_POLTEAGEIST 855 +#define NATIONAL_DEX_HATENNA 856 +#define NATIONAL_DEX_HATTREM 857 +#define NATIONAL_DEX_HATTERENE 858 +#define NATIONAL_DEX_IMPIDIMP 859 +#define NATIONAL_DEX_MORGREM 860 +#define NATIONAL_DEX_GRIMMSNARL 861 +#define NATIONAL_DEX_OBSTAGOON 862 +#define NATIONAL_DEX_PERRSERKER 863 +#define NATIONAL_DEX_CURSOLA 864 +#define NATIONAL_DEX_SIRFETCHD 865 +#define NATIONAL_DEX_MR_RIME 866 +#define NATIONAL_DEX_RUNERIGUS 867 +#define NATIONAL_DEX_MILCERY 868 +#define NATIONAL_DEX_ALCREMIE 869 +#define NATIONAL_DEX_FALINKS 870 +#define NATIONAL_DEX_PINCURCHIN 871 +#define NATIONAL_DEX_SNOM 872 +#define NATIONAL_DEX_FROSMOTH 873 +#define NATIONAL_DEX_STONJOURNER 874 +#define NATIONAL_DEX_EISCUE 875 +#define NATIONAL_DEX_INDEEDEE 876 +#define NATIONAL_DEX_MORPEKO 877 +#define NATIONAL_DEX_CUFANT 878 +#define NATIONAL_DEX_COPPERAJAH 879 +#define NATIONAL_DEX_DRACOZOLT 880 +#define NATIONAL_DEX_ARCTOZOLT 881 +#define NATIONAL_DEX_DRACOVISH 882 +#define NATIONAL_DEX_ARCTOVISH 883 +#define NATIONAL_DEX_DURALUDON 884 +#define NATIONAL_DEX_DREEPY 885 +#define NATIONAL_DEX_DRAKLOAK 886 +#define NATIONAL_DEX_DRAGAPULT 887 +#define NATIONAL_DEX_ZACIAN 888 +#define NATIONAL_DEX_ZAMAZENTA 889 +#define NATIONAL_DEX_ETERNATUS 890 + +#define FINAL_DEX_ENTRY NATIONAL_DEX_ETERNATUS //Not +1 b/c used like this for some asm +#define NATIONAL_DEX_COUNT NATIONAL_DEX_ETERNATUS + 1 extern const u8 DEX_ENTRY_TURTWIG[]; extern const u8 DEX_ENTRY_GROTLE[]; @@ -1343,6 +1426,87 @@ extern const u8 DEX_ENTRY_BLACEPHALON[]; extern const u8 DEX_ENTRY_ZERAORA[]; extern const u8 DEX_ENTRY_MELTAN[]; extern const u8 DEX_ENTRY_MELMETAL[]; +extern const u8 DEX_ENTRY_GROOKEY[]; +extern const u8 DEX_ENTRY_THWACKEY[]; +extern const u8 DEX_ENTRY_RILLABOOM[]; +extern const u8 DEX_ENTRY_SCORBUNNY[]; +extern const u8 DEX_ENTRY_RABOOT[]; +extern const u8 DEX_ENTRY_CINDERACE[]; +extern const u8 DEX_ENTRY_SOBBLE[]; +extern const u8 DEX_ENTRY_DRIZZILE[]; +extern const u8 DEX_ENTRY_INTELEON[]; +extern const u8 DEX_ENTRY_SKWOVET[]; +extern const u8 DEX_ENTRY_GREEDENT[]; +extern const u8 DEX_ENTRY_ROOKIDEE[]; +extern const u8 DEX_ENTRY_CORVISQUIRE[]; +extern const u8 DEX_ENTRY_CORVIKNIGHT[]; +extern const u8 DEX_ENTRY_BLIPBUG[]; +extern const u8 DEX_ENTRY_DOTTLER[]; +extern const u8 DEX_ENTRY_ORBEETLE[]; +extern const u8 DEX_ENTRY_NICKIT[]; +extern const u8 DEX_ENTRY_THIEVUL[]; +extern const u8 DEX_ENTRY_GOSSIFLEUR[]; +extern const u8 DEX_ENTRY_ELDEGOSS[]; +extern const u8 DEX_ENTRY_WOOLOO[]; +extern const u8 DEX_ENTRY_DUBWOOL[]; +extern const u8 DEX_ENTRY_CHEWTLE[]; +extern const u8 DEX_ENTRY_DREDNAW[]; +extern const u8 DEX_ENTRY_YAMPER[]; +extern const u8 DEX_ENTRY_BOLTUND[]; +extern const u8 DEX_ENTRY_ROLYCOLY[]; +extern const u8 DEX_ENTRY_CARKOL[]; +extern const u8 DEX_ENTRY_COALOSSAL[]; +extern const u8 DEX_ENTRY_APPLIN[]; +extern const u8 DEX_ENTRY_FLAPPLE[]; +extern const u8 DEX_ENTRY_APPLETUN[]; +extern const u8 DEX_ENTRY_SILICOBRA[]; +extern const u8 DEX_ENTRY_SANDACONDA[]; +extern const u8 DEX_ENTRY_CRAMORANT[]; +extern const u8 DEX_ENTRY_ARROKUDA[]; +extern const u8 DEX_ENTRY_BARRASKEWDA[]; +extern const u8 DEX_ENTRY_TOXEL[]; +extern const u8 DEX_ENTRY_TOXTRICITY[]; +extern const u8 DEX_ENTRY_SIZZLIPEDE[]; +extern const u8 DEX_ENTRY_CENTISKORCH[]; +extern const u8 DEX_ENTRY_CLOBBOPUS[]; +extern const u8 DEX_ENTRY_GRAPPLOCT[]; +extern const u8 DEX_ENTRY_SINISTEA[]; +extern const u8 DEX_ENTRY_POLTEAGEIST[]; +extern const u8 DEX_ENTRY_HATENNA[]; +extern const u8 DEX_ENTRY_HATTREM[]; +extern const u8 DEX_ENTRY_HATTERENE[]; +extern const u8 DEX_ENTRY_IMPIDIMP[]; +extern const u8 DEX_ENTRY_MORGREM[]; +extern const u8 DEX_ENTRY_GRIMMSNARL[]; +extern const u8 DEX_ENTRY_OBSTAGOON[]; +extern const u8 DEX_ENTRY_PERRSERKER[]; +extern const u8 DEX_ENTRY_CURSOLA[]; +extern const u8 DEX_ENTRY_SIRFETCHD[]; +extern const u8 DEX_ENTRY_MR_RIME[]; +extern const u8 DEX_ENTRY_RUNERIGUS[]; +extern const u8 DEX_ENTRY_MILCERY[]; +extern const u8 DEX_ENTRY_ALCREMIE[]; +extern const u8 DEX_ENTRY_FALINKS[]; +extern const u8 DEX_ENTRY_PINCURCHIN[]; +extern const u8 DEX_ENTRY_SNOM[]; +extern const u8 DEX_ENTRY_FROSMOTH[]; +extern const u8 DEX_ENTRY_STONJOURNER[]; +extern const u8 DEX_ENTRY_EISCUE[]; +extern const u8 DEX_ENTRY_INDEEDEE[]; +extern const u8 DEX_ENTRY_MORPEKO[]; +extern const u8 DEX_ENTRY_CUFANT[]; +extern const u8 DEX_ENTRY_COPPERAJAH[]; +extern const u8 DEX_ENTRY_DRACOZOLT[]; +extern const u8 DEX_ENTRY_ARCTOZOLT[]; +extern const u8 DEX_ENTRY_DRACOVISH[]; +extern const u8 DEX_ENTRY_ARCTOVISH[]; +extern const u8 DEX_ENTRY_DURALUDON[]; +extern const u8 DEX_ENTRY_DREEPY[]; +extern const u8 DEX_ENTRY_DRAKLOAK[]; +extern const u8 DEX_ENTRY_DRAGAPULT[]; +extern const u8 DEX_ENTRY_ZACIAN[]; +extern const u8 DEX_ENTRY_ZAMAZENTA[]; +extern const u8 DEX_ENTRY_ETERNATUS[]; extern const u8 DEX_ENTRY_RATTATA_A[]; extern const u8 DEX_ENTRY_RATICATE_A[]; @@ -1354,14 +1518,28 @@ extern const u8 DEX_ENTRY_NINETALES_A[]; extern const u8 DEX_ENTRY_DIGLETT_A[]; extern const u8 DEX_ENTRY_DUGTRIO_A[]; extern const u8 DEX_ENTRY_MEOWTH_A[]; +extern const u8 DEX_ENTRY_MEOWTH_G[]; extern const u8 DEX_ENTRY_PERSIAN_A[]; extern const u8 DEX_ENTRY_GEODUDE_A[]; extern const u8 DEX_ENTRY_GRAVELER_A[]; extern const u8 DEX_ENTRY_GOLEM_A[]; +extern const u8 DEX_ENTRY_PONYTA_G[]; +extern const u8 DEX_ENTRY_RAPIDASH_G[]; +extern const u8 DEX_ENTRY_FARFETCHD_G[]; extern const u8 DEX_ENTRY_GRIMER_A[]; extern const u8 DEX_ENTRY_MUK_A[]; extern const u8 DEX_ENTRY_EXEGGUTOR_A[]; extern const u8 DEX_ENTRY_MAROWAK_A[]; +extern const u8 DEX_ENTRY_WEEZING_G[]; +extern const u8 DEX_ENTRY_MR_MIME_G[]; +extern const u8 DEX_ENTRY_CORSOLA_G[]; +extern const u8 DEX_ENTRY_ZIGZAGOON_G[]; +extern const u8 DEX_ENTRY_LINOONE_G[]; +extern const u8 DEX_ENTRY_DARUMAKA_G[]; +extern const u8 DEX_ENTRY_DARMANITAN_G[]; +extern const u8 DEX_ENTRY_DARMANITAN_ZEN_G[]; +extern const u8 DEX_ENTRY_YAMASK_G[]; +extern const u8 DEX_ENTRY_STUNFISK_G[]; extern const u8 DEX_ENTRY_ZYGARDE_10[]; extern const u8 DEX_ENTRY_ZYGARDE_COMPLETE[]; extern const u8 DEX_ENTRY_ORICORIO_Y[]; @@ -1373,3 +1551,21 @@ extern const u8 DEX_ENTRY_WISHIWASHI_S[]; extern const u8 DEX_ENTRY_NECROZMA_DUSK_MANE[]; extern const u8 DEX_ENTRY_NECROZMA_DAWN_WINGS[]; extern const u8 DEX_ENTRY_NECROZMA_ULTRA[]; +extern const u8 DEX_ENTRY_CRAMORANT_GULPING[]; +extern const u8 DEX_ENTRY_CRAMORANT_GORGING[]; +extern const u8 DEX_ENTRY_TOXTRICITY_LOW_KEY[]; +extern const u8 DEX_ENTRY_POLTEAGEIST_ANTIQUE[]; +extern const u8 DEX_ENTRY_ALCREMIE_VANILLA_CREAM[]; +extern const u8 DEX_ENTRY_ALCREMIE_RUBY_CREAM[]; +extern const u8 DEX_ENTRY_ALCREMIE_MATCHA_CREAM[]; +extern const u8 DEX_ENTRY_ALCREMIE_MINT_CREAM[]; +extern const u8 DEX_ENTRY_ALCREMIE_LEMON_CREAM[]; +extern const u8 DEX_ENTRY_ALCREMIE_SALTED_CREAM[]; +extern const u8 DEX_ENTRY_ALCREMIE_RUBY_SWIRL[]; +extern const u8 DEX_ENTRY_ALCREMIE_CARAMEL_SWIRL[]; +extern const u8 DEX_ENTRY_ALCREMIE_RAINBOW_SWIRL[]; +extern const u8 DEX_ENTRY_EISCUE_NOICE[]; +extern const u8 DEX_ENTRY_INDEEDEE_F[]; +extern const u8 DEX_ENTRY_MORPEKO_HANGRY[]; +extern const u8 DEX_ENTRY_ZACIAN_CROWNED_SWORD[]; +extern const u8 DEX_ENTRY_ZAMAZENTA_CROWNED_SHIELD[];