Add missing Gen8 icons

include/graphics.h

@@ -5456,8 +5456,8 @@ extern const u8 gMonIcon_Cinderace[];
 extern const u8 gMonIcon_Sobble[];
 extern const u8 gMonIcon_Drizzile[];
 extern const u8 gMonIcon_Inteleon[];
-//extern const u8 gMonIcon_Skwovet[];
+extern const u8 gMonIcon_Skwovet[];
-//extern const u8 gMonIcon_Greedent[];
+extern const u8 gMonIcon_Greedent[];
 extern const u8 gMonIcon_Rookidee[];
 extern const u8 gMonIcon_Corvisquire[];
 extern const u8 gMonIcon_Corviknight[];
@@ -5483,9 +5483,9 @@ extern const u8 gMonIcon_Appletun[];
 extern const u8 gMonIcon_Silicobra[];
 extern const u8 gMonIcon_Sandaconda[];
 extern const u8 gMonIcon_Cramorant[];
-//extern const u8 gMonIcon_Arrokuda[];
+extern const u8 gMonIcon_Arrokuda[];
-//extern const u8 gMonIcon_Barraskewda[];
+extern const u8 gMonIcon_Barraskewda[];
-//extern const u8 gMonIcon_Toxel[];
+extern const u8 gMonIcon_Toxel[];
 extern const u8 gMonIcon_Toxtricity[];
 extern const u8 gMonIcon_Sizzlipede[];
 extern const u8 gMonIcon_Centiskorch[];
@@ -5506,9 +5506,9 @@ extern const u8 gMonIcon_Sirfetchd[];
 extern const u8 gMonIcon_MrRime[];
 extern const u8 gMonIcon_Runerigus[];
 extern const u8 gMonIcon_Milcery[];
-//extern const u8 gMonIcon_Alcremie[];
+extern const u8 gMonIcon_Alcremie[];
 extern const u8 gMonIcon_Falinks[];
-//extern const u8 gMonIcon_Pincurchin[];
+extern const u8 gMonIcon_Pincurchin[];
 extern const u8 gMonIcon_Snom[];
 extern const u8 gMonIcon_Frosmoth[];
 extern const u8 gMonIcon_Stonjourner[];
@@ -5517,10 +5517,10 @@ extern const u8 gMonIcon_Indeedee[];
 extern const u8 gMonIcon_Morpeko[];
 extern const u8 gMonIcon_Cufant[];
 extern const u8 gMonIcon_Copperajah[];
-//extern const u8 gMonIcon_Dracozolt[];
+extern const u8 gMonIcon_Dracozolt[];
-//extern const u8 gMonIcon_Arctozolt[];
+extern const u8 gMonIcon_Arctozolt[];
-//extern const u8 gMonIcon_Dracovish[];
+extern const u8 gMonIcon_Dracovish[];
-//extern const u8 gMonIcon_Arctovish[];
+extern const u8 gMonIcon_Arctovish[];
 extern const u8 gMonIcon_Duraludon[];
 extern const u8 gMonIcon_Dreepy[];
 extern const u8 gMonIcon_Drakloak[];
@@ -5528,13 +5528,13 @@ extern const u8 gMonIcon_Dragapult[];
 extern const u8 gMonIcon_Zacian[];
 extern const u8 gMonIcon_Zamazenta[];
 extern const u8 gMonIcon_Eternatus[];
-//extern const u8 gMonIcon_Kubfu[];
+extern const u8 gMonIcon_Kubfu[];
-//extern const u8 gMonIcon_Urshifu[];
+extern const u8 gMonIcon_Urshifu[];
-//extern const u8 gMonIcon_Zarude[];
+extern const u8 gMonIcon_Zarude[];
-//extern const u8 gMonIcon_Regieleki[];
+extern const u8 gMonIcon_Regieleki[];
-//extern const u8 gMonIcon_Regidrago[];
+extern const u8 gMonIcon_Regidrago[];
-//extern const u8 gMonIcon_Glastrier[];
+extern const u8 gMonIcon_Glastrier[];
-//extern const u8 gMonIcon_Spectrier[];
+extern const u8 gMonIcon_Spectrier[];
 //extern const u8 gMonIcon_Calyrex[];
 extern const u8 gMonIcon_VenusaurMega[];
 extern const u8 gMonIcon_CharizardMegaX[];
@@ -5607,15 +5607,15 @@ extern const u8 gMonIcon_MarowakAlolan[];
 extern const u8 gMonIcon_MeowthGalarian[];
 extern const u8 gMonIcon_PonytaGalarian[];
 extern const u8 gMonIcon_RapidashGalarian[];
-//extern const u8 gMonIcon_SlowpokeGalarian[];
+extern const u8 gMonIcon_SlowpokeGalarian[];
-//extern const u8 gMonIcon_SlowbroGalarian[];
+extern const u8 gMonIcon_SlowbroGalarian[];
 extern const u8 gMonIcon_FarfetchdGalarian[];
 extern const u8 gMonIcon_WeezingGalarian[];
 extern const u8 gMonIcon_MrMimeGalarian[];
-//extern const u8 gMonIcon_ArticunoGalarian[];
+extern const u8 gMonIcon_ArticunoGalarian[];
-//extern const u8 gMonIcon_ZapdosGalarian[];
+extern const u8 gMonIcon_ZapdosGalarian[];
-//extern const u8 gMonIcon_MoltresGalarian[];
+extern const u8 gMonIcon_MoltresGalarian[];
-//extern const u8 gMonIcon_SlowkingGalarian[];
+extern const u8 gMonIcon_SlowkingGalarian[];
 extern const u8 gMonIcon_CorsolaGalarian[];
 extern const u8 gMonIcon_ZigzagoonGalarian[];
 extern const u8 gMonIcon_LinooneGalarian[];
@@ -5686,7 +5686,7 @@ extern const u8 gMonIcon_GiratinaOrigin[];
 extern const u8 gMonIcon_ShayminSky[];
 extern const u8 gMonIcon_BasculinBlueStriped[];
 extern const u8 gMonIcon_DarmanitanZenMode[];
-//extern const u8 gMonIcon_DarmanitanZenModeGalarian[];
+extern const u8 gMonIcon_DarmanitanZenModeGalarian[];
 extern const u8 gMonIcon_DeerlingSummer[];
 extern const u8 gMonIcon_DeerlingAutumn[];
 extern const u8 gMonIcon_DeerlingWinter[];
@@ -5782,9 +5782,8 @@ extern const u8 gMonIcon_IndeedeeFemale[];
 extern const u8 gMonIcon_MorpekoHangry[];
 extern const u8 gMonIcon_ZacianCrownedSword[];
 extern const u8 gMonIcon_ZamazentaCrownedShield[];
-//extern const u8 gMonIcon_EternatusEternamax[];
+extern const u8 gMonIcon_EternatusEternamax[];
-//extern const u8 gMonIcon_UrshifuRapidStrikeStyle[];
+extern const u8 gMonIcon_ZarudeDada[];
-//extern const u8 gMonIcon_ZarudeDada[];
 //extern const u8 gMonIcon_CalyrexIceRider[];
 //extern const u8 gMonIcon_CalyrexShadowRider[];
 extern const u8 gMonIcon_Egg[];

src/data/graphics/pokemon.h

@@ -5419,8 +5419,8 @@ const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/icon.4bpp"
 const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/icon.4bpp");
 const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/icon.4bpp");
 const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/icon.4bpp");
-//const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp");
+const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp");
-//const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp");
+const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp");
 const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/icon.4bpp");
 const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/icon.4bpp");
 const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/icon.4bpp");
@@ -5446,9 +5446,9 @@ const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/icon.4bpp");
 const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/icon.4bpp");
 const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/icon.4bpp");
 const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp");
-//const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp");
+const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp");
-//const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp");
+const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp");
-//const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp");
+const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp");
 const u8 gMonIcon_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp");
 const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp");
 const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp");
@@ -5469,9 +5469,9 @@ const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/icon.4bpp"
 const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/icon.4bpp");
 const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/icon.4bpp");
 const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/icon.4bpp");
-//const u8 gMonIcon_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/icon.4bpp");
+const u8 gMonIcon_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/icon.4bpp");
 const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/icon.4bpp");
-//const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp");
+const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp");
 const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp");
 const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp");
 const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp");
@@ -5480,10 +5480,10 @@ const u8 gMonIcon_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp");
 const u8 gMonIcon_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp");
 const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp");
 const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp");
-//const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp");
+const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp");
-//const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp");
+const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp");
-//const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp");
+const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp");
-//const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp");
+const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp");
 const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp");
 const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp");
 const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp");
@@ -5491,13 +5491,13 @@ const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp"
 const u8 gMonIcon_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp");
 const u8 gMonIcon_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp");
 const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp");
-//const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp");
+const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp");
-//const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp");
+const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp");
-//const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp");
+const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp");
-//const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp");
+const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp");
-//const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp");
+const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp");
-//const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp");
+const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp");
-//const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp");
+const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp");
 //const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp");
 const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/mega_venusaur/icon.4bpp");
 const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/mega_charizard_x/icon.4bpp");
@@ -5570,15 +5570,15 @@ const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/alolan_marowak/i
 const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp");
 const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp");
 const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp");
-//const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp");
+const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp");
-//const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp");
+const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp");
 const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/farfetchd/galarian/icon.4bpp");
 const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/weezing/galarian/icon.4bpp");
 const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/mr_mime/galarian/icon.4bpp");
-//const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp");
+const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp");
-//const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp");
+const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp");
-//const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp");
+const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp");
-//const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp");
+const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp");
 const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp");
 const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp");
 const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp");
@@ -5649,7 +5649,7 @@ const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin
 const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp");
 const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp");
 const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp");
-//const u8 gMonIcon_DarmanitanZenModeGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp");
+const u8 gMonIcon_DarmanitanZenModeGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp");
 const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp");
 const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/deerling/autumn/icon.4bpp");
 const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/deerling/winter/icon.4bpp");
@@ -5745,9 +5745,8 @@ const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female
 const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/morpeko/hangry/icon.4bpp");
 const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp");
 const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp");
-//const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/icon.4bpp");
+const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/icon.4bpp");
-//const u8 gMonIcon_UrshifuRapidStrikeStyle[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style/icon.4bpp");
+const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp");
-//const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp");
 //const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp");
 //const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
 const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");

src/pokemon_icon.c

@@ -846,8 +846,8 @@ const u8 *const gMonIconTable[] =
     [SPECIES_SOBBLE] = gMonIcon_Sobble,
     [SPECIES_DRIZZILE] = gMonIcon_Drizzile,
     [SPECIES_INTELEON] = gMonIcon_Inteleon,
-    [SPECIES_SKWOVET] = gMonIcon_QuestionMark,//gMonIcon_Skwovet,
+    [SPECIES_SKWOVET] = gMonIcon_Skwovet,
-    [SPECIES_GREEDENT] = gMonIcon_QuestionMark,//gMonIcon_Greedent,
+    [SPECIES_GREEDENT] = gMonIcon_Greedent,
     [SPECIES_ROOKIDEE] = gMonIcon_Rookidee,
     [SPECIES_CORVISQUIRE] = gMonIcon_Corvisquire,
     [SPECIES_CORVIKNIGHT] = gMonIcon_Corviknight,
@@ -873,9 +873,9 @@ const u8 *const gMonIconTable[] =
     [SPECIES_SILICOBRA] = gMonIcon_Silicobra,
     [SPECIES_SANDACONDA] = gMonIcon_Sandaconda,
     [SPECIES_CRAMORANT] = gMonIcon_Cramorant,
-    [SPECIES_ARROKUDA] = gMonIcon_QuestionMark,//gMonIcon_Arrokuda,
+    [SPECIES_ARROKUDA] = gMonIcon_Arrokuda,
-    [SPECIES_BARRASKEWDA] = gMonIcon_QuestionMark,//gMonIcon_Barraskewda,
+    [SPECIES_BARRASKEWDA] = gMonIcon_Barraskewda,
-    [SPECIES_TOXEL] = gMonIcon_QuestionMark,//gMonIcon_Toxel,
+    [SPECIES_TOXEL] = gMonIcon_Toxel,
     [SPECIES_TOXTRICITY] = gMonIcon_Toxtricity,
     [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede,
     [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch,
@@ -896,9 +896,9 @@ const u8 *const gMonIconTable[] =
     [SPECIES_MR_RIME] = gMonIcon_MrRime,
     [SPECIES_RUNERIGUS] = gMonIcon_Runerigus,
     [SPECIES_MILCERY] = gMonIcon_Milcery,
-    [SPECIES_ALCREMIE] = gMonIcon_QuestionMark,//gMonIcon_Alcremie,
+    [SPECIES_ALCREMIE] = gMonIcon_Alcremie,
     [SPECIES_FALINKS] = gMonIcon_Falinks,
-    [SPECIES_PINCURCHIN] = gMonIcon_QuestionMark,//gMonIcon_Pincurchin,
+    [SPECIES_PINCURCHIN] = gMonIcon_Pincurchin,
     [SPECIES_SNOM] = gMonIcon_Snom,
     [SPECIES_FROSMOTH] = gMonIcon_Frosmoth,
     [SPECIES_STONJOURNER] = gMonIcon_Stonjourner,
@@ -907,10 +907,10 @@ const u8 *const gMonIconTable[] =
     [SPECIES_MORPEKO] = gMonIcon_Morpeko,
     [SPECIES_CUFANT] = gMonIcon_Cufant,
     [SPECIES_COPPERAJAH] = gMonIcon_Copperajah,
-    [SPECIES_DRACOZOLT] = gMonIcon_QuestionMark,//gMonIcon_Dracozolt,
+    [SPECIES_DRACOZOLT] = gMonIcon_Dracozolt,
-    [SPECIES_ARCTOZOLT] = gMonIcon_QuestionMark,//gMonIcon_Arctozolt,
+    [SPECIES_ARCTOZOLT] = gMonIcon_Arctozolt,
-    [SPECIES_DRACOVISH] = gMonIcon_QuestionMark,//gMonIcon_Dracovish,
+    [SPECIES_DRACOVISH] = gMonIcon_Dracovish,
-    [SPECIES_ARCTOVISH] = gMonIcon_QuestionMark,//gMonIcon_Arctovish,
+    [SPECIES_ARCTOVISH] = gMonIcon_Arctovish,
     [SPECIES_DURALUDON] = gMonIcon_Duraludon,
     [SPECIES_DREEPY] = gMonIcon_Dreepy,
     [SPECIES_DRAKLOAK] = gMonIcon_Drakloak,
@@ -918,13 +918,13 @@ const u8 *const gMonIconTable[] =
     [SPECIES_ZACIAN] = gMonIcon_Zacian,
     [SPECIES_ZAMAZENTA] = gMonIcon_Zamazenta,
     [SPECIES_ETERNATUS] = gMonIcon_Eternatus,
-    [SPECIES_KUBFU] = gMonIcon_QuestionMark,//gMonIcon_Kubfu,
+    [SPECIES_KUBFU] = gMonIcon_Kubfu,
-    [SPECIES_URSHIFU] = gMonIcon_QuestionMark,//gMonIcon_Urshifu,
+    [SPECIES_URSHIFU] = gMonIcon_Urshifu,
-    [SPECIES_ZARUDE] = gMonIcon_QuestionMark,//gMonIcon_Zarude,
+    [SPECIES_ZARUDE] = gMonIcon_Zarude,
-    [SPECIES_REGIELEKI] = gMonIcon_QuestionMark,//gMonIcon_Regieleki,
+    [SPECIES_REGIELEKI] = gMonIcon_Regieleki,
-    [SPECIES_REGIDRAGO] = gMonIcon_QuestionMark,//gMonIcon_Regidrago,
+    [SPECIES_REGIDRAGO] = gMonIcon_Regidrago,
-    [SPECIES_GLASTRIER] = gMonIcon_QuestionMark,//gMonIcon_Glastrier,
+    [SPECIES_GLASTRIER] = gMonIcon_Glastrier,
-    [SPECIES_SPECTRIER] = gMonIcon_QuestionMark,//gMonIcon_Spectrier,
+    [SPECIES_SPECTRIER] = gMonIcon_Spectrier,
     [SPECIES_CALYREX] = gMonIcon_QuestionMark,//gMonIcon_Calyrex,
     [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega,
     [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX,
@@ -997,15 +997,15 @@ const u8 *const gMonIconTable[] =
     [SPECIES_MEOWTH_GALARIAN] = gMonIcon_MeowthGalarian,
     [SPECIES_PONYTA_GALARIAN] = gMonIcon_PonytaGalarian,
     [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_RapidashGalarian,
-    [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowpokeGalarian,
+    [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_SlowpokeGalarian,
-    [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowbroGalarian,
+    [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_SlowbroGalarian,
     [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_FarfetchdGalarian,
     [SPECIES_WEEZING_GALARIAN] = gMonIcon_WeezingGalarian,
     [SPECIES_MR_MIME_GALARIAN] = gMonIcon_MrMimeGalarian,
-    [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_ArticunoGalarian,
+    [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_ArticunoGalarian,
-    [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_ZapdosGalarian,
+    [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_ZapdosGalarian,
-    [SPECIES_MOLTRES_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_MoltresGalarian,
+    [SPECIES_MOLTRES_GALARIAN] = gMonIcon_MoltresGalarian,
-    [SPECIES_SLOWKING_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_SlowkingGalarian,
+    [SPECIES_SLOWKING_GALARIAN] = gMonIcon_SlowkingGalarian,
     [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian,
     [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian,
     [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian,
@@ -1094,7 +1094,7 @@ const u8 *const gMonIconTable[] =
     [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus,
     [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped,
     [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode,
-    [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_QuestionMark,//gMonIcon_DarmanitanZenModeGalarian,
+    [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_DarmanitanZenModeGalarian,
     [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer,
     [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn,
     [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter,
@@ -1229,9 +1229,9 @@ const u8 *const gMonIconTable[] =
     [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry,
     [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword,
     [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield,
-    [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_QuestionMark,//gMonIcon_EternatusEternamax,
+    [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_EternatusEternamax,
-    [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_QuestionMark,//gMonIcon_UrshifuRapidStrikeStyle,
+    [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_Urshifu,
-    [SPECIES_ZARUDE_DADA] = gMonIcon_QuestionMark,//gMonIcon_ZarudeDada,
+    [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada,
     [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexIceRider,
     [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_QuestionMark,//gMonIcon_CalyrexShadowRider,
     [SPECIES_EGG] = gMonIcon_Egg,
@@ -2062,7 +2062,7 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_SOBBLE] = 2,
     [SPECIES_DRIZZILE] = 2,
     [SPECIES_INTELEON] = 0,
-    [SPECIES_SKWOVET] = 0,
+    [SPECIES_SKWOVET] = 2,
     [SPECIES_GREEDENT] = 0,
     [SPECIES_ROOKIDEE] = 0,
     [SPECIES_CORVISQUIRE] = 0,
@@ -2089,9 +2089,9 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_SILICOBRA] = 1,
     [SPECIES_SANDACONDA] = 1,
     [SPECIES_CRAMORANT] = 0,
-    [SPECIES_ARROKUDA] = 0,
+    [SPECIES_ARROKUDA] = 2,
-    [SPECIES_BARRASKEWDA] = 0,
+    [SPECIES_BARRASKEWDA] = 2,
-    [SPECIES_TOXEL] = 0,
+    [SPECIES_TOXEL] = 2,
     [SPECIES_TOXTRICITY] = 2,
     [SPECIES_SIZZLIPEDE] = 0,
     [SPECIES_CENTISKORCH] = 0,
@@ -2112,7 +2112,7 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_MR_RIME] = 0,
     [SPECIES_RUNERIGUS] = 2,
     [SPECIES_MILCERY] = 1,
-    [SPECIES_ALCREMIE] = 0,
+    [SPECIES_ALCREMIE] = 1,
     [SPECIES_FALINKS] = 0,
     [SPECIES_PINCURCHIN] = 0,
     [SPECIES_SNOM] = 0,
@@ -2123,8 +2123,8 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_MORPEKO] = 2,
     [SPECIES_CUFANT] = 0,
     [SPECIES_COPPERAJAH] = 0,
-    [SPECIES_DRACOZOLT] = 0,
+    [SPECIES_DRACOZOLT] = 1,
-    [SPECIES_ARCTOZOLT] = 0,
+    [SPECIES_ARCTOZOLT] = 2,
     [SPECIES_DRACOVISH] = 0,
     [SPECIES_ARCTOVISH] = 0,
     [SPECIES_DURALUDON] = 0,
@@ -2134,11 +2134,11 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_ZACIAN] = 2,
     [SPECIES_ZAMAZENTA] = 2,
     [SPECIES_ETERNATUS] = 0,
-    [SPECIES_KUBFU] = 0,
+    [SPECIES_KUBFU] = 1,
-    [SPECIES_URSHIFU] = 0,
+    [SPECIES_URSHIFU] = 2,
-    [SPECIES_ZARUDE] = 0,
+    [SPECIES_ZARUDE] = 1,
     [SPECIES_REGIELEKI] = 0,
-    [SPECIES_REGIDRAGO] = 0,
+    [SPECIES_REGIDRAGO] = 2,
     [SPECIES_GLASTRIER] = 0,
     [SPECIES_SPECTRIER] = 0,
     [SPECIES_CALYREX] = 0,
@@ -2213,15 +2213,15 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_MEOWTH_GALARIAN] = 0,
     [SPECIES_PONYTA_GALARIAN] = 2,
     [SPECIES_RAPIDASH_GALARIAN] = 2,
-    [SPECIES_SLOWPOKE_GALARIAN] = 0,
+    [SPECIES_SLOWPOKE_GALARIAN] = 1,
     [SPECIES_SLOWBRO_GALARIAN] = 0,
     [SPECIES_FARFETCHD_GALARIAN] = 1,
     [SPECIES_WEEZING_GALARIAN] = 1,
     [SPECIES_MR_MIME_GALARIAN] = 0,
-    [SPECIES_ARTICUNO_GALARIAN] = 0,
+    [SPECIES_ARTICUNO_GALARIAN] = 2,
     [SPECIES_ZAPDOS_GALARIAN] = 0,
     [SPECIES_MOLTRES_GALARIAN] = 0,
-    [SPECIES_SLOWKING_GALARIAN] = 0,
+    [SPECIES_SLOWKING_GALARIAN] = 2,
     [SPECIES_CORSOLA_GALARIAN] = 0,
     [SPECIES_ZIGZAGOON_GALARIAN] = 0,
     [SPECIES_LINOONE_GALARIAN] = 0,
@@ -2411,8 +2411,8 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_ZACIAN_CROWNED_SWORD] = 2,
     [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = 2,
     [SPECIES_ETERNATUS_ETERNAMAX] = 0,
-    [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 0,
+    [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = 2,
-    [SPECIES_ZARUDE_DADA] = 0,
+    [SPECIES_ZARUDE_DADA] = 1,
     [SPECIES_CALYREX_ICE_RIDER] = 0,
     [SPECIES_CALYREX_SHADOW_RIDER] = 0,
     [SPECIES_EGG] = 1,