Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-15 00:37:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify giratina check

Browse source 
No need to check both cases when we're really just checking for a
mismatch
This commit is contained in:
Kurt 2017-02-02 19:30:17 -08:00
parent c0e5db6bb0
commit e93d814ce8
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PKHeX/Legality/Checks.cs
View file

@ -1594,7 +1594,7 @@ namespace PKHeX.Core
}
break;
case 487: // Giratina
if (pkm.AltForm == 1 && pkm.HeldItem != 112 || pkm.AltForm == 0 && pkm.HeldItem == 112) // Origin form only with Griseous Orb
if (pkm.AltForm == 1 ^ pkm.HeldItem == 112) // Origin form only with Griseous Orb
{
AddLine(Severity.Invalid, "Held item does not match Form.", CheckIdentifier.Form);
return;
@ -1683,7 +1683,10 @@ namespace PKHeX.Core
case 676: // Furfrou
case 720: // Hoopa
if (pkm.AltForm != 0 && pkm.Box > -1) // has form but stored in box
{
AddLine(Severity.Invalid, "Form cannot exist outside of Party.", CheckIdentifier.Form);
return;
}
break;
}