From 9927da275fc2c643ffc60c9a86c090060b1c1b56 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 20 Jul 2014 12:28:56 -0700 Subject: [PATCH] Pokerus saving, new mega selection --- PKHeX.csproj | 4 ++++ Properties/Resources.Designer.cs | 28 ++++++++++++++++++++++++ Properties/Resources.resx | 12 ++++++++++ Resources/img/Pokemon Sprites/254-1.png | Bin 0 -> 442 bytes Resources/img/Pokemon Sprites/260-1.png | Bin 0 -> 442 bytes Resources/img/Pokemon Sprites/376-1.png | Bin 0 -> 442 bytes Resources/img/Pokemon Sprites/719-1.png | Bin 0 -> 442 bytes f1-Main.cs | 13 ++++++++--- 8 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 Resources/img/Pokemon Sprites/254-1.png create mode 100644 Resources/img/Pokemon Sprites/260-1.png create mode 100644 Resources/img/Pokemon Sprites/376-1.png create mode 100644 Resources/img/Pokemon Sprites/719-1.png diff --git a/PKHeX.csproj b/PKHeX.csproj index d83ad33c8..3f8f84849 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -254,6 +254,10 @@ + + + + diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 820095089..3ddd5d506 100644 --- a/Properties/Resources.Designer.cs +++ b/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); diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 87fbcedfd..08d4b7c3e 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -3577,4 +3577,16 @@ ..\Resources\text\fr\lang_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\img\Pokemon Sprites\254-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\260-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\376-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\719-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Resources/img/Pokemon Sprites/254-1.png b/Resources/img/Pokemon Sprites/254-1.png new file mode 100644 index 0000000000000000000000000000000000000000..19f5c8a3963b830bdaf3d6dcb98c9e5ab85ec1d4 GIT binary patch literal 442 zcmV;r0Y(0aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003gNklw1_X$0+m6ykrq|gLAcE~8uaSX;V>I9tAPC|F*R5P^`X~4M{k~c)%GXZ`{-=sl--`fpfZ3Oq-_%Qc88C|D_!~14Rd= z6k8Y8dN1Z;)*iIN;CZ4+mDm!t_Miu-{IK9T3B4azUjy15q-n3hrBm#2v1`r89J~yW kU%~9}-}mRyY{&TdpWgDMK>XIk{Qv*}07*qoM6N<$f)xI-(*OVf literal 0 HcmV?d00001 diff --git a/Resources/img/Pokemon Sprites/260-1.png b/Resources/img/Pokemon Sprites/260-1.png new file mode 100644 index 0000000000000000000000000000000000000000..19f5c8a3963b830bdaf3d6dcb98c9e5ab85ec1d4 GIT binary patch literal 442 zcmV;r0Y(0aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003gNklw1_X$0+m6ykrq|gLAcE~8uaSX;V>I9tAPC|F*R5P^`X~4M{k~c)%GXZ`{-=sl--`fpfZ3Oq-_%Qc88C|D_!~14Rd= z6k8Y8dN1Z;)*iIN;CZ4+mDm!t_Miu-{IK9T3B4azUjy15q-n3hrBm#2v1`r89J~yW kU%~9}-}mRyY{&TdpWgDMK>XIk{Qv*}07*qoM6N<$f)xI-(*OVf literal 0 HcmV?d00001 diff --git a/Resources/img/Pokemon Sprites/376-1.png b/Resources/img/Pokemon Sprites/376-1.png new file mode 100644 index 0000000000000000000000000000000000000000..19f5c8a3963b830bdaf3d6dcb98c9e5ab85ec1d4 GIT binary patch literal 442 zcmV;r0Y(0aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003gNklw1_X$0+m6ykrq|gLAcE~8uaSX;V>I9tAPC|F*R5P^`X~4M{k~c)%GXZ`{-=sl--`fpfZ3Oq-_%Qc88C|D_!~14Rd= z6k8Y8dN1Z;)*iIN;CZ4+mDm!t_Miu-{IK9T3B4azUjy15q-n3hrBm#2v1`r89J~yW kU%~9}-}mRyY{&TdpWgDMK>XIk{Qv*}07*qoM6N<$f)xI-(*OVf literal 0 HcmV?d00001 diff --git a/Resources/img/Pokemon Sprites/719-1.png b/Resources/img/Pokemon Sprites/719-1.png new file mode 100644 index 0000000000000000000000000000000000000000..19f5c8a3963b830bdaf3d6dcb98c9e5ab85ec1d4 GIT binary patch literal 442 zcmV;r0Y(0aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003gNklw1_X$0+m6ykrq|gLAcE~8uaSX;V>I9tAPC|F*R5P^`X~4M{k~c)%GXZ`{-=sl--`fpfZ3Oq-_%Qc88C|D_!~14Rd= z6k8Y8dN1Z;)*iIN;CZ4+mDm!t_Miu-{IK9T3B4azUjy15q-n3hrBm#2v1`r89J~yW kU%~9}-}mRyY{&TdpWgDMK>XIk{Qv*}07*qoM6N<$f)xI-(*OVf literal 0 HcmV?d00001 diff --git a/f1-Main.cs b/f1-Main.cs index 7a7b4c050..90cd9f099 100644 --- a/f1-Main.cs +++ b/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