From 330fe29055f5ff2417bf66ccb8d05eddb780b8ff Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 4 Apr 2015 20:45:29 -0700 Subject: [PATCH] Minor fix Pokerus days will no longer cause errors --- PKX/f1-Main.cs | 2 +- Resources/text/changelog.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 4b0ae9f53..9d822bb5a 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -1126,7 +1126,7 @@ private void populateFields(byte[] data) // Set SelectedIndexes for PKRS CB_PKRSStrain.SelectedIndex = PKRS_Strain; CHK_Cured.Checked = (PKRS_Strain > 0 && PKRS_Duration == 0); - CB_PKRSDays.SelectedIndex = Math.Min(CB_PKRSStrain.Items.Count - 1, PKRS_Duration); // to strip out bad hacked 'rus + CB_PKRSDays.SelectedIndex = Math.Min(CB_PKRSDays.Items.Count - 1, PKRS_Duration); // to strip out bad hacked 'rus TB_Cool.Text = cnt_cool.ToString(); TB_Beauty.Text = cnt_beauty.ToString(); diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt index 4e50b5d60..1954c07c3 100644 --- a/Resources/text/changelog.txt +++ b/Resources/text/changelog.txt @@ -491,7 +491,7 @@ http://projectpokemon.org/forums/showthread.php?36986 - Added: Boot Status to help debug some users being stuck on the splash screen. - Added: Event Constant editing to Event Flag window. -3/1/15 - New Update: (14140) +3/1/15 - New Update: (100000) - Added: QR Code Generation; click "QR!" and a QR window will appear with a scannable image. Requires an active internet connection. - Added: QR Code to Tabs; hold ALT when clicking "QR!" after copying the URL of the QR to your clipboard (CTRL-C). Requires internet. - Added: Decrypted Battle Video scraping for ek6 data; battle stats are not kept.