From 7290cc7abe0b7d2dbde572ef02a9b5b1a9ec72c2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 28 Nov 2014 02:14:15 -0800 Subject: [PATCH] Cleanup --- Misc/PKX.cs | 13 +++++---- Misc/Util.cs | 26 +++++------------- PKX/f1-Main.Designer.cs | 1 - PKX/f1-Main.cs | 58 +++++++++++------------------------------ 4 files changed, 27 insertions(+), 71 deletions(-) diff --git a/Misc/PKX.cs b/Misc/PKX.cs index a6106df32..359efc800 100644 --- a/Misc/PKX.cs +++ b/Misc/PKX.cs @@ -2311,11 +2311,8 @@ public static int getLevel(int species, ref uint exp) } // when calcexp exceeds our exp, we exit loop } - if ((uint)table.Rows[tl][growth + 1] == exp) - { - // Matches level threshold + if ((uint)table.Rows[tl][growth + 1] == exp) // Matches level threshold return tl; - } else return (tl - 1); } else return tl; @@ -2471,12 +2468,14 @@ public static bool verifychk(byte[] input) return (checksum == BitConverter.ToUInt16(input, 0x6)); } } - - public static UInt16 getTSV(UInt32 PID, UInt16 TID, UInt16 SID) + public static UInt16 getPSV(UInt32 PID) { - UInt16 tsv = Convert.ToUInt16((TID ^ SID) >> 4); return Convert.ToUInt16(((PID >> 16) ^ (PID & 0xFFFF)) >> 4); } + public static UInt16 getTSV(UInt16 TID, UInt16 SID) + { + return Convert.ToUInt16((TID ^ SID) >> 4); + } public static uint getRandomPID(int species, int cg) { int gt = (int)SpeciesTable().Rows[species][8]; diff --git a/Misc/Util.cs b/Misc/Util.cs index 2fe0f0fa2..a933f7f9c 100644 --- a/Misc/Util.cs +++ b/Misc/Util.cs @@ -98,9 +98,8 @@ internal static string GetRegistryValue(string key) Microsoft.Win32.RegistryKey currentUser = Microsoft.Win32.Registry.CurrentUser; Microsoft.Win32.RegistryKey key3 = currentUser.OpenSubKey(GetRegistryBase()); if (key3 == null) - { return null; - } + string str = key3.GetValue(key) as string; key3.Close(); currentUser.Close(); @@ -213,12 +212,9 @@ internal static int ToInt32(String value) try { value = value.TrimEnd(new char[]{'_'}); - return Int32.Parse(value); - } - catch - { - return 0; + return Int32.Parse(value); } + catch { return 0; } } internal static uint ToUInt32(String value) { @@ -230,10 +226,7 @@ internal static uint ToUInt32(String value) value = value.TrimEnd(new char[]{'_'}); return UInt32.Parse(value); } - catch - { - return 0; - } + catch { return 0; } } internal static uint getHEXval(TextBox tb) { @@ -246,19 +239,12 @@ internal static int getIndex(ComboBox cb) { int val = 0; if (cb.SelectedValue == null) - { return 0; - } try - { - val = Util.ToInt32(cb.SelectedValue.ToString()); - } + { val = Util.ToInt32(cb.SelectedValue.ToString()); } catch - { - val = cb.SelectedIndex; - if (val < 0) val = 0; - } + { val = cb.SelectedIndex; if (val < 0) val = 0; } return val; } internal static string getOnlyHex(string str) diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs index 6fd736fac..2e7fbcf41 100644 --- a/PKX/f1-Main.Designer.cs +++ b/PKX/f1-Main.Designer.cs @@ -2404,7 +2404,6 @@ public void InitializeComponent() this.CB_ExtraBytes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_ExtraBytes.FormattingEnabled = true; this.CB_ExtraBytes.Items.AddRange(new object[] { - "0x35", "0x36", "0x37", "0x3A", diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 17b7cf477..5fa73c1cc 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -250,9 +250,6 @@ public Form1() #endregion #region //// PKX WINDOW FUNCTIONS //// - // Randomization // - // Index Tables // - // Functions that Set Stuff up for PKX viewing // private void InitializeFields() { // Initialize Fields @@ -3721,10 +3718,7 @@ private void openQuick(string path) { // detect if it is a folder (load into boxes or not) if (Directory.Exists(path)) - { - loadBoxesFromDB(path); - return; - } + { loadBoxesFromDB(path); return; } string ext = Path.GetExtension(path); FileInfo fi = new FileInfo(path); @@ -3941,8 +3935,7 @@ private void openSave(bool oras) B_JPEG.Enabled = B_BoxIO.Enabled = B_VerifyCHK.Enabled = true; - B_VerifySHA.Enabled = false; - B_SwitchSAV.Enabled = false; + B_VerifySHA.Enabled = B_SwitchSAV.Enabled = false; tabBoxMulti.Enabled = true; savedited = false; @@ -3961,7 +3954,7 @@ private void openSave(bool oras) B_OpenSecretBase.Visible = oras; this.Width = largeWidth; - System.Media.SystemSounds.Beep.Play(); + System.Media.SystemSounds.Beep.Play(); // audibly indicate the save is loaded } // Secondary Windows for Ribbons/Amie/Memories private void openribbons(object sender, EventArgs e) @@ -4024,19 +4017,13 @@ public bool verifiedpkx() } #endregion if (Util.getIndex(CB_Species) == 0) // Not gonna write 0 species. - { - tabMain.SelectedIndex = 0; - goto invalid; - } + { tabMain.SelectedIndex = 0; goto invalid; } // If no errors detected... return true; // else... invalid: - { - System.Media.SystemSounds.Exclamation.Play(); - return false; - } + { System.Media.SystemSounds.Exclamation.Play(); return false; } } public byte[] preparepkx(byte[] buff) { @@ -5041,10 +5028,7 @@ private void rcmView_Click(object sender, EventArgs e) PictureBox picturebox = pba[slot]; if (picturebox.Image == null) - { - System.Media.SystemSounds.Exclamation.Play(); - return; - } + { System.Media.SystemSounds.Exclamation.Play(); return; } // Load the PKX file if (BitConverter.ToUInt64(savefile, offset + 8) != 0) @@ -5075,9 +5059,7 @@ private void rcmView_Click(object sender, EventArgs e) populateFields(blank); } catch // Still fails, just let the original errors occur. - { - populateFields(buff); - } + { populateFields(buff); } } // Visual to display what slot is currently loaded. getSlotColor(slot, Properties.Resources.slotView); @@ -5154,7 +5136,7 @@ private void rcmDelete_Click(object sender, EventArgs e) } private void setPokedex(byte[] pkxdata) { - if (savegame_oras) return; + if (savegame_oras) return; // not yet ready for ORAS if (savindex > 1) return; int species = BitConverter.ToUInt16(pkxdata, 0x8); // Species int lang = pkxdata[0xE3] - 1; if (lang > 5) lang--; // 0-6 language vals @@ -5163,7 +5145,7 @@ private void setPokedex(byte[] pkxdata) uint pid = BitConverter.ToUInt32(pkxdata, 0x18); ushort TID = BitConverter.ToUInt16(pkxdata, 0xC); ushort SID = BitConverter.ToUInt16(pkxdata, 0xE); - int shiny = Convert.ToInt16(Convert.ToBoolean(((pid >> 16) ^ (pid & 0xFFFF) ^ TID ^ SID) < 16)); + int shiny = Convert.ToInt16(Convert.ToBoolean((PKX.getPSV(pid) ^ PKX.getTSV(TID,SID)) < 16)); int dexoff = savindex * 0x7F000 + SaveGame.PokeDex + 8; // need to re-do this for ORAS int shiftoff = (shiny * 0x60 * 2) + (gender * 0x60) + 0x60; @@ -5201,10 +5183,8 @@ private byte setParty() savefile[offset + 6 * 0x104 + savindex * 0x7F000] = partymembers; // Zero out the party slots that are empty. for (int i = 0; i < 6; i++) - { if (i >= partymembers) Array.Copy(PKX.encryptArray(new Byte[0x104]), 0, savefile, offset + (i * 0x104), 0x104); - } // Repeat for Battle Box. byte battlemem = 0; @@ -5225,10 +5205,9 @@ private byte setParty() // Zero out the party slots that are empty. for (int i = 0; i < 6; i++) - { if (i >= battlemem) Array.Copy(PKX.encryptArray(new Byte[0x104]), 0, savefile, offset2 + (i * 0xE8), 0xE8); - } + if (battlemem == 0) savefile[offset2 + 6 * 0xE8 + savindex * 0x7F000] = 0; @@ -5468,11 +5447,9 @@ private void getSlotFiller(int offset, PictureBox pb) // Redrawing logic uint PID = BitConverter.ToUInt32(dslotdata, 0x18); - uint UID = (PID >> 16); - uint LID = (PID & 0xFFFF); - uint PSV = UID ^ LID; - uint TSV = (uint)(BitConverter.ToUInt16(dslotdata, 0x0C) ^ BitConverter.ToUInt16(dslotdata, 0x0E)); - uint XOR = TSV ^ PSV; + ushort PSV = PKX.getPSV(PID); + ushort TSV = (ushort)(BitConverter.ToUInt16(dslotdata, 0x0C) ^ BitConverter.ToUInt16(dslotdata, 0x0E)); + ushort XOR = (ushort)(TSV ^ PSV); Image baseImage = (Image)Properties.Resources.ResourceManager.GetObject(file); if (baseImage == null) @@ -5544,12 +5521,12 @@ private void getTSV(object sender, EventArgs e) { uint TID = Util.ToUInt32(TB_TID.Text); uint SID = Util.ToUInt32(TB_SID.Text); - uint tsv = (TID ^ SID) >> 4; + uint tsv = PKX.getTSV((ushort)TID, (ushort)SID); Tip1.SetToolTip(this.TB_TID, "TSV: " + tsv.ToString("0000")); Tip2.SetToolTip(this.TB_SID, "TSV: " + tsv.ToString("0000")); uint PID = Util.getHEXval(TB_PID); - uint psv = ((PID >> 16) ^ (PID & 0xFFFF)) >> 4; + uint psv = PKX.getPSV(PID); Tip3.SetToolTip(this.TB_PID, "PSV: " + psv.ToString("0000")); } private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) @@ -6414,11 +6391,6 @@ public override string ToString() { return Text; } - - public int GetValue() - { - return Util.ToInt32 (Value.ToString()); - } } public class SaveGames {