Pokerus saving, new mega selection

PKHeX.csproj

@@ -254,6 +254,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
+    <None Include="Resources\img\Pokemon Sprites\719-1.png" />
+    <None Include="Resources\img\Pokemon Sprites\376-1.png" />
+    <None Include="Resources\img\Pokemon Sprites\260-1.png" />
+    <None Include="Resources\img\Pokemon Sprites\254-1.png" />
     <None Include="Resources\text\de\lang_de.txt" />
     <None Include="Resources\text\fr\lang_fr.txt" />
     <None Include="Resources\img\misc\rare_icon.png" />

Properties/Resources.Designer.cs

@@ -1544,6 +1544,13 @@ namespace PKHeX.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap _254_1 {
+            get {
+                object obj = ResourceManager.GetObject("_254_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap _255 {
             get {
                 object obj = ResourceManager.GetObject("_255", resourceCulture);
@@ -1600,6 +1607,13 @@ namespace PKHeX.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap _260_1 {
+            get {
+                object obj = ResourceManager.GetObject("_260_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap _261 {
             get {
                 object obj = ResourceManager.GetObject("_261", resourceCulture);
@@ -2573,6 +2587,13 @@ namespace PKHeX.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap _376_1 {
+            get {
+                object obj = ResourceManager.GetObject("_376_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap _377 {
             get {
                 object obj = ResourceManager.GetObject("_377", resourceCulture);
@@ -6353,6 +6374,13 @@ namespace PKHeX.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap _719_1 {
+            get {
+                object obj = ResourceManager.GetObject("_719_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap _72 {
             get {
                 object obj = ResourceManager.GetObject("_72", resourceCulture);

Properties/Resources.resx

@@ -3577,4 +3577,16 @@
   <data name="lang_fr" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\text\fr\lang_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="_254_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\254-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_260_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\260-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_376_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\376-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_719_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\719-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

f1-Main.cs

@@ -4087,7 +4087,10 @@ namespace PKHeX
         {
             int val = 0;
             try { val = ToInt32(cb.SelectedValue.ToString()); }
-            catch { };
+            catch { 
+                val = cb.SelectedIndex;
+                if (val < 0) val = 0;
+                };
             return val;
         }
         private void getIsShiny()
@@ -4328,7 +4331,11 @@ namespace PKHeX
             CB_Form.ValueMember = "Value";
 
             // Mega List
-            int[] mspec = { 3, 9, 65, 94, 115, 127, 130, 142, 154, 181, 212, 214, 229, 248, 257, 282, 303, 306, 308, 310, 354, 359, 380, 381, 445, 448, 460, 469 };
+            int[] mspec = {     // XY
+                              3, 9, 65, 94, 115, 127, 130, 142, 154, 181, 212, 214, 229, 248, 257, 282, 303, 306, 308, 310, 354, 359, 380, 381, 445, 448, 460, 469, 
+                                // ORAS
+                              254, 260, 376, 719,
+                          };
             for (int i = 0; i < mspec.Length; i++)
             {
                 if (mspec[i] == species)
@@ -6708,7 +6715,7 @@ namespace PKHeX
             markings += Convert.ToInt32(CHK_Star.Checked) * 16;
             markings += Convert.ToInt32(CHK_Diamond.Checked) * 32;
             pkx[0x2A] = (byte)markings;
-            pkx[0x2B] = (byte)(getIndex(CB_PKRSDays) + getIndex(CB_PKRSStrain) * 0x10);
+            pkx[0x2B] = (byte)(CB_PKRSDays.SelectedIndex + CB_PKRSStrain.SelectedIndex * 0x10);
 
             // Already in buff (then transferred to new pkx)
             // 0x2C, 0x2D, 0x2E, 0x2F