Remove KOR language from gen3 selection

add flag for non japanese lang gen3 eggs
Closes #1747
This commit is contained in:
Kurt 2018-01-06 22:43:48 -08:00
parent 63a983749e
commit 701edbc592
2 changed files with 9 additions and 2 deletions

View File

@ -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)

View File

@ -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);