From e9cebf933c47bb49b299daa9f19c8b54106b7ce7 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 29 Oct 2017 20:19:49 -0700 Subject: [PATCH] Fix headbutt encountertype fetch future improvement can be detecting when "none" is appropriate, but for now, whatever. Closes #1502 --- PKHeX.Core/Legality/Encounters/Data/Encounters4.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs index d3f332b61..0f85328c7 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs @@ -213,6 +213,7 @@ namespace PKHeX.Core case SlotType.Grass: case SlotType.Grass_Safari: case SlotType.BugContest: return GrassType; + case SlotType.Surf: case SlotType.Old_Rod: case SlotType.Good_Rod: @@ -229,8 +230,9 @@ namespace PKHeX.Core return GrassType; return EncounterType.None; - case SlotType.Headbutt: return HeadbuttType; - case SlotType.Headbutt_Special: return EncounterType.None; + case SlotType.Headbutt_Special: + 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; }