Update FormVerifier.cs

This commit is contained in:
Kurt 2021-04-18 21:22:58 -07:00
parent f61108ac4e
commit 45f12bd924

View file

@ -76,9 +76,10 @@ namespace PKHeX.Core
int arceus = GetArceusFormFromHeldItem(pkm.HeldItem, pkm.Format); int arceus = GetArceusFormFromHeldItem(pkm.HeldItem, pkm.Format);
return arceus != form ? GetInvalid(LFormItemInvalid) : GetValid(LFormItem); return arceus != form ? GetInvalid(LFormItemInvalid) : GetValid(LFormItem);
} }
case Keldeo when pkm.Format < 8 && enc.Generation != 5: case Keldeo when enc.Generation != 5 || pkm.Format >= 8:
// can mismatch in gen5 via BW tutor and transfer up // can mismatch in gen5 via BW tutor and transfer up
// can mismatch in gen8+ as the form activates in battle when knowing the move; outside of battle can be either state. // can mismatch in gen8+ as the form activates in battle when knowing the move; outside of battle can be either state.
// Generation 8 patched out the mismatch; always forced to match moves.
bool hasSword = pkm.HasMove((int) Move.SecretSword); bool hasSword = pkm.HasMove((int) Move.SecretSword);
bool isSword = pkm.Form == 1; bool isSword = pkm.Form == 1;
if (isSword != hasSword) if (isSword != hasSword)