Further cleanup of sprite assets

Reduces the size

Misc/PKX.cs

@@ -724,18 +724,16 @@ namespace PKHeX
         // Data Requests
         internal static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny)
         {
-            string file;
             if (species == 0)
-            { return (Image)Properties.Resources.ResourceManager.GetObject("_0"); }
-            {
-                file = "_" + species;
-                if (form > 0) // Alt Form Handling
-                    file = file + "_" + form;
-                else if (gender == 1 && (species == 592 || species == 593)) // Frillish & Jellicent
-                    file = file + "_" + gender;
-                else if (gender == 1 && (species == 521 || species == 668)) // Unfezant & Pyroar
-                    file = "_" + species + "f";
-            }
+                return (Image)Properties.Resources.ResourceManager.GetObject("_0");
+            if (new[] { 664, 665, 414, 493 }.Contains(species)) // Species who show their default sprite regardless of Form
+                form = 0;
+
+            string file = "_" + species;
+            if (form > 0) // Alt Form Handling
+                file = file + "_" + form;
+            else if (gender == 1 && new[] { 592, 593, 521, 668 }.Contains(species)) // Frillish & Jellicent, Unfezant & Pyroar
+                file = file + "_" + gender;
 
             // Redrawing logic
             Image baseImage = (Image)Properties.Resources.ResourceManager.GetObject(file);
@@ -824,7 +822,6 @@ namespace PKHeX
         // Personal.dat
         internal static string[] getFormList(int species, string[] t, string[] f, string[] g)
         {
-            
             // Mega List            
             if (Array.IndexOf(new[] 
                 { // XY
@@ -896,6 +893,7 @@ namespace PKHeX
 
                 case 412:
                 case 413:
+                case 414:
                     return new[]
                     {
                         f[412], // Plant

PKHeX.csproj

@@ -119,11 +119,6 @@
     <Compile Include="PKX\f3-MemoryAmie.Designer.cs">
       <DependentUpon>f3-MemoryAmie.cs</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Misc\ram2sav.cs" />
     <Compile Include="SAV\SAV_Database.cs">
       <SubType>Form</SubType>
@@ -271,7 +266,6 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="SAV\SAV_BerryField.resx">
       <DependentUpon>SAV_BerryField.cs</DependentUpon>
@@ -352,6 +346,8 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\img\Pokemon Sprites\414-2.png" />
+    <None Include="Resources\img\Pokemon Sprites\414-1.png" />
     <None Include="Resources\img\Trainer Sprites\tr_129.png" />
     <None Include="Resources\img\Trainer Sprites\tr_128.png" />
     <None Include="Resources\img\Trainer Sprites\tr_81.png" />

Properties/Resources.Designer.cs

@@ -4380,26 +4380,6 @@ namespace PKHeX.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _414_1 {
-            get {
-                object obj = ResourceManager.GetObject("_414_1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _414_2 {
-            get {
-                object obj = ResourceManager.GetObject("_414_2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -5420,186 +5400,6 @@ namespace PKHeX.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_1 {
-            get {
-                object obj = ResourceManager.GetObject("_493_1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_10 {
-            get {
-                object obj = ResourceManager.GetObject("_493_10", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_11 {
-            get {
-                object obj = ResourceManager.GetObject("_493_11", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_12 {
-            get {
-                object obj = ResourceManager.GetObject("_493_12", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_13 {
-            get {
-                object obj = ResourceManager.GetObject("_493_13", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_14 {
-            get {
-                object obj = ResourceManager.GetObject("_493_14", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_15 {
-            get {
-                object obj = ResourceManager.GetObject("_493_15", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_16 {
-            get {
-                object obj = ResourceManager.GetObject("_493_16", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_17 {
-            get {
-                object obj = ResourceManager.GetObject("_493_17", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_18 {
-            get {
-                object obj = ResourceManager.GetObject("_493_18", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_2 {
-            get {
-                object obj = ResourceManager.GetObject("_493_2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_3 {
-            get {
-                object obj = ResourceManager.GetObject("_493_3", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_4 {
-            get {
-                object obj = ResourceManager.GetObject("_493_4", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_5 {
-            get {
-                object obj = ResourceManager.GetObject("_493_5", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_6 {
-            get {
-                object obj = ResourceManager.GetObject("_493_6", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_7 {
-            get {
-                object obj = ResourceManager.GetObject("_493_7", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_8 {
-            get {
-                object obj = ResourceManager.GetObject("_493_8", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _493_9 {
-            get {
-                object obj = ResourceManager.GetObject("_493_9", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -5923,9 +5723,9 @@ namespace PKHeX.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _521f {
+        internal static System.Drawing.Bitmap _521_1 {
             get {
-                object obj = ResourceManager.GetObject("_521f", resourceCulture);
+                object obj = ResourceManager.GetObject("_521_1", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -7760,196 +7560,6 @@ namespace PKHeX.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_1 {
-            get {
-                object obj = ResourceManager.GetObject("_664_1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_10 {
-            get {
-                object obj = ResourceManager.GetObject("_664_10", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_11 {
-            get {
-                object obj = ResourceManager.GetObject("_664_11", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_12 {
-            get {
-                object obj = ResourceManager.GetObject("_664_12", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_13 {
-            get {
-                object obj = ResourceManager.GetObject("_664_13", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_14 {
-            get {
-                object obj = ResourceManager.GetObject("_664_14", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_15 {
-            get {
-                object obj = ResourceManager.GetObject("_664_15", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_16 {
-            get {
-                object obj = ResourceManager.GetObject("_664_16", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_17 {
-            get {
-                object obj = ResourceManager.GetObject("_664_17", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_18 {
-            get {
-                object obj = ResourceManager.GetObject("_664_18", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_19 {
-            get {
-                object obj = ResourceManager.GetObject("_664_19", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_2 {
-            get {
-                object obj = ResourceManager.GetObject("_664_2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_3 {
-            get {
-                object obj = ResourceManager.GetObject("_664_3", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_4 {
-            get {
-                object obj = ResourceManager.GetObject("_664_4", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_5 {
-            get {
-                object obj = ResourceManager.GetObject("_664_5", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_6 {
-            get {
-                object obj = ResourceManager.GetObject("_664_6", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_7 {
-            get {
-                object obj = ResourceManager.GetObject("_664_7", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_8 {
-            get {
-                object obj = ResourceManager.GetObject("_664_8", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _664_9 {
-            get {
-                object obj = ResourceManager.GetObject("_664_9", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -7960,196 +7570,6 @@ namespace PKHeX.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_1 {
-            get {
-                object obj = ResourceManager.GetObject("_665_1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_10 {
-            get {
-                object obj = ResourceManager.GetObject("_665_10", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_11 {
-            get {
-                object obj = ResourceManager.GetObject("_665_11", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_12 {
-            get {
-                object obj = ResourceManager.GetObject("_665_12", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_13 {
-            get {
-                object obj = ResourceManager.GetObject("_665_13", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_14 {
-            get {
-                object obj = ResourceManager.GetObject("_665_14", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_15 {
-            get {
-                object obj = ResourceManager.GetObject("_665_15", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_16 {
-            get {
-                object obj = ResourceManager.GetObject("_665_16", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_17 {
-            get {
-                object obj = ResourceManager.GetObject("_665_17", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_18 {
-            get {
-                object obj = ResourceManager.GetObject("_665_18", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_19 {
-            get {
-                object obj = ResourceManager.GetObject("_665_19", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_2 {
-            get {
-                object obj = ResourceManager.GetObject("_665_2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_3 {
-            get {
-                object obj = ResourceManager.GetObject("_665_3", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_4 {
-            get {
-                object obj = ResourceManager.GetObject("_665_4", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_5 {
-            get {
-                object obj = ResourceManager.GetObject("_665_5", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_6 {
-            get {
-                object obj = ResourceManager.GetObject("_665_6", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_7 {
-            get {
-                object obj = ResourceManager.GetObject("_665_7", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_8 {
-            get {
-                object obj = ResourceManager.GetObject("_665_8", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _665_9 {
-            get {
-                object obj = ResourceManager.GetObject("_665_9", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -8373,9 +7793,9 @@ namespace PKHeX.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _668f {
+        internal static System.Drawing.Bitmap _668_1 {
             get {
-                object obj = ResourceManager.GetObject("_668f", resourceCulture);
+                object obj = ResourceManager.GetObject("_668_1", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }

Properties/Resources.resx

@@ -1888,8 +1888,8 @@
   <data name="_521" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\521.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_521f" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\521f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="_521_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\521_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_522" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\522.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -2431,123 +2431,9 @@
   <data name="_664" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\664.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_664_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_10" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_11" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_13" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_14" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_15" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_17" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_18" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_19" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_8" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_664_9" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\664-9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="_665" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\665.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_665_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_10" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_11" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_13" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_14" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_15" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_17" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_18" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_19" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_8" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_665_9" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\665-9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="_666" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\666.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -2611,8 +2497,8 @@
   <data name="_668" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\668.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_668f" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\668f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="_668_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\668_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_669" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\669.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -2986,60 +2872,6 @@
   <data name="_487_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\487-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_493_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_10" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_11" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_13" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_14" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_15" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_17" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_18" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_8" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_493_9" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\493-9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="_676_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\676-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -5881,10 +5713,4 @@
   <data name="tr_129" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Trainer Sprites\tr_129.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_414_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\414-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="_414_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\414-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>