Reorder move source determination

Closes #875
Also removes XY default eggmoves (will be necessary for new legality
checks for prior generations)
This commit is contained in:
Kurt 2017-02-21 18:10:09 -08:00
parent 9edf8615ab
commit 8198bba01b

View file

@ -1953,10 +1953,10 @@ namespace PKHeX.Core
{
if (moves[i] == 0)
res[i] = new CheckResult(Severity.Valid, "Empty", CheckIdentifier.Move);
else if (relearn.Contains(moves[i]))
res[i] = new CheckResult(Severity.Valid, "Relearn Move.", CheckIdentifier.Move) { Flag = true };
else if (learn.Contains(moves[i]))
res[i] = new CheckResult(Severity.Valid, "Level-up.", CheckIdentifier.Move);
else if (relearn.Contains(moves[i]))
res[i] = new CheckResult(Severity.Valid, "Relearn Move.", CheckIdentifier.Move) { Flag = true };
else if (tmhm.Contains(moves[i]))
res[i] = new CheckResult(Severity.Valid, "TM/HM.", CheckIdentifier.Move);
else if (tutor.Contains(moves[i]))
@ -2021,7 +2021,7 @@ namespace PKHeX.Core
if (pkm.WasEgg && !Legal.NoHatchFromEgg.Contains(pkm.Species))
{
GameVersion[] Games = { GameVersion.XY };
GameVersion[] Games = {};
switch (pkm.GenNumber)
{
case 6: