From 1b3294c8b31e2fed5c161af9bc9b2db202302e88 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 19 Mar 2017 15:40:49 -0700 Subject: [PATCH] Update nickname text check Generation specific names now show up legal if they are correct (ie all caps) --- PKHeX/Legality/Checks.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 477949b9e..ec07955b1 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -280,8 +280,8 @@ private void verifyNickname() else { // Can't have another language name if it hasn't evolved or wasn't a language-traded egg. - bool match = (pkm.WasTradedEgg || Legal.getHasEvolved(pkm)) && PKX.SpeciesLang.Any(lang => lang[pkm.Species] == nickname) - || PKX.SpeciesLang[pkm.Language][pkm.Species] == nickname; + bool match = PKX.getSpeciesNameGeneration(pkm.Species, pkm.Language, pkm.Format) == nickname; + match |= (pkm.WasTradedEgg || Legal.getHasEvolved(pkm)) && PKX.getIsNicknamedAnyLanguage(pkm.Species, nickname, pkm.Format); if (!match) {