diff --git a/graphics/pokemon/abomasnow/icon.png b/graphics/pokemon/abomasnow/icon.png new file mode 100644 index 000000000..ddaddaea9 Binary files /dev/null and b/graphics/pokemon/abomasnow/icon.png differ diff --git a/graphics/pokemon/ambipom/icon.png b/graphics/pokemon/ambipom/icon.png new file mode 100644 index 000000000..1ba2759a2 Binary files /dev/null and b/graphics/pokemon/ambipom/icon.png differ diff --git a/graphics/pokemon/arceus/icon.png b/graphics/pokemon/arceus/icon.png new file mode 100644 index 000000000..0eddfe1e4 Binary files /dev/null and b/graphics/pokemon/arceus/icon.png differ diff --git a/graphics/pokemon/azelf/icon.png b/graphics/pokemon/azelf/icon.png new file mode 100644 index 000000000..f4f1de081 Binary files /dev/null and b/graphics/pokemon/azelf/icon.png differ diff --git a/graphics/pokemon/bastiodon/icon.png b/graphics/pokemon/bastiodon/icon.png new file mode 100644 index 000000000..8db45425d Binary files /dev/null and b/graphics/pokemon/bastiodon/icon.png differ diff --git a/graphics/pokemon/bibarel/icon.png b/graphics/pokemon/bibarel/icon.png new file mode 100644 index 000000000..1e50473c4 Binary files /dev/null and b/graphics/pokemon/bibarel/icon.png differ diff --git a/graphics/pokemon/bidoof/icon.png b/graphics/pokemon/bidoof/icon.png new file mode 100644 index 000000000..838c3613e Binary files /dev/null and b/graphics/pokemon/bidoof/icon.png differ diff --git a/graphics/pokemon/bonsly/icon.png b/graphics/pokemon/bonsly/icon.png new file mode 100644 index 000000000..7e37cdad7 Binary files /dev/null and b/graphics/pokemon/bonsly/icon.png differ diff --git a/graphics/pokemon/bronzong/icon.png b/graphics/pokemon/bronzong/icon.png new file mode 100644 index 000000000..fd27e8b06 Binary files /dev/null and b/graphics/pokemon/bronzong/icon.png differ diff --git a/graphics/pokemon/bronzor/icon.png b/graphics/pokemon/bronzor/icon.png new file mode 100644 index 000000000..5329e915b Binary files /dev/null and b/graphics/pokemon/bronzor/icon.png differ diff --git a/graphics/pokemon/budew/icon.png b/graphics/pokemon/budew/icon.png new file mode 100644 index 000000000..3865c960a Binary files /dev/null and b/graphics/pokemon/budew/icon.png differ diff --git a/graphics/pokemon/buizel/icon.png b/graphics/pokemon/buizel/icon.png new file mode 100644 index 000000000..aceb4d750 Binary files /dev/null and b/graphics/pokemon/buizel/icon.png differ diff --git a/graphics/pokemon/buneary/icon.png b/graphics/pokemon/buneary/icon.png new file mode 100644 index 000000000..ee43e830f Binary files /dev/null and b/graphics/pokemon/buneary/icon.png differ diff --git a/graphics/pokemon/burmy/icon.png b/graphics/pokemon/burmy/icon.png new file mode 100644 index 000000000..89049b633 Binary files /dev/null and b/graphics/pokemon/burmy/icon.png differ diff --git a/graphics/pokemon/carnivine/icon.png b/graphics/pokemon/carnivine/icon.png new file mode 100644 index 000000000..bc160d055 Binary files /dev/null and b/graphics/pokemon/carnivine/icon.png differ diff --git a/graphics/pokemon/chatot/icon.png b/graphics/pokemon/chatot/icon.png new file mode 100644 index 000000000..4d14808dd Binary files /dev/null and b/graphics/pokemon/chatot/icon.png differ diff --git a/graphics/pokemon/cherrim/icon.png b/graphics/pokemon/cherrim/icon.png new file mode 100644 index 000000000..be5181f29 Binary files /dev/null and b/graphics/pokemon/cherrim/icon.png differ diff --git a/graphics/pokemon/cherubi/icon.png b/graphics/pokemon/cherubi/icon.png new file mode 100644 index 000000000..490be404b Binary files /dev/null and b/graphics/pokemon/cherubi/icon.png differ diff --git a/graphics/pokemon/chimchar/icon.png b/graphics/pokemon/chimchar/icon.png new file mode 100644 index 000000000..94375e963 Binary files /dev/null and b/graphics/pokemon/chimchar/icon.png differ diff --git a/graphics/pokemon/chingling/icon.png b/graphics/pokemon/chingling/icon.png new file mode 100644 index 000000000..a68352e35 Binary files /dev/null and b/graphics/pokemon/chingling/icon.png differ diff --git a/graphics/pokemon/combee/icon.png b/graphics/pokemon/combee/icon.png new file mode 100644 index 000000000..f351bb939 Binary files /dev/null and b/graphics/pokemon/combee/icon.png differ diff --git a/graphics/pokemon/cranidos/icon.png b/graphics/pokemon/cranidos/icon.png new file mode 100644 index 000000000..a1ef96ba7 Binary files /dev/null and b/graphics/pokemon/cranidos/icon.png differ diff --git a/graphics/pokemon/cresselia/icon.png b/graphics/pokemon/cresselia/icon.png new file mode 100644 index 000000000..e392f8e74 Binary files /dev/null and b/graphics/pokemon/cresselia/icon.png differ diff --git a/graphics/pokemon/croagunk/icon.png b/graphics/pokemon/croagunk/icon.png new file mode 100644 index 000000000..2809ba586 Binary files /dev/null and b/graphics/pokemon/croagunk/icon.png differ diff --git a/graphics/pokemon/darkrai/icon.png b/graphics/pokemon/darkrai/icon.png new file mode 100644 index 000000000..def7692fb Binary files /dev/null and b/graphics/pokemon/darkrai/icon.png differ diff --git a/graphics/pokemon/dialga/icon.png b/graphics/pokemon/dialga/icon.png new file mode 100644 index 000000000..57b46fd6c Binary files /dev/null and b/graphics/pokemon/dialga/icon.png differ diff --git a/graphics/pokemon/drapion/icon.png b/graphics/pokemon/drapion/icon.png new file mode 100644 index 000000000..f07cf8715 Binary files /dev/null and b/graphics/pokemon/drapion/icon.png differ diff --git a/graphics/pokemon/drifblim/icon.png b/graphics/pokemon/drifblim/icon.png new file mode 100644 index 000000000..353bbb006 Binary files /dev/null and b/graphics/pokemon/drifblim/icon.png differ diff --git a/graphics/pokemon/drifloon/icon.png b/graphics/pokemon/drifloon/icon.png new file mode 100644 index 000000000..d27f64eca Binary files /dev/null and b/graphics/pokemon/drifloon/icon.png differ diff --git a/graphics/pokemon/dusknoir/icon.png b/graphics/pokemon/dusknoir/icon.png new file mode 100644 index 000000000..16a907500 Binary files /dev/null and b/graphics/pokemon/dusknoir/icon.png differ diff --git a/graphics/pokemon/electivire/icon.png b/graphics/pokemon/electivire/icon.png new file mode 100644 index 000000000..2c3fb72e5 Binary files /dev/null and b/graphics/pokemon/electivire/icon.png differ diff --git a/graphics/pokemon/empoleon/icon.png b/graphics/pokemon/empoleon/icon.png new file mode 100644 index 000000000..148386ab2 Binary files /dev/null and b/graphics/pokemon/empoleon/icon.png differ diff --git a/graphics/pokemon/finneon/icon.png b/graphics/pokemon/finneon/icon.png new file mode 100644 index 000000000..a7be828e2 Binary files /dev/null and b/graphics/pokemon/finneon/icon.png differ diff --git a/graphics/pokemon/floatzel/icon.png b/graphics/pokemon/floatzel/icon.png new file mode 100644 index 000000000..845cd3265 Binary files /dev/null and b/graphics/pokemon/floatzel/icon.png differ diff --git a/graphics/pokemon/froslass/icon.png b/graphics/pokemon/froslass/icon.png new file mode 100644 index 000000000..87bdc7932 Binary files /dev/null and b/graphics/pokemon/froslass/icon.png differ diff --git a/graphics/pokemon/gabite/icon.png b/graphics/pokemon/gabite/icon.png new file mode 100644 index 000000000..cccb5e83d Binary files /dev/null and b/graphics/pokemon/gabite/icon.png differ diff --git a/graphics/pokemon/gallade/icon.png b/graphics/pokemon/gallade/icon.png new file mode 100644 index 000000000..7d93b215e Binary files /dev/null and b/graphics/pokemon/gallade/icon.png differ diff --git a/graphics/pokemon/garchomp/icon.png b/graphics/pokemon/garchomp/icon.png new file mode 100644 index 000000000..ca61931ba Binary files /dev/null and b/graphics/pokemon/garchomp/icon.png differ diff --git a/graphics/pokemon/gastrodonE/icon.png b/graphics/pokemon/gastrodonE/icon.png new file mode 100644 index 000000000..a3e3885cd Binary files /dev/null and b/graphics/pokemon/gastrodonE/icon.png differ diff --git a/graphics/pokemon/gible/icon.png b/graphics/pokemon/gible/icon.png new file mode 100644 index 000000000..6a9b288f9 Binary files /dev/null and b/graphics/pokemon/gible/icon.png differ diff --git a/graphics/pokemon/giratina/icon.png b/graphics/pokemon/giratina/icon.png new file mode 100644 index 000000000..ba3a4d00f Binary files /dev/null and b/graphics/pokemon/giratina/icon.png differ diff --git a/graphics/pokemon/glaceon/icon.png b/graphics/pokemon/glaceon/icon.png new file mode 100644 index 000000000..8dfd712aa Binary files /dev/null and b/graphics/pokemon/glaceon/icon.png differ diff --git a/graphics/pokemon/glameow/icon.png b/graphics/pokemon/glameow/icon.png new file mode 100644 index 000000000..2be06e8ba Binary files /dev/null and b/graphics/pokemon/glameow/icon.png differ diff --git a/graphics/pokemon/gliscor/icon.png b/graphics/pokemon/gliscor/icon.png new file mode 100644 index 000000000..5e7beb14c Binary files /dev/null and b/graphics/pokemon/gliscor/icon.png differ diff --git a/graphics/pokemon/grotle/icon.png b/graphics/pokemon/grotle/icon.png new file mode 100644 index 000000000..cb7a7dc74 Binary files /dev/null and b/graphics/pokemon/grotle/icon.png differ diff --git a/graphics/pokemon/happiny/icon.png b/graphics/pokemon/happiny/icon.png new file mode 100644 index 000000000..a137d3d52 Binary files /dev/null and b/graphics/pokemon/happiny/icon.png differ diff --git a/graphics/pokemon/heatran/icon.png b/graphics/pokemon/heatran/icon.png new file mode 100644 index 000000000..4d8e02b4d Binary files /dev/null and b/graphics/pokemon/heatran/icon.png differ diff --git a/graphics/pokemon/hippopotas/icon.png b/graphics/pokemon/hippopotas/icon.png new file mode 100644 index 000000000..02c803c11 Binary files /dev/null and b/graphics/pokemon/hippopotas/icon.png differ diff --git a/graphics/pokemon/hippowdon/icon.png b/graphics/pokemon/hippowdon/icon.png new file mode 100644 index 000000000..142318a7c Binary files /dev/null and b/graphics/pokemon/hippowdon/icon.png differ diff --git a/graphics/pokemon/honchkrow/icon.png b/graphics/pokemon/honchkrow/icon.png new file mode 100644 index 000000000..9790f0237 Binary files /dev/null and b/graphics/pokemon/honchkrow/icon.png differ diff --git a/graphics/pokemon/infernape/icon.png b/graphics/pokemon/infernape/icon.png new file mode 100644 index 000000000..e7326694f Binary files /dev/null and b/graphics/pokemon/infernape/icon.png differ diff --git a/graphics/pokemon/kricketot/icon.png b/graphics/pokemon/kricketot/icon.png new file mode 100644 index 000000000..d301072ec Binary files /dev/null and b/graphics/pokemon/kricketot/icon.png differ diff --git a/graphics/pokemon/kricketune/icon.png b/graphics/pokemon/kricketune/icon.png new file mode 100644 index 000000000..c296c65b2 Binary files /dev/null and b/graphics/pokemon/kricketune/icon.png differ diff --git a/graphics/pokemon/leafeon/icon.png b/graphics/pokemon/leafeon/icon.png new file mode 100644 index 000000000..b75a11b0f Binary files /dev/null and b/graphics/pokemon/leafeon/icon.png differ diff --git a/graphics/pokemon/lickilicky/icon.png b/graphics/pokemon/lickilicky/icon.png new file mode 100644 index 000000000..2f924854f Binary files /dev/null and b/graphics/pokemon/lickilicky/icon.png differ diff --git a/graphics/pokemon/lopunny/icon.png b/graphics/pokemon/lopunny/icon.png new file mode 100644 index 000000000..58c84713b Binary files /dev/null and b/graphics/pokemon/lopunny/icon.png differ diff --git a/graphics/pokemon/lucario/icon.png b/graphics/pokemon/lucario/icon.png new file mode 100644 index 000000000..b9bef0dd3 Binary files /dev/null and b/graphics/pokemon/lucario/icon.png differ diff --git a/graphics/pokemon/lumineon/icon.png b/graphics/pokemon/lumineon/icon.png new file mode 100644 index 000000000..871a41e9f Binary files /dev/null and b/graphics/pokemon/lumineon/icon.png differ diff --git a/graphics/pokemon/luxio/icon.png b/graphics/pokemon/luxio/icon.png new file mode 100644 index 000000000..714f2fc8f Binary files /dev/null and b/graphics/pokemon/luxio/icon.png differ diff --git a/graphics/pokemon/luxray/icon.png b/graphics/pokemon/luxray/icon.png new file mode 100644 index 000000000..cf4562436 Binary files /dev/null and b/graphics/pokemon/luxray/icon.png differ diff --git a/graphics/pokemon/magmortar/icon.png b/graphics/pokemon/magmortar/icon.png new file mode 100644 index 000000000..0118b114b Binary files /dev/null and b/graphics/pokemon/magmortar/icon.png differ diff --git a/graphics/pokemon/magnezone/icon.png b/graphics/pokemon/magnezone/icon.png new file mode 100644 index 000000000..c9afd8bf4 Binary files /dev/null and b/graphics/pokemon/magnezone/icon.png differ diff --git a/graphics/pokemon/mamoswine/icon.png b/graphics/pokemon/mamoswine/icon.png new file mode 100644 index 000000000..73165f0d3 Binary files /dev/null and b/graphics/pokemon/mamoswine/icon.png differ diff --git a/graphics/pokemon/manaphy/icon.png b/graphics/pokemon/manaphy/icon.png new file mode 100644 index 000000000..60369d15b Binary files /dev/null and b/graphics/pokemon/manaphy/icon.png differ diff --git a/graphics/pokemon/mantyke/icon.png b/graphics/pokemon/mantyke/icon.png new file mode 100644 index 000000000..0df39d708 Binary files /dev/null and b/graphics/pokemon/mantyke/icon.png differ diff --git a/graphics/pokemon/mesprit/icon.png b/graphics/pokemon/mesprit/icon.png new file mode 100644 index 000000000..924d03e2a Binary files /dev/null and b/graphics/pokemon/mesprit/icon.png differ diff --git a/graphics/pokemon/mimejr/icon.png b/graphics/pokemon/mimejr/icon.png new file mode 100644 index 000000000..90a69a412 Binary files /dev/null and b/graphics/pokemon/mimejr/icon.png differ diff --git a/graphics/pokemon/mismagius/icon.png b/graphics/pokemon/mismagius/icon.png new file mode 100644 index 000000000..f5741fd07 Binary files /dev/null and b/graphics/pokemon/mismagius/icon.png differ diff --git a/graphics/pokemon/monferno/icon.png b/graphics/pokemon/monferno/icon.png new file mode 100644 index 000000000..d64ce4d02 Binary files /dev/null and b/graphics/pokemon/monferno/icon.png differ diff --git a/graphics/pokemon/mothim/icon.png b/graphics/pokemon/mothim/icon.png new file mode 100644 index 000000000..002989457 Binary files /dev/null and b/graphics/pokemon/mothim/icon.png differ diff --git a/graphics/pokemon/munchlax/icon.png b/graphics/pokemon/munchlax/icon.png new file mode 100644 index 000000000..076e03248 Binary files /dev/null and b/graphics/pokemon/munchlax/icon.png differ diff --git a/graphics/pokemon/pachirisu/icon.png b/graphics/pokemon/pachirisu/icon.png new file mode 100644 index 000000000..d220871f8 Binary files /dev/null and b/graphics/pokemon/pachirisu/icon.png differ diff --git a/graphics/pokemon/palkia/icon.png b/graphics/pokemon/palkia/icon.png new file mode 100644 index 000000000..7a4766b8c Binary files /dev/null and b/graphics/pokemon/palkia/icon.png differ diff --git a/graphics/pokemon/phione/icon.png b/graphics/pokemon/phione/icon.png new file mode 100644 index 000000000..3cbb093bb Binary files /dev/null and b/graphics/pokemon/phione/icon.png differ diff --git a/graphics/pokemon/piplup/icon.png b/graphics/pokemon/piplup/icon.png new file mode 100644 index 000000000..03ace8da1 Binary files /dev/null and b/graphics/pokemon/piplup/icon.png differ diff --git a/graphics/pokemon/porygonZ/icon.png b/graphics/pokemon/porygonZ/icon.png new file mode 100644 index 000000000..e7ad4e79c Binary files /dev/null and b/graphics/pokemon/porygonZ/icon.png differ diff --git a/graphics/pokemon/prinplup/icon.png b/graphics/pokemon/prinplup/icon.png new file mode 100644 index 000000000..bc8711b4a Binary files /dev/null and b/graphics/pokemon/prinplup/icon.png differ diff --git a/graphics/pokemon/probopass/icon.png b/graphics/pokemon/probopass/icon.png new file mode 100644 index 000000000..e368c8955 Binary files /dev/null and b/graphics/pokemon/probopass/icon.png differ diff --git a/graphics/pokemon/purugly/icon.png b/graphics/pokemon/purugly/icon.png new file mode 100644 index 000000000..d61443148 Binary files /dev/null and b/graphics/pokemon/purugly/icon.png differ diff --git a/graphics/pokemon/rampardos/icon.png b/graphics/pokemon/rampardos/icon.png new file mode 100644 index 000000000..abb7f2325 Binary files /dev/null and b/graphics/pokemon/rampardos/icon.png differ diff --git a/graphics/pokemon/regigigas/icon.png b/graphics/pokemon/regigigas/icon.png new file mode 100644 index 000000000..237a119af Binary files /dev/null and b/graphics/pokemon/regigigas/icon.png differ diff --git a/graphics/pokemon/rhyperior/icon.png b/graphics/pokemon/rhyperior/icon.png new file mode 100644 index 000000000..08a4f289a Binary files /dev/null and b/graphics/pokemon/rhyperior/icon.png differ diff --git a/graphics/pokemon/riolu/icon.png b/graphics/pokemon/riolu/icon.png new file mode 100644 index 000000000..050f80535 Binary files /dev/null and b/graphics/pokemon/riolu/icon.png differ diff --git a/graphics/pokemon/roserade/icon.png b/graphics/pokemon/roserade/icon.png new file mode 100644 index 000000000..5cf4987fe Binary files /dev/null and b/graphics/pokemon/roserade/icon.png differ diff --git a/graphics/pokemon/rotom/icon.png b/graphics/pokemon/rotom/icon.png new file mode 100644 index 000000000..ec5d50141 Binary files /dev/null and b/graphics/pokemon/rotom/icon.png differ diff --git a/graphics/pokemon/shaymin/icon.png b/graphics/pokemon/shaymin/icon.png new file mode 100644 index 000000000..da7799bb8 Binary files /dev/null and b/graphics/pokemon/shaymin/icon.png differ diff --git a/graphics/pokemon/shellosE/icon.png b/graphics/pokemon/shellosE/icon.png new file mode 100644 index 000000000..b9b33b93b Binary files /dev/null and b/graphics/pokemon/shellosE/icon.png differ diff --git a/graphics/pokemon/shieldon/icon.png b/graphics/pokemon/shieldon/icon.png new file mode 100644 index 000000000..c56c35232 Binary files /dev/null and b/graphics/pokemon/shieldon/icon.png differ diff --git a/graphics/pokemon/shinx/icon.png b/graphics/pokemon/shinx/icon.png new file mode 100644 index 000000000..9c62620f2 Binary files /dev/null and b/graphics/pokemon/shinx/icon.png differ diff --git a/graphics/pokemon/skorupi/icon.png b/graphics/pokemon/skorupi/icon.png new file mode 100644 index 000000000..0b036c84d Binary files /dev/null and b/graphics/pokemon/skorupi/icon.png differ diff --git a/graphics/pokemon/skuntank/icon.png b/graphics/pokemon/skuntank/icon.png new file mode 100644 index 000000000..28ba564ba Binary files /dev/null and b/graphics/pokemon/skuntank/icon.png differ diff --git a/graphics/pokemon/snover/icon.png b/graphics/pokemon/snover/icon.png new file mode 100644 index 000000000..644b5deb4 Binary files /dev/null and b/graphics/pokemon/snover/icon.png differ diff --git a/graphics/pokemon/spiritomb/icon.png b/graphics/pokemon/spiritomb/icon.png new file mode 100644 index 000000000..5652415a4 Binary files /dev/null and b/graphics/pokemon/spiritomb/icon.png differ diff --git a/graphics/pokemon/staraptor/icon.png b/graphics/pokemon/staraptor/icon.png new file mode 100644 index 000000000..538bbc901 Binary files /dev/null and b/graphics/pokemon/staraptor/icon.png differ diff --git a/graphics/pokemon/staravia/icon.png b/graphics/pokemon/staravia/icon.png new file mode 100644 index 000000000..20e106bfa Binary files /dev/null and b/graphics/pokemon/staravia/icon.png differ diff --git a/graphics/pokemon/starly/icon.png b/graphics/pokemon/starly/icon.png new file mode 100644 index 000000000..1e0a4721d Binary files /dev/null and b/graphics/pokemon/starly/icon.png differ diff --git a/graphics/pokemon/stunky/icon.png b/graphics/pokemon/stunky/icon.png new file mode 100644 index 000000000..c9e2640eb Binary files /dev/null and b/graphics/pokemon/stunky/icon.png differ diff --git a/graphics/pokemon/tangrowth/icon.png b/graphics/pokemon/tangrowth/icon.png new file mode 100644 index 000000000..b9dd1b15e Binary files /dev/null and b/graphics/pokemon/tangrowth/icon.png differ diff --git a/graphics/pokemon/togekiss/icon.png b/graphics/pokemon/togekiss/icon.png new file mode 100644 index 000000000..f620df355 Binary files /dev/null and b/graphics/pokemon/togekiss/icon.png differ diff --git a/graphics/pokemon/torterra/icon.png b/graphics/pokemon/torterra/icon.png new file mode 100644 index 000000000..7f0af0d1b Binary files /dev/null and b/graphics/pokemon/torterra/icon.png differ diff --git a/graphics/pokemon/toxicroak/icon.png b/graphics/pokemon/toxicroak/icon.png new file mode 100644 index 000000000..0c5741565 Binary files /dev/null and b/graphics/pokemon/toxicroak/icon.png differ diff --git a/graphics/pokemon/turtwig/icon.png b/graphics/pokemon/turtwig/icon.png new file mode 100644 index 000000000..5d919b03b Binary files /dev/null and b/graphics/pokemon/turtwig/icon.png differ diff --git a/graphics/pokemon/uxie/icon.png b/graphics/pokemon/uxie/icon.png new file mode 100644 index 000000000..b6c27320e Binary files /dev/null and b/graphics/pokemon/uxie/icon.png differ diff --git a/graphics/pokemon/vespiquen/icon.png b/graphics/pokemon/vespiquen/icon.png new file mode 100644 index 000000000..86dc123f9 Binary files /dev/null and b/graphics/pokemon/vespiquen/icon.png differ diff --git a/graphics/pokemon/weavile/icon.png b/graphics/pokemon/weavile/icon.png new file mode 100644 index 000000000..be2836f3d Binary files /dev/null and b/graphics/pokemon/weavile/icon.png differ diff --git a/graphics/pokemon/wormadam/icon.png b/graphics/pokemon/wormadam/icon.png new file mode 100644 index 000000000..249701506 Binary files /dev/null and b/graphics/pokemon/wormadam/icon.png differ diff --git a/graphics/pokemon/yanmega/icon.png b/graphics/pokemon/yanmega/icon.png new file mode 100644 index 000000000..7cf27b8b7 Binary files /dev/null and b/graphics/pokemon/yanmega/icon.png differ diff --git a/include/constants/species.h b/include/constants/species.h index 67dd1380b..3bc20725c 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -810,8 +810,58 @@ #define SPECIES_BLACEPHALON 806 #define SPECIES_ZERAORA 807 +// Megas +#define SPECIES_MEGA_GENGAR 808 +#define SPECIES_MEGA_GARDEVOIR 809 +#define SPECIES_MEGA_AMPHAROS 810 +#define SPECIES_MEGA_VENUSAUR 811 +#define SPECIES_MEGA_CHARIZARD_X 812 +#define SPECIES_MEGA_CHARIZARD_Y 813 +#define SPECIES_MEGA_MEWTWO_X 814 +#define SPECIES_MEGA_MEWTWO_Y 815 +#define SPECIES_MEGA_BLAZIKEN 816 +#define SPECIES_MEGA_MEDICHAM 817 +#define SPECIES_MEGA_HOUNDOOM 818 +#define SPECIES_MEGA_AGGRON 819 +#define SPECIES_MEGA_BANETTE 820 +#define SPECIES_MEGA_TYRANITAR 821 +#define SPECIES_MEGA_SCIZOR 822 +#define SPECIES_MEGA_PINSIR 823 +#define SPECIES_MEGA_AERODACTYL 824 +#define SPECIES_MEGA_LUCARIO 825 +#define SPECIES_MEGA_ABOMASNOW 826 +#define SPECIES_MEGA_BLASTOISE 827 +#define SPECIES_MEGA_KANGASKHAN 828 +#define SPECIES_MEGA_GYARADOS 829 +#define SPECIES_MEGA_ABSOL 830 +#define SPECIES_MEGA_ALAKAZAM 831 +#define SPECIES_MEGA_HERACROSS 832 +#define SPECIES_MEGA_MAWILE 833 +#define SPECIES_MEGA_MANECTRIC 834 +#define SPECIES_MEGA_GARCHOMP 835 +#define SPECIES_MEGA_LATIOS 836 +#define SPECIES_MEGA_LATIAS 837 +#define SPECIES_MEGA_SWAMPERT 838 +#define SPECIES_MEGA_SCEPTILE 839 +#define SPECIES_MEGA_SABLEYE 840 +#define SPECIES_MEGA_ALTARIA 841 +#define SPECIES_MEGA_GALLADE 842 +#define SPECIES_MEGA_AUDINO 843 +#define SPECIES_MEGA_SHARPEDO 844 +#define SPECIES_MEGA_SLOWBRO 845 +#define SPECIES_MEGA_STEELIX 846 +#define SPECIES_MEGA_PIDGEOT 847 +#define SPECIES_MEGA_GLALIE 848 +#define SPECIES_MEGA_DIANCIE 849 +#define SPECIES_MEGA_METAGROSS 850 +#define SPECIES_MEGA_RAYQUAZA 851 +#define SPECIES_MEGA_CAMERUPT 852 +#define SPECIES_MEGA_LOPUNNY 853 +#define SPECIES_MEGA_SALAMENCE 854 +#define SPECIES_MEGA_BEEDRILL 855 + // TODO: forms -#define SPECIES_EGG 808 +#define SPECIES_EGG 856 #define NUM_SPECIES SPECIES_EGG diff --git a/include/graphics.h b/include/graphics.h index 2584e713e..cfd11048a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2868,6 +2868,115 @@ extern const u32 gMonShinyPalette_DoubleQuestionMark[]; extern const u32 gMonStillFrontPic_DoubleQuestionMark[]; extern const u16 gMonIconPalettes[][16]; +// New pokemon gfx +extern const u8 gMonIcon_Turtwig[]; +extern const u8 gMonIcon_Grotle[]; +extern const u8 gMonIcon_Torterra[]; +extern const u8 gMonIcon_Chimchar[]; +extern const u8 gMonIcon_Monferno[]; +extern const u8 gMonIcon_Infernape[]; +extern const u8 gMonIcon_Piplup[]; +extern const u8 gMonIcon_Prinplup[]; +extern const u8 gMonIcon_Empoleon[]; +extern const u8 gMonIcon_Starly[]; +extern const u8 gMonIcon_Staravia[]; +extern const u8 gMonIcon_Staraptor[]; +extern const u8 gMonIcon_Bidoof[]; +extern const u8 gMonIcon_Bibarel[]; +extern const u8 gMonIcon_Kricketot[]; +extern const u8 gMonIcon_Kricketune[]; +extern const u8 gMonIcon_Shinx[]; +extern const u8 gMonIcon_Luxio[]; +extern const u8 gMonIcon_Luxray[]; +extern const u8 gMonIcon_Budew[]; +extern const u8 gMonIcon_Roserade[]; +extern const u8 gMonIcon_Cranidos[]; +extern const u8 gMonIcon_Rampardos[]; +extern const u8 gMonIcon_Shieldon[]; +extern const u8 gMonIcon_Bastiodon[]; +extern const u8 gMonIcon_Burmy[]; +extern const u8 gMonIcon_Wormadam[]; +extern const u8 gMonIcon_Mothim[]; +extern const u8 gMonIcon_Combee[]; +extern const u8 gMonIcon_Vespiquen[]; +extern const u8 gMonIcon_Pachirisu[]; +extern const u8 gMonIcon_Buizel[]; +extern const u8 gMonIcon_Floatzel[]; +extern const u8 gMonIcon_Cherubi[]; +extern const u8 gMonIcon_Cherrim[]; +extern const u8 gMonIcon_Shellos[]; +extern const u8 gMonIcon_Gastrodon[]; +extern const u8 gMonIcon_Ambipom[]; +extern const u8 gMonIcon_Drifloon[]; +extern const u8 gMonIcon_Drifblim[]; +extern const u8 gMonIcon_Buneary[]; +extern const u8 gMonIcon_Lopunny[]; +extern const u8 gMonIcon_Mismagius[]; +extern const u8 gMonIcon_Honchkrow[]; +extern const u8 gMonIcon_Glameow[]; +extern const u8 gMonIcon_Purugly[]; +extern const u8 gMonIcon_Chingling[]; +extern const u8 gMonIcon_Stunky[]; +extern const u8 gMonIcon_Skuntank[]; +extern const u8 gMonIcon_Bronzor[]; +extern const u8 gMonIcon_Bronzong[]; +extern const u8 gMonIcon_Bonsly[]; +extern const u8 gMonIcon_Mimejr[]; +extern const u8 gMonIcon_Happiny[]; +extern const u8 gMonIcon_Chatot[]; +extern const u8 gMonIcon_Spiritomb[]; +extern const u8 gMonIcon_Gible[]; +extern const u8 gMonIcon_Gabite[]; +extern const u8 gMonIcon_Garchomp[]; +extern const u8 gMonIcon_Munchlax[]; +extern const u8 gMonIcon_Riolu[]; +extern const u8 gMonIcon_Lucario[]; +extern const u8 gMonIcon_Hippopotas[]; +extern const u8 gMonIcon_Hippowdon[]; +extern const u8 gMonIcon_Skorupi[]; +extern const u8 gMonIcon_Drapion[]; +extern const u8 gMonIcon_Croagunk[]; +extern const u8 gMonIcon_Toxicroak[]; +extern const u8 gMonIcon_Carnivine[]; +extern const u8 gMonIcon_Finneon[]; +extern const u8 gMonIcon_Lumineon[]; +extern const u8 gMonIcon_Mantyke[]; +extern const u8 gMonIcon_Snover[]; +extern const u8 gMonIcon_Abomasnow[]; +extern const u8 gMonIcon_Weavile[]; +extern const u8 gMonIcon_Magnezone[]; +extern const u8 gMonIcon_Lickilicky[]; +extern const u8 gMonIcon_Rhyperior[]; +extern const u8 gMonIcon_Tangrowth[]; +extern const u8 gMonIcon_Electivire[]; +extern const u8 gMonIcon_Magmortar[]; +extern const u8 gMonIcon_Togekiss[]; +extern const u8 gMonIcon_Yanmega[]; +extern const u8 gMonIcon_Leafeon[]; +extern const u8 gMonIcon_Glaceon[]; +extern const u8 gMonIcon_Gliscor[]; +extern const u8 gMonIcon_Mamoswine[]; +extern const u8 gMonIcon_Porygon_Z[]; +extern const u8 gMonIcon_Gallade[]; +extern const u8 gMonIcon_Probopass[]; +extern const u8 gMonIcon_Dusknoir[]; +extern const u8 gMonIcon_Froslass[]; +extern const u8 gMonIcon_Rotom[]; +extern const u8 gMonIcon_Uxie[]; +extern const u8 gMonIcon_Mesprit[]; +extern const u8 gMonIcon_Azelf[]; +extern const u8 gMonIcon_Dialga[]; +extern const u8 gMonIcon_Palkia[]; +extern const u8 gMonIcon_Heatran[]; +extern const u8 gMonIcon_Regigigas[]; +extern const u8 gMonIcon_Giratina[]; +extern const u8 gMonIcon_Cresselia[]; +extern const u8 gMonIcon_Phione[]; +extern const u8 gMonIcon_Manaphy[]; +extern const u8 gMonIcon_Darkrai[]; +extern const u8 gMonIcon_Shaymin[]; +extern const u8 gMonIcon_Arceus[]; + // trainer sprites extern const u32 gTrainerFrontPic_Hiker[]; extern const u32 gTrainerFrontPic_AquaGruntM[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 07415949d..ecf928d46 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -2821,3 +2821,112 @@ const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/ico const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/front_question_mark.4bpp.lz"); const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/back_question_mark.4bpp.lz"); const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/icon_question_mark.4bpp"); + +// New Mons gfx +const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp"); +const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); +const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp"); +const u8 gMonIcon_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/icon.4bpp"); +const u8 gMonIcon_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/icon.4bpp"); +const u8 gMonIcon_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/icon.4bpp"); +const u8 gMonIcon_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/icon.4bpp"); +const u8 gMonIcon_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/icon.4bpp"); +const u8 gMonIcon_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/icon.4bpp"); +const u8 gMonIcon_Starly[] = INCBIN_U8("graphics/pokemon/starly/icon.4bpp"); +const u8 gMonIcon_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/icon.4bpp"); +const u8 gMonIcon_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/icon.4bpp"); +const u8 gMonIcon_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/icon.4bpp"); +const u8 gMonIcon_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/icon.4bpp"); +const u8 gMonIcon_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/icon.4bpp"); +const u8 gMonIcon_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/icon.4bpp"); +const u8 gMonIcon_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/icon.4bpp"); +const u8 gMonIcon_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/icon.4bpp"); +const u8 gMonIcon_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/icon.4bpp"); +const u8 gMonIcon_Budew[] = INCBIN_U8("graphics/pokemon/budew/icon.4bpp"); +const u8 gMonIcon_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/icon.4bpp"); +const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp"); +const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp"); +const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp"); +const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp"); +const u8 gMonIcon_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp"); +const u8 gMonIcon_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp"); +const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp"); +const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp"); +const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp"); +const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/icon.4bpp"); +const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/icon.4bpp"); +const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/icon.4bpp"); +const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/icon.4bpp"); +const u8 gMonIcon_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp"); +const u8 gMonIcon_Shellos[] = INCBIN_U8("graphics/pokemon/shellosE/icon.4bpp"); +const u8 gMonIcon_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodonE/icon.4bpp"); +const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/icon.4bpp"); +const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/icon.4bpp"); +const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/icon.4bpp"); +const u8 gMonIcon_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/icon.4bpp"); +const u8 gMonIcon_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/icon.4bpp"); +const u8 gMonIcon_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/icon.4bpp"); +const u8 gMonIcon_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/icon.4bpp"); +const u8 gMonIcon_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/icon.4bpp"); +const u8 gMonIcon_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/icon.4bpp"); +const u8 gMonIcon_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/icon.4bpp"); +const u8 gMonIcon_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/icon.4bpp"); +const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp"); +const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp"); +const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp"); +const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp"); +const u8 gMonIcon_Mimejr[] = INCBIN_U8("graphics/pokemon/mimejr/icon.4bpp"); +const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp"); +const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp"); +const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp"); +const u8 gMonIcon_Gible[] = INCBIN_U8("graphics/pokemon/gible/icon.4bpp"); +const u8 gMonIcon_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/icon.4bpp"); +const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/icon.4bpp"); +const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/icon.4bpp"); +const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp"); +const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp"); +const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp"); +const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp"); +const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp"); +const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp"); +const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp"); +const u8 gMonIcon_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/icon.4bpp"); +const u8 gMonIcon_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/icon.4bpp"); +const u8 gMonIcon_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/icon.4bpp"); +const u8 gMonIcon_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/icon.4bpp"); +const u8 gMonIcon_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/icon.4bpp"); +const u8 gMonIcon_Snover[] = INCBIN_U8("graphics/pokemon/snover/icon.4bpp"); +const u8 gMonIcon_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/icon.4bpp"); +const u8 gMonIcon_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/icon.4bpp"); +const u8 gMonIcon_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/icon.4bpp"); +const u8 gMonIcon_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/icon.4bpp"); +const u8 gMonIcon_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/icon.4bpp"); +const u8 gMonIcon_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/icon.4bpp"); +const u8 gMonIcon_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/icon.4bpp"); +const u8 gMonIcon_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/icon.4bpp"); +const u8 gMonIcon_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/icon.4bpp"); +const u8 gMonIcon_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/icon.4bpp"); +const u8 gMonIcon_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/icon.4bpp"); +const u8 gMonIcon_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/icon.4bpp"); +const u8 gMonIcon_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/icon.4bpp"); +const u8 gMonIcon_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/icon.4bpp"); +const u8 gMonIcon_Porygon_Z[] = INCBIN_U8("graphics/pokemon/porygonZ/icon.4bpp"); +const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/icon.4bpp"); +const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/icon.4bpp"); +const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/icon.4bpp"); +const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/icon.4bpp"); +const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/icon.4bpp"); +const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/icon.4bpp"); +const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/icon.4bpp"); +const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/icon.4bpp"); +const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/icon.4bpp"); +const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/icon.4bpp"); +const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/icon.4bpp"); +const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/icon.4bpp"); +const u8 gMonIcon_Giratina[] = INCBIN_U8("graphics/pokemon/giratina/icon.4bpp"); +const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/icon.4bpp"); +const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/phione/icon.4bpp"); +const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/icon.4bpp"); +const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp"); +const u8 gMonIcon_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); +const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/icon.4bpp"); diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 1f095d2d0..d035f4c09 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -412,6 +412,113 @@ const u8 *const gMonIconTable[] = [SPECIES_JIRACHI] = gMonIcon_Jirachi, [SPECIES_DEOXYS] = gMonIcon_Deoxys, [SPECIES_CHIMECHO] = gMonIcon_Chimecho, + [SPECIES_TURTWIG] = gMonIcon_Turtwig, + [SPECIES_GROTLE] = gMonIcon_Grotle, + [SPECIES_TORTERRA] = gMonIcon_Torterra, + [SPECIES_CHIMCHAR] = gMonIcon_Chimchar, + [SPECIES_MONFERNO] = gMonIcon_Monferno, + [SPECIES_INFERNAPE] = gMonIcon_Infernape, + [SPECIES_PIPLUP] = gMonIcon_Piplup, + [SPECIES_PRINPLUP] = gMonIcon_Prinplup, + [SPECIES_EMPOLEON] = gMonIcon_Empoleon, + [SPECIES_STARLY] = gMonIcon_Starly, + [SPECIES_STARAVIA] = gMonIcon_Staravia, + [SPECIES_STARAPTOR] = gMonIcon_Staraptor, + [SPECIES_BIDOOF] = gMonIcon_Bidoof, + [SPECIES_BIBAREL] = gMonIcon_Bibarel, + [SPECIES_KRICKETOT] = gMonIcon_Kricketot, + [SPECIES_KRICKETUNE] = gMonIcon_Kricketune, + [SPECIES_SHINX] = gMonIcon_Shinx, + [SPECIES_LUXIO] = gMonIcon_Luxio, + [SPECIES_LUXRAY] = gMonIcon_Luxray, + [SPECIES_BUDEW] = gMonIcon_Budew, + [SPECIES_ROSERADE] = gMonIcon_Roserade, + [SPECIES_CRANIDOS] = gMonIcon_Cranidos, + [SPECIES_RAMPARDOS] = gMonIcon_Rampardos, + [SPECIES_SHIELDON] = gMonIcon_Shieldon, + [SPECIES_BASTIODON] = gMonIcon_Bastiodon, + [SPECIES_BURMY] = gMonIcon_Burmy, + [SPECIES_WORMADAM] = gMonIcon_Wormadam, + [SPECIES_MOTHIM] = gMonIcon_Mothim, + [SPECIES_COMBEE] = gMonIcon_Combee, + [SPECIES_VESPIQUEN] = gMonIcon_Vespiquen, + [SPECIES_PACHIRISU] = gMonIcon_Pachirisu, + [SPECIES_BUIZEL] = gMonIcon_Buizel, + [SPECIES_FLOATZEL] = gMonIcon_Floatzel, + [SPECIES_CHERUBI] = gMonIcon_Cherubi, + [SPECIES_CHERRIM] = gMonIcon_Cherrim, + [SPECIES_SHELLOS] = gMonIcon_Shellos, + [SPECIES_GASTRODON] = gMonIcon_Gastrodon, + [SPECIES_AMBIPOM] = gMonIcon_Ambipom, + [SPECIES_DRIFLOON] = gMonIcon_Drifloon, + [SPECIES_DRIFBLIM] = gMonIcon_Drifblim, + [SPECIES_BUNEARY] = gMonIcon_Buneary, + [SPECIES_LOPUNNY] = gMonIcon_Lopunny, + [SPECIES_MISMAGIUS] = gMonIcon_Mismagius, + [SPECIES_HONCHKROW] = gMonIcon_Honchkrow, + [SPECIES_GLAMEOW] = gMonIcon_Glameow, + [SPECIES_PURUGLY] = gMonIcon_Purugly, + [SPECIES_CHINGLING] = gMonIcon_Chingling, + [SPECIES_STUNKY] = gMonIcon_Stunky, + [SPECIES_SKUNTANK] = gMonIcon_Skuntank, + [SPECIES_BRONZOR] = gMonIcon_Bronzor, + [SPECIES_BRONZONG] = gMonIcon_Bronzong, + [SPECIES_BONSLY] = gMonIcon_Bonsly, + [SPECIES_MIMEJR] = gMonIcon_Mimejr, + [SPECIES_HAPPINY] = gMonIcon_Happiny, + [SPECIES_CHATOT] = gMonIcon_Chatot, + [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, + [SPECIES_GIBLE] = gMonIcon_Gible, + [SPECIES_GABITE] = gMonIcon_Gabite, + [SPECIES_GARCHOMP] = gMonIcon_Garchomp, + [SPECIES_MUNCHLAX] = gMonIcon_Munchlax, + [SPECIES_RIOLU] = gMonIcon_Riolu, + [SPECIES_LUCARIO] = gMonIcon_Lucario, + [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, + [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, + [SPECIES_SKORUPI] = gMonIcon_Skorupi, + [SPECIES_DRAPION] = gMonIcon_Drapion, + [SPECIES_CROAGUNK] = gMonIcon_Croagunk, + [SPECIES_TOXICROAK] = gMonIcon_Toxicroak, + [SPECIES_CARNIVINE] = gMonIcon_Carnivine, + [SPECIES_FINNEON] = gMonIcon_Finneon, + [SPECIES_LUMINEON] = gMonIcon_Lumineon, + [SPECIES_MANTYKE] = gMonIcon_Mantyke, + [SPECIES_SNOVER] = gMonIcon_Snover, + [SPECIES_ABOMASNOW] = gMonIcon_Abomasnow, + [SPECIES_WEAVILE] = gMonIcon_Weavile, + [SPECIES_MAGNEZONE] = gMonIcon_Magnezone, + [SPECIES_LICKILICKY] = gMonIcon_Lickilicky, + [SPECIES_RHYPERIOR] = gMonIcon_Rhyperior, + [SPECIES_TANGROWTH] = gMonIcon_Tangrowth, + [SPECIES_ELECTIVIRE] = gMonIcon_Electivire, + [SPECIES_MAGMORTAR] = gMonIcon_Magmortar, + [SPECIES_TOGEKISS] = gMonIcon_Togekiss, + [SPECIES_YANMEGA] = gMonIcon_Yanmega, + [SPECIES_LEAFEON] = gMonIcon_Leafeon, + [SPECIES_GLACEON] = gMonIcon_Glaceon, + [SPECIES_GLISCOR] = gMonIcon_Gliscor, + [SPECIES_MAMOSWINE] = gMonIcon_Mamoswine, + [SPECIES_PORYGON_Z] = gMonIcon_Porygon_Z, + [SPECIES_GALLADE] = gMonIcon_Gallade, + [SPECIES_PROBOPASS] = gMonIcon_Probopass, + [SPECIES_DUSKNOIR] = gMonIcon_Dusknoir, + [SPECIES_FROSLASS] = gMonIcon_Froslass, + [SPECIES_ROTOM] = gMonIcon_Rotom, + [SPECIES_UXIE] = gMonIcon_Uxie, + [SPECIES_MESPRIT] = gMonIcon_Mesprit, + [SPECIES_AZELF] = gMonIcon_Azelf, + [SPECIES_DIALGA] = gMonIcon_Dialga, + [SPECIES_PALKIA] = gMonIcon_Palkia, + [SPECIES_HEATRAN] = gMonIcon_Heatran, + [SPECIES_REGIGIGAS] = gMonIcon_Regigigas, + [SPECIES_GIRATINA] = gMonIcon_Giratina, + [SPECIES_CRESSELIA] = gMonIcon_Cresselia, + [SPECIES_PHIONE] = gMonIcon_Phione, + [SPECIES_MANAPHY] = gMonIcon_Manaphy, + [SPECIES_DARKRAI] = gMonIcon_Darkrai, + [SPECIES_SHAYMIN] = gMonIcon_Shaymin, + [SPECIES_ARCEUS] = gMonIcon_Arceus, [SPECIES_EGG] = gMonIcon_Egg, }; @@ -804,6 +911,113 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_JIRACHI] = 0, [SPECIES_DEOXYS] = 0, [SPECIES_CHIMECHO] = 0, + [SPECIES_TURTWIG] = 1, + [SPECIES_GROTLE] = 1, + [SPECIES_TORTERRA] = 1, + [SPECIES_CHIMCHAR] = 1, + [SPECIES_MONFERNO] = 0, + [SPECIES_INFERNAPE] = 0, + [SPECIES_PIPLUP] = 2, + [SPECIES_PRINPLUP] = 2, + [SPECIES_EMPOLEON] = 0, + [SPECIES_STARLY] = 0, + [SPECIES_STARAVIA] = 0, + [SPECIES_STARAPTOR] = 0, + [SPECIES_BIDOOF] = 2, + [SPECIES_BIBAREL] = 2, + [SPECIES_KRICKETOT] = 0, + [SPECIES_KRICKETUNE] = 0, + [SPECIES_SHINX] = 0, + [SPECIES_LUXIO] = 0, + [SPECIES_LUXRAY] = 0, + [SPECIES_BUDEW] = 1, + [SPECIES_ROSERADE] = 0, + [SPECIES_CRANIDOS] = 0, + [SPECIES_RAMPARDOS] = 0, + [SPECIES_SHIELDON] = 1, + [SPECIES_BASTIODON] = 1, + [SPECIES_BURMY] = 1, + [SPECIES_WORMADAM] = 1, + [SPECIES_MOTHIM] = 0, + [SPECIES_COMBEE] = 0, + [SPECIES_VESPIQUEN] = 0, + [SPECIES_PACHIRISU] = 0, + [SPECIES_BUIZEL] = 0, + [SPECIES_FLOATZEL] = 0, + [SPECIES_CHERUBI] = 1, + [SPECIES_CHERRIM] = 0, + [SPECIES_SHELLOS] = 0, + [SPECIES_GASTRODON] = 0, + [SPECIES_AMBIPOM] = 2, + [SPECIES_DRIFLOON] = 2, + [SPECIES_DRIFBLIM] = 2, + [SPECIES_BUNEARY] = 2, + [SPECIES_LOPUNNY] = 2, + [SPECIES_MISMAGIUS] = 0, + [SPECIES_HONCHKROW] = 1, + [SPECIES_GLAMEOW] = 0, + [SPECIES_PURUGLY] = 2, + [SPECIES_CHINGLING] = 0, + [SPECIES_STUNKY] = 2, + [SPECIES_SKUNTANK] = 2, + [SPECIES_BRONZOR] = 0, + [SPECIES_BRONZONG] = 0, + [SPECIES_BONSLY] = 1, + [SPECIES_MIMEJR] = 0, + [SPECIES_HAPPINY] = 0, + [SPECIES_CHATOT] = 0, + [SPECIES_SPIRITOMB] = 0, + [SPECIES_GIBLE] = 0, + [SPECIES_GABITE] = 0, + [SPECIES_GARCHOMP] = 0, + [SPECIES_MUNCHLAX] = 2, + [SPECIES_RIOLU] = 2, + [SPECIES_LUCARIO] = 2, + [SPECIES_HIPPOPOTAS] = 1, + [SPECIES_HIPPOWDON] = 1, + [SPECIES_SKORUPI] = 0, + [SPECIES_DRAPION] = 2, + [SPECIES_CROAGUNK] = 0, + [SPECIES_TOXICROAK] = 0, + [SPECIES_CARNIVINE] = 1, + [SPECIES_FINNEON] = 0, + [SPECIES_LUMINEON] = 0, + [SPECIES_MANTYKE] = 0, + [SPECIES_SNOVER] = 1, + [SPECIES_ABOMASNOW] = 1, + [SPECIES_WEAVILE] = 0, + [SPECIES_MAGNEZONE] = 0, + [SPECIES_LICKILICKY] = 1, + [SPECIES_RHYPERIOR] = 0, + [SPECIES_TANGROWTH] = 2, + [SPECIES_ELECTIVIRE] = 1, + [SPECIES_MAGMORTAR] = 0, + [SPECIES_TOGEKISS] = 2, + [SPECIES_YANMEGA] = 1, + [SPECIES_LEAFEON] = 1, + [SPECIES_GLACEON] = 0, + [SPECIES_GLISCOR] = 2, + [SPECIES_MAMOSWINE] = 2, + [SPECIES_PORYGON_Z] = 0, + [SPECIES_GALLADE] = 1, + [SPECIES_PROBOPASS] = 0, + [SPECIES_DUSKNOIR] = 2, + [SPECIES_FROSLASS] = 2, + [SPECIES_ROTOM] = 0, + [SPECIES_UXIE] = 0, + [SPECIES_MESPRIT] = 0, + [SPECIES_AZELF] = 0, + [SPECIES_DIALGA] = 2, + [SPECIES_PALKIA] = 2, + [SPECIES_HEATRAN] = 0, + [SPECIES_REGIGIGAS] = 0, + [SPECIES_GIRATINA] = 0, + [SPECIES_CRESSELIA] = 0, + [SPECIES_PHIONE] = 0, + [SPECIES_MANAPHY] = 0, + [SPECIES_DARKRAI] = 0, + [SPECIES_SHAYMIN] = 1, + [SPECIES_ARCEUS] = 0, [SPECIES_EGG] = 1, };