From 0a0b944de11034a0828dec25f1f2afc89e4d762a Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 16 Feb 2018 16:38:02 -0800 Subject: [PATCH] Use explicit generation param for forme fetch closes #1837 --- PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.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/Gen6/SAV_SecretBase.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs index 8c8e0714b..e72152b75 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Pokedex4.cs @@ -148,7 +148,7 @@ namespace PKHeX.WinForms private static string[] GetFormNames4Dex(int species) { - string[] formNames = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, 4); + string[] formNames = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation); if (species == 172) formNames = new[] { MALE, FEMALE, formNames[1] }; // Spiky return formNames; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs index c3b80d6e2..5e99e2b7d 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Pokedex5.cs @@ -139,7 +139,7 @@ namespace PKHeX.WinForms int f = SAV.B2W2 ? SaveUtil.GetDexFormIndexB2W2(species, fc) : SaveUtil.GetDexFormIndexBW(species, fc); if (f < 0) return; - string[] forms = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols); + string[] forms = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation); if (forms.Length < 1) return; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs index 5c8db57f0..354e45b73 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs @@ -331,7 +331,7 @@ namespace PKHeX.WinForms CB_Form.DisplayMember = "Text"; CB_Form.ValueMember = "Value"; - CB_Form.DataSource = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols).ToList(); + CB_Form.DataSource = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation).ToList(); } private void UpdateSpecies(object sender, EventArgs e) { diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs index aaaa34308..10bac87ca 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs @@ -131,7 +131,7 @@ namespace PKHeX.WinForms int f = SaveUtil.GetDexFormIndexORAS(species, fc); if (f < 0) return; - string[] forms = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols); + string[] forms = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation); if (forms.Length < 1) return; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs index f449850a6..899159d44 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs @@ -132,7 +132,7 @@ namespace PKHeX.WinForms int f = SaveUtil.GetDexFormIndexXY(species, fc); if (f < 0) return; - string[] forms = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols); + string[] forms = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation); if (forms.Length < 1) return; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs index 034fc146a..7d8faf57d 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs @@ -436,7 +436,7 @@ namespace PKHeX.WinForms CB_Form.DisplayMember = "Text"; CB_Form.ValueMember = "Value"; - CB_Form.DataSource = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols).ToList(); + CB_Form.DataSource = PKX.GetFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation).ToList(); } private void UpdateSpecies(object sender, EventArgs e) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs index e2700f904..e82f4faa0 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs @@ -346,7 +346,7 @@ namespace PKHeX.WinForms L_Vivillon.Text = GameInfo.Strings.specieslist[666] + ":"; CB_Vivillon.DisplayMember = "Text"; CB_Vivillon.ValueMember = "Value"; - CB_Vivillon.DataSource = PKX.GetFormList(666, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols).ToList(); + CB_Vivillon.DataSource = PKX.GetFormList(666, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, 6).ToList(); } private void GetBadges() { diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs index 33eaca9c2..3c00c8177 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs @@ -113,7 +113,7 @@ namespace PKHeX.WinForms L_Vivillon.Text = GameInfo.Strings.specieslist[666] + ":"; CB_Vivillon.DisplayMember = "Text"; CB_Vivillon.ValueMember = "Value"; - CB_Vivillon.DataSource = PKX.GetFormList(666, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols).ToList(); + CB_Vivillon.DataSource = PKX.GetFormList(666, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation).ToList(); var styles = new List(BattleStyles); if (SAV.USUM)