diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 8bf6e8462..1a0a98ff9 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -1760,7 +1760,7 @@ private void populatefields(byte[] buff) } catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } } - else { CHK_AsEgg.Checked = false; CB_EggLocation.SelectedValue = 0; GB_EggConditions.Enabled = false; } + else { CHK_AsEgg.Checked = GB_EggConditions.Enabled = false; CB_EggLocation.SelectedValue = 0; } CB_MetLocation.SelectedValue = metloc; @@ -1768,16 +1768,16 @@ private void populatefields(byte[] buff) else Label_CTGender.Text = "♂"; if (TB_OTt2.Text == "") Label_CTGender.Text = ""; - if (CHK_IsEgg.Checked) - { - CB_MetLocation.Enabled = false; - CAL_MetDate.Enabled = false; - } - else - { - CB_MetLocation.Enabled = true; - CAL_MetDate.Enabled = true; - } + //if (CHK_IsEgg.Checked) + //{ + // CB_MetLocation.Enabled = false; + // CAL_MetDate.Enabled = false; + //} + //else + //{ + // CB_MetLocation.Enabled = true; + // CAL_MetDate.Enabled = true; + //} // reset CHK_Cured.Checked = false; @@ -3394,7 +3394,7 @@ private void updateNickname(object sender, EventArgs e) case 7: l = "es"; break; case 8: l = "ko"; break; default: l = curlanguage; break; - } + } TB_Nickname.Text = Util.getStringList("Species", l)[species]; } } @@ -3469,7 +3469,7 @@ private void updateIsEgg(object sender, EventArgs e) GB_EggConditions.Enabled = true; CAL_MetDate.Value = new DateTime(2000, 01, 01); - CB_MetLocation.SelectedValue = 0; + CB_MetLocation.SelectedIndex = 2; } else // Not Egg { @@ -3489,8 +3489,8 @@ private void updateIsEgg(object sender, EventArgs e) Label_HatchCounter.Visible = CHK_IsEgg.Checked; Label_Friendship.Visible = !CHK_IsEgg.Checked; // Disable - CB_MetLocation.Enabled = !CHK_IsEgg.Checked; - CAL_MetDate.Enabled = !CHK_IsEgg.Checked; + // CB_MetLocation.Enabled = !CHK_IsEgg.Checked; + // CAL_MetDate.Enabled = !CHK_IsEgg.Checked; } private void updateMetAsEgg(object sender, EventArgs e) { @@ -4514,7 +4514,7 @@ public byte[] preparepkx(byte[] buff) pkx[0xD5] = (byte)CAL_MetDate.Value.Month; pkx[0xD6] = (byte)CAL_MetDate.Value.Day; - if (CHK_IsEgg.Checked) // If still an egg, it has no hatch location/date. Zero it! + if (CHK_IsEgg.Checked && CB_MetLocation.SelectedIndex == 0) // If still an egg, it has no hatch location/date. Zero it! { pkx[0xD4] = 0; pkx[0xD5] = 0; diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt index 4dbb42836..d3e9e27ed 100644 --- a/Resources/text/changelog.txt +++ b/Resources/text/changelog.txt @@ -316,7 +316,7 @@ http://projectpokemon.org/forums/showthread.php?36986 - Fixed: Pokedex corruption (I hope). - Removed: Backup (.bak) saving when replacing the Cyber Save file "main". -08/31/14 - New Update: +08/31/14 - New Update (3900): - Added: Cyber screwup notification upon saving. - - If a 0x200 byte chunk is all 0xFF, your save will be corrupt when you write it back (not PKHeX's fault). - Added: All Item 'cheat', activated by holding ALT when clicking the ITEMS button within the Inventory Menu. @@ -331,6 +331,8 @@ http://projectpokemon.org/forums/showthread.php?36986 - Fixed: Can no longer set illegal Dex entries (either manually or via Give All) - Misc: Cleaned up some code, reduced file size. -09/XX/14 - New Update: +09/22/14 - New Update: - Added: Box Import will start at the current box. - - Added: Box Import can be instructed to clear all boxes or just overwrite individual slots. \ No newline at end of file + - Added: Box Import can be instructed to clear all boxes or just overwrite individual slots. + - Fixed: Importing past generation files will no longer fail for valid files. + - Removed: Erroneous Mega selection ("Mega Meganium & Mega Yanmega") ;) \ No newline at end of file