Ignore static encounters if pokemon is insde a safari ball or inside a sports ball, to fix error on Voltorb from HGSS Safari that is mistaken from HGSS static voltorb

This commit is contained in:
javierhimura 2017-04-25 02:55:56 +02:00
parent 1dc6204b61
commit 4f371dbe35

View file

@ -1021,7 +1021,7 @@ namespace PKHeX.Core
WildEncounter = (EncounterSlot[])EncounterMatch;
}
if (Gen4Result == null && null != (EncounterStaticMatch = Legal.getValidStaticEncounter(pkm)))
if (Gen4Result == null && pkm.Ball != 5 && pkm.Ball != 0x18 && null != (EncounterStaticMatch = Legal.getValidStaticEncounter(pkm)))
{
EncounterMatch = EncounterStaticMatch.First();
var result = verifyEncounterStatic();