Fix nickname check when traded between languages

This commit is contained in:
Kurt
2017-04-09 18:28:22 -07:00
parent 0d8a58d3ab
commit 6d2c09f629

View File

@@ -266,11 +266,17 @@ private void verifyNickname()
else
{
// Can't have another language name if it hasn't evolved or wasn't a language-traded egg.
bool evolved = Legal.getHasEvolved(pkm);
bool match = PKX.getSpeciesNameGeneration(pkm.Species, pkm.Language, pkm.Format) == nickname;
if (pkm.WasTradedEgg || Legal.getHasEvolved(pkm))
if (pkm.WasTradedEgg || evolved)
match |= !PKX.getIsNicknamedAnyLanguage(pkm.Species, nickname, pkm.Format);
if (pkm.Format == 5 && !pkm.IsNative) // transfer
match |= PKX.getSpeciesNameGeneration(pkm.Species, pkm.Language, 4) == nickname;
if (!match && pkm.Format == 5 && !pkm.IsNative) // transfer
{
if (evolved)
match |= !PKX.getIsNicknamedAnyLanguage(pkm.Species, nickname, 4);
else
match |= PKX.getSpeciesNameGeneration(pkm.Species, pkm.Language, 4) == nickname;
}
if (!match)
{