From a693ba87bab2476b4252821ac7b063b7ff08bcd2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 22 Jul 2018 12:06:43 -0700 Subject: [PATCH] Update cosplay sprite handling Cosplay are stuck on gen6, cap pikachu can interact with bank; make Cosplay the oddball resource. --- PKHeX.Core/PKM/Util/PKX.cs | 9 +++++---- PKHeX.WinForms/Properties/Resources.resx | 8 ++++---- .../Resources/img/Pokemon Sprites/25-1.png | Bin 419 -> 396 bytes .../Resources/img/Pokemon Sprites/25-1c.png | Bin 396 -> 419 bytes .../Resources/img/Pokemon Sprites/25-2.png | Bin 487 -> 389 bytes .../Resources/img/Pokemon Sprites/25-2c.png | Bin 389 -> 487 bytes .../Resources/img/Pokemon Sprites/25-3.png | Bin 456 -> 393 bytes .../Resources/img/Pokemon Sprites/25-3c.png | Bin 393 -> 456 bytes .../Resources/img/Pokemon Sprites/25-4.png | Bin 427 -> 391 bytes .../Resources/img/Pokemon Sprites/25-4c.png | Bin 391 -> 427 bytes .../Resources/img/Pokemon Sprites/25-5.png | Bin 403 -> 390 bytes .../Resources/img/Pokemon Sprites/25-5c.png | Bin 390 -> 403 bytes .../Resources/img/Pokemon Sprites/25-6.png | Bin 369 -> 385 bytes .../Resources/img/Pokemon Sprites/25-6c.png | Bin 385 -> 369 bytes .../img/Pokemon Sprites/{25-7c.png => 25-7.png} | Bin .../img/Shiny Pokemon Sprites/25-1cs.png | Bin 390 -> 402 bytes .../img/Shiny Pokemon Sprites/25-1s.png | Bin 402 -> 390 bytes .../img/Shiny Pokemon Sprites/25-2cs.png | Bin 384 -> 463 bytes .../img/Shiny Pokemon Sprites/25-2s.png | Bin 463 -> 384 bytes .../img/Shiny Pokemon Sprites/25-3cs.png | Bin 391 -> 426 bytes .../img/Shiny Pokemon Sprites/25-3s.png | Bin 426 -> 391 bytes .../img/Shiny Pokemon Sprites/25-4cs.png | Bin 386 -> 408 bytes .../img/Shiny Pokemon Sprites/25-4s.png | Bin 408 -> 386 bytes .../img/Shiny Pokemon Sprites/25-5cs.png | Bin 384 -> 392 bytes .../img/Shiny Pokemon Sprites/25-5s.png | Bin 392 -> 384 bytes .../img/Shiny Pokemon Sprites/25-6cs.png | Bin 381 -> 352 bytes .../img/Shiny Pokemon Sprites/25-6s.png | Bin 352 -> 381 bytes .../{25-7cs.png => 25-7s.png} | Bin 28 files changed, 9 insertions(+), 8 deletions(-) rename PKHeX.WinForms/Resources/img/Pokemon Sprites/{25-7c.png => 25-7.png} (100%) rename PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/{25-7cs.png => 25-7s.png} (100%) diff --git a/PKHeX.Core/PKM/Util/PKX.cs b/PKHeX.Core/PKM/Util/PKX.cs index 0244693e1..da055b786 100644 --- a/PKHeX.Core/PKM/Util/PKX.cs +++ b/PKHeX.Core/PKM/Util/PKX.cs @@ -595,9 +595,10 @@ public static uint GetRandomPID(int species, int cg, int origin, int nature, int // Data Requests public static string GetResourceStringBall(int ball) => $"_ball{ball}"; private const string ResourceSeparator = "_"; - private const string ResourcePikachuCap = "c"; + private const string ResourcePikachuCosplay = "c"; private const string ResourceShiny = "s"; - public static bool AllowShinySprite = false; + public static bool AllowShinySprite { get; set; } + public static string GetResourceStringSprite(int species, int form, int gender, int generation = Generation, bool shiny = false) { if (Legal.SpeciesDefaultFormSprite.Contains(species)) // Species who show their default sprite regardless of Form @@ -610,8 +611,8 @@ public static string GetResourceStringSprite(int species, int form, int gender, else if (gender == 1 && Legal.SpeciesGenderedSprite.Contains(species)) // Frillish & Jellicent, Unfezant & Pyroar { sb.Append(ResourceSeparator); sb.Append(gender); } - if (species == 25 && form > 0 && generation >= 7) // Pikachu - sb.Append(ResourcePikachuCap); + if (species == 25 && form > 0 && generation == 6) // Cosplay Pikachu + sb.Append(ResourcePikachuCosplay); if (shiny && AllowShinySprite) sb.Append(ResourceShiny); return sb.ToString(); diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx index 3e74aa6a8..c5e7f1226 100644 --- a/PKHeX.WinForms/Properties/Resources.resx +++ b/PKHeX.WinForms/Properties/Resources.resx @@ -5956,8 +5956,8 @@ ..\Resources\img\Pokemon Sprites\490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-7c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Pokemon Sprites\744-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -6742,8 +6742,8 @@ ..\Resources\img\Shiny Pokemon Sprites\25-6s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-7cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-7s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\260s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1.png index 3543033bac2e36dfcd8696ebdf9ca5b31e826a48..f46ce71705fc9ba0b101b3ae0aaee6cd8fdb7381 100644 GIT binary patch delta 319 zcmV-F0l@yF1B?TZR(~N$L_t(oNA1!v4uUWk1z@h@*dus_j*g68!)rKl1Xo5!M^{FU z;EKG;i!Xm_bfBe)eaTBrh4!P+)YR0}6dLE;#4b~1gs6)@Or!TFlw{lK2;&WvB_}^7PU}CVPl1zPy28^njELW1{Q@8 z!GDS*CM!}mvlyUtj`Q}uq(B54SV(9)15q=d9fyr#-(3vY9bYGlF*%OGMl4T;pxA5X zd{!i*NX6-Io;YH59HKxX6~}IZV-#s&=w_#<0f4o@&2csgEe@wC8uw>unkR6GvOz(L R(a8V+002ovPDHLkV1h&eibMba delta 342 zcmV-c0jd6s1ET|wR)082L_t(oN9~k54uU`!ggJ_>B}ecI9Kq6SP}*8rT2k6tT3UJ) zTlE7*$BhpXV6oUqChX&P=gW^vmXwr~l+;goo?mf0{iv>WgNneSD1HX3u1oEp>H^4K z2>7kOm;7MH$KAa4yFh`cPJj;DmJTBh+$^34D|lNjUcwk-2Y-nQC`bi+5aY|avBNoF z_?yARp#mgCAecRT%4hYy)&%Ds1x^yA!!ZZU;pkLZuH(WX0)D~qp9HR|_Aijp;V{7{ z+!J6_NI}pchhd#ps(A=Ec^7Lh?|}F|c0li76u84?_V`r10~DN|)b3VIm)m2;6+xH_ zq1Prz-CQ@9Cr>&gB5YMPPICTzdZ8AVfpx8V4 o7jU5*^6%gzb+er&O{^@t0lafI4_KL7v# diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1c.png index f46ce71705fc9ba0b101b3ae0aaee6cd8fdb7381..3543033bac2e36dfcd8696ebdf9ca5b31e826a48 100644 GIT binary patch delta 342 zcmV-c0jd6s1ET|wR)082L_t(oN9~k54uU`!ggJ_>B}ecI9Kq6SP}*8rT2k6tT3UJ) zTlE7*$BhpXV6oUqChX&P=gW^vmXwr~l+;goo?mf0{iv>WgNneSD1HX3u1oEp>H^4K z2>7kOm;7MH$KAa4yFh`cPJj;DmJTBh+$^34D|lNjUcwk-2Y-nQC`bi+5aY|avBNoF z_?yARp#mgCAecRT%4hYy)&%Ds1x^yA!!ZZU;pkLZuH(WX0)D~qp9HR|_Aijp;V{7{ z+!J6_NI}pchhd#ps(A=Ec^7Lh?|}F|c0li76u84?_V`r10~DN|)b3VIm)m2;6+xH_ zq1Prz-CQ@9Cr>&gB5YMPPICTzdZ8AVfpx8V4 o7jU5*^6%gzb+er&O{^@t0lafI4_KL7v# delta 319 zcmV-F0l@yF1B?TZR(~N$L_t(oNA1!v4uUWk1z@h@*dus_j*g68!)rKl1Xo5!M^{FU z;EKG;i!Xm_bfBe)eaTBrh4!P+)YR0}6dLE;#4b~1gs6)@Or!TFlw{lK2;&WvB_}^7PU}CVPl1zPy28^njELW1{Q@8 z!GDS*CM!}mvlyUtj`Q}uq(B54SV(9)15q=d9fyr#-(3vY9bYGlF*%OGMl4T;pxA5X zd{!i*NX6-Io;YH59HKxX6~}IZV-#s&=w_#<0f4o@&2csgEe@wC8uw>unkR6GvOz(L R(a8V+002ovPDHLkV1h&eibMba diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2.png index 2a0adac50a02668b9ab2c6268c3d9e544417f88f..a58914b86033f77fa38e7ef6a217b0e6c19953db 100644 GIT binary patch delta 312 zcmV-80muI51BC;SR(~2vL_t(oNA1$F4Z<)K1kkKQ=@DotQ&Of(n-N%pG9$18B_%5` z0&U<77oEO7N)tPl@JS~l1O6|DrlzK*rqF~CCic5kMu-}QVQw){3u7PsA$AFw^g(cN zck5z3+!7M|&wH4z<1P&nhXT}({fxA@UqHpNt0QqBVIJ_(9)Dx)U=O!C5QnvG8&Rx> zBT#E$NpK#-1L7fYTUfPOaJGtKfn$^77#wP$io#%polpDtc{Djrg8>$W6~TLoBql3T zhgl5Jy2pL{y`(?{11u!AdjnCkpB;xm-v7=6j{WCmu_nhc7{u~s2=abr?q@|Zid3Aw z<}GH&Aqpf?aWU*BI7X2chHiFy8UR=e+#F}4(Bg2KqH%wgrg;IvwT>yjs3~Uv0000< KMNUMnLSTZW~6HbT=O$ zg-heyn0o>WS$_?X8}ld=(w6+u=?E&Uh zrJpi8!Y$UGB23Rg#@5iHaHS$_R9w$T*ViVY{;_tuR}_ibJZHhsOv(TN002ovPDHLk FV1niczMlX9 diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2c.png index a58914b86033f77fa38e7ef6a217b0e6c19953db..2a0adac50a02668b9ab2c6268c3d9e544417f88f 100644 GIT binary patch delta 411 zcmV;M0c8G#1Lp&fR)2g+L_t(oN9~q9PQySLL~|WVmy}$=N8kz^!DU)X${c}~(np|m z$q~{TztukYSPTk~wJnj6M&7@8UM5oP-9;DuP)*Z}I8V1D!N%iD@}?joSo9_!zkW~6HbT=O$ zg-heyn0o>WS$_?X8}ld=(w6+u=?E&Uh zrJpi8!Y$UGB23Rg#@5iHaHS$_R9w$T*ViVY{;_tuR}_ibJZHhsOv(TN002ovPDHLk FV1niczMlX9 delta 312 zcmV-80muI51BC;SR(~2vL_t(oNA1$F4Z<)K1kkKQ=@DotQ&Of(n-N%pG9$18B_%5` z0&U<77oEO7N)tPl@JS~l1O6|DrlzK*rqF~CCic5kMu-}QVQw){3u7PsA$AFw^g(cN zck5z3+!7M|&wH4z<1P&nhXT}({fxA@UqHpNt0QqBVIJ_(9)Dx)U=O!C5QnvG8&Rx> zBT#E$NpK#-1L7fYTUfPOaJGtKfn$^77#wP$io#%polpDtc{Djrg8>$W6~TLoBql3T zhgl5Jy2pL{y`(?{11u!AdjnCkpB;xm-v7=6j{WCmu_nhc7{u~s2=abr?q@|Zid3Aw z<}GH&Aqpf?aWU*BI7X2chHiFy8UR=e+#F}4(Bg2KqH%wgrg;IvwT>yjs3~Uv0000< KMNUMnLSTZq@RieqO-Vnf1Gz<7sp{x>VKC4Uc={Pam|inFo@;J5S03vxn2~> zC{l6ynWtDBhczgWNX4;>;21?(7`oW$X#ij?aB-ZCLaW1Rs>c0Un&t&t8;(d60fhdE1IPoAR)1YdL_t(oNA1)xQiDJkhGC9kYsnG30!Og)3MnaVQ(97bg_M?* zT*J~9c~{=}&uYd@gr(t|`G?(P!#>$vsP^pHvuDr$QrGoJ&E1Q+cHE+2!lr5doY-;K zj9nx{eHf`*fvX~cji(_2-@5yBrRJ~C5kfIeV1&*?Z;v;dyMGDyet1nKjJ9CLh>DO^ zflTa8X^SBO1vBZ#@KqwfMIh}(aE6;QVb>f}adR-@1Vz! z6c>{NDJG76pp46ro8d_QotUCX5pgTUcupFpw&#+Er#S9(yi2Ra z)BGC{Sld1)oODlj_w>ExtA~le@p|FP%5Vh(+<^4`*!O)oWCVh;9nTz1zE|>ahH;#_iUT0 Z`UDiVs3TRV>3jeH002ovPDHLkV1migz5)OM diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3c.png index 7cbb328d088c4b52c2665993685f6d9663b725b5..8369ed6204e444777221d8e9614227b81883dd6d 100644 GIT binary patch delta 379 zcmV->0fhdE1IPoAR)1YdL_t(oNA1)xQiDJkhGC9kYsnG30!Og)3MnaVQ(97bg_M?* zT*J~9c~{=}&uYd@gr(t|`G?(P!#>$vsP^pHvuDr$QrGoJ&E1Q+cHE+2!lr5doY-;K zj9nx{eHf`*fvX~cji(_2-@5yBrRJ~C5kfIeV1&*?Z;v;dyMGDyet1nKjJ9CLh>DO^ zflTa8X^SBO1vBZ#@KqwfMIh}(aE6;QVb>f}adR-@1Vz! z6c>{NDJG76pp46ro8d_QotUCX5pgTUcupFpw&#+Er#S9(yi2Ra z)BGC{Sld1)oODlj_w>ExtA~le@p|FP%5Vh(+<^4`*!O)oWCVh;9nTz1zE|>ahH;#_iUT0 Z`UDiVs3TRV>3jeH002ovPDHLkV1migz5)OM delta 316 zcmV-C0mJ^t1BnBWR(~EzL_t(oNA1$F4Z<)K1kkKQ=@DotT~boIO-V_~3Y3(TS%DE) zff3RM&T!G`%P39kSRyB#f}F(vVQAK@S+l0nIOhiTyHrPr3ZWfa4b;NeXV}F~A+vrF zY<#@+u_@dX66^iL4fpFN4-%UK)SkN$X>q@RieqO-Vnf1Gz<7sp{x>VKC4Uc={Pam|inFo@;J5S03vxn2~> zC{l6ynWtDBhczgWNX4;>;21?(7`oW$X#ij?aB-ZCLaW1Rs>c0Un&t&t8;(d6 zu(2QSp~Dn)F-wqGe@t$^j=MZaYzi3q3z-_OICga;Hq;Yb3V%%DRtE;0_a7i?WB)L$ zg=N9<`2qq>1?#v8oL0CQX%XDFDg-z-JC4Do7OE%=R@iyihtH$gaT*M;C|nV|r$}Oo zB6XO>0Ih3Wx8KVOL@>ZYLQgLsYSxS6FevrhrGR7qK3QC|;}{HLc`^j0erB#0MKX$1 zoWABM7RMn9Br{TR>?Sxykrsw-c6u5BSPR@7XQR;SaGI)df0nL$0zqfEzQS-nDgXcg M07*qoM6N<$f^%eo`v3p{ delta 350 zcmV-k0iphf1FHj&R)0WAL_t(oN9~k7PQySH27MG-N|%&e!AGFnD^OC>Qc~s!Zd2w6 zv_1wcFdI+uv`R<<_7Vw?^l5**_8UFRZWb0678ZU^+qNHMTz<in;5ggqv&{aT6l02E2C7DsedX6Q9v<^BJ=*Xzs@=e zGM`=UIqf?^*dvG;Wy;JhHw;5Aj-*N5T`qp8b1}2ZK`F?HT)BRCF_m%U$>RpU7dH(PFFp4V3zFkG~vETlFR%t6u7|4?`=>O`CtCJxkh^-z6aWAK07*qoM6N<$f|yRB)c^nh diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4c.png index 992d9276f7a257750ed74d573014ee3c1b4b481f..e009d488558e4d33f1545d6b69c4ff162c5810a5 100644 GIT binary patch delta 350 zcmV-k0iphf1FHj&R)0WAL_t(oN9~k7PQySH27MG-N|%&e!AGFnD^OC>Qc~s!Zd2w6 zv_1wcFdI+uv`R<<_7Vw?^l5**_8UFRZWb0678ZU^+qNHMTz<in;5ggqv&{aT6l02E2C7DsedX6Q9v<^BJ=*Xzs@=e zGM`=UIqf?^*dvG;Wy;JhHw;5Aj-*N5T`qp8b1}2ZK`F?HT)BRCF_m%U$>RpU7dH(PFFp4V3zFkG~vETlFR%t6u7|4?`=>O`CtCJxkh^-z6aWAK07*qoM6N<$f|yRB)c^nh delta 314 zcmV-A0mc5S1BU~UR(~8xL_t(oNA1(G4Z<)K1kkKQ=@DotT~bnJjjTbL5m zu(2QSp~Dn)F-wqGe@t$^j=MZaYzi3q3z-_OICga;Hq;Yb3V%%DRtE;0_a7i?WB)L$ zg=N9<`2qq>1?#v8oL0CQX%XDFDg-z-JC4Do7OE%=R@iyihtH$gaT*M;C|nV|r$}Oo zB6XO>0Ih3Wx8KVOL@>ZYLQgLsYSxS6FevrhrGR7qK3QC|;}{HLc`^j0erB#0MKX$1 zoWABM7RMn9Br{TR>?Sxykrsw-c6u5BSPR@7XQR;SaGI)df0nL$0zqfEzQS-nDgXcg M07*qoM6N<$f^%eo`v3p{ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5.png index d59ca16f9563775fcaf9c60e50e1a7e40e1d424a..d8151fe025c918e793263b3678e7255564992952 100644 GIT binary patch delta 313 zcmV-90mlB51BL^TR(~5wL_t(oNA1$F4Z<)KgyF11nGt9yQ&Lj025V3<0xcyYumU5{ z0)NOwr$;0}iXBVjq?3b5>@S9D&YU@O3Qb+tceR@;BSIaUb>Cv3Agtle@YRh zGRM8%2up(VM39%4;ItUM*>Eu+9Rf~Gj#F4PLLJ4%4%_dR?fo=4&cg-~#Yp(hk-}s} z`eqRW+UGPMpGyiPY!D%BH%}l9^VxB1H1xk40v@)nlVwbfQ`kt=$p|#`GiyF8QgNi? z{931&9Y-7}q%z~wNpOlIBaBXVdL9631Wt~NacFTkPtmwPOI1ApxHhjjWTYjA00000 LNkvXXu0mjfgA0jJ delta 326 zcmV-M0lEH$1Cs-gR(~i-L_t(oNA1%wZo)tiMqwX?Hl>e1o6=>e;>nwpxL`_i`Ufy%cRbL+l`hK60&U2W{XTlPLQ z{{ci(?|+Xa#3{%7*>MEKp+6SS zB2J*VSVeG?WF$wuD2@mOA?$0rN+r_&Bvl+obDBjQ;T>z<^IS|(BtOpNoDv0!=Nzf; z5`4U#L(U2$A}v5^{XPQ6@|gW%i{qG>AHW2eff2WReM{H=eVoqxqhICy7XGD6`tba3pFpC2T0E?*sdm7wnggzzCh|IS&3#Vy* Y0Bsr<(Q3RXtN;K207*qoM6N<$f}SIm=>Px# diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5c.png index d8151fe025c918e793263b3678e7255564992952..d59ca16f9563775fcaf9c60e50e1a7e40e1d424a 100644 GIT binary patch delta 326 zcmV-M0lEH$1Cs-gR(~i-L_t(oNA1%wZo)tiMqwX?Hl>e1o6=>e;>nwpxL`_i`Ufy%cRbL+l`hK60&U2W{XTlPLQ z{{ci(?|+Xa#3{%7*>MEKp+6SS zB2J*VSVeG?WF$wuD2@mOA?$0rN+r_&Bvl+obDBjQ;T>z<^IS|(BtOpNoDv0!=Nzf; z5`4U#L(U2$A}v5^{XPQ6@|gW%i{qG>AHW2eff2WReM{H=eVoqxqhICy7XGD6`tba3pFpC2T0E?*sdm7wnggzzCh|IS&3#Vy* Y0Bsr<(Q3RXtN;K207*qoM6N<$f}SIm=>Px# delta 313 zcmV-90mlB51BL^TR(~5wL_t(oNA1$F4Z<)KgyF11nGt9yQ&Lj025V3<0xcyYumU5{ z0)NOwr$;0}iXBVjq?3b5>@S9D&YU@O3Qb+tceR@;BSIaUb>Cv3Agtle@YRh zGRM8%2up(VM39%4;ItUM*>Eu+9Rf~Gj#F4PLLJ4%4%_dR?fo=4&cg-~#Yp(hk-}s} z`eqRW+UGPMpGyiPY!D%BH%}l9^VxB1H1xk40v@)nlVwbfQ`kt=$p|#`GiyF8QgNi? z{931&9Y-7}q%z~wNpOlIBaBXVdL9631Wt~NacFTkPtmwPOI1ApxHhjjWTYjA00000 LNkvXXu0mjfgA0jJ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6.png index c2d33a910ec16842134bc1b3aab092b9a0597f4e..e3028a3590ea4f39db6d1e7e82f61bb9d4754354 100644 GIT binary patch delta 308 zcmV-40n7gJ0)YdNR(}>rL_t(oNA1$F4Z<)K1kkKQ=@D2VC1uLAl$5NIG9@ceQl`ur zlxYoTICT1QLW3PkH`vP6Y2Ml9;SWU1l*r z>x^^zxuie@3oInGc>+;0&yK^Q*#9mD?AzDP;!KWXu!!Z&5EOgNoM%Ncid3Aw<}GH& zAqpf?aqKEMMlF#RhOTyd8UR=eTpeel(Bg2KqH%wgs(Ju2k*4caI)1qT0000p$I5oZ@nx z!R1`SqpN0}MNV`HsSvtuUJ^lpp$I5oZ@nx z!R1`SqpN0}MNV`HsSvtuUJ^lprL_t(oNA1$F4Z<)K1kkKQ=@D2VC1uLAl$5NIG9@ceQl`ur zlxYoTICT1QLW3PkH`vP6Y2Ml9;SWU1l*r z>x^^zxuie@3oInGc>+;0&yK^Q*#9mD?AzDP;!KWXu!!Z&5EOgNoM%Ncid3Aw<}GH& zAqpf?aqKEMMlF#RhOTyd8UR=eTpeel(Bg2KqH%wgs(Ju2k*4caI)1qT0000LF zl9F|x4EYW}`WOd;6kCxFS(Hm!RMDTU;5K?Vb?K#XwMqNt%bDkwAC)gVOa zW|$a+Q?Zz{1bu2Gf_5_+Zb&`Hy6Ee4qBgABAoxNX74VzJv^Rjid;)Y1IDFN$=mEGa VTk1g;?;QXD002ovPDHLkV1g3%pU?mR delta 363 zcmV-x0hIod1BL^TB!5jwL_t(o!|m6x4Z<)G1<;I=mXZ}1!9qf!%m@s@6tuKdP*PH| zLP|z}((nTx9jCj1z_uuI(w7mS_~jgjP{kOlf6iay2H*f3fWHF!s;=wER9{vWAW_>e zkEam2@mpweAP}gwZM%_3<{eU>NK&B2u`J|aIjVH<{$(@9XMay*7GQI1qArQFfD*?% zj+Yh)-2Sw8fxI5y;gSP!uy6wa$Y>xVclQHp;*u>f4#wpp!s;M`lR&pH%4i%qn*=Cv zUL*uKrVp14C~plO3KL7%YB4dFS6`c1cCkibL~$c9#PlJv06CGy=;ig0S%E}q2y$*h z7YA8xi7}CN-DFw7-R%C|^>l3Byt8#sZveS#t?qirEI|DWL8QdV*X&}k4thW$`!-8) zphkMjTNH@8P5cshU0U7K-_QO;ttYgw9e zkEam2@mpweAP}gwZM%_3<{eU>NK&B2u`J|aIjVH<{$(@9XMay*7GQI1qArQFfD*?% zj+Yh)-2Sw8fxI5y;gSP!uy6wa$Y>xVclQHp;*u>f4#wpp!s;M`lR&pH%4i%qn*=Cv zUL*uKrVp14C~plO3KL7%YB4dFS6`c1cCkibL~$c9#PlJv06CGy=;ig0S%E}q2y$*h z7YA8xi7}CN-DFw7-R%C|^>l3Byt8#sZveS#t?qirEI|DWL8QdV*X&}k4thW$`!-8) zphkMjTNH@8P5cshU0U7K-_QO;ttYgw9LF zl9F|x4EYW}`WOd;6kCxFS(Hm!RMDTU;5K?Vb?K#XwMqNt%bDkwAC)gVOa zW|$a+Q?Zz{1bu2Gf_5_+Zb&`Hy6Ee4qBgABAoxNX74VzJv^Rjid;)Y1IDFN$=mEGa VTk1g;?;QXD002ovPDHLkV1g3%pU?mR diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2cs.png index 0ace3d38e16afc26379ce11f751ce9d701c4ee1c..0ca951a94efdae05d7234e29c9a21f357647193d 100644 GIT binary patch delta 437 zcmV;m0ZRUW1J47HB!8AkL_t(o!{yd7PQx%5#qk~`YsZeP93e;G2ylc-UAi(dc4lH_ z%r!D{gfbeQ#Xowr98x6Psf49ZO%tpB^~H(32_bB5xmE}K58z)~*L6X4P2Z+KVB!1` z>l$P;pu@bDkWGMdxSIry<1pRk{robI24(zhXcJ7!KQ5KH%Ncd+-+FhwX;?`9Ae`Xi=aKqGPq=+Zcf=9p{kEfaw4r z)j*OaKyc}wD}Ia9dBlJ@BuO&Y0Q&T(@{o|o=j(1NpO=nQ^J|XN?=%B~1d{@H{c|kG zRRiX5B**O+PJbXBgXdiJ1OdK0-d`ZW>6pYkT~gKgYAXrrE0DC#4}C1s^L`+6FY)3) zRt^p5^A8+AUB7rG%`At-Z?SeOyh?;&7sCUQzH$J9ufAE}-4-YPcOn9VQ1gU&n$?%@ zX^O>x>Eh48+WUE0G{^ZW(*&sW1mn|Dl;f(;!5osxAuc_&G`S|gIjpyI54jp}4!hL1 f7;w#69k5hi1&qwdGWuAy00000NkvXXu0mjfl8o0> delta 357 zcmV-r0h<2L1AqgNB!5RqL_t(o!|m5G3c@fH2H+f}t7EU==okdSv13Pj2T$RstCJqV z(Q9}F9jkxkmFLe(6-k0f13#5olCLjGt*&ib_sel3a0HIPe+CYZd97m%hz)6O1 z(SZ8VpmAIs4cn}y=JfK~OtOm^g(I451c_jVkV$|t5My|HL&&5+K{5onR=!IBnQw|Q zkhShC;BoQ1c3w9x&4+ig3i1ZfyVk012$=-PzYv1dIQ?0wn5}{#pdg1fOLib5L(`iT zi1rxxC3;<2)#K}vzftpm7B+;-0{oZd97m%hz)6O1 z(SZ8VpmAIs4cn}y=JfK~OtOm^g(I451c_jVkV$|t5My|HL&&5+K{5onR=!IBnQw|Q zkhShC;BoQ1c3w9x&4+ig3i1ZfyVk012$=-PzYv1dIQ?0wn5}{#pdg1fOLib5L(`iT zi1rxxC3;<2)#K}vzftpm7B+;-0{ol$P;pu@bDkWGMdxSIry<1pRk{robI24(zhXcJ7!KQ5KH%Ncd+-+FhwX;?`9Ae`Xi=aKqGPq=+Zcf=9p{kEfaw4r z)j*OaKyc}wD}Ia9dBlJ@BuO&Y0Q&T(@{o|o=j(1NpO=nQ^J|XN?=%B~1d{@H{c|kG zRRiX5B**O+PJbXBgXdiJ1OdK0-d`ZW>6pYkT~gKgYAXrrE0DC#4}C1s^L`+6FY)3) zRt^p5^A8+AUB7rG%`At-Z?SeOyh?;&7sCUQzH$J9ufAE}-4-YPcOn9VQ1gU&n$?%@ zX^O>x>Eh48+WUE0G{^ZW(*&sW1mn|Dl;f(;!5osxAuc_&G`S|gIjpyI54jp}4!hL1 f7;w#69k5hi1&qwdGWuAy00000NkvXXu0mjfl8o0> diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3cs.png index 351d7cb2b0b9af1b1c726301ee1e2bc0cfbdf47d..b5e998af95647073ca138d111f966cd690b81ced 100644 GIT binary patch delta 400 zcmV;B0dM|?1F8d%B!6*9L_t(o!|m5GPQ)+}g<&5hl$5ywM~FB9M?iF2u0%siNeLa| z23u05+-p!mY4Tfo=wT8Og*Z!LOQUrp%l;(F`7L&VN$2IL%`~VEg@D!s&EBUAEtF#WM(w>xEx3!!H=%Y9Mt#_I>{Yxd{-I z`o0J0`{k`ev{?qph%RlE8H}7H<)D2*FtykR?vItP05JXy>{mv>@t6&O9j8uE8H}7H<)D2*FtykR?vItP05JXy>{mv>@t6&O9j8u;(F`7L&VN$2IL%`~VEg@D!s&EBUAEtF#WM(w>xEx3!!H=%Y9Mt#_I>{Yxd{-I z`o0J0`{k`ev{?qph%Rlem>?JnnjzzkP`2oZdR(<@e`pXmKDAvIt4gK3#VK;>2-#OE9t`K`f1VPFp1EGO#p%C+fpn-M6yqG%&f2$Ms)0BInJk<)7-U4ev@5ae$WQw(Ii zDaJtBy3>Hi*73s(i$r}{qr4}UvrdR(<@e`pXmKDAvIt4gK3#VK;>2-#OE9t`K`f1VPFp1EGO#p%C+fpn-M6yqG%&f2$Ms)0BInJk<)7-U4ev@5ae$WQw(Ii zDaJtBy3>Hi*73s(i$r}{qr4}Uvrem>?JnnjzzkP`2oZG9%x7M^Fl9mx4`xAhOB6%q>&4$bWvE;i4pod+LHjMXmEu%Y)ryM- zWF&viUgKD#0ouXmQmTe`WS_rbQGjjOKDZ=6M)sNeS753n2mHzdxhY}GsnA?F00000 LNkvXXu0mjfiJ__O delta 357 zcmV-r0h<1Z1AqgNB!5RqL_t(o!|m5GZo)7a1z;Z~YsXxHv7=Q9sUu^@9-^n{%GwFW zjJ-;a0HfPSdDhRvb`Y|ys>&}t1%)X2^4m_pg%I3dj$42WZ~^{jV5x>-2#mY4ngEH~ z`RAB>q1Ayve7!tg1xRe?ka{CkfyBj{rY!RF?ZIiV|M)TDyMKtR4kYXpL6(3P$DGes zzk>{s7RdQHhpP_6$-MWmONwIHK^uitAL2N)=TeXjZUWuH)<$vYY!#s5w1Bh_;FuDw z8qhu(Y-x8a?EQ6>9A2H9O;)j@utjkpFvOIQO@O?RVsv&K~&&tM)y=#{!@$00000NkvXXu0mjf DH^H$1 diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5s.png index 6f9907419df3c76fa07c68ff49b4853b3c63bce4..5d9fc28e5f3f3ac40a0823179814d4cfce6548eb 100644 GIT binary patch delta 357 zcmV-r0h<1Z1AqgNB!5RqL_t(o!|m5GZo)7a1z;Z~YsXxHv7=Q9sUu^@9-^n{%GwFW zjJ-;a0HfPSdDhRvb`Y|ys>&}t1%)X2^4m_pg%I3dj$42WZ~^{jV5x>-2#mY4ngEH~ z`RAB>q1Ayve7!tg1xRe?ka{CkfyBj{rY!RF?ZIiV|M)TDyMKtR4kYXpL6(3P$DGes zzk>{s7RdQHhpP_6$-MWmONwIHK^uitAL2N)=TeXjZUWuH)<$vYY!#s5w1Bh_;FuDw z8qhu(Y-x8a?EQ6>9A2H9O;)j@utjkpFvOIQO@O?RVsv&K~&&tM)y=#{!@$00000NkvXXu0mjf DH^H$1 delta 365 zcmV-z0h0cJ1Be5VB!5pyL_t(oh3(cc4uU`s1yGKHr6otu(vnzNdIaMQOgx39w%)+f zlIv)>G9%x7M^Fl9mx4`xAhOB6%q>&4$bWvE;i4pod+LHjMXmEu%Y)ryM- zWF&viUgKD#0ouXmQmTe`WS_rbQGjjOKDZ=6M)sNeS753n2mHzdxhY}GsnA?F00000 LNkvXXu0mjfiJ__O diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6cs.png index f8242e95b1bbc88721451ceb8ea6f97f27c76f0a..2d2caca1f3381ea801801dc510bce5ce9e639b03 100644 GIT binary patch delta 325 zcmV-L0lNPE0^kCWB!4GKL_t(o!|m6x4Z<)G1yGL?O3JLj2oV!70x$zp(9%-TQnC`1 zCTIBQbDT*E&ZMxVFQQ=Nr?W3Wh%tsKCsbesR$v8A1ehC5(?m%a7}h*@pe)#R-5?P2 z^xVk;G2ab%+0E0U{cFneI&c8NJOCN$0^F|`DOk9_PK)t!Ck%2###^7@VBXqCj0uoJnpX-AFFL98QLQ511U%706o& zjBKgKTgbm`vE;hyQZmSLTYTQmUJWn=JZ&D2mcz3Bc#ykRP&WW~u2o$N=?0YNphTZ7 z#_=_(Sge9MAU=O{}TedQ-u(!f6iaydSDOifjNM&s_Qx+)sN)@1nRO{ zhU0YJ9e;&p2Lh%8B%mn}e~_#|;7}G2$kTdIape4MKa}TQNPia~5<^-*jYH&IcA!S3 z#{3EA1{4U7*aGS>%w@#rUfZ@E24P^+G+npksKYqvY&M|0;cRmayK{IeU^PT=ND7w~ zhz<%8;qGYIW-&6y%h#sME@qS*rLYkYU{XjIAQoZ_k2i*N1p>(s$#vFri6G03SQfIb zI}3Q2JYTyV4_nPIZ?_Ke2GG0K>TV3_0_0x^AT>@uMi+~9Fa`uNwONV-85tXIQJ~ag z;kW4P(&`?+-u;f67qqZ3ToK?m_3iC{|F^S5?sC>*ceE~BS^xk507*qoM6N<$g6mtL A}TedQ-u(!f6iaydSDOifjNM&s_Qx+)sN)@1nRO{ zhU0YJ9e;&p2Lh%8B%mn}e~_#|;7}G2$kTdIape4MKa}TQNPia~5<^-*jYH&IcA!S3 z#{3EA1{4U7*aGS>%w@#rUfZ@E24P^+G+npksKYqvY&M|0;cRmayK{IeU^PT=ND7w~ zhz<%8;qGYIW-&6y%h#sME@qS*rLYkYU{XjIAQoZ_k2i*N1p>(s$#vFri6G03SQfIb zI}3Q2JYTyV4_nPIZ?_Ke2GG0K>TV3_0_0x^AT>@uMi+~9Fa`uNwONV-85tXIQJ~ag z;kW4P(&`?+-u;f67qqZ3ToK?m_3iC{|F^S5?sC>*ceE~BS^xk507*qoM6N<$g6mtL A!Ck%2###^7@VBXqCj0uoJnpX-AFFL98QLQ511U%706o& zjBKgKTgbm`vE;hyQZmSLTYTQmUJWn=JZ&D2mcz3Bc#ykRP&WW~u2o$N=?0YNphTZ7 z#_=_(Sge9MAU=O{