From d33b97bf67fc2bead970ac9c06b6f3e98b45284d Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 17 Sep 2022 01:16:11 -0700 Subject: [PATCH] Fix direct cast from object(->int)->ushort https://projectpokemon.org/home/forums/topic/62327-error-occurs-when-trying-to-goto-a-specific-pokemon-through-combo-box-in-pokedex-editor/ ty liopds ! --- PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexGG.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexSM.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexBDSP.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs index 9e0bebcd7..dc00a6407 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs @@ -727,7 +727,7 @@ private void CHK_Continue_CheckedChanged(object sender, EventArgs e) private void ChangeSpecies(object sender, EventArgs e) { - species = (ushort)CB_Species.SelectedValue; + species = (ushort)WinFormsUtil.GetIndex(CB_Species); if (editing) return; editing = true; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs index 25dac5ced..cb1b6c5d3 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs @@ -57,7 +57,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - species = (ushort)CB_Species.SelectedValue; + species = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = species - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; GetEntry(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs index 527d09eab..53e704c6e 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs @@ -207,7 +207,7 @@ private void SaveMain() for (int i = 0; i < cbr.Length; i++) { int c = SAV.Data[ofsRoamer + 0x2E + i]; - var d = (int)cbr[i].SelectedValue; + var d = (ushort)WinFormsUtil.GetIndex(cbr[i]); if (c == d) continue; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs index 47bc7745e..906decc32 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs @@ -47,7 +47,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - species = (ushort)CB_Species.SelectedValue; + species = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = species - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; GetEntry(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs index 675bf7ff9..d536ed531 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs @@ -50,7 +50,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - species = (ushort)CB_Species.SelectedValue; + species = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = species - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; GetEntry(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs index dcc3a20f3..4e2a200ba 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs @@ -50,7 +50,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - species = (ushort)CB_Species.SelectedValue; + species = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = species - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; GetEntry(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexGG.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexGG.cs index 65b6ddae0..6a6b0e9b5 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexGG.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexGG.cs @@ -66,7 +66,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - currentSpecies = (ushort)CB_Species.SelectedValue; + currentSpecies = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = currentSpecies - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; if (!allModifying) FillLBForms(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexSM.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexSM.cs index 676e9ddcf..e35304ee7 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexSM.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_PokedexSM.cs @@ -53,7 +53,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - currentSpecies = (ushort)CB_Species.SelectedValue; + currentSpecies = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = currentSpecies - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; if (!allModifying) FillLBForms(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexBDSP.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexBDSP.cs index 3acc52809..c301fe149 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexBDSP.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexBDSP.cs @@ -46,7 +46,7 @@ private void ChangeCBSpecies(object sender, EventArgs e) SetEntry(); editing = true; - species = (ushort)CB_Species.SelectedValue; + species = (ushort)WinFormsUtil.GetIndex(CB_Species); LB_Species.SelectedIndex = species - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 LB_Species.TopIndex = LB_Species.SelectedIndex; GetEntry(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs index 3350759f1..7b4d629cc 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -142,7 +142,7 @@ private void LoadWork(IEnumerable editorWork) { if (editing) return; - var value = (int) cb.SelectedValue; + var value = WinFormsUtil.GetIndex(cb); editing = true; var match = f.Options.FirstOrDefault(z => z.Value == value); nud.Enabled = match?.Custom == true;