From 05a3753404145bcb12562cc9448206997cec2829 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 5 Dec 2020 06:29:28 -0800 Subject: [PATCH] Fix 40x30 cosplay sprite fetch Closes #3102 #2966 --- .../Properties/Resources.Designer.cs | 68 +++++++++++------- PKHeX.Drawing/Properties/Resources.resx | 54 +++++++------- .../Pokemon Sprites/{25-1c.png => 25-1cf.png} | Bin .../Pokemon Sprites/{25-2c.png => 25-2cf.png} | Bin .../Pokemon Sprites/{25-3c.png => 25-3cf.png} | Bin .../Pokemon Sprites/{25-4c.png => 25-4cf.png} | Bin .../Pokemon Sprites/{25-5c.png => 25-5cf.png} | Bin .../Pokemon Sprites/{25-6c.png => 25-6cf.png} | Bin .../Resources/img/Pokemon Sprites/25f.png | Bin 0 -> 265 bytes .../{25-1cs.png => 25-1cfs.png} | Bin .../{25-2cs.png => 25-2cfs.png} | Bin .../{25-3cs.png => 25-3cfs.png} | Bin .../{25-4cs.png => 25-4cfs.png} | Bin .../{25-5cs.png => 25-5cfs.png} | Bin .../{25-6cs.png => 25-6cfs.png} | Bin .../img/Shiny Pokemon Sprites/25sf.png | Bin 0 -> 285 bytes 16 files changed, 74 insertions(+), 48 deletions(-) rename PKHeX.Drawing/Resources/img/Pokemon Sprites/{25-1c.png => 25-1cf.png} (100%) rename PKHeX.Drawing/Resources/img/Pokemon Sprites/{25-2c.png => 25-2cf.png} (100%) rename PKHeX.Drawing/Resources/img/Pokemon Sprites/{25-3c.png => 25-3cf.png} (100%) rename PKHeX.Drawing/Resources/img/Pokemon Sprites/{25-4c.png => 25-4cf.png} (100%) rename PKHeX.Drawing/Resources/img/Pokemon Sprites/{25-5c.png => 25-5cf.png} (100%) rename PKHeX.Drawing/Resources/img/Pokemon Sprites/{25-6c.png => 25-6cf.png} (100%) create mode 100644 PKHeX.Drawing/Resources/img/Pokemon Sprites/25f.png rename PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/{25-1cs.png => 25-1cfs.png} (100%) rename PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/{25-2cs.png => 25-2cfs.png} (100%) rename PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/{25-3cs.png => 25-3cfs.png} (100%) rename PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/{25-4cs.png => 25-4cfs.png} (100%) rename PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/{25-5cs.png => 25-5cfs.png} (100%) rename PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/{25-6cs.png => 25-6cfs.png} (100%) create mode 100644 PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/25sf.png diff --git a/PKHeX.Drawing/Properties/Resources.Designer.cs b/PKHeX.Drawing/Properties/Resources.Designer.cs index f9c704453..eb54417e9 100644 --- a/PKHeX.Drawing/Properties/Resources.Designer.cs +++ b/PKHeX.Drawing/Properties/Resources.Designer.cs @@ -4403,9 +4403,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_1c { + public static System.Drawing.Bitmap _25_1cf { get { - object obj = ResourceManager.GetObject("_25_1c", resourceCulture); + object obj = ResourceManager.GetObject("_25_1cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4413,9 +4413,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_1cs { + public static System.Drawing.Bitmap _25_1cfs { get { - object obj = ResourceManager.GetObject("_25_1cs", resourceCulture); + object obj = ResourceManager.GetObject("_25_1cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4443,9 +4443,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_2c { + public static System.Drawing.Bitmap _25_2cf { get { - object obj = ResourceManager.GetObject("_25_2c", resourceCulture); + object obj = ResourceManager.GetObject("_25_2cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4453,9 +4453,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_2cs { + public static System.Drawing.Bitmap _25_2cfs { get { - object obj = ResourceManager.GetObject("_25_2cs", resourceCulture); + object obj = ResourceManager.GetObject("_25_2cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4483,9 +4483,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_3c { + public static System.Drawing.Bitmap _25_3cf { get { - object obj = ResourceManager.GetObject("_25_3c", resourceCulture); + object obj = ResourceManager.GetObject("_25_3cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4493,9 +4493,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_3cs { + public static System.Drawing.Bitmap _25_3cfs { get { - object obj = ResourceManager.GetObject("_25_3cs", resourceCulture); + object obj = ResourceManager.GetObject("_25_3cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4523,9 +4523,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_4c { + public static System.Drawing.Bitmap _25_4cf { get { - object obj = ResourceManager.GetObject("_25_4c", resourceCulture); + object obj = ResourceManager.GetObject("_25_4cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4533,9 +4533,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_4cs { + public static System.Drawing.Bitmap _25_4cfs { get { - object obj = ResourceManager.GetObject("_25_4cs", resourceCulture); + object obj = ResourceManager.GetObject("_25_4cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4563,9 +4563,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_5c { + public static System.Drawing.Bitmap _25_5cf { get { - object obj = ResourceManager.GetObject("_25_5c", resourceCulture); + object obj = ResourceManager.GetObject("_25_5cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4573,9 +4573,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_5cs { + public static System.Drawing.Bitmap _25_5cfs { get { - object obj = ResourceManager.GetObject("_25_5cs", resourceCulture); + object obj = ResourceManager.GetObject("_25_5cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4603,9 +4603,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_6c { + public static System.Drawing.Bitmap _25_6cf { get { - object obj = ResourceManager.GetObject("_25_6c", resourceCulture); + object obj = ResourceManager.GetObject("_25_6cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4613,9 +4613,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _25_6cs { + public static System.Drawing.Bitmap _25_6cfs { get { - object obj = ResourceManager.GetObject("_25_6cs", resourceCulture); + object obj = ResourceManager.GetObject("_25_6cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -4910,6 +4910,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap _25f { + get { + object obj = ResourceManager.GetObject("_25f", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -4920,6 +4930,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap _25sf { + get { + object obj = ResourceManager.GetObject("_25sf", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX.Drawing/Properties/Resources.resx b/PKHeX.Drawing/Properties/Resources.resx index 512c9a985..86a8eeeb7 100644 --- a/PKHeX.Drawing/Properties/Resources.resx +++ b/PKHeX.Drawing/Properties/Resources.resx @@ -5386,11 +5386,11 @@ ..\Resources\img\Pokemon Sprites\25-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-1c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-1cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-1cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-1cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\25-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5398,11 +5398,11 @@ ..\Resources\img\Pokemon Sprites\25-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-2c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-2cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-2cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-2cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\25-2s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5410,11 +5410,11 @@ ..\Resources\img\Pokemon Sprites\25-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-3c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-3cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-3cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-3cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\25-3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5422,11 +5422,11 @@ ..\Resources\img\Pokemon Sprites\25-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-4c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-4cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-4cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-4cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\25-4s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5434,11 +5434,11 @@ ..\Resources\img\Pokemon Sprites\25-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-5c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-5cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-5cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-5cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\25-5s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5446,11 +5446,11 @@ ..\Resources\img\Pokemon Sprites\25-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\25-6c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25-6cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\25-6cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Shiny Pokemon Sprites\25-6cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Shiny Pokemon Sprites\25-6s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -18871,4 +18871,10 @@ ..\Resources\img\Big Shiny Sprites\b_898-2s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\25f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\25sf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-1c.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-1cf.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/25-1c.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/25-1cf.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-2c.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-2cf.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/25-2c.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/25-2cf.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-3c.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-3cf.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/25-3c.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/25-3cf.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-4c.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-4cf.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/25-4c.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/25-4cf.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-5c.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-5cf.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/25-5c.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/25-5cf.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-6c.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25-6cf.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/25-6c.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/25-6cf.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/25f.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/25f.png new file mode 100644 index 0000000000000000000000000000000000000000..8049691414d2b0f21a32ea47b41a984f11549c98 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<^!VDzWe0F>Xq!a^uLR^8gp`l?=P|%zfr={73 zTZ=XKPEkC%RP%ds(D!SG|Ns9#by8mvsEDy7$S;_|;n|HeAZMDVi(`n!#H$kxxegl$ zuzasmSbAdNC8dOrT_rR1pQ!sO|6!SK#8Q3wkIC0qmX({I8k{bY`HXq*MZYLR^9L|Ns9L6cmDjg60%C zEe$c;8m_swMDb{w=J({F@9PYKvJcD~Er9BnN`m}?85qhYp9S%jdAc};Xat|VxRLje z0}tzke)9&-zQqqpQk9lyq@J3x=78G5jS`AaU7b$q&z$fr$B031{=ey}(#Pi>+^^KY z!Ej)qTPB0UA--oP6J|9?gxgBX2;7e2_2N1dcJ+#|ciQqOeW6K@7g-&A)a`sJAoJJZyt%yxA$^PJTi+P=wb#>S3j3^P6