mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-16 09:08:02 +00:00
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:
parent
9edf8615ab
commit
8198bba01b
1 changed files with 3 additions and 3 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue