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

Fix headbutt encountertype fetch

Browse source 
future improvement can be detecting when "none" is appropriate, but for
now, whatever.
Closes #1502
This commit is contained in:
Kurt 2017-10-29 20:19:49 -07:00
parent da9e316cd8
commit e9cebf933c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Encounters/Data/Encounters4.cs
View file

@ -213,6 +213,7 @@ namespace PKHeX.Core
case SlotType.Grass: case SlotType.Grass:
case SlotType.Grass_Safari: case SlotType.Grass_Safari:
case SlotType.BugContest: return GrassType; case SlotType.BugContest: return GrassType;
case SlotType.Surf: case SlotType.Surf:
case SlotType.Old_Rod: case SlotType.Old_Rod:
case SlotType.Good_Rod: case SlotType.Good_Rod:
@ -229,8 +230,9 @@ namespace PKHeX.Core
return GrassType; return GrassType;
return EncounterType.None; return EncounterType.None;
case SlotType.Headbutt: return HeadbuttType; case SlotType.Headbutt_Special:
case SlotType.Headbutt_Special: return EncounterType.None; case SlotType.Headbutt: return HeadbuttType | EncounterType.None;
// not sure on if "None" should always be allowed, but this is so uncommon it shouldn't matter (gen7 doesn't keep this value anyway).
} }
return EncounterType.None; return EncounterType.None;
} }