diff --git a/pk3DS.Core/Legality/Tables7.cs b/pk3DS.Core/Legality/Tables7.cs index 88995e0..4b6e60b 100644 --- a/pk3DS.Core/Legality/Tables7.cs +++ b/pk3DS.Core/Legality/Tables7.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; namespace pk3DS.Core { @@ -204,5 +205,38 @@ public static partial class Legal }; #endregion internal static readonly bool[] ReleasedHeldItems_7 = Enumerable.Range(0, MaxItemID_7+1).Select(i => HeldItems_SM.Contains((ushort)i) && !UnreleasedHeldItems_7.Contains(i)).ToArray(); + + public static readonly HashSet Totem_Alolan = new HashSet + { + 020, // Raticate (Normal, Alolan, Totem) + 105, // Marowak (Normal, Alolan, Totem) + 778, // Mimikyu (Normal, Busted, Totem, Totem_Busted) + }; + public static readonly HashSet Totem_SM = new HashSet + { + 020, // Raticate + 735, // Gumshoos + //746, // Wishiwashi + 758, // Salazzle + 754, // Lurantis + 738, // Vikavolt + 778, // Mimikyu + 784, // Kommo-o + }; + public static readonly HashSet Totem_USUM = new HashSet + { + 020, // Raticate + 735, // Gumshoos + //746, // Wishiwashi + 758, // Salazzle + 754, // Lurantis + 738, // Vikavolt + 778, // Mimikyu + 784, // Kommo-o + 105, // Marowak + 752, // Araquanid + 777, // Togedemaru + 743, // Ribombee + }; } } diff --git a/pk3DS/Properties/Resources.Designer.cs b/pk3DS/Properties/Resources.Designer.cs index 79a632f..aaf33cb 100644 --- a/pk3DS/Properties/Resources.Designer.cs +++ b/pk3DS/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace pk3DS.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -10670,6 +10670,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _744_1 { + get { + object obj = ResourceManager.GetObject("_744_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10690,6 +10700,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _745_2 { + get { + object obj = ResourceManager.GetObject("_745_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -11480,6 +11500,36 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _800_1 { + get { + object obj = ResourceManager.GetObject("_800_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _800_2 { + get { + object obj = ResourceManager.GetObject("_800_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _800_3 { + get { + object obj = ResourceManager.GetObject("_800_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -11510,6 +11560,56 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _803 { + get { + object obj = ResourceManager.GetObject("_803", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _804 { + get { + object obj = ResourceManager.GetObject("_804", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _805 { + get { + object obj = ResourceManager.GetObject("_805", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _806 { + get { + object obj = ResourceManager.GetObject("_806", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _807 { + get { + object obj = ResourceManager.GetObject("_807", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15793,6 +15893,46 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_776 { + get { + object obj = ResourceManager.GetObject("item_776", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_777 { + get { + object obj = ResourceManager.GetObject("item_777", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_778 { + get { + object obj = ResourceManager.GetObject("item_778", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_779 { + get { + object obj = ResourceManager.GetObject("item_779", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15803,6 +15943,106 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_780 { + get { + object obj = ResourceManager.GetObject("item_780", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_781 { + get { + object obj = ResourceManager.GetObject("item_781", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_782 { + get { + object obj = ResourceManager.GetObject("item_782", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_783 { + get { + object obj = ResourceManager.GetObject("item_783", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_784 { + get { + object obj = ResourceManager.GetObject("item_784", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_785 { + get { + object obj = ResourceManager.GetObject("item_785", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_786 { + get { + object obj = ResourceManager.GetObject("item_786", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_787 { + get { + object obj = ResourceManager.GetObject("item_787", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_788 { + get { + object obj = ResourceManager.GetObject("item_788", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_789 { + get { + object obj = ResourceManager.GetObject("item_789", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15813,6 +16053,96 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_790 { + get { + object obj = ResourceManager.GetObject("item_790", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_791 { + get { + object obj = ResourceManager.GetObject("item_791", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_792 { + get { + object obj = ResourceManager.GetObject("item_792", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_793 { + get { + object obj = ResourceManager.GetObject("item_793", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_794 { + get { + object obj = ResourceManager.GetObject("item_794", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_795 { + get { + object obj = ResourceManager.GetObject("item_795", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_796 { + get { + object obj = ResourceManager.GetObject("item_796", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_798 { + get { + object obj = ResourceManager.GetObject("item_798", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_799 { + get { + object obj = ResourceManager.GetObject("item_799", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15833,6 +16163,76 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_800 { + get { + object obj = ResourceManager.GetObject("item_800", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_801 { + get { + object obj = ResourceManager.GetObject("item_801", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_802 { + get { + object obj = ResourceManager.GetObject("item_802", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_803 { + get { + object obj = ResourceManager.GetObject("item_803", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_804 { + get { + object obj = ResourceManager.GetObject("item_804", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_805 { + get { + object obj = ResourceManager.GetObject("item_805", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_806 { + get { + object obj = ResourceManager.GetObject("item_806", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15863,6 +16263,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_836 { + get { + object obj = ResourceManager.GetObject("item_836", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15873,6 +16283,26 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_846 { + get { + object obj = ResourceManager.GetObject("item_846", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_849 { + get { + object obj = ResourceManager.GetObject("item_849", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15883,6 +16313,66 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_851 { + get { + object obj = ResourceManager.GetObject("item_851", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_852 { + get { + object obj = ResourceManager.GetObject("item_852", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_853 { + get { + object obj = ResourceManager.GetObject("item_853", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_854 { + get { + object obj = ResourceManager.GetObject("item_854", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_855 { + get { + object obj = ResourceManager.GetObject("item_855", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_856 { + get { + object obj = ResourceManager.GetObject("item_856", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15903,6 +16393,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_879 { + get { + object obj = ResourceManager.GetObject("item_879", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15913,6 +16413,56 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_880 { + get { + object obj = ResourceManager.GetObject("item_880", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_881 { + get { + object obj = ResourceManager.GetObject("item_881", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_882 { + get { + object obj = ResourceManager.GetObject("item_882", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_883 { + get { + object obj = ResourceManager.GetObject("item_883", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_884 { + get { + object obj = ResourceManager.GetObject("item_884", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15943,6 +16493,66 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_904 { + get { + object obj = ResourceManager.GetObject("item_904", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_905 { + get { + object obj = ResourceManager.GetObject("item_905", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_906 { + get { + object obj = ResourceManager.GetObject("item_906", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_907 { + get { + object obj = ResourceManager.GetObject("item_907", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_908 { + get { + object obj = ResourceManager.GetObject("item_908", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_909 { + get { + object obj = ResourceManager.GetObject("item_909", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15953,6 +16563,106 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_910 { + get { + object obj = ResourceManager.GetObject("item_910", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_911 { + get { + object obj = ResourceManager.GetObject("item_911", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_912 { + get { + object obj = ResourceManager.GetObject("item_912", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_913 { + get { + object obj = ResourceManager.GetObject("item_913", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_914 { + get { + object obj = ResourceManager.GetObject("item_914", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_915 { + get { + object obj = ResourceManager.GetObject("item_915", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_916 { + get { + object obj = ResourceManager.GetObject("item_916", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_917 { + get { + object obj = ResourceManager.GetObject("item_917", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_918 { + get { + object obj = ResourceManager.GetObject("item_918", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_919 { + get { + object obj = ResourceManager.GetObject("item_919", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15963,6 +16673,76 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_920 { + get { + object obj = ResourceManager.GetObject("item_920", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_921 { + get { + object obj = ResourceManager.GetObject("item_921", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_922 { + get { + object obj = ResourceManager.GetObject("item_922", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_923 { + get { + object obj = ResourceManager.GetObject("item_923", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_924 { + get { + object obj = ResourceManager.GetObject("item_924", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_925 { + get { + object obj = ResourceManager.GetObject("item_925", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_926 { + get { + object obj = ResourceManager.GetObject("item_926", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/pk3DS/Properties/Resources.resx b/pk3DS/Properties/Resources.resx index 15d1a63..69b896c 100644 --- a/pk3DS/Properties/Resources.resx +++ b/pk3DS/Properties/Resources.resx @@ -4939,4 +4939,238 @@ ..\Resources\img\Pokemon Sprites\25-6c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\item\item_776.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_777.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_778.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_779.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_780.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_781.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_782.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_783.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_784.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_785.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_786.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_787.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_788.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_789.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_790.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_791.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_792.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_793.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_794.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_795.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_796.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_798.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_799.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_800.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_801.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_802.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_803.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_804.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_805.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_806.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_836.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_846.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_849.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_851.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_852.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_853.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_854.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_855.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_856.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_879.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_880.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_881.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_882.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_883.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_884.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_904.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_905.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_906.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_907.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_908.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_909.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_910.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_911.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_912.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_913.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_914.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_915.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_916.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_917.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_918.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_919.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_920.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_921.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_922.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_923.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_924.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_925.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_926.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 + + + ..\Resources\img\Pokemon Sprites\745-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\800-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\800-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\800-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\803.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\804.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\805.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\806.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\807.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/pk3DS/Resources/img/Pokemon Sprites/744-1.png b/pk3DS/Resources/img/Pokemon Sprites/744-1.png new file mode 100644 index 0000000..b8a8bfb Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/744-1.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/745-2.png b/pk3DS/Resources/img/Pokemon Sprites/745-2.png new file mode 100644 index 0000000..d60e2ed Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/745-2.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/800-1.png b/pk3DS/Resources/img/Pokemon Sprites/800-1.png new file mode 100644 index 0000000..c031ed3 Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/800-1.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/800-2.png b/pk3DS/Resources/img/Pokemon Sprites/800-2.png new file mode 100644 index 0000000..fc7029e Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/800-2.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/800-3.png b/pk3DS/Resources/img/Pokemon Sprites/800-3.png new file mode 100644 index 0000000..5d8e5ab Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/800-3.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/803.png b/pk3DS/Resources/img/Pokemon Sprites/803.png new file mode 100644 index 0000000..82bad1e Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/803.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/804.png b/pk3DS/Resources/img/Pokemon Sprites/804.png new file mode 100644 index 0000000..6302202 Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/804.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/805.png b/pk3DS/Resources/img/Pokemon Sprites/805.png new file mode 100644 index 0000000..1fd2d58 Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/805.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/806.png b/pk3DS/Resources/img/Pokemon Sprites/806.png new file mode 100644 index 0000000..460d370 Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/806.png differ diff --git a/pk3DS/Resources/img/Pokemon Sprites/807.png b/pk3DS/Resources/img/Pokemon Sprites/807.png new file mode 100644 index 0000000..e7c9f34 Binary files /dev/null and b/pk3DS/Resources/img/Pokemon Sprites/807.png differ diff --git a/pk3DS/Resources/img/item/item_776.png b/pk3DS/Resources/img/item/item_776.png new file mode 100644 index 0000000..5b512b2 Binary files /dev/null and b/pk3DS/Resources/img/item/item_776.png differ diff --git a/pk3DS/Resources/img/item/item_777.png b/pk3DS/Resources/img/item/item_777.png new file mode 100644 index 0000000..ec913b3 Binary files /dev/null and b/pk3DS/Resources/img/item/item_777.png differ diff --git a/pk3DS/Resources/img/item/item_778.png b/pk3DS/Resources/img/item/item_778.png new file mode 100644 index 0000000..dde4632 Binary files /dev/null and b/pk3DS/Resources/img/item/item_778.png differ diff --git a/pk3DS/Resources/img/item/item_779.png b/pk3DS/Resources/img/item/item_779.png new file mode 100644 index 0000000..32f186a Binary files /dev/null and b/pk3DS/Resources/img/item/item_779.png differ diff --git a/pk3DS/Resources/img/item/item_780.png b/pk3DS/Resources/img/item/item_780.png new file mode 100644 index 0000000..d59741c Binary files /dev/null and b/pk3DS/Resources/img/item/item_780.png differ diff --git a/pk3DS/Resources/img/item/item_781.png b/pk3DS/Resources/img/item/item_781.png new file mode 100644 index 0000000..ddfffb1 Binary files /dev/null and b/pk3DS/Resources/img/item/item_781.png differ diff --git a/pk3DS/Resources/img/item/item_782.png b/pk3DS/Resources/img/item/item_782.png new file mode 100644 index 0000000..21c9886 Binary files /dev/null and b/pk3DS/Resources/img/item/item_782.png differ diff --git a/pk3DS/Resources/img/item/item_783.png b/pk3DS/Resources/img/item/item_783.png new file mode 100644 index 0000000..0be1fc3 Binary files /dev/null and b/pk3DS/Resources/img/item/item_783.png differ diff --git a/pk3DS/Resources/img/item/item_784.png b/pk3DS/Resources/img/item/item_784.png new file mode 100644 index 0000000..1e58e3e Binary files /dev/null and b/pk3DS/Resources/img/item/item_784.png differ diff --git a/pk3DS/Resources/img/item/item_785.png b/pk3DS/Resources/img/item/item_785.png new file mode 100644 index 0000000..df4e44b Binary files /dev/null and b/pk3DS/Resources/img/item/item_785.png differ diff --git a/pk3DS/Resources/img/item/item_786.png b/pk3DS/Resources/img/item/item_786.png new file mode 100644 index 0000000..bafe206 Binary files /dev/null and b/pk3DS/Resources/img/item/item_786.png differ diff --git a/pk3DS/Resources/img/item/item_787.png b/pk3DS/Resources/img/item/item_787.png new file mode 100644 index 0000000..746a24a Binary files /dev/null and b/pk3DS/Resources/img/item/item_787.png differ diff --git a/pk3DS/Resources/img/item/item_788.png b/pk3DS/Resources/img/item/item_788.png new file mode 100644 index 0000000..769bb11 Binary files /dev/null and b/pk3DS/Resources/img/item/item_788.png differ diff --git a/pk3DS/Resources/img/item/item_789.png b/pk3DS/Resources/img/item/item_789.png new file mode 100644 index 0000000..b424ed6 Binary files /dev/null and b/pk3DS/Resources/img/item/item_789.png differ diff --git a/pk3DS/Resources/img/item/item_790.png b/pk3DS/Resources/img/item/item_790.png new file mode 100644 index 0000000..617ab27 Binary files /dev/null and b/pk3DS/Resources/img/item/item_790.png differ diff --git a/pk3DS/Resources/img/item/item_791.png b/pk3DS/Resources/img/item/item_791.png new file mode 100644 index 0000000..bfacdc4 Binary files /dev/null and b/pk3DS/Resources/img/item/item_791.png differ diff --git a/pk3DS/Resources/img/item/item_792.png b/pk3DS/Resources/img/item/item_792.png new file mode 100644 index 0000000..2648a1a Binary files /dev/null and b/pk3DS/Resources/img/item/item_792.png differ diff --git a/pk3DS/Resources/img/item/item_793.png b/pk3DS/Resources/img/item/item_793.png new file mode 100644 index 0000000..2446dfa Binary files /dev/null and b/pk3DS/Resources/img/item/item_793.png differ diff --git a/pk3DS/Resources/img/item/item_794.png b/pk3DS/Resources/img/item/item_794.png new file mode 100644 index 0000000..32f186a Binary files /dev/null and b/pk3DS/Resources/img/item/item_794.png differ diff --git a/pk3DS/Resources/img/item/item_795.png b/pk3DS/Resources/img/item/item_795.png new file mode 100644 index 0000000..e9e7c06 Binary files /dev/null and b/pk3DS/Resources/img/item/item_795.png differ diff --git a/pk3DS/Resources/img/item/item_796.png b/pk3DS/Resources/img/item/item_796.png new file mode 100644 index 0000000..011698b Binary files /dev/null and b/pk3DS/Resources/img/item/item_796.png differ diff --git a/pk3DS/Resources/img/item/item_798.png b/pk3DS/Resources/img/item/item_798.png new file mode 100644 index 0000000..d59741c Binary files /dev/null and b/pk3DS/Resources/img/item/item_798.png differ diff --git a/pk3DS/Resources/img/item/item_799.png b/pk3DS/Resources/img/item/item_799.png new file mode 100644 index 0000000..ec913b3 Binary files /dev/null and b/pk3DS/Resources/img/item/item_799.png differ diff --git a/pk3DS/Resources/img/item/item_800.png b/pk3DS/Resources/img/item/item_800.png new file mode 100644 index 0000000..dde4632 Binary files /dev/null and b/pk3DS/Resources/img/item/item_800.png differ diff --git a/pk3DS/Resources/img/item/item_801.png b/pk3DS/Resources/img/item/item_801.png new file mode 100644 index 0000000..757e081 Binary files /dev/null and b/pk3DS/Resources/img/item/item_801.png differ diff --git a/pk3DS/Resources/img/item/item_802.png b/pk3DS/Resources/img/item/item_802.png new file mode 100644 index 0000000..f15d2ad Binary files /dev/null and b/pk3DS/Resources/img/item/item_802.png differ diff --git a/pk3DS/Resources/img/item/item_803.png b/pk3DS/Resources/img/item/item_803.png new file mode 100644 index 0000000..48a1b6c Binary files /dev/null and b/pk3DS/Resources/img/item/item_803.png differ diff --git a/pk3DS/Resources/img/item/item_804.png b/pk3DS/Resources/img/item/item_804.png new file mode 100644 index 0000000..e1b179f Binary files /dev/null and b/pk3DS/Resources/img/item/item_804.png differ diff --git a/pk3DS/Resources/img/item/item_805.png b/pk3DS/Resources/img/item/item_805.png new file mode 100644 index 0000000..e5047e1 Binary files /dev/null and b/pk3DS/Resources/img/item/item_805.png differ diff --git a/pk3DS/Resources/img/item/item_806.png b/pk3DS/Resources/img/item/item_806.png new file mode 100644 index 0000000..f25628a Binary files /dev/null and b/pk3DS/Resources/img/item/item_806.png differ diff --git a/pk3DS/Resources/img/item/item_836.png b/pk3DS/Resources/img/item/item_836.png new file mode 100644 index 0000000..e8c5aa6 Binary files /dev/null and b/pk3DS/Resources/img/item/item_836.png differ diff --git a/pk3DS/Resources/img/item/item_846.png b/pk3DS/Resources/img/item/item_846.png new file mode 100644 index 0000000..00ebc75 Binary files /dev/null and b/pk3DS/Resources/img/item/item_846.png differ diff --git a/pk3DS/Resources/img/item/item_849.png b/pk3DS/Resources/img/item/item_849.png new file mode 100644 index 0000000..e897910 Binary files /dev/null and b/pk3DS/Resources/img/item/item_849.png differ diff --git a/pk3DS/Resources/img/item/item_851.png b/pk3DS/Resources/img/item/item_851.png new file mode 100644 index 0000000..f27d492 Binary files /dev/null and b/pk3DS/Resources/img/item/item_851.png differ diff --git a/pk3DS/Resources/img/item/item_852.png b/pk3DS/Resources/img/item/item_852.png new file mode 100644 index 0000000..e133712 Binary files /dev/null and b/pk3DS/Resources/img/item/item_852.png differ diff --git a/pk3DS/Resources/img/item/item_853.png b/pk3DS/Resources/img/item/item_853.png new file mode 100644 index 0000000..ec8a299 Binary files /dev/null and b/pk3DS/Resources/img/item/item_853.png differ diff --git a/pk3DS/Resources/img/item/item_854.png b/pk3DS/Resources/img/item/item_854.png new file mode 100644 index 0000000..0a346e1 Binary files /dev/null and b/pk3DS/Resources/img/item/item_854.png differ diff --git a/pk3DS/Resources/img/item/item_855.png b/pk3DS/Resources/img/item/item_855.png new file mode 100644 index 0000000..474a051 Binary files /dev/null and b/pk3DS/Resources/img/item/item_855.png differ diff --git a/pk3DS/Resources/img/item/item_856.png b/pk3DS/Resources/img/item/item_856.png new file mode 100644 index 0000000..f421e83 Binary files /dev/null and b/pk3DS/Resources/img/item/item_856.png differ diff --git a/pk3DS/Resources/img/item/item_879.png b/pk3DS/Resources/img/item/item_879.png new file mode 100644 index 0000000..6873ba8 Binary files /dev/null and b/pk3DS/Resources/img/item/item_879.png differ diff --git a/pk3DS/Resources/img/item/item_880.png b/pk3DS/Resources/img/item/item_880.png new file mode 100644 index 0000000..0c3c3a8 Binary files /dev/null and b/pk3DS/Resources/img/item/item_880.png differ diff --git a/pk3DS/Resources/img/item/item_881.png b/pk3DS/Resources/img/item/item_881.png new file mode 100644 index 0000000..bbbc6d8 Binary files /dev/null and b/pk3DS/Resources/img/item/item_881.png differ diff --git a/pk3DS/Resources/img/item/item_882.png b/pk3DS/Resources/img/item/item_882.png new file mode 100644 index 0000000..bff71f1 Binary files /dev/null and b/pk3DS/Resources/img/item/item_882.png differ diff --git a/pk3DS/Resources/img/item/item_883.png b/pk3DS/Resources/img/item/item_883.png new file mode 100644 index 0000000..f2d5f79 Binary files /dev/null and b/pk3DS/Resources/img/item/item_883.png differ diff --git a/pk3DS/Resources/img/item/item_884.png b/pk3DS/Resources/img/item/item_884.png new file mode 100644 index 0000000..261dbb8 Binary files /dev/null and b/pk3DS/Resources/img/item/item_884.png differ diff --git a/pk3DS/Resources/img/item/item_904.png b/pk3DS/Resources/img/item/item_904.png new file mode 100644 index 0000000..6561b04 Binary files /dev/null and b/pk3DS/Resources/img/item/item_904.png differ diff --git a/pk3DS/Resources/img/item/item_905.png b/pk3DS/Resources/img/item/item_905.png new file mode 100644 index 0000000..29a608b Binary files /dev/null and b/pk3DS/Resources/img/item/item_905.png differ diff --git a/pk3DS/Resources/img/item/item_906.png b/pk3DS/Resources/img/item/item_906.png new file mode 100644 index 0000000..e61dcd4 Binary files /dev/null and b/pk3DS/Resources/img/item/item_906.png differ diff --git a/pk3DS/Resources/img/item/item_907.png b/pk3DS/Resources/img/item/item_907.png new file mode 100644 index 0000000..526fa2b Binary files /dev/null and b/pk3DS/Resources/img/item/item_907.png differ diff --git a/pk3DS/Resources/img/item/item_908.png b/pk3DS/Resources/img/item/item_908.png new file mode 100644 index 0000000..a8dac06 Binary files /dev/null and b/pk3DS/Resources/img/item/item_908.png differ diff --git a/pk3DS/Resources/img/item/item_909.png b/pk3DS/Resources/img/item/item_909.png new file mode 100644 index 0000000..9a93568 Binary files /dev/null and b/pk3DS/Resources/img/item/item_909.png differ diff --git a/pk3DS/Resources/img/item/item_910.png b/pk3DS/Resources/img/item/item_910.png new file mode 100644 index 0000000..17c016f Binary files /dev/null and b/pk3DS/Resources/img/item/item_910.png differ diff --git a/pk3DS/Resources/img/item/item_911.png b/pk3DS/Resources/img/item/item_911.png new file mode 100644 index 0000000..4a55a2b Binary files /dev/null and b/pk3DS/Resources/img/item/item_911.png differ diff --git a/pk3DS/Resources/img/item/item_912.png b/pk3DS/Resources/img/item/item_912.png new file mode 100644 index 0000000..956d944 Binary files /dev/null and b/pk3DS/Resources/img/item/item_912.png differ diff --git a/pk3DS/Resources/img/item/item_913.png b/pk3DS/Resources/img/item/item_913.png new file mode 100644 index 0000000..c503a35 Binary files /dev/null and b/pk3DS/Resources/img/item/item_913.png differ diff --git a/pk3DS/Resources/img/item/item_914.png b/pk3DS/Resources/img/item/item_914.png new file mode 100644 index 0000000..95dddac Binary files /dev/null and b/pk3DS/Resources/img/item/item_914.png differ diff --git a/pk3DS/Resources/img/item/item_915.png b/pk3DS/Resources/img/item/item_915.png new file mode 100644 index 0000000..28521a5 Binary files /dev/null and b/pk3DS/Resources/img/item/item_915.png differ diff --git a/pk3DS/Resources/img/item/item_916.png b/pk3DS/Resources/img/item/item_916.png new file mode 100644 index 0000000..e522cdd Binary files /dev/null and b/pk3DS/Resources/img/item/item_916.png differ diff --git a/pk3DS/Resources/img/item/item_917.png b/pk3DS/Resources/img/item/item_917.png new file mode 100644 index 0000000..5821fcd Binary files /dev/null and b/pk3DS/Resources/img/item/item_917.png differ diff --git a/pk3DS/Resources/img/item/item_918.png b/pk3DS/Resources/img/item/item_918.png new file mode 100644 index 0000000..84ff61e Binary files /dev/null and b/pk3DS/Resources/img/item/item_918.png differ diff --git a/pk3DS/Resources/img/item/item_919.png b/pk3DS/Resources/img/item/item_919.png new file mode 100644 index 0000000..3a629fb Binary files /dev/null and b/pk3DS/Resources/img/item/item_919.png differ diff --git a/pk3DS/Resources/img/item/item_920.png b/pk3DS/Resources/img/item/item_920.png new file mode 100644 index 0000000..dc44f4d Binary files /dev/null and b/pk3DS/Resources/img/item/item_920.png differ diff --git a/pk3DS/Resources/img/item/item_921.png b/pk3DS/Resources/img/item/item_921.png new file mode 100644 index 0000000..be2b151 Binary files /dev/null and b/pk3DS/Resources/img/item/item_921.png differ diff --git a/pk3DS/Resources/img/item/item_922.png b/pk3DS/Resources/img/item/item_922.png new file mode 100644 index 0000000..556c671 Binary files /dev/null and b/pk3DS/Resources/img/item/item_922.png differ diff --git a/pk3DS/Resources/img/item/item_923.png b/pk3DS/Resources/img/item/item_923.png new file mode 100644 index 0000000..a678676 Binary files /dev/null and b/pk3DS/Resources/img/item/item_923.png differ diff --git a/pk3DS/Resources/img/item/item_924.png b/pk3DS/Resources/img/item/item_924.png new file mode 100644 index 0000000..872fc4e Binary files /dev/null and b/pk3DS/Resources/img/item/item_924.png differ diff --git a/pk3DS/Resources/img/item/item_925.png b/pk3DS/Resources/img/item/item_925.png new file mode 100644 index 0000000..d29501a Binary files /dev/null and b/pk3DS/Resources/img/item/item_925.png differ diff --git a/pk3DS/Resources/img/item/item_926.png b/pk3DS/Resources/img/item/item_926.png new file mode 100644 index 0000000..da184d9 Binary files /dev/null and b/pk3DS/Resources/img/item/item_926.png differ diff --git a/pk3DS/WinFormsUtil.cs b/pk3DS/WinFormsUtil.cs index c0e4e0a..3029fe6 100644 --- a/pk3DS/WinFormsUtil.cs +++ b/pk3DS/WinFormsUtil.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Windows.Forms; +using pk3DS.Properties; namespace pk3DS { @@ -71,39 +72,67 @@ public static string GetResourceStringSprite(int species, int form, int gender, public static Bitmap getSprite(int species, int form, int gender, int item, GameConfig config, bool shiny = false) { if (species == 0) - return Properties.Resources._0; + return Resources._0; if (species > config.MaxSpeciesID) - return Properties.Resources.unknown; + return Resources.unknown; var file = GetResourceStringSprite(species, form, gender, config.Generation); // Redrawing logic - Bitmap baseImage = Properties.Resources.ResourceManager.GetObject(file) as Bitmap; + // Redrawing logic + Bitmap baseImage = (Bitmap)Resources.ResourceManager.GetObject(file); + if (IsTotemForm(species, form)) + { + form = GetTotemBaseForm(species, form); + file = GetResourceStringSprite(species, form, gender, Main.Config.Generation); + baseImage = (Bitmap)Resources.ResourceManager.GetObject(file); + baseImage = ToGrayscale(baseImage); + } if (baseImage == null) { if (species < config.MaxSpeciesID) { baseImage = LayerImage( - Properties.Resources.ResourceManager.GetObject("_" + species) as Image, - Properties.Resources.unknown, + Resources.ResourceManager.GetObject("_" + species) as Image, + Resources.unknown, 0, 0, .5); } else - baseImage = Properties.Resources.unknown; + baseImage = Resources.unknown; } if (shiny) { // Add shiny star to top left of image. - baseImage = LayerImage(baseImage, Properties.Resources.rare_icon, 0, 0, 0.7); + baseImage = LayerImage(baseImage, Resources.rare_icon, 0, 0, 0.7); } if (item > 0) { - Bitmap itemimg = (Bitmap)(Properties.Resources.ResourceManager.GetObject("item_" + item) ?? Properties.Resources.helditem); + Bitmap itemimg = (Bitmap)(Resources.ResourceManager.GetObject("item_" + item) ?? Resources.helditem); // Redraw baseImage = LayerImage(baseImage, itemimg, 22 + (15 - itemimg.Width) / 2, 15 + (15 - itemimg.Height), 1); } return baseImage; } + public static bool IsTotemForm(int species, int form, int generation = 7) + { + if (generation != 7) + return false; + if (form == 0) + return false; + if (!Legal.Totem_USUM.Contains(species)) + return false; + if (species == 778) // Mimikyu + return form == 2 || form == 3; + if (Legal.Totem_Alolan.Contains(species)) + return form == 2; + return form == 1; + } + public static int GetTotemBaseForm(int species, int form) + { + if (species == 778) // Mimikyu + return form - 2; + return form - 1; + } public static Bitmap scaleImage(Bitmap rawImg, int s) { Bitmap bigImg = new Bitmap(rawImg.Width * s, rawImg.Height * s); @@ -112,12 +141,66 @@ public static Bitmap scaleImage(Bitmap rawImg, int s) bigImg.SetPixel(x, y, rawImg.GetPixel(x / s, y / s)); return bigImg; } + public static Bitmap ToGrayscale(Image img) + { + if (img == null) + return null; + if (img.PixelFormat.HasFlag(PixelFormat.Indexed)) + return (Bitmap)img; + + var bmp = (Bitmap)img.Clone(); + GetBitmapData(bmp, out BitmapData bmpData, out IntPtr ptr, out byte[] data); + + Marshal.Copy(ptr, data, 0, data.Length); + SetAllColorToGrayScale(data); + Marshal.Copy(data, 0, ptr, data.Length); + bmp.UnlockBits(bmpData); + + return bmp; + } + private static void GetBitmapData(Bitmap bmp, out BitmapData bmpData, out IntPtr ptr, out byte[] data) + { + bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); + ptr = bmpData.Scan0; + data = new byte[bmp.Width * bmp.Height * 4]; + } + private static void SetAllTransparencyTo(byte[] data, double trans) + { + for (int i = 0; i < data.Length; i += 4) + data[i + 3] = (byte)(data[i + 3] * trans); + } + private static void SetAllColorTo(byte[] data, Color c) + { + byte R = c.R; + byte G = c.G; + byte B = c.B; + for (int i = 0; i < data.Length; i += 4) + { + if (data[i + 3] == 0) + continue; + data[i + 0] = B; + data[i + 1] = G; + data[i + 2] = R; + } + } + private static void SetAllColorToGrayScale(byte[] data) + { + for (int i = 0; i < data.Length; i += 4) + { + if (data[i + 3] == 0) + continue; + byte greyS = (byte)((0.3 * data[i + 2] + 0.59 * data[i + 1] + 0.11 * data[i + 0]) / 3); + data[i + 0] = greyS; + data[i + 1] = greyS; + data[i + 2] = greyS; + } + } // Strings and Paths public static string[] getStringList(string f, string l) { - object txt = Properties.Resources.ResourceManager.GetObject("text_" + f + "_" + l); // Fetch File, \n to list. + object txt = Resources.ResourceManager.GetObject("text_" + f + "_" + l); // Fetch File, \n to list. List rawlist = ((string)txt).Split('\n').ToList(); string[] stringdata = new string[rawlist.Count]; @@ -128,7 +211,7 @@ public static string[] getStringList(string f, string l) } public static string[] getSimpleStringList(string f) { - object txt = Properties.Resources.ResourceManager.GetObject(f); // Fetch File, \n to list. + object txt = Resources.ResourceManager.GetObject(f); // Fetch File, \n to list. List rawlist = ((string)txt).Split('\n').ToList(); string[] stringdata = new string[rawlist.Count]; @@ -211,7 +294,7 @@ public static void TranslateInterface(Control form, string lang) rawlist = File.ReadAllLines(externalLangPath); else { - object txt = Properties.Resources.ResourceManager.GetObject("lang_" + lang); + object txt = Resources.ResourceManager.GetObject("lang_" + lang); if (txt == null) return; // Translation file does not exist as a resource; abort this function and don't translate UI. rawlist = ((string)txt).Split(new[] { "\n" }, StringSplitOptions.None); rawlist = rawlist.Select(i => i.Trim()).ToArray(); // Remove trailing spaces diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index a882dfb..c8715b3 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -1829,6 +1829,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1836,6 +1904,16 @@ + + + + + + + + + +