From 1acaf7f8699094fb003d1a07fbe07934a28148ab Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Thu, 26 Oct 2023 15:35:38 -0500
Subject: [PATCH] Fixed icons

---
 graphics/pokemon/dipplin/icon.png      | Bin 278 -> 310 bytes
 graphics/pokemon/fezandipiti/icon.png  | Bin 367 -> 395 bytes
 graphics/pokemon/munkidori/icon.png    | Bin 299 -> 337 bytes
 graphics/pokemon/ogerpon/icon.png      | Bin 336 -> 364 bytes
 graphics/pokemon/okidogi/icon.png      | Bin 414 -> 442 bytes
 graphics/pokemon/poltchageist/icon.png | Bin 317 -> 340 bytes
 graphics/pokemon/sinistcha/icon.png    | Bin 309 -> 339 bytes
 src/pokemon_icon.c                     |  28 ++++++++++++-------------
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/graphics/pokemon/dipplin/icon.png b/graphics/pokemon/dipplin/icon.png
index e77c0a7f60ab98156c10b50f4ab4a20490ce055f..5fab863bd982222876a6972e46152f9877c0d1c8 100644
GIT binary patch
delta 283
zcmbQnw2f(kO1(jVPl#*MoaW-<;=OzK{{R2KdXCqevtCoadA%#1^KHtvy-T9LJ=6U5
zZOzrIS<k#Qlaitw9UU_*Yoi$$7z9d!{DOg6P{3KmO;dn!OFdm2Lp(a)PBG+TQRHFX
z&Y%>L`2YWQ@y)7?t6pzl>19`En(};SSG}v;pH1v#|4!Uv$mwOTXLzv4o3U48<yI*n
zW{*!(MTGSE9ZD6fw`v%6Es5F5RgqC};QZl7YP%)97!$53J2iY=ch@FqAMc~jaq$HT
zz73i+9I_MN|D5nd`S}@62YI1@yYrQPFlq&6SA<VlAGWh5U{(9u`7!hM{%U_$v*Yu_
cbM5jX3MQhf_pi7-6X;|HPgg&ebxsLQ0JU+5MF0Q*

delta 250
zcmV<W00sZH0+s@hB!2;OQb$4nuFf3k0000XP)t-sV3>eoV_N4)Bzv4n_vR_RrCOcO
zNtE|W?{u9&KtT8Rt>8s`4FCWDqe(<TR7i>KlsgUtAq+#ueB-(Qfj4GK0#w^!2^v3~
z2vDBqDi(S0`ySZ&BYOj|6dwEmfQv2#6r$%+YDf$q%U4oJymLGN)q&>JqQoeYTjeU?
zp}_$^4~v^jX6PM&S&9e&mXdb!i1{{%&wG8rfjj}G@F65bzUM=dkJcI|0BJ}-b$^QB
z2dG4?;ayR_TIKRVsUEg}a(VXZAG-75&WAf6e(v)NADiOLd;kCd07*qoM6N<$f`rX(
A@&Et;

diff --git a/graphics/pokemon/fezandipiti/icon.png b/graphics/pokemon/fezandipiti/icon.png
index 5983f267982622e674ea2b20c1ffff1f8d037406..1bd6d0bf31426e0b15748e8827ffa79180d47018 100644
GIT binary patch
delta 368
zcmV-$0gwLg0*eEXB!4haOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele&F*uY
z|Foo}#s6xooMK{HK|w)TsgPs<000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ008<)
zL_t(YiS3ljs>3i0L?b)4!Gf9p|JyrCpe3!6c6I3@f~<5jdVj{t^1nuY0#;r_Tvwvy
z#1=>ZEeF^_+)A<5kP%d%+yV?~5&^B1;%07n5{BPgW@lBJq6;e=NL%FyKZgigvm(5X
zunPKAM+rc()}kKif)Zlc22}!(oeZ2sKoBQ8i5!Fb+}Ym|wJ?U2-NBB2B&hO-A;uj7
z=m!b4;BcP^KxwUT9OF5CP7(U{jrErV5w5Tq8sQ%jz^g(emdu33%KKY|d?+E@>D8#U
zPzv?@bZIboSkDfdTOhU5%hQ*LT>|{#5Bq7m--r8sc)IWR;hE<*--ka3p&H5HS1Eb`
O0000<MNUMnLSTY3D!0%8

delta 340
zcmV-a0jvIt1MdQmB!2;OQb$4nuFf3k0000aP)t-sV3>eoV_Mc@Lidy@_xCBir9y;+
zbMJGUKtMpfy}kdnrT_o`tnu>z0002_Nkl<ZNQv!~%dUek3`ChEI1}gp|M!kTYDH^k
zS65wNiItDXPqHlkYvd<j<u$~0C0b5wfdtTUfGxyr3~LP;L4O6xEx?c_5zyKgZswLJ
zVff8uc2=b+dT_#lv{lydvx=}aE5c_Do1k}flmH~>9O{uSC?S?@P$K}@$-p@T1aY#H
z$Wgh^o#h=-3$@zV9V{qEf-1inV%#Bsa*$994)=}#)C%h{p51#Fp>N+<c}WoA3hSW}
z{we{yDnw$*bWK>Syu4M&hZ4e_UX5A{rBKgLmj;uE^X#y>1yVb`Jbj7SCBQHKu%EX3
meYoF;r~7^%o_T)refR^tWf5zQ<ETvl0000<MNUMnLSTX)51$bL

diff --git a/graphics/pokemon/munkidori/icon.png b/graphics/pokemon/munkidori/icon.png
index c3546b4dcfd1a01dc449d1d9b916862096d1172c..20144ff87e17dcc113c7870875f48eaa65be61da 100644
GIT binary patch
delta 310
zcmZ3@bdhO-O1(jVPl#*MoaW}{;=OzK{{R1f?-Ivv-!!i#Iewd>*<JlV$?NR9;yM4f
zELn2&f7Y5gNl8(Tj*gKlC!{biFbI?c`2_>Dpn$WAo2CHe4tTmahIn+oonpv!)PTo%
z_Ci$&<-7m4#h=Pq?)^Vt#m9gP-LG#r9<TrCD*2?hXQQ%3Tf?*kCGO5EezlYy2^HjV
z@p0I-NI|T?^+8dX>5Q3dQ<S_IoGu-geh@M_*yZx!h2B2%Y-+oAHTf+sVN5XO+V$tm
zOUEhALH&6`a%Eflwz78IWH`0uU1c~6tL|Ov>}#!Gr6=CZnbXYSB)>J!@$!xRJ9nG^
zJi7Xke({XymOeKRZsxlzd7@~>2i9G!rxWvdTK*eMkmuhbH1&3u>3pDX7(8A5T-G@y
GGywp$b(?np

delta 272
zcmV+r0q_3N0;>X$B!2;OQb$4nuFf3k0000RP)t-sV3>eoV_Mc@LihJ6goJbNbDWHO
z|3X4SrN#f&0RapE006#8L_t(YiS3jz4#hACL+dug-2cSi&J5|&KU6AWsN@$)Ao6j1
zQ3iP<W9$fyA)qBF-O&)LK4BekRs;hP6OgVbhy|PxIGt4uW`CvurHB%Mko55exYXnn
z(e!ZW5|bA%-=eOd(<xm5Sd4-$KXZBz<)GA~n}mm5tz&HgVm5#>t$W@TK|xFR&YE>$
z{YGRq8|NT`&_}IX&@}dM?(R)~@v8V7=4B33cJQpjbOy2<CVYWz;c}Q81K~dm<OgGS
W2+B{5GHw6>00{s|MNUMnLSTY>f_6aw

diff --git a/graphics/pokemon/ogerpon/icon.png b/graphics/pokemon/ogerpon/icon.png
index 54a0de1e927d7342de6dbb855acccec81a7103de..65448e8d1d68218ac29a1093e32e059fb1a83de3 100644
GIT binary patch
delta 337
zcmcb>^oD7IO1(jVPl#*MoaW-<;=OzK{{R2KdXCqevtCoadA%#1^KHtvy-T9LJ=6U5
zZOzrIS<k#Qlaitw9UU_*Yoi$$7z9d!{DOg6P{3KmO;dn!w>@1PLp(a)PC1x&M1jX;
z<Ho>4iGTjr-!|;JGS$0G`)gRLO3{J-kM#_KYybMY-tk}maGUZW_bmc^<@cGAdk!#V
zY<M}T!C7F#>6H$g4P2^<EPGuP8ALm@rtNX#WDj}zAZyn8s*|TOFD}m3@YQ*px;>|_
z!#T<HWYx(7vL!+%Qzt~_C#I>am=_uFT4fjGb03e6-m`(F*3ak6n3iVE&?Y=%!@cip
z;rx1D$8X#XpT~c@c<<HfA8DT?>Yvr$%}x>9t9(ge|Mml4=eOJ!)_2SA<p1iv|H@}O
hoA=Ju_uB1WbI*Sxw)nPpkTuYw44$rjF6*2UngCAmsbl~E

delta 309
zcmV-50m}aD0?-1GB!2;OQb$4nuFf3k0000aP)t-sV3>eoV_I`_b9<ah_vR_RrCOZM
zN|g6XLPA2ly}kF8_y7O@J=uk*0002mNkl<ZNQv!~!EVGL3`7~57(4v`|8|Tbb>))X
zO1)JXi5&1_JU~Qi|5NVw(`%US2)E(Qg~QCYz!<}^02*w%B!6HKIP`KVPy(PlNC-hI
zQ3xOe5`iVFQQUwCIk}qVt6s8lTH>7HK@-h-*)5yH{S;qKvR*Q92a`l{8Kl;mt11a<
zW){>siK)QR6B1%$b5v80-aERc*$#l>06KKey}{Lk%Q1HMmFL6uT(9*WzL`A6pZQ<+
z>X{|(h&0IWEiQ2VCvNw|i_u%+L;cY&^}G+y`_P{E;m`U44ABhf@!{dn00000NkvXX
Hu0mjf`)`>i

diff --git a/graphics/pokemon/okidogi/icon.png b/graphics/pokemon/okidogi/icon.png
index 2ed55bd7cf1a59b8288256f57456fc1d13038420..91984549c32fd8fc2dd9df71f9544631f5bd4b76 100644
GIT binary patch
delta 416
zcmV;R0bl-}1G)o{B!4haOjJc;oP%?7bG^O2|NsAcoJyR{N|g3W?sJ^>l=i)(TK48C
z_V%pR)oSKSDPm$;K|w)jIel9I000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00AjU
zL_t(YiS3lpu7n^AMD1#^@nQP^e|x7OD9Y}A-AyF%L3*H_mVeAN{nm2#e*hqm_nbpS
z-1)T|dz7JAwgYaf`6aHIKn1Y&0F<XI;SK|diumNS5ir@JkjYnL23Sqv!ULAl=G(?=
z5XV>Uv>eQj6pL{&jS!KO3Mw?rtTJN!`qSh>q2V>ZW|d&T{4I{8>>&vSpe&Bn^OFW7
zT~rFeB7&0qdw&4QQrVJJIwfe`%EXfQ5f`XxCFDfJlwwGcVZWj$%7mS*K#d1_86}mJ
z`ebjK-e%1Lb`7oziOai*UTFyBy9#O7_~fcAg@H27!Mn>_6q9-Zcdl#F2)Jh-rFzzf
z^%%%wAcv5%fs7oaGZ68+gY*V6a**Z^$io~t$l(v49~s^k`oka5@f)11;Si+&0000<
KMNUMnLSTX+3Doic

delta 387
zcmV-}0et?t1D*qrB!2;OQb$4nuFf3k0000aP)t-sV3>eoV_I`_b9<ah_vR^_&PtT`
zO7C-=LPA2ly}kF8_y7O@KbRxO0003fNkl<ZNQv!~(XNCb3`Cu3v0MNDfA16oMcKWt
zyNM(|NDs8rl9{I8T4weS00i=$Gl+;8zjkAfG8D^qz<hPP#D6str~uX;fbw)D%-|qV
z5u0pt0xnAwGTG|P0Ix|*c)(LyY*}~>;`qv)mV^0`VlghR5h8L@L4}TuRYr_of0|q<
zbiB6LrV<R8zr~T1JtUz3l*O@ne$s%Xvq~XYL{O4{4<LCeTarqr1g%?{nDaj30#&Vq
zoQRlG3@I|~SA6tDnXs`HsPRBAqok5jpX^Q3+pJl@uEBIBad|h<D-EH1S0U{hpG=jd
zFi@sBcz1b=Vp1>Q&UH;10r%{qRL}ab9s_v{<PdT;kdcFQ1|oKMklsK>4$}Mqd6**y
hIsD=C!}~&i_yfD)5P%IUb7uem002ovPDHLkV1hTmv4j8s

diff --git a/graphics/pokemon/poltchageist/icon.png b/graphics/pokemon/poltchageist/icon.png
index 3be6b6ed7ced9ab19f1fa95edffd31642fb1b010..6b686ad08d101072dbdffe321662d9257a304af4 100644
GIT binary patch
delta 313
zcmdnXbcJbxO1(jVPl#*MoaW-<;=OzK{{R2KdXCqevtEu_Q{ENN`8MU--X&4rzI87-
z`afyPlB-FMNl8(Tj*bgYi8BC!KuM5aFi;B$IIFm63Q+E_r;B5VN9Wrqd-)D4@U$dL
z>r2+W|G&-FdC4WV6Bjm0D6-Yhso!8x-<QkGyy4sGmt77sBF}KHV7ngD{M|Hn72`>c
z9>rt^C8124c9xhUJ5w1i<W6%Ezfkyw|IXT{0^zb2ANRdo(|A2nweb`0g?KMkrSL5R
za~Yx^s4D%Pw4148^Z7=@8_U=<Rv%ctKlP+YL{r-Ohez|bI<4F8(fFvmLF=pT1tSTM
zE0so>!pyy2UnE$XpZ}Nspkl_|-2J!z$$$HQVdbCq|35HE^9$5AIA(Q$eCz4z=d#Wz
Gp$Py>_nZp=

delta 290
zcmV+-0p0%80=)u|B!2;OQb$4nuFf3k0000aP)t-sV3>eoV_I`_b9<ahvb27j&PqZ;
zLcP7c_xG*;`se@r@c;k+=TfZH0002TNkl<ZNQv!~%@Ttk41`TE8-e$K-!9-xX+=5o
zSk`eo<YV(=hHYCK2*7jPlRpuVl#<*Na2Gze9z5?ww;s@vfqyx43_w+-h~FUrQ#HQ&
z05F_$F*<>c<9uM2t3=K|aNvE~Ad$z}C4uk_Fdjk$Bnp9+qBGzKEQpl2CdsV^$kErp
z9GQcxfU^sH##@y!I$Q8EYgn*Luh8>f6oX(_fG+i4pj9xisQc132D?134))1rP2zK4
oo9yn=?^^f6x*H!lm;b#VUMFq}twNRK&;S4c07*qoM6N<$g1R<{`Tzg`

diff --git a/graphics/pokemon/sinistcha/icon.png b/graphics/pokemon/sinistcha/icon.png
index 953a867c7015953913169deae8926ef301c2384a..74fc0b2643bff143d099cb9cf5b834ab8e48f18e 100644
GIT binary patch
delta 312
zcmdnWbeU;_O1(jVPl#*MoaW-<;=OzK{{R2KdXCqevtCoadA%#1^KHtvy-T9LJ=6U5
zZOzrIS<k#Qlaitw9UU_*Yoi$$7z9d!{DOg6P{3KmO;dn!hdf;zLp(a)PTnYV*nq>C
znNR0V=l}n=Px;+CsCsYLmo+idUPPK5l&L@dU(@)yozgTHwhbyqNum=qr55%(I61q@
zHS*|f-{>Cc_5CcHzy&7HX)o?6uMxiL_A;MAbYkX1<z$8#jUg7{yQL)q%mkSi++;nR
z*~Z!MdGS{U>82XSb#1q887KY}un`X~@a)oZX<^K8W-SnO5Vl+UFHmL5yNc6&6En;|
zT)1d>M(*CKuv&p+)7Q}_=dIN*OW*eG$NP`_8*TsXzs8;SP<Zw&hihs;|1fyE`njxg
HN@xNAvi_E+

delta 282
zcmV+#0p<SF0<{8=B!2;OQb$4nuFf3k0000XP)t-sV3>eoV_I`_b9<ahvb27j&PtT`
zN<u<Hy}iBn_pSf`{{RgWBme*a!bwCyR7i>KlR*}PFbG6D7#Q*X2kwNX8;#j@)93iy
z$Y&A+Ua$WX$#oo=OM(e331+S=NNbtx79d(Svs-|vbgwg}rGNCedjW|yL8uZVx`lUQ
zb`awWU`CLhQ62^046q@T9pPdi`H3h%!7ey9cbou(K6*Fs66^v*bByQ)n4K@7d&vbK
z*?z6U%w&M0WRo9J1aO$1<7zO7UD0}{9TRa3;HIOb%y*?PX2w;`dMeek^<a1A(X;-~
g`VZh)|6l73*Awsz^}eR(v;Y7A07*qoM6N<$f)c8K^8f$<

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 7c10e9b255..a17ffa59a7 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -941,7 +941,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
     [SPECIES_WYRDEER] = gMonIcon_Wyrdeer,
     [SPECIES_KLEAVOR] = gMonIcon_Kleavor,
     [SPECIES_URSALUNA] = gMonIcon_Ursaluna,
-    //[SPECIES_URSALUNA_BLOODMOON] = gMonIcon_UrsalunaBloodmoon,
+    //[SPECIES_URSALUNA_BLOODMOON] = gMonIcon_UrsalunaBloodmoon, TODO
     [SPECIES_BASCULEGION_MALE] = gMonIcon_BasculegionMale,
     [SPECIES_SNEASLER] = gMonIcon_Sneasler,
     [SPECIES_OVERQWIL] = gMonIcon_Overqwil,
@@ -1460,13 +1460,13 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
     [SPECIES_MUNKIDORI] = gMonIcon_Munkidori,
     [SPECIES_FEZANDIPITI] = gMonIcon_Fezandipiti,
     [SPECIES_OGERPON_TEAL] = gMonIcon_OgerponTeal,
-    //[SPECIES_OGERPON_WELLSPRING] = gMonIcon_OgerponWellspring,
-    //[SPECIES_OGERPON_HEARTHFLAME] = gMonIcon_OgerponHearthflame,
-    //[SPECIES_OGERPON_CORNERSTONE] = gMonIcon_OgerponCornerstone,
+    //[SPECIES_OGERPON_WELLSPRING] = gMonIcon_OgerponWellspring, TODO
+    //[SPECIES_OGERPON_HEARTHFLAME] = gMonIcon_OgerponHearthflame, TODO
+    //[SPECIES_OGERPON_CORNERSTONE] = gMonIcon_OgerponCornerstone, TODO
     [SPECIES_OGERPON_TEAL_TERA] = gMonIcon_OgerponTeal,
-    //[SPECIES_OGERPON_WELLSPRING_TERA] = gMonIcon_OgerponWellspring,
-    //[SPECIES_OGERPON_HEARTHFLAME_TERA] = gMonIcon_OgerponHearthflame,
-    //[SPECIES_OGERPON_CORNERSTONE_TERA] = gMonIcon_OgerponCornerstone,
+    //[SPECIES_OGERPON_WELLSPRING_TERA] = gMonIcon_OgerponWellspring, TODO
+    //[SPECIES_OGERPON_HEARTHFLAME_TERA] = gMonIcon_OgerponHearthflame, TODO
+    //[SPECIES_OGERPON_CORNERSTONE_TERA] = gMonIcon_OgerponCornerstone, TODO
 #endif
     [SPECIES_EGG] = gMonIcon_Egg,
 };
@@ -2855,18 +2855,18 @@ const u8 gMonIconPaletteIndices[] =
     [SPECIES_WALKING_WAKE] = 2,
     [SPECIES_IRON_LEAVES] = 1,
     [SPECIES_DIPPLIN] = 1,
-    [SPECIES_POLTCHAGEIST_COUNTERFEIT] = 0,
-    [SPECIES_POLTCHAGEIST_ARTISAN] = 0,
-    [SPECIES_SINISTCHA_UNREMARKABLE] = 0,
-    [SPECIES_SINISTCHA_MASTERPIECE] = 0,
-    [SPECIES_OKIDOGI] = 0,
+    [SPECIES_POLTCHAGEIST_COUNTERFEIT] = 4,
+    [SPECIES_POLTCHAGEIST_ARTISAN] = 4,
+    [SPECIES_SINISTCHA_UNREMARKABLE] = 1,
+    [SPECIES_SINISTCHA_MASTERPIECE] = 1,
+    [SPECIES_OKIDOGI] = 1,
     [SPECIES_MUNKIDORI] = 0,
     [SPECIES_FEZANDIPITI] = 0,
-    [SPECIES_OGERPON_TEAL] = 0,
+    [SPECIES_OGERPON_TEAL] = 1,
     [SPECIES_OGERPON_WELLSPRING] = 0,
     [SPECIES_OGERPON_HEARTHFLAME] = 0,
     [SPECIES_OGERPON_CORNERSTONE] = 0,
-    [SPECIES_OGERPON_TEAL_TERA] = 0,
+    [SPECIES_OGERPON_TEAL_TERA] = 1,
     [SPECIES_OGERPON_WELLSPRING_TERA] = 0,
     [SPECIES_OGERPON_HEARTHFLAME_TERA] = 0,
     [SPECIES_OGERPON_CORNERSTONE_TERA] = 0,