From 424ad65d4f7aaca838c2b552ab97c3e62df9c8c1 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 27 Dec 2016 08:17:25 -0800 Subject: [PATCH] Fix dex species dropdown now constrained to the real maximum species ID --- PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs | 2 +- PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs index dd83657fa..fe1699971 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs @@ -23,7 +23,7 @@ public SAV_PokedexORAS() // Fill List CB_Species.DisplayMember = "Text"; CB_Species.ValueMember = "Value"; - CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).ToList(), null); + CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).Where(id => id.Value <= SAV.MaxSpeciesID).ToList(), null); for (int i = 1; i < SAV.MaxSpeciesID + 1; i++) LB_Species.Items.Add(i.ToString("000") + " - " + Main.GameStrings.specieslist[i]); diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs index 28f5a205f..97b7e83b4 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs @@ -23,7 +23,7 @@ public SAV_PokedexXY() // Fill List CB_Species.DisplayMember = "Text"; CB_Species.ValueMember = "Value"; - CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).ToList(), null); + CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).Where(id => id.Value <= SAV.MaxSpeciesID).ToList(), null); for (int i = 1; i < SAV.MaxSpeciesID + 1; i++) LB_Species.Items.Add(i.ToString("000") + " - " + Main.GameStrings.specieslist[i]);