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 3543033ba..f46ce7170 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1c.png index f46ce7170..3543033ba 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1c.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-1c.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2.png index 2a0adac50..a58914b86 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2c.png index a58914b86..2a0adac50 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2c.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-2c.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3.png index 8369ed620..7cbb328d0 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3c.png index 7cbb328d0..8369ed620 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3c.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-3c.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4.png index e009d4885..992d9276f 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4c.png index 992d9276f..e009d4885 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4c.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-4c.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5.png index d59ca16f9..d8151fe02 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5c.png index d8151fe02..d59ca16f9 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5c.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-5c.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6.png index c2d33a910..e3028a359 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6c.png index e3028a359..c2d33a910 100644 Binary files a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6c.png and b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-6c.png differ diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7c.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7c.png rename to PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1cs.png index 7e3e4c384..b40a10410 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1cs.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1cs.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1s.png index b40a10410..7e3e4c384 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1s.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-1s.png differ 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 0ace3d38e..0ca951a94 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2cs.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2cs.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2s.png index 0ca951a94..0ace3d38e 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2s.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-2s.png differ 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 351d7cb2b..b5e998af9 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3cs.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3cs.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3s.png index b5e998af9..351d7cb2b 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3s.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-3s.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4cs.png index a1e3d1172..b0d478cea 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4cs.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4cs.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4s.png index b0d478cea..a1e3d1172 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4s.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-4s.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5cs.png index 5d9fc28e5..6f9907419 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5cs.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5cs.png differ 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 6f9907419..5d9fc28e5 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5s.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-5s.png differ 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 f8242e95b..2d2caca1f 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6cs.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6cs.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6s.png index 2d2caca1f..f8242e95b 100644 Binary files a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6s.png and b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-6s.png differ diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-7cs.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-7s.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-7cs.png rename to PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/25-7s.png