From 701edbc5925e10da0935fa746aed234a6abb7a8d Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 6 Jan 2018 22:43:48 -0800 Subject: [PATCH] Remove KOR language from gen3 selection add flag for non japanese lang gen3 eggs Closes #1747 --- PKHeX.Core/Legality/Checks.cs | 5 +++++ PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index 0ff53a00f..6cea3f097 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -2189,6 +2189,11 @@ private void VerifyMisc() if (pk4.PokéathlonStat != 0) AddLine(Severity.Invalid, V415, CheckIdentifier.Egg); } + if (pkm is PK3) + { + if (pkm.Language != 1) // All Eggs are Japanese and flagged specially for localized string + AddLine(Severity.Invalid, string.Format(V5, LanguageID.Japanese, (LanguageID)pkm.Language), CheckIdentifier.Egg); + } } if (!Encounter.Valid) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index e4f1b6b3c..70db6f903 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -2082,8 +2082,10 @@ private void PopulateFilteredDataSources(SaveFile SAV) CB_HeldItem.DataSource = new BindingSource(GameInfo.ItemDataSource.Where(i => i.Value <= SAV.MaxItemID).ToList(), null); var languages = Util.GetUnsortedCBList("languages"); - if (SAV.Generation < 7) - languages = languages.Where(l => l.Value <= (int)LanguageID.Korean).ToList(); + if (SAV.Generation == 3) + languages.RemoveAll(l => l.Value >= (int)LanguageID.Korean); + else if (SAV.Generation < 7) + languages.RemoveAll(l => l.Value > (int)LanguageID.Korean); CB_Language.DataSource = languages; CB_Ball.DataSource = new BindingSource(GameInfo.BallDataSource.Where(b => b.Value <= SAV.MaxBallID).ToList(), null);