diff --git a/graphics/pokemon/annihilape/icon.png b/graphics/pokemon/annihilape/icon.png index 561a4afedd..e45f7583cb 100755 Binary files a/graphics/pokemon/annihilape/icon.png and b/graphics/pokemon/annihilape/icon.png differ diff --git a/graphics/pokemon/arboliva/icon.png b/graphics/pokemon/arboliva/icon.png index 039efb5489..07f763a941 100755 Binary files a/graphics/pokemon/arboliva/icon.png and b/graphics/pokemon/arboliva/icon.png differ diff --git a/graphics/pokemon/arcanine/hisuian/icon.png b/graphics/pokemon/arcanine/hisuian/icon.png index 9fe9007929..215b8d8d6e 100644 Binary files a/graphics/pokemon/arcanine/hisuian/icon.png and b/graphics/pokemon/arcanine/hisuian/icon.png differ diff --git a/graphics/pokemon/archaludon/icon.png b/graphics/pokemon/archaludon/icon.png new file mode 100644 index 0000000000..9ad59de8fe Binary files /dev/null and b/graphics/pokemon/archaludon/icon.png differ diff --git a/graphics/pokemon/arctibax/icon.png b/graphics/pokemon/arctibax/icon.png index cd7aec243e..f15a4e3545 100755 Binary files a/graphics/pokemon/arctibax/icon.png and b/graphics/pokemon/arctibax/icon.png differ diff --git a/graphics/pokemon/armarouge/icon.png b/graphics/pokemon/armarouge/icon.png index 2a348cab51..5cf958e578 100755 Binary files a/graphics/pokemon/armarouge/icon.png and b/graphics/pokemon/armarouge/icon.png differ diff --git a/graphics/pokemon/basculegion/female/icon.png b/graphics/pokemon/basculegion/female/icon.png index fb85ca6c0c..4a0e539212 100644 Binary files a/graphics/pokemon/basculegion/female/icon.png and b/graphics/pokemon/basculegion/female/icon.png differ diff --git a/graphics/pokemon/basculegion/icon.png b/graphics/pokemon/basculegion/icon.png index 579a83d550..6226cf6a59 100644 Binary files a/graphics/pokemon/basculegion/icon.png and b/graphics/pokemon/basculegion/icon.png differ diff --git a/graphics/pokemon/basculin/white_striped/icon.png b/graphics/pokemon/basculin/white_striped/icon.png index a69c4e51a8..bc7287fd62 100644 Binary files a/graphics/pokemon/basculin/white_striped/icon.png and b/graphics/pokemon/basculin/white_striped/icon.png differ diff --git a/graphics/pokemon/baxcalibur/icon.png b/graphics/pokemon/baxcalibur/icon.png index befc75d3c8..e5386582f0 100755 Binary files a/graphics/pokemon/baxcalibur/icon.png and b/graphics/pokemon/baxcalibur/icon.png differ diff --git a/graphics/pokemon/bellibolt/icon.png b/graphics/pokemon/bellibolt/icon.png index 28492e341d..5f2a98c8ef 100755 Binary files a/graphics/pokemon/bellibolt/icon.png and b/graphics/pokemon/bellibolt/icon.png differ diff --git a/graphics/pokemon/bombirdier/icon.png b/graphics/pokemon/bombirdier/icon.png index 06bcf71c86..45e4ac91df 100755 Binary files a/graphics/pokemon/bombirdier/icon.png and b/graphics/pokemon/bombirdier/icon.png differ diff --git a/graphics/pokemon/brambleghast/icon.png b/graphics/pokemon/brambleghast/icon.png index 645ed7014d..ca6a29df23 100755 Binary files a/graphics/pokemon/brambleghast/icon.png and b/graphics/pokemon/brambleghast/icon.png differ diff --git a/graphics/pokemon/bramblin/icon.png b/graphics/pokemon/bramblin/icon.png index 9833e5007b..64fa8677b3 100755 Binary files a/graphics/pokemon/bramblin/icon.png and b/graphics/pokemon/bramblin/icon.png differ diff --git a/graphics/pokemon/braviary/hisuian/icon.png b/graphics/pokemon/braviary/hisuian/icon.png index c2aa449d95..85eb4decd4 100755 Binary files a/graphics/pokemon/braviary/hisuian/icon.png and b/graphics/pokemon/braviary/hisuian/icon.png differ diff --git a/graphics/pokemon/brute_bonnet/icon.png b/graphics/pokemon/brute_bonnet/icon.png index 052517c12d..82161e124d 100755 Binary files a/graphics/pokemon/brute_bonnet/icon.png and b/graphics/pokemon/brute_bonnet/icon.png differ diff --git a/graphics/pokemon/capsakid/icon.png b/graphics/pokemon/capsakid/icon.png index ede6dc9c0c..c10dfa5a9e 100755 Binary files a/graphics/pokemon/capsakid/icon.png and b/graphics/pokemon/capsakid/icon.png differ diff --git a/graphics/pokemon/ceruledge/icon.png b/graphics/pokemon/ceruledge/icon.png index 329d5ede31..4107555cd4 100755 Binary files a/graphics/pokemon/ceruledge/icon.png and b/graphics/pokemon/ceruledge/icon.png differ diff --git a/graphics/pokemon/cetitan/icon.png b/graphics/pokemon/cetitan/icon.png index 2a0db87041..078ee54a48 100755 Binary files a/graphics/pokemon/cetitan/icon.png and b/graphics/pokemon/cetitan/icon.png differ diff --git a/graphics/pokemon/cetoddle/icon.png b/graphics/pokemon/cetoddle/icon.png index b123bf1f81..b01b85d258 100755 Binary files a/graphics/pokemon/cetoddle/icon.png and b/graphics/pokemon/cetoddle/icon.png differ diff --git a/graphics/pokemon/charcadet/icon.png b/graphics/pokemon/charcadet/icon.png index 50d9e46d88..cddec8626b 100755 Binary files a/graphics/pokemon/charcadet/icon.png and b/graphics/pokemon/charcadet/icon.png differ diff --git a/graphics/pokemon/chi_yu/icon.png b/graphics/pokemon/chi_yu/icon.png index 29a9114af0..1aeb8e6c5b 100755 Binary files a/graphics/pokemon/chi_yu/icon.png and b/graphics/pokemon/chi_yu/icon.png differ diff --git a/graphics/pokemon/chien_pao/icon.png b/graphics/pokemon/chien_pao/icon.png index eaad400548..d2626c6554 100755 Binary files a/graphics/pokemon/chien_pao/icon.png and b/graphics/pokemon/chien_pao/icon.png differ diff --git a/graphics/pokemon/clodsire/icon.png b/graphics/pokemon/clodsire/icon.png index bcc0e34e50..277d20250b 100755 Binary files a/graphics/pokemon/clodsire/icon.png and b/graphics/pokemon/clodsire/icon.png differ diff --git a/graphics/pokemon/crocalor/icon.png b/graphics/pokemon/crocalor/icon.png index dea043b25f..615e2e6de0 100755 Binary files a/graphics/pokemon/crocalor/icon.png and b/graphics/pokemon/crocalor/icon.png differ diff --git a/graphics/pokemon/cyclizar/icon.png b/graphics/pokemon/cyclizar/icon.png index 64eba81963..8ab324773e 100755 Binary files a/graphics/pokemon/cyclizar/icon.png and b/graphics/pokemon/cyclizar/icon.png differ diff --git a/graphics/pokemon/dachsbun/icon.png b/graphics/pokemon/dachsbun/icon.png index fe1caf375d..cb05cd3be6 100644 Binary files a/graphics/pokemon/dachsbun/icon.png and b/graphics/pokemon/dachsbun/icon.png differ diff --git a/graphics/pokemon/decidueye/hisuian/icon.png b/graphics/pokemon/decidueye/hisuian/icon.png index 997071396f..bd490472d2 100755 Binary files a/graphics/pokemon/decidueye/hisuian/icon.png and b/graphics/pokemon/decidueye/hisuian/icon.png differ diff --git a/graphics/pokemon/dipplin/icon.png b/graphics/pokemon/dipplin/icon.png index 5fab863bd9..2db7df997f 100644 Binary files a/graphics/pokemon/dipplin/icon.png and b/graphics/pokemon/dipplin/icon.png differ diff --git a/graphics/pokemon/dolliv/icon.png b/graphics/pokemon/dolliv/icon.png index 932b6e62eb..bc2867dc75 100755 Binary files a/graphics/pokemon/dolliv/icon.png and b/graphics/pokemon/dolliv/icon.png differ diff --git a/graphics/pokemon/dondozo/icon.png b/graphics/pokemon/dondozo/icon.png index 066128e0d4..a704280ec0 100755 Binary files a/graphics/pokemon/dondozo/icon.png and b/graphics/pokemon/dondozo/icon.png differ diff --git a/graphics/pokemon/dudunsparce/icon.png b/graphics/pokemon/dudunsparce/icon.png index cf9c3501fe..ed9c479669 100755 Binary files a/graphics/pokemon/dudunsparce/icon.png and b/graphics/pokemon/dudunsparce/icon.png differ diff --git a/graphics/pokemon/eevee/partner/icon.png b/graphics/pokemon/eevee/partner/icon.png new file mode 100644 index 0000000000..b202c18862 Binary files /dev/null and b/graphics/pokemon/eevee/partner/icon.png differ diff --git a/graphics/pokemon/eevee/partner/iconf.png b/graphics/pokemon/eevee/partner/iconf.png new file mode 100644 index 0000000000..c82f753f32 Binary files /dev/null and b/graphics/pokemon/eevee/partner/iconf.png differ diff --git a/graphics/pokemon/electrode/hisuian/icon.png b/graphics/pokemon/electrode/hisuian/icon.png index d624e246cb..76efc29827 100644 Binary files a/graphics/pokemon/electrode/hisuian/icon.png and b/graphics/pokemon/electrode/hisuian/icon.png differ diff --git a/graphics/pokemon/enamorus/icon.png b/graphics/pokemon/enamorus/icon.png index c127c07345..3c808f30b1 100644 Binary files a/graphics/pokemon/enamorus/icon.png and b/graphics/pokemon/enamorus/icon.png differ diff --git a/graphics/pokemon/enamorus/therian/icon.png b/graphics/pokemon/enamorus/therian/icon.png index dfca5087fe..fcaf4f41d3 100644 Binary files a/graphics/pokemon/enamorus/therian/icon.png and b/graphics/pokemon/enamorus/therian/icon.png differ diff --git a/graphics/pokemon/espathra/icon.png b/graphics/pokemon/espathra/icon.png index cdca057311..12039cb258 100755 Binary files a/graphics/pokemon/espathra/icon.png and b/graphics/pokemon/espathra/icon.png differ diff --git a/graphics/pokemon/farigiraf/icon.png b/graphics/pokemon/farigiraf/icon.png index 0ef8b01ae8..a2657d0e5d 100755 Binary files a/graphics/pokemon/farigiraf/icon.png and b/graphics/pokemon/farigiraf/icon.png differ diff --git a/graphics/pokemon/fezandipiti/icon.png b/graphics/pokemon/fezandipiti/icon.png index 1bd6d0bf31..eb150e6db9 100644 Binary files a/graphics/pokemon/fezandipiti/icon.png and b/graphics/pokemon/fezandipiti/icon.png differ diff --git a/graphics/pokemon/fidough/icon.png b/graphics/pokemon/fidough/icon.png index 2a6c4b15f5..eea5ee85e3 100755 Binary files a/graphics/pokemon/fidough/icon.png and b/graphics/pokemon/fidough/icon.png differ diff --git a/graphics/pokemon/finizen/icon.png b/graphics/pokemon/finizen/icon.png index b82b4c673f..b689ed7879 100755 Binary files a/graphics/pokemon/finizen/icon.png and b/graphics/pokemon/finizen/icon.png differ diff --git a/graphics/pokemon/flamigo/icon.png b/graphics/pokemon/flamigo/icon.png index 0f0381579c..f1970373f4 100755 Binary files a/graphics/pokemon/flamigo/icon.png and b/graphics/pokemon/flamigo/icon.png differ diff --git a/graphics/pokemon/flittle/icon.png b/graphics/pokemon/flittle/icon.png index f588d537ef..1f96368e89 100755 Binary files a/graphics/pokemon/flittle/icon.png and b/graphics/pokemon/flittle/icon.png differ diff --git a/graphics/pokemon/floragato/icon.png b/graphics/pokemon/floragato/icon.png index aaf9a3b10d..448ee0d191 100644 Binary files a/graphics/pokemon/floragato/icon.png and b/graphics/pokemon/floragato/icon.png differ diff --git a/graphics/pokemon/flutter_mane/icon.png b/graphics/pokemon/flutter_mane/icon.png index 2b65fc048f..ab756908b9 100755 Binary files a/graphics/pokemon/flutter_mane/icon.png and b/graphics/pokemon/flutter_mane/icon.png differ diff --git a/graphics/pokemon/frigibax/icon.png b/graphics/pokemon/frigibax/icon.png index b50575cd47..e248df892b 100755 Binary files a/graphics/pokemon/frigibax/icon.png and b/graphics/pokemon/frigibax/icon.png differ diff --git a/graphics/pokemon/fuecoco/icon.png b/graphics/pokemon/fuecoco/icon.png index 923e5f03fd..31bcf19b0f 100755 Binary files a/graphics/pokemon/fuecoco/icon.png and b/graphics/pokemon/fuecoco/icon.png differ diff --git a/graphics/pokemon/garganacl/icon.png b/graphics/pokemon/garganacl/icon.png index bc2d038478..e9a0245277 100755 Binary files a/graphics/pokemon/garganacl/icon.png and b/graphics/pokemon/garganacl/icon.png differ diff --git a/graphics/pokemon/gholdengo/icon.png b/graphics/pokemon/gholdengo/icon.png index 99d0e122f2..a49e6561a9 100755 Binary files a/graphics/pokemon/gholdengo/icon.png and b/graphics/pokemon/gholdengo/icon.png differ diff --git a/graphics/pokemon/gimmighoul/icon.png b/graphics/pokemon/gimmighoul/icon.png index 9191406326..79167add31 100644 Binary files a/graphics/pokemon/gimmighoul/icon.png and b/graphics/pokemon/gimmighoul/icon.png differ diff --git a/graphics/pokemon/gimmighoul/roaming/icon.png b/graphics/pokemon/gimmighoul/roaming/icon.png index e803b52554..13ec7881b5 100644 Binary files a/graphics/pokemon/gimmighoul/roaming/icon.png and b/graphics/pokemon/gimmighoul/roaming/icon.png differ diff --git a/graphics/pokemon/glimmet/icon.png b/graphics/pokemon/glimmet/icon.png index 1bc74def32..c7b16b5631 100755 Binary files a/graphics/pokemon/glimmet/icon.png and b/graphics/pokemon/glimmet/icon.png differ diff --git a/graphics/pokemon/glimmora/icon.png b/graphics/pokemon/glimmora/icon.png index 12e50f0cbc..6cc6f8922f 100755 Binary files a/graphics/pokemon/glimmora/icon.png and b/graphics/pokemon/glimmora/icon.png differ diff --git a/graphics/pokemon/goodra/hisuian/icon.png b/graphics/pokemon/goodra/hisuian/icon.png index 3216854349..283617c206 100644 Binary files a/graphics/pokemon/goodra/hisuian/icon.png and b/graphics/pokemon/goodra/hisuian/icon.png differ diff --git a/graphics/pokemon/gouging_fire/icon.png b/graphics/pokemon/gouging_fire/icon.png new file mode 100644 index 0000000000..38e429abbf Binary files /dev/null and b/graphics/pokemon/gouging_fire/icon.png differ diff --git a/graphics/pokemon/grafaiai/icon.png b/graphics/pokemon/grafaiai/icon.png index 9e027481aa..3ba6803542 100755 Binary files a/graphics/pokemon/grafaiai/icon.png and b/graphics/pokemon/grafaiai/icon.png differ diff --git a/graphics/pokemon/great_tusk/icon.png b/graphics/pokemon/great_tusk/icon.png index 30384d570d..60bbe9f419 100755 Binary files a/graphics/pokemon/great_tusk/icon.png and b/graphics/pokemon/great_tusk/icon.png differ diff --git a/graphics/pokemon/greavard/icon.png b/graphics/pokemon/greavard/icon.png index a43e9a3875..96b16a4a8c 100755 Binary files a/graphics/pokemon/greavard/icon.png and b/graphics/pokemon/greavard/icon.png differ diff --git a/graphics/pokemon/growlithe/hisuian/icon.png b/graphics/pokemon/growlithe/hisuian/icon.png index b2b03733f0..71a2ffdbae 100644 Binary files a/graphics/pokemon/growlithe/hisuian/icon.png and b/graphics/pokemon/growlithe/hisuian/icon.png differ diff --git a/graphics/pokemon/houndstone/icon.png b/graphics/pokemon/houndstone/icon.png index 51d26434c8..9777c7b79a 100755 Binary files a/graphics/pokemon/houndstone/icon.png and b/graphics/pokemon/houndstone/icon.png differ diff --git a/graphics/pokemon/hydrapple/icon.png b/graphics/pokemon/hydrapple/icon.png index 352513f998..1d7ce98bc7 100644 Binary files a/graphics/pokemon/hydrapple/icon.png and b/graphics/pokemon/hydrapple/icon.png differ diff --git a/graphics/pokemon/iron_boulder/icon.png b/graphics/pokemon/iron_boulder/icon.png new file mode 100644 index 0000000000..eafb584ccc Binary files /dev/null and b/graphics/pokemon/iron_boulder/icon.png differ diff --git a/graphics/pokemon/iron_bundle/icon.png b/graphics/pokemon/iron_bundle/icon.png index 99b380a543..df537e34d2 100755 Binary files a/graphics/pokemon/iron_bundle/icon.png and b/graphics/pokemon/iron_bundle/icon.png differ diff --git a/graphics/pokemon/iron_crown/icon.png b/graphics/pokemon/iron_crown/icon.png new file mode 100644 index 0000000000..cb127c82df Binary files /dev/null and b/graphics/pokemon/iron_crown/icon.png differ diff --git a/graphics/pokemon/iron_hands/icon.png b/graphics/pokemon/iron_hands/icon.png index d28b62a6d0..5fc933dd96 100755 Binary files a/graphics/pokemon/iron_hands/icon.png and b/graphics/pokemon/iron_hands/icon.png differ diff --git a/graphics/pokemon/iron_jugulis/icon.png b/graphics/pokemon/iron_jugulis/icon.png index 14ae400dfd..c043e15c6c 100755 Binary files a/graphics/pokemon/iron_jugulis/icon.png and b/graphics/pokemon/iron_jugulis/icon.png differ diff --git a/graphics/pokemon/iron_leaves/icon.png b/graphics/pokemon/iron_leaves/icon.png index a5d308e6cb..16eb1d5dc4 100644 Binary files a/graphics/pokemon/iron_leaves/icon.png and b/graphics/pokemon/iron_leaves/icon.png differ diff --git a/graphics/pokemon/iron_moth/icon.png b/graphics/pokemon/iron_moth/icon.png index ac43ad66ea..ff1e7353cb 100755 Binary files a/graphics/pokemon/iron_moth/icon.png and b/graphics/pokemon/iron_moth/icon.png differ diff --git a/graphics/pokemon/iron_thorns/icon.png b/graphics/pokemon/iron_thorns/icon.png index 48391a50c7..2c1e081217 100755 Binary files a/graphics/pokemon/iron_thorns/icon.png and b/graphics/pokemon/iron_thorns/icon.png differ diff --git a/graphics/pokemon/iron_treads/icon.png b/graphics/pokemon/iron_treads/icon.png index a75d7f93c9..25e9038a69 100755 Binary files a/graphics/pokemon/iron_treads/icon.png and b/graphics/pokemon/iron_treads/icon.png differ diff --git a/graphics/pokemon/iron_valiant/icon.png b/graphics/pokemon/iron_valiant/icon.png index c1441e5dd5..2d66aa5aed 100755 Binary files a/graphics/pokemon/iron_valiant/icon.png and b/graphics/pokemon/iron_valiant/icon.png differ diff --git a/graphics/pokemon/kilowattrel/icon.png b/graphics/pokemon/kilowattrel/icon.png index d4e5f7211b..cfa950dd2d 100755 Binary files a/graphics/pokemon/kilowattrel/icon.png and b/graphics/pokemon/kilowattrel/icon.png differ diff --git a/graphics/pokemon/kingambit/icon.png b/graphics/pokemon/kingambit/icon.png index ce85b3c190..c4d91769d9 100755 Binary files a/graphics/pokemon/kingambit/icon.png and b/graphics/pokemon/kingambit/icon.png differ diff --git a/graphics/pokemon/klawf/icon.png b/graphics/pokemon/klawf/icon.png index e7c232f130..6b393ebdfb 100755 Binary files a/graphics/pokemon/klawf/icon.png and b/graphics/pokemon/klawf/icon.png differ diff --git a/graphics/pokemon/kleavor/icon.png b/graphics/pokemon/kleavor/icon.png index 4443cc1433..63d9653597 100644 Binary files a/graphics/pokemon/kleavor/icon.png and b/graphics/pokemon/kleavor/icon.png differ diff --git a/graphics/pokemon/koraidon/icon.png b/graphics/pokemon/koraidon/icon.png index 127a03e5d7..4048255617 100755 Binary files a/graphics/pokemon/koraidon/icon.png and b/graphics/pokemon/koraidon/icon.png differ diff --git a/graphics/pokemon/lechonk/icon.png b/graphics/pokemon/lechonk/icon.png index d368c427be..6123d0773a 100755 Binary files a/graphics/pokemon/lechonk/icon.png and b/graphics/pokemon/lechonk/icon.png differ diff --git a/graphics/pokemon/lilligant/hisuian/icon.png b/graphics/pokemon/lilligant/hisuian/icon.png index c8149843fc..67809d8897 100644 Binary files a/graphics/pokemon/lilligant/hisuian/icon.png and b/graphics/pokemon/lilligant/hisuian/icon.png differ diff --git a/graphics/pokemon/lokix/icon.png b/graphics/pokemon/lokix/icon.png index 205de36a02..e6e944b6b9 100755 Binary files a/graphics/pokemon/lokix/icon.png and b/graphics/pokemon/lokix/icon.png differ diff --git a/graphics/pokemon/mabosstiff/icon.png b/graphics/pokemon/mabosstiff/icon.png index 3b99df2d4a..e18a9d6c1c 100755 Binary files a/graphics/pokemon/mabosstiff/icon.png and b/graphics/pokemon/mabosstiff/icon.png differ diff --git a/graphics/pokemon/maschiff/icon.png b/graphics/pokemon/maschiff/icon.png index f5127dcc42..cb2308d15b 100755 Binary files a/graphics/pokemon/maschiff/icon.png and b/graphics/pokemon/maschiff/icon.png differ diff --git a/graphics/pokemon/maushold/four/icon.png b/graphics/pokemon/maushold/four/icon.png index 97c2d70826..fc6684d61b 100755 Binary files a/graphics/pokemon/maushold/four/icon.png and b/graphics/pokemon/maushold/four/icon.png differ diff --git a/graphics/pokemon/maushold/icon.png b/graphics/pokemon/maushold/icon.png index 728aca58a1..48cb9d2c26 100755 Binary files a/graphics/pokemon/maushold/icon.png and b/graphics/pokemon/maushold/icon.png differ diff --git a/graphics/pokemon/meowscarada/icon.png b/graphics/pokemon/meowscarada/icon.png index 5b79821453..2a6d199d22 100755 Binary files a/graphics/pokemon/meowscarada/icon.png and b/graphics/pokemon/meowscarada/icon.png differ diff --git a/graphics/pokemon/miraidon/icon.png b/graphics/pokemon/miraidon/icon.png index 3ccf056b51..776082feb0 100755 Binary files a/graphics/pokemon/miraidon/icon.png and b/graphics/pokemon/miraidon/icon.png differ diff --git a/graphics/pokemon/munkidori/icon.png b/graphics/pokemon/munkidori/icon.png index 20144ff87e..338d84d3ef 100644 Binary files a/graphics/pokemon/munkidori/icon.png and b/graphics/pokemon/munkidori/icon.png differ diff --git a/graphics/pokemon/nacli/icon.png b/graphics/pokemon/nacli/icon.png index ed0895c1d8..86522af3a1 100755 Binary files a/graphics/pokemon/nacli/icon.png and b/graphics/pokemon/nacli/icon.png differ diff --git a/graphics/pokemon/naclstack/icon.png b/graphics/pokemon/naclstack/icon.png index a536c3818d..133228573b 100755 Binary files a/graphics/pokemon/naclstack/icon.png and b/graphics/pokemon/naclstack/icon.png differ diff --git a/graphics/pokemon/nymble/icon.png b/graphics/pokemon/nymble/icon.png index 791bd0a427..74c4c79b52 100755 Binary files a/graphics/pokemon/nymble/icon.png and b/graphics/pokemon/nymble/icon.png differ diff --git a/graphics/pokemon/ogerpon/cornerstone/icon.png b/graphics/pokemon/ogerpon/cornerstone/icon.png new file mode 100644 index 0000000000..7a8323c815 Binary files /dev/null and b/graphics/pokemon/ogerpon/cornerstone/icon.png differ diff --git a/graphics/pokemon/ogerpon/hearthflame/icon.png b/graphics/pokemon/ogerpon/hearthflame/icon.png new file mode 100644 index 0000000000..108ac492cc Binary files /dev/null and b/graphics/pokemon/ogerpon/hearthflame/icon.png differ diff --git a/graphics/pokemon/ogerpon/icon.png b/graphics/pokemon/ogerpon/icon.png index 65448e8d1d..96f048f15b 100644 Binary files a/graphics/pokemon/ogerpon/icon.png and b/graphics/pokemon/ogerpon/icon.png differ diff --git a/graphics/pokemon/ogerpon/wellspring/icon.png b/graphics/pokemon/ogerpon/wellspring/icon.png new file mode 100644 index 0000000000..0257bc38e9 Binary files /dev/null and b/graphics/pokemon/ogerpon/wellspring/icon.png differ diff --git a/graphics/pokemon/oinkologne/female/icon.png b/graphics/pokemon/oinkologne/female/icon.png index 0acd6e2711..c1b272c73e 100755 Binary files a/graphics/pokemon/oinkologne/female/icon.png and b/graphics/pokemon/oinkologne/female/icon.png differ diff --git a/graphics/pokemon/oinkologne/female/iconTODO.png b/graphics/pokemon/oinkologne/female/iconTODO.png deleted file mode 100755 index 36ce1eb7f8..0000000000 Binary files a/graphics/pokemon/oinkologne/female/iconTODO.png and /dev/null differ diff --git a/graphics/pokemon/oinkologne/icon.png b/graphics/pokemon/oinkologne/icon.png index 0acd6e2711..055bfeab86 100755 Binary files a/graphics/pokemon/oinkologne/icon.png and b/graphics/pokemon/oinkologne/icon.png differ diff --git a/graphics/pokemon/okidogi/icon.png b/graphics/pokemon/okidogi/icon.png index 91984549c3..fd4809f80d 100644 Binary files a/graphics/pokemon/okidogi/icon.png and b/graphics/pokemon/okidogi/icon.png differ diff --git a/graphics/pokemon/orthworm/icon.png b/graphics/pokemon/orthworm/icon.png index 9cb39cc79b..5c4dd54525 100755 Binary files a/graphics/pokemon/orthworm/icon.png and b/graphics/pokemon/orthworm/icon.png differ diff --git a/graphics/pokemon/overqwil/icon.png b/graphics/pokemon/overqwil/icon.png index 661013b728..9af70e8057 100644 Binary files a/graphics/pokemon/overqwil/icon.png and b/graphics/pokemon/overqwil/icon.png differ diff --git a/graphics/pokemon/palafin/hero/icon.png b/graphics/pokemon/palafin/hero/icon.png index 8dd8a11844..8f581581cf 100755 Binary files a/graphics/pokemon/palafin/hero/icon.png and b/graphics/pokemon/palafin/hero/icon.png differ diff --git a/graphics/pokemon/palafin/icon.png b/graphics/pokemon/palafin/icon.png index d24e846fc5..14de30254f 100755 Binary files a/graphics/pokemon/palafin/icon.png and b/graphics/pokemon/palafin/icon.png differ diff --git a/graphics/pokemon/pawmi/icon.png b/graphics/pokemon/pawmi/icon.png index a7fc302fe0..bcef3f24b0 100755 Binary files a/graphics/pokemon/pawmi/icon.png and b/graphics/pokemon/pawmi/icon.png differ diff --git a/graphics/pokemon/pawmo/icon.png b/graphics/pokemon/pawmo/icon.png index 41cc6b4f9a..ef69e9e301 100755 Binary files a/graphics/pokemon/pawmo/icon.png and b/graphics/pokemon/pawmo/icon.png differ diff --git a/graphics/pokemon/pawmot/icon.png b/graphics/pokemon/pawmot/icon.png index cc9d2e942a..90b36e7378 100755 Binary files a/graphics/pokemon/pawmot/icon.png and b/graphics/pokemon/pawmot/icon.png differ diff --git a/graphics/pokemon/pecharunt/icon.png b/graphics/pokemon/pecharunt/icon.png new file mode 100644 index 0000000000..1027623748 Binary files /dev/null and b/graphics/pokemon/pecharunt/icon.png differ diff --git a/graphics/pokemon/pikachu/partner/icon.png b/graphics/pokemon/pikachu/partner/icon.png new file mode 100644 index 0000000000..891f0d1b3e Binary files /dev/null and b/graphics/pokemon/pikachu/partner/icon.png differ diff --git a/graphics/pokemon/pikachu/partner/iconf.png b/graphics/pokemon/pikachu/partner/iconf.png new file mode 100644 index 0000000000..8779879f07 Binary files /dev/null and b/graphics/pokemon/pikachu/partner/iconf.png differ diff --git a/graphics/pokemon/poltchageist/icon.png b/graphics/pokemon/poltchageist/icon.png index 6b686ad08d..55fc98ec84 100644 Binary files a/graphics/pokemon/poltchageist/icon.png and b/graphics/pokemon/poltchageist/icon.png differ diff --git a/graphics/pokemon/quaquaval/icon.png b/graphics/pokemon/quaquaval/icon.png index 4e68d84ff4..d9b37ea902 100755 Binary files a/graphics/pokemon/quaquaval/icon.png and b/graphics/pokemon/quaquaval/icon.png differ diff --git a/graphics/pokemon/quaxly/icon.png b/graphics/pokemon/quaxly/icon.png index 4036957445..6df869ecdc 100755 Binary files a/graphics/pokemon/quaxly/icon.png and b/graphics/pokemon/quaxly/icon.png differ diff --git a/graphics/pokemon/quaxwell/icon.png b/graphics/pokemon/quaxwell/icon.png index 3806542c09..73a2d4ace7 100755 Binary files a/graphics/pokemon/quaxwell/icon.png and b/graphics/pokemon/quaxwell/icon.png differ diff --git a/graphics/pokemon/qwilfish/hisuian/icon.png b/graphics/pokemon/qwilfish/hisuian/icon.png index 6936dfe88d..30b8f5ad61 100644 Binary files a/graphics/pokemon/qwilfish/hisuian/icon.png and b/graphics/pokemon/qwilfish/hisuian/icon.png differ diff --git a/graphics/pokemon/rabsca/icon.png b/graphics/pokemon/rabsca/icon.png index 57c93e30a3..83e9bcbeb7 100755 Binary files a/graphics/pokemon/rabsca/icon.png and b/graphics/pokemon/rabsca/icon.png differ diff --git a/graphics/pokemon/raging_bolt/icon.png b/graphics/pokemon/raging_bolt/icon.png new file mode 100644 index 0000000000..f31beb8293 Binary files /dev/null and b/graphics/pokemon/raging_bolt/icon.png differ diff --git a/graphics/pokemon/rellor/icon.png b/graphics/pokemon/rellor/icon.png index 56ea140347..9c443bcee9 100755 Binary files a/graphics/pokemon/rellor/icon.png and b/graphics/pokemon/rellor/icon.png differ diff --git a/graphics/pokemon/revavroom/icon.png b/graphics/pokemon/revavroom/icon.png index 8d3a2ee0cc..0cece4d451 100755 Binary files a/graphics/pokemon/revavroom/icon.png and b/graphics/pokemon/revavroom/icon.png differ diff --git a/graphics/pokemon/roaring_moon/icon.png b/graphics/pokemon/roaring_moon/icon.png index d8d82fb015..e9dabef1ac 100755 Binary files a/graphics/pokemon/roaring_moon/icon.png and b/graphics/pokemon/roaring_moon/icon.png differ diff --git a/graphics/pokemon/samurott/hisuian/icon.png b/graphics/pokemon/samurott/hisuian/icon.png index fdcbe6718f..8ffa1a3f17 100644 Binary files a/graphics/pokemon/samurott/hisuian/icon.png and b/graphics/pokemon/samurott/hisuian/icon.png differ diff --git a/graphics/pokemon/sandy_shocks/icon.png b/graphics/pokemon/sandy_shocks/icon.png index 99d693a1ac..956607df16 100755 Binary files a/graphics/pokemon/sandy_shocks/icon.png and b/graphics/pokemon/sandy_shocks/icon.png differ diff --git a/graphics/pokemon/scovillain/icon.png b/graphics/pokemon/scovillain/icon.png index f346a1cb48..f0763b3463 100755 Binary files a/graphics/pokemon/scovillain/icon.png and b/graphics/pokemon/scovillain/icon.png differ diff --git a/graphics/pokemon/scream_tail/icon.png b/graphics/pokemon/scream_tail/icon.png index 09ca4083ec..13669394a0 100755 Binary files a/graphics/pokemon/scream_tail/icon.png and b/graphics/pokemon/scream_tail/icon.png differ diff --git a/graphics/pokemon/shroodle/icon.png b/graphics/pokemon/shroodle/icon.png index 1e7a9430d8..0ea3daa36e 100755 Binary files a/graphics/pokemon/shroodle/icon.png and b/graphics/pokemon/shroodle/icon.png differ diff --git a/graphics/pokemon/sinistcha/icon.png b/graphics/pokemon/sinistcha/icon.png index 74fc0b2643..07bb624d17 100644 Binary files a/graphics/pokemon/sinistcha/icon.png and b/graphics/pokemon/sinistcha/icon.png differ diff --git a/graphics/pokemon/skeledirge/icon.png b/graphics/pokemon/skeledirge/icon.png index 901aab95d9..6fb9ba2c44 100755 Binary files a/graphics/pokemon/skeledirge/icon.png and b/graphics/pokemon/skeledirge/icon.png differ diff --git a/graphics/pokemon/sliggoo/hisuian/icon.png b/graphics/pokemon/sliggoo/hisuian/icon.png index c66baae5a9..c2cdfc0bca 100644 Binary files a/graphics/pokemon/sliggoo/hisuian/icon.png and b/graphics/pokemon/sliggoo/hisuian/icon.png differ diff --git a/graphics/pokemon/slither_wing/icon.png b/graphics/pokemon/slither_wing/icon.png index e969280a5d..5eccb7f4f0 100755 Binary files a/graphics/pokemon/slither_wing/icon.png and b/graphics/pokemon/slither_wing/icon.png differ diff --git a/graphics/pokemon/smoliv/icon.png b/graphics/pokemon/smoliv/icon.png index 53b8ffc945..dfddec3177 100755 Binary files a/graphics/pokemon/smoliv/icon.png and b/graphics/pokemon/smoliv/icon.png differ diff --git a/graphics/pokemon/sneasel/hisuian/icon.png b/graphics/pokemon/sneasel/hisuian/icon.png index bd9cae88b9..f2646a7ad0 100644 Binary files a/graphics/pokemon/sneasel/hisuian/icon.png and b/graphics/pokemon/sneasel/hisuian/icon.png differ diff --git a/graphics/pokemon/sneasler/icon.png b/graphics/pokemon/sneasler/icon.png index 4238b0e6a3..d3612a640c 100644 Binary files a/graphics/pokemon/sneasler/icon.png and b/graphics/pokemon/sneasler/icon.png differ diff --git a/graphics/pokemon/spidops/icon.png b/graphics/pokemon/spidops/icon.png index c35aa36c61..cdb680571f 100755 Binary files a/graphics/pokemon/spidops/icon.png and b/graphics/pokemon/spidops/icon.png differ diff --git a/graphics/pokemon/sprigatito/icon.png b/graphics/pokemon/sprigatito/icon.png index 114fcff288..22fc9125d8 100755 Binary files a/graphics/pokemon/sprigatito/icon.png and b/graphics/pokemon/sprigatito/icon.png differ diff --git a/graphics/pokemon/squawkabilly/blue_plumage/icon.png b/graphics/pokemon/squawkabilly/blue_plumage/icon.png index 4ad732211c..3226b3acb2 100755 Binary files a/graphics/pokemon/squawkabilly/blue_plumage/icon.png and b/graphics/pokemon/squawkabilly/blue_plumage/icon.png differ diff --git a/graphics/pokemon/squawkabilly/icon.png b/graphics/pokemon/squawkabilly/icon.png index 540b7521a8..2abbffb286 100644 Binary files a/graphics/pokemon/squawkabilly/icon.png and b/graphics/pokemon/squawkabilly/icon.png differ diff --git a/graphics/pokemon/squawkabilly/white_plumage/icon.png b/graphics/pokemon/squawkabilly/white_plumage/icon.png index a784c6cdda..ecdabe3630 100755 Binary files a/graphics/pokemon/squawkabilly/white_plumage/icon.png and b/graphics/pokemon/squawkabilly/white_plumage/icon.png differ diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/icon.png b/graphics/pokemon/squawkabilly/yellow_plumage/icon.png index a042d981d0..085b3e0e2b 100755 Binary files a/graphics/pokemon/squawkabilly/yellow_plumage/icon.png and b/graphics/pokemon/squawkabilly/yellow_plumage/icon.png differ diff --git a/graphics/pokemon/tadbulb/icon.png b/graphics/pokemon/tadbulb/icon.png index 0341a387fb..de71775609 100755 Binary files a/graphics/pokemon/tadbulb/icon.png and b/graphics/pokemon/tadbulb/icon.png differ diff --git a/graphics/pokemon/tandemaus/icon.png b/graphics/pokemon/tandemaus/icon.png index 8effa87c57..5e8443f8d3 100755 Binary files a/graphics/pokemon/tandemaus/icon.png and b/graphics/pokemon/tandemaus/icon.png differ diff --git a/graphics/pokemon/tarountula/icon.png b/graphics/pokemon/tarountula/icon.png index d4802eb0ea..67f4423f90 100755 Binary files a/graphics/pokemon/tarountula/icon.png and b/graphics/pokemon/tarountula/icon.png differ diff --git a/graphics/pokemon/tatsugiri/droopy/icon.png b/graphics/pokemon/tatsugiri/droopy/icon.png index 48e8c01fd0..041a9a4469 100755 Binary files a/graphics/pokemon/tatsugiri/droopy/icon.png and b/graphics/pokemon/tatsugiri/droopy/icon.png differ diff --git a/graphics/pokemon/tatsugiri/icon.png b/graphics/pokemon/tatsugiri/icon.png index 98fe8aa569..0db952cbd8 100644 Binary files a/graphics/pokemon/tatsugiri/icon.png and b/graphics/pokemon/tatsugiri/icon.png differ diff --git a/graphics/pokemon/tatsugiri/stretchy/icon.png b/graphics/pokemon/tatsugiri/stretchy/icon.png index 1634ec3178..9403a331e3 100755 Binary files a/graphics/pokemon/tatsugiri/stretchy/icon.png and b/graphics/pokemon/tatsugiri/stretchy/icon.png differ diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/icon.png b/graphics/pokemon/tauros/paldean_aqua_breed/icon.png index a0421d7dd0..b2f37e2c13 100644 Binary files a/graphics/pokemon/tauros/paldean_aqua_breed/icon.png and b/graphics/pokemon/tauros/paldean_aqua_breed/icon.png differ diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/icon.png b/graphics/pokemon/tauros/paldean_blaze_breed/icon.png index 25ec7e0463..3eed6b8bd8 100644 Binary files a/graphics/pokemon/tauros/paldean_blaze_breed/icon.png and b/graphics/pokemon/tauros/paldean_blaze_breed/icon.png differ diff --git a/graphics/pokemon/tauros/paldean_combat_breed/icon.png b/graphics/pokemon/tauros/paldean_combat_breed/icon.png index daa2eb7882..22ea3c94f0 100644 Binary files a/graphics/pokemon/tauros/paldean_combat_breed/icon.png and b/graphics/pokemon/tauros/paldean_combat_breed/icon.png differ diff --git a/graphics/pokemon/terapagos/icon.png b/graphics/pokemon/terapagos/icon.png new file mode 100644 index 0000000000..0376369455 Binary files /dev/null and b/graphics/pokemon/terapagos/icon.png differ diff --git a/graphics/pokemon/terapagos/stellar/icon.png b/graphics/pokemon/terapagos/stellar/icon.png new file mode 100644 index 0000000000..f11525da0d Binary files /dev/null and b/graphics/pokemon/terapagos/stellar/icon.png differ diff --git a/graphics/pokemon/terapagos/terastal/icon.png b/graphics/pokemon/terapagos/terastal/icon.png new file mode 100644 index 0000000000..0f15ff3bb6 Binary files /dev/null and b/graphics/pokemon/terapagos/terastal/icon.png differ diff --git a/graphics/pokemon/ting_lu/icon.png b/graphics/pokemon/ting_lu/icon.png index 0b1f975f9e..a4cbc121a2 100755 Binary files a/graphics/pokemon/ting_lu/icon.png and b/graphics/pokemon/ting_lu/icon.png differ diff --git a/graphics/pokemon/tinkatink/icon.png b/graphics/pokemon/tinkatink/icon.png index fc7300cb0a..0eaec6b140 100644 Binary files a/graphics/pokemon/tinkatink/icon.png and b/graphics/pokemon/tinkatink/icon.png differ diff --git a/graphics/pokemon/tinkaton/icon.png b/graphics/pokemon/tinkaton/icon.png index 72ab26b86b..15175f41e2 100755 Binary files a/graphics/pokemon/tinkaton/icon.png and b/graphics/pokemon/tinkaton/icon.png differ diff --git a/graphics/pokemon/tinkatuff/icon.png b/graphics/pokemon/tinkatuff/icon.png index 7ab30334fa..345da19116 100755 Binary files a/graphics/pokemon/tinkatuff/icon.png and b/graphics/pokemon/tinkatuff/icon.png differ diff --git a/graphics/pokemon/toedscool/icon.png b/graphics/pokemon/toedscool/icon.png index 91edeb2472..6021e614df 100755 Binary files a/graphics/pokemon/toedscool/icon.png and b/graphics/pokemon/toedscool/icon.png differ diff --git a/graphics/pokemon/toedscruel/icon.png b/graphics/pokemon/toedscruel/icon.png index fe3f98f9fa..6095eae573 100755 Binary files a/graphics/pokemon/toedscruel/icon.png and b/graphics/pokemon/toedscruel/icon.png differ diff --git a/graphics/pokemon/typhlosion/hisuian/icon.png b/graphics/pokemon/typhlosion/hisuian/icon.png index c3e0474968..58f2f11198 100644 Binary files a/graphics/pokemon/typhlosion/hisuian/icon.png and b/graphics/pokemon/typhlosion/hisuian/icon.png differ diff --git a/graphics/pokemon/ursaluna/bloodmoon/icon.png b/graphics/pokemon/ursaluna/bloodmoon/icon.png new file mode 100644 index 0000000000..e5fbf80555 Binary files /dev/null and b/graphics/pokemon/ursaluna/bloodmoon/icon.png differ diff --git a/graphics/pokemon/ursaluna/icon.png b/graphics/pokemon/ursaluna/icon.png index 8a84704072..d56041d555 100644 Binary files a/graphics/pokemon/ursaluna/icon.png and b/graphics/pokemon/ursaluna/icon.png differ diff --git a/graphics/pokemon/varoom/icon.png b/graphics/pokemon/varoom/icon.png index 7debadffde..e342395296 100755 Binary files a/graphics/pokemon/varoom/icon.png and b/graphics/pokemon/varoom/icon.png differ diff --git a/graphics/pokemon/veluza/icon.png b/graphics/pokemon/veluza/icon.png index 6d06051669..6282d9c37c 100755 Binary files a/graphics/pokemon/veluza/icon.png and b/graphics/pokemon/veluza/icon.png differ diff --git a/graphics/pokemon/voltorb/hisuian/icon.png b/graphics/pokemon/voltorb/hisuian/icon.png index 2a35e4ec33..c3381d7fde 100644 Binary files a/graphics/pokemon/voltorb/hisuian/icon.png and b/graphics/pokemon/voltorb/hisuian/icon.png differ diff --git a/graphics/pokemon/walking_wake/icon.png b/graphics/pokemon/walking_wake/icon.png index 9260531ecf..a3a37af7f1 100644 Binary files a/graphics/pokemon/walking_wake/icon.png and b/graphics/pokemon/walking_wake/icon.png differ diff --git a/graphics/pokemon/wattrel/icon.png b/graphics/pokemon/wattrel/icon.png index a0a8bc9d49..33bf137c90 100755 Binary files a/graphics/pokemon/wattrel/icon.png and b/graphics/pokemon/wattrel/icon.png differ diff --git a/graphics/pokemon/wiglett/icon.png b/graphics/pokemon/wiglett/icon.png index 668309c68e..4c8e951fd8 100755 Binary files a/graphics/pokemon/wiglett/icon.png and b/graphics/pokemon/wiglett/icon.png differ diff --git a/graphics/pokemon/wo_chien/icon.png b/graphics/pokemon/wo_chien/icon.png index 22402d15c5..3772daf861 100755 Binary files a/graphics/pokemon/wo_chien/icon.png and b/graphics/pokemon/wo_chien/icon.png differ diff --git a/graphics/pokemon/wugtrio/icon.png b/graphics/pokemon/wugtrio/icon.png index 1b67044787..f35b1d0456 100755 Binary files a/graphics/pokemon/wugtrio/icon.png and b/graphics/pokemon/wugtrio/icon.png differ diff --git a/graphics/pokemon/wyrdeer/icon.png b/graphics/pokemon/wyrdeer/icon.png index 905dfe083c..7786e2b3a4 100644 Binary files a/graphics/pokemon/wyrdeer/icon.png and b/graphics/pokemon/wyrdeer/icon.png differ diff --git a/graphics/pokemon/zoroark/hisuian/icon.png b/graphics/pokemon/zoroark/hisuian/icon.png index 6c4f6faf1b..a9610d1fdb 100644 Binary files a/graphics/pokemon/zoroark/hisuian/icon.png and b/graphics/pokemon/zoroark/hisuian/icon.png differ diff --git a/graphics/pokemon/zorua/hisuian/icon.png b/graphics/pokemon/zorua/hisuian/icon.png index 17f9229a2f..79faea9a1a 100644 Binary files a/graphics/pokemon/zorua/hisuian/icon.png and b/graphics/pokemon/zorua/hisuian/icon.png differ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index fde6e3ed3d..54dfc40895 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -474,6 +474,11 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/pikachu/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS + const u8 gMonIcon_PikachuPartner[] = INCBIN_U8("graphics/pokemon/pikachu/partner/icon.4bpp"); + #if P_CUSTOM_GENDER_DIFF_ICONS + const u8 gMonIcon_PikachuPartnerF[] = INCBIN_U8("graphics/pokemon/pikachu/partner/iconf.4bpp"); + #endif + const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz"); const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/normal.gbapal.lz"); const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz"); @@ -2267,6 +2272,11 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/eevee/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS + const u8 gMonIcon_EeveePartner[] = INCBIN_U8("graphics/pokemon/eevee/partner/icon.4bpp"); + #if P_CUSTOM_GENDER_DIFF_ICONS + const u8 gMonIcon_EeveePartnerF[] = INCBIN_U8("graphics/pokemon/eevee/partner/iconf.4bpp"); + #endif + const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz"); const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/normal.gbapal.lz"); const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/back.4bpp.lz"); @@ -3538,7 +3548,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/normal.gbapal.lz"); const u32 gMonBackPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/back.4bpp.lz"); const u32 gMonShinyPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/shiny.gbapal.lz"); - // const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/ursaluna/bloodmoon/icon.4bpp"); + const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/ursaluna/bloodmoon/icon.4bpp"); #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA @@ -11578,7 +11588,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/normal.gbapal.lz"); const u32 gMonBackPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/back.4bpp.lz"); const u32 gMonShinyPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/shiny.gbapal.lz"); - // const u8 gMonIcon_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/icon.4bpp"); + const u8 gMonIcon_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -12927,19 +12937,19 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz"); const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz"); const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz"); - // const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp"); + const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp"); const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz"); const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz"); const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz"); const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz"); - // const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp"); + const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp"); const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz"); const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz"); const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz"); const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz"); - // const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp"); + const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp"); // const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz"); // const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz"); @@ -12967,7 +12977,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/normal.gbapal.lz"); const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz"); const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz"); - // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp"); + const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -12978,7 +12988,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/normal.gbapal.lz"); const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz"); const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz"); - // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp"); + const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -12989,7 +12999,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/normal.gbapal.lz"); const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz"); const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz"); - // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp"); + const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -13000,7 +13010,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/normal.gbapal.lz"); const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz"); const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz"); - // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp"); + const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -13011,7 +13021,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz"); // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz"); // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz"); - // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp"); + const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -13020,13 +13030,13 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz"); // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz"); // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz"); - // const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp"); + const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp"); // const u32 gMonFrontPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/front.4bpp.lz"); // const u32 gMonPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/normal.gbapal.lz"); // const u32 gMonBackPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/back.4bpp.lz"); // const u32 gMonShinyPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/shiny.gbapal.lz"); - // const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/icon.4bpp"); + const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/icon.4bpp"); #endif //P_FAMILY_TERAPAGOS #if P_FAMILY_PECHARUNT @@ -13034,7 +13044,7 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/normal.gbapal.lz"); const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz"); const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz"); - // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp"); + const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp"); #if P_FOOTPRINTS // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp"); #endif //P_FOOTPRINTS diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index c66b4a7a4e..a12130d568 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -3149,10 +3149,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, .palette = gMonPalette_Pikachu, .shinyPalette = gMonShinyPalette_Pikachu, - .iconSprite = gMonIcon_Pikachu, + .iconSprite = gMonIcon_PikachuPartner, .iconPalIndex = 2, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE - .iconSpriteFemale = gMonIcon_PikachuF, + .iconSpriteFemale = gMonIcon_PikachuPartnerF, .iconPalIndexFemale = 2, #endif FOOTPRINT(Pikachu) @@ -13738,8 +13738,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, .palette = gMonPalette_Eevee, .shinyPalette = gMonShinyPalette_Eevee, - .iconSprite = gMonIcon_Eevee, + .iconSprite = gMonIcon_EeveePartner, .iconPalIndex = 2, + #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE + .iconSpriteFemale = gMonIcon_EeveePartnerF, + .iconPalIndexFemale = 2, + #endif FOOTPRINT(Eevee) .cannotBeTraded = TRUE, .allPerfectIVs = TRUE, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index 68d15b3398..d1d33e3483 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -2666,7 +2666,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .palette = gMonPalette_Clodsire, .shinyPalette = gMonShinyPalette_Clodsire, .iconSprite = gMonIcon_Clodsire, - .iconPalIndex = 2, + .iconPalIndex = 0, //FOOTPRINT(Clodsire) .levelUpLearnset = sClodsireLevelUpLearnset, .teachableLearnset = sClodsireTeachableLearnset, @@ -3210,7 +3210,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .palette = gMonPalette_Farigiraf, .shinyPalette = gMonShinyPalette_Farigiraf, .iconSprite = gMonIcon_Farigiraf, - .iconPalIndex = 0, + .iconPalIndex = 1, //FOOTPRINT(Farigiraf) .levelUpLearnset = sFarigirafLevelUpLearnset, .teachableLearnset = sFarigirafTeachableLearnset, @@ -3841,7 +3841,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .palette = gMonPalette_QwilfishHisuian, .shinyPalette = gMonShinyPalette_QwilfishHisuian, .iconSprite = gMonIcon_QwilfishHisuian, - .iconPalIndex = 0, + .iconPalIndex = 1, FOOTPRINT(Qwilfish) .isHisuianForm = TRUE, .levelUpLearnset = sQwilfishHisuianLevelUpLearnset, @@ -4253,7 +4253,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .palette = gMonPalette_SneaselHisuian, .shinyPalette = gMonShinyPalette_SneaselHisuian, .iconSprite = gMonIcon_SneaselHisuian, - .iconPalIndex = 2, + .iconPalIndex = 0, FOOTPRINT(Sneasel) .isHisuianForm = TRUE, .levelUpLearnset = sSneaselHisuianLevelUpLearnset, @@ -4528,8 +4528,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_UrsalunaBloodmoon, .shinyPalette = gMonShinyPalette_UrsalunaBloodmoon, - //.iconSprite = gMonIcon_UrsalunaBloodmoon, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_UrsalunaBloodmoon, + .iconPalIndex = 2, //FOOTPRINT(UrsalunaBloodmoon) .levelUpLearnset = sUrsalunaBloodmoonLevelUpLearnset, .teachableLearnset = sUrsalunaBloodmoonTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 1edf573743..4b1fea0263 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -8591,7 +8591,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .palette = gMonPalette_Kingambit, .shinyPalette = gMonShinyPalette_Kingambit, .iconSprite = gMonIcon_Kingambit, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Kingambit) .levelUpLearnset = sKingambitLevelUpLearnset, .teachableLearnset = sKingambitTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 1e6abfa420..bb9ff9c087 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -2394,7 +2394,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .palette = gMonPalette_Hydrapple, .shinyPalette = gMonShinyPalette_Hydrapple, .iconSprite = gMonIcon_Hydrapple, - .iconPalIndex = 1, + .iconPalIndex = 5, //FOOTPRINT(Hydrapple) .levelUpLearnset = sHydrappleLevelUpLearnset, .teachableLearnset = sHydrappleTeachableLearnset, @@ -5389,8 +5389,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Archaludon, .shinyPalette = gMonShinyPalette_Archaludon, - //.iconSprite = gMonIcon_Archaludon, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_Archaludon, + .iconPalIndex = 0, //FOOTPRINT(Archaludon) .levelUpLearnset = sArchaludonLevelUpLearnset, .teachableLearnset = sArchaludonTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 52fbda5090..61524fe69f 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -50,7 +50,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Sprigatito, .shinyPalette = gMonShinyPalette_Sprigatito, .iconSprite = gMonIcon_Sprigatito, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Sprigatito) .levelUpLearnset = sSprigatitoLevelUpLearnset, .teachableLearnset = sSprigatitoTeachableLearnset, @@ -210,7 +210,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Fuecoco, .shinyPalette = gMonShinyPalette_Fuecoco, .iconSprite = gMonIcon_Fuecoco, - .iconPalIndex = 0, + .iconPalIndex = 2, //FOOTPRINT(Fuecoco) .levelUpLearnset = sFuecocoLevelUpLearnset, .teachableLearnset = sFuecocoTeachableLearnset, @@ -370,7 +370,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Quaxly, .shinyPalette = gMonShinyPalette_Quaxly, .iconSprite = gMonIcon_Quaxly, - .iconPalIndex = 2, + .iconPalIndex = 0, //FOOTPRINT(Quaxly) .levelUpLearnset = sQuaxlyLevelUpLearnset, .teachableLearnset = sQuaxlyTeachableLearnset, @@ -636,7 +636,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_OinkologneFemale, .shinyPalette = gMonShinyPalette_OinkologneFemale, .iconSprite = gMonIcon_OinkologneFemale, - .iconPalIndex = 2, + .iconPalIndex = 0, //FOOTPRINT(Oinkologne) .levelUpLearnset = sOinkologneFemaleLevelUpLearnset, .teachableLearnset = sOinkologneTeachableLearnset, @@ -905,7 +905,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Pawmi, .shinyPalette = gMonShinyPalette_Pawmi, .iconSprite = gMonIcon_Pawmi, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Pawmi) .levelUpLearnset = sPawmiLevelUpLearnset, .teachableLearnset = sPawmiTeachableLearnset, @@ -958,7 +958,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Pawmo, .shinyPalette = gMonShinyPalette_Pawmo, .iconSprite = gMonIcon_Pawmo, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Pawmo) .levelUpLearnset = sPawmoLevelUpLearnset, .teachableLearnset = sPawmoTeachableLearnset, @@ -1011,7 +1011,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Pawmot, .shinyPalette = gMonShinyPalette_Pawmot, .iconSprite = gMonIcon_Pawmot, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Pawmot) .levelUpLearnset = sPawmotLevelUpLearnset, .teachableLearnset = sPawmotTeachableLearnset, @@ -1065,7 +1065,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Tandemaus, .shinyPalette = gMonShinyPalette_Tandemaus, .iconSprite = gMonIcon_Tandemaus, - .iconPalIndex = 0, + .iconPalIndex = 1, //FOOTPRINT(Tandemaus) .levelUpLearnset = sTandemausLevelUpLearnset, .teachableLearnset = sTandemausTeachableLearnset, @@ -1119,7 +1119,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Maushold, .shinyPalette = gMonShinyPalette_Maushold, .iconSprite = gMonIcon_MausholdFamilyOfThree, - .iconPalIndex = 0, + .iconPalIndex = 1, /*FOOTPRINT(Maushold)*/ .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, @@ -1171,7 +1171,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Maushold, .shinyPalette = gMonShinyPalette_Maushold, .iconSprite = gMonIcon_MausholdFamilyOfFour, - .iconPalIndex = 0, + .iconPalIndex = 1, /*FOOTPRINT(Maushold)*/ .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, @@ -1279,7 +1279,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Dachsbun, .shinyPalette = gMonShinyPalette_Dachsbun, .iconSprite = gMonIcon_Dachsbun, - .iconPalIndex = 0, // TODO + .iconPalIndex = 0, //FOOTPRINT(Dachsbun) .levelUpLearnset = sDachsbunLevelUpLearnset, .teachableLearnset = sDachsbunTeachableLearnset, @@ -1439,7 +1439,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Arboliva, .shinyPalette = gMonShinyPalette_Arboliva, .iconSprite = gMonIcon_Arboliva, - .iconPalIndex = 5, + .iconPalIndex = 1, //FOOTPRINT(Arboliva) .levelUpLearnset = sArbolivaLevelUpLearnset, .teachableLearnset = sArbolivaTeachableLearnset, @@ -1546,7 +1546,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_SquawkabillyBluePlumage, .shinyPalette = gMonShinyPalette_SquawkabillyBluePlumage, .iconSprite = gMonIcon_SquawkabillyBluePlumage, - .iconPalIndex = 2, + .iconPalIndex = 0, /*FOOTPRINT(Squawkabilly)*/ .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, @@ -1652,7 +1652,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_SquawkabillyWhitePlumage, .shinyPalette = gMonShinyPalette_SquawkabillyWhitePlumage, .iconSprite = gMonIcon_SquawkabillyWhitePlumage, - .iconPalIndex = 1, + .iconPalIndex = 0, /*FOOTPRINT(Squawkabilly)*/ .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, @@ -1760,7 +1760,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Naclstack, .shinyPalette = gMonShinyPalette_Naclstack, .iconSprite = gMonIcon_Naclstack, - .iconPalIndex = 2, // TODO: recolor + .iconPalIndex = 2, //FOOTPRINT(Naclstack) .levelUpLearnset = sNaclstackLevelUpLearnset, .teachableLearnset = sNaclstackTeachableLearnset, @@ -1867,7 +1867,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Charcadet, .shinyPalette = gMonShinyPalette_Charcadet, .iconSprite = gMonIcon_Charcadet, - .iconPalIndex = 1, + .iconPalIndex = 0, //FOOTPRINT(Charcadet) .levelUpLearnset = sCharcadetLevelUpLearnset, .teachableLearnset = sCharcadetTeachableLearnset, @@ -2028,7 +2028,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Tadbulb, .shinyPalette = gMonShinyPalette_Tadbulb, .iconSprite = gMonIcon_Tadbulb, - .iconPalIndex = 5, // TODO: Redo to 0 + .iconPalIndex = 0, //FOOTPRINT(Tadbulb) .levelUpLearnset = sTadbulbLevelUpLearnset, .teachableLearnset = sTadbulbTeachableLearnset, @@ -2135,7 +2135,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Wattrel, .shinyPalette = gMonShinyPalette_Wattrel, .iconSprite = gMonIcon_Wattrel, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Wattrel) .levelUpLearnset = sWattrelLevelUpLearnset, .teachableLearnset = sWattrelTeachableLearnset, @@ -2188,7 +2188,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Kilowattrel, .shinyPalette = gMonShinyPalette_Kilowattrel, .iconSprite = gMonIcon_Kilowattrel, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Kilowattrel) .levelUpLearnset = sKilowattrelLevelUpLearnset, .teachableLearnset = sKilowattrelTeachableLearnset, @@ -2242,7 +2242,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Maschiff, .shinyPalette = gMonShinyPalette_Maschiff, .iconSprite = gMonIcon_Maschiff, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Maschiff) .levelUpLearnset = sMaschiffLevelUpLearnset, .teachableLearnset = sMaschiffTeachableLearnset, @@ -2295,7 +2295,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Mabosstiff, .shinyPalette = gMonShinyPalette_Mabosstiff, .iconSprite = gMonIcon_Mabosstiff, - .iconPalIndex = 5, + .iconPalIndex = 0, //FOOTPRINT(Mabosstiff) .levelUpLearnset = sMabosstiffLevelUpLearnset, .teachableLearnset = sMabosstiffTeachableLearnset, @@ -2456,7 +2456,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Bramblin, .shinyPalette = gMonShinyPalette_Bramblin, .iconSprite = gMonIcon_Bramblin, - .iconPalIndex = 3, + .iconPalIndex = 1, //FOOTPRINT(Bramblin) .levelUpLearnset = sBramblinLevelUpLearnset, .teachableLearnset = sBramblinTeachableLearnset, @@ -2509,7 +2509,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Brambleghast, .shinyPalette = gMonShinyPalette_Brambleghast, .iconSprite = gMonIcon_Brambleghast, - .iconPalIndex = 5, + .iconPalIndex = 2, //FOOTPRINT(Brambleghast) .levelUpLearnset = sBrambleghastLevelUpLearnset, .teachableLearnset = sBrambleghastTeachableLearnset, @@ -2831,7 +2831,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Rellor, .shinyPalette = gMonShinyPalette_Rellor, .iconSprite = gMonIcon_Rellor, - .iconPalIndex = 5, + .iconPalIndex = 0, //FOOTPRINT(Rellor) .levelUpLearnset = sRellorLevelUpLearnset, .teachableLearnset = sRellorTeachableLearnset, @@ -2938,7 +2938,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Flittle, .shinyPalette = gMonShinyPalette_Flittle, .iconSprite = gMonIcon_Flittle, - .iconPalIndex = 3, + .iconPalIndex = 1, //FOOTPRINT(Flittle) .levelUpLearnset = sFlittleLevelUpLearnset, .teachableLearnset = sFlittleTeachableLearnset, @@ -2991,7 +2991,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Espathra, .shinyPalette = gMonShinyPalette_Espathra, .iconSprite = gMonIcon_Espathra, - .iconPalIndex = 5, + .iconPalIndex = 0, //FOOTPRINT(Espathra) .levelUpLearnset = sEspathraLevelUpLearnset, .teachableLearnset = sEspathraTeachableLearnset, @@ -3098,7 +3098,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Tinkatuff, .shinyPalette = gMonShinyPalette_Tinkatuff, .iconSprite = gMonIcon_Tinkatuff, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Tinkatuff) .levelUpLearnset = sTinkatuffLevelUpLearnset, .teachableLearnset = sTinkatuffTeachableLearnset, @@ -3151,7 +3151,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Tinkaton, .shinyPalette = gMonShinyPalette_Tinkaton, .iconSprite = gMonIcon_Tinkaton, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Tinkaton) .levelUpLearnset = sTinkatonLevelUpLearnset, .teachableLearnset = sTinkatonTeachableLearnset, @@ -3527,7 +3527,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Varoom, .shinyPalette = gMonShinyPalette_Varoom, .iconSprite = gMonIcon_Varoom, - .iconPalIndex = 5, + .iconPalIndex = 2, //FOOTPRINT(Varoom) .levelUpLearnset = sVaroomLevelUpLearnset, .teachableLearnset = sVaroomTeachableLearnset, @@ -3580,7 +3580,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Revavroom, .shinyPalette = gMonShinyPalette_Revavroom, .iconSprite = gMonIcon_Revavroom, - .iconPalIndex = 5, + .iconPalIndex = 2, //FOOTPRINT(Revavroom) .levelUpLearnset = sRevavroomLevelUpLearnset, .teachableLearnset = sRevavroomTeachableLearnset, @@ -3688,7 +3688,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Orthworm, .shinyPalette = gMonShinyPalette_Orthworm, .iconSprite = gMonIcon_Orthworm, - .iconPalIndex = 4, + .iconPalIndex = 0, //FOOTPRINT(Orthworm) .levelUpLearnset = sOrthwormLevelUpLearnset, .teachableLearnset = sOrthwormTeachableLearnset, @@ -3851,7 +3851,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Greavard, .shinyPalette = gMonShinyPalette_Greavard, .iconSprite = gMonIcon_Greavard, - .iconPalIndex = 2, + .iconPalIndex = 0, //FOOTPRINT(Greavard) .levelUpLearnset = sGreavardLevelUpLearnset, .teachableLearnset = sGreavardTeachableLearnset, @@ -3904,7 +3904,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Houndstone, .shinyPalette = gMonShinyPalette_Houndstone, .iconSprite = gMonIcon_Houndstone, - .iconPalIndex = 5, + .iconPalIndex = 2, //FOOTPRINT(Houndstone) .levelUpLearnset = sHoundstoneLevelUpLearnset, .teachableLearnset = sHoundstoneTeachableLearnset, @@ -3958,7 +3958,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Flamigo, .shinyPalette = gMonShinyPalette_Flamigo, .iconSprite = gMonIcon_Flamigo, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Flamigo) .levelUpLearnset = sFlamigoLevelUpLearnset, .teachableLearnset = sFlamigoTeachableLearnset, @@ -4120,7 +4120,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Veluza, .shinyPalette = gMonShinyPalette_Veluza, .iconSprite = gMonIcon_Veluza, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Veluza) .levelUpLearnset = sVeluzaLevelUpLearnset, .teachableLearnset = sVeluzaTeachableLearnset, @@ -4556,7 +4556,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_FlutterMane, .shinyPalette = gMonShinyPalette_FlutterMane, .iconSprite = gMonIcon_FlutterMane, - .iconPalIndex = 4, + .iconPalIndex = 2, //FOOTPRINT(FlutterMane) .isParadoxForm = TRUE, .levelUpLearnset = sFlutterManeLevelUpLearnset, @@ -4610,7 +4610,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_SlitherWing, .shinyPalette = gMonShinyPalette_SlitherWing, .iconSprite = gMonIcon_SlitherWing, - .iconPalIndex = 3, + .iconPalIndex = 1, //FOOTPRINT(SlitherWing) .isParadoxForm = TRUE, .levelUpLearnset = sSlitherWingLevelUpLearnset, @@ -4720,7 +4720,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_IronTreads, .shinyPalette = gMonShinyPalette_IronTreads, .iconSprite = gMonIcon_IronTreads, - .iconPalIndex = 0, + .iconPalIndex = 1, //FOOTPRINT(IronTreads) .isParadoxForm = TRUE, .levelUpLearnset = sIronTreadsLevelUpLearnset, @@ -4886,7 +4886,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_IronJugulis, .shinyPalette = gMonShinyPalette_IronJugulis, .iconSprite = gMonIcon_IronJugulis, - .iconPalIndex = 2, + .iconPalIndex = 0, //FOOTPRINT(IronJugulis) .isParadoxForm = TRUE, .levelUpLearnset = sIronJugulisLevelUpLearnset, @@ -4942,7 +4942,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_IronMoth, .shinyPalette = gMonShinyPalette_IronMoth, .iconSprite = gMonIcon_IronMoth, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(IronMoth) .isParadoxForm = TRUE, .levelUpLearnset = sIronMothLevelUpLearnset, @@ -5052,7 +5052,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Frigibax, .shinyPalette = gMonShinyPalette_Frigibax, .iconSprite = gMonIcon_Frigibax, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(Frigibax) .levelUpLearnset = sFrigibaxLevelUpLearnset, .teachableLearnset = sFrigibaxTeachableLearnset, @@ -5374,7 +5374,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_WoChien, .shinyPalette = gMonShinyPalette_WoChien, .iconSprite = gMonIcon_WoChien, - .iconPalIndex = 5, + .iconPalIndex = 1, //FOOTPRINT(WoChien) .isLegendary = TRUE, .levelUpLearnset = sWoChienLevelUpLearnset, @@ -5596,7 +5596,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_RoaringMoon, .shinyPalette = gMonShinyPalette_RoaringMoon, .iconSprite = gMonIcon_RoaringMoon, - .iconPalIndex = 3, + .iconPalIndex = 0, //FOOTPRINT(RoaringMoon) .isParadoxForm = TRUE, .levelUpLearnset = sRoaringMoonLevelUpLearnset, @@ -5650,7 +5650,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_IronValiant, .shinyPalette = gMonShinyPalette_IronValiant, .iconSprite = gMonIcon_IronValiant, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(IronValiant) .isParadoxForm = TRUE, .levelUpLearnset = sIronValiantLevelUpLearnset, @@ -5926,7 +5926,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Poltchageist, .shinyPalette = gMonShinyPalette_Poltchageist, .iconSprite = gMonIcon_Poltchageist, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Poltchageist) .levelUpLearnset = sPoltchageistLevelUpLearnset, .teachableLearnset = sPoltchageistTeachableLearnset, @@ -5979,7 +5979,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .palette = gMonPalette_Poltchageist, .shinyPalette = gMonShinyPalette_Poltchageist, .iconSprite = gMonIcon_Poltchageist, - .iconPalIndex = 4, + .iconPalIndex = 1, //FOOTPRINT(Poltchageist) .levelUpLearnset = sPoltchageistLevelUpLearnset, .teachableLearnset = sPoltchageistTeachableLearnset, @@ -6258,7 +6258,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON -#define OGERPON_SPECIES_INFO(Form, type, ability, color) \ +#define OGERPON_SPECIES_INFO(Form, type, ability, color, iconpalette) \ { \ .baseHP = 80, \ .baseAttack = 120, \ @@ -6299,8 +6299,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_Ogerpon##Form, \ .shinyPalette = gMonShinyPalette_Ogerpon##Form, \ - .iconSprite = gMonIcon_OgerponTealMask,/* Each form should have its own icon */ \ - .iconPalIndex = 1, \ + .iconSprite = gMonIcon_Ogerpon##Form, \ + .iconPalIndex = iconpalette, \ /*FOOTPRINT(Ogerpon)*/ \ .levelUpLearnset = sOgerponLevelUpLearnset, \ .teachableLearnset = sOgerponTeachableLearnset, \ @@ -6309,15 +6309,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .isLegendary = TRUE, \ } - [SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN), - [SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE), - [SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED), - [SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY), + [SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1), + [SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0), + [SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0), + [SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0), #if P_TERA_FORMS - [SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL, BODY_COLOR_GREEN), - [SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING, BODY_COLOR_BLUE), - [SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME, BODY_COLOR_RED), - [SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE, BODY_COLOR_GRAY), + [SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL, BODY_COLOR_GREEN, 1), + [SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING, BODY_COLOR_BLUE, 0), + [SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(HearthflameMask, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME, BODY_COLOR_RED, 0), + [SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(CornerstoneMask, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE, BODY_COLOR_GRAY, 0), #endif //P_TERA_FORMS #endif //P_FAMILY_OGERPON @@ -6368,8 +6368,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GougingFire, .shinyPalette = gMonShinyPalette_GougingFire, - //.iconSprite = gMonIcon_GougingFire, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_GougingFire, + .iconPalIndex = 5, //FOOTPRINT(GougingFire) .isParadoxForm = TRUE, .levelUpLearnset = sGougingFireLevelUpLearnset, @@ -6423,8 +6423,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_RagingBolt, .shinyPalette = gMonShinyPalette_RagingBolt, - //.iconSprite = gMonIcon_RagingBolt, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_RagingBolt, + .iconPalIndex = 2, //FOOTPRINT(RagingBolt) .isParadoxForm = TRUE, .levelUpLearnset = sRagingBoltLevelUpLearnset, @@ -6477,8 +6477,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronBoulder, .shinyPalette = gMonShinyPalette_IronBoulder, - //.iconSprite = gMonIcon_IronBoulder, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_IronBoulder, + .iconPalIndex = 5, //FOOTPRINT(IronBoulder) .isParadoxForm = TRUE, .levelUpLearnset = sIronBoulderLevelUpLearnset, @@ -6532,8 +6532,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronCrown, .shinyPalette = gMonShinyPalette_IronCrown, - //.iconSprite = gMonIcon_IronCrown, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_IronCrown, + .iconPalIndex = 3, //FOOTPRINT(IronCrown) .isParadoxForm = TRUE, .levelUpLearnset = sIronCrownLevelUpLearnset, @@ -6587,8 +6587,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //.palette = gMonPalette_TerapagosNormal, //.shinyPalette = gMonShinyPalette_TerapagosNormal, - //.iconSprite = gMonIcon_TerapagosNormal, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_TerapagosNormal, + .iconPalIndex = 0, //FOOTPRINT(Terapagos) .isLegendary = TRUE, .levelUpLearnset = sTerapagosLevelUpLearnset, @@ -6643,8 +6643,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //.palette = gMonPalette_TerapagosTerastal, //.shinyPalette = gMonShinyPalette_TerapagosTerastal, - //.iconSprite = gMonIcon_TerapagosTerastal, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_TerapagosTerastal, + .iconPalIndex = 0, //FOOTPRINT(Terapagos) .isLegendary = TRUE, .levelUpLearnset = sTerapagosLevelUpLearnset, @@ -6698,8 +6698,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //.palette = gMonPalette_TerapagosStellar, //.shinyPalette = gMonShinyPalette_TerapagosStellar, - //.iconSprite = gMonIcon_TerapagosStellar, - //.iconPalIndex = 0, + .iconSprite = gMonIcon_TerapagosStellar, + .iconPalIndex = 0, //FOOTPRINT(Terapagos) .isLegendary = TRUE, .levelUpLearnset = sTerapagosLevelUpLearnset, @@ -6755,8 +6755,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Pecharunt, .shinyPalette = gMonShinyPalette_Pecharunt, - // .iconSprite = gMonIcon_Pecharunt, - // .iconPalIndex = 0, + .iconSprite = gMonIcon_Pecharunt, + .iconPalIndex = 0, //FOOTPRINT(Pecharunt) .isMythical = TRUE, .levelUpLearnset = sPecharuntLevelUpLearnset,