From ea2c6260faaa5996db8d53bb9659fe6cc9d0eac2 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 29 Apr 2018 21:56:12 -0700
Subject: [PATCH] Prevent providing beta safari zone encounters

Fixes Krabby / etc.
Fix genderless encounterstatic gender set (Voltorb)

Now at 103, Exeggutor
pretty cool that over 100 species can have every single encounter
generate a legal pkm ;)
might be useful to add metrics to count how many encounters are
generated in a session
---
 .../Encounters/Generator/EncounterMovesetGenerator.cs       | 6 +++++-
 PKHeX.Core/Legality/RNG/PIDGenerator.cs                     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
index 84494f148..fd9b973f9 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterMovesetGenerator.cs
@@ -255,8 +255,12 @@ private static IEnumerable<EncounterSlot> GetSlots(PKM pk, IReadOnlyCollection<i
             var slots = EncounterSlotGenerator.GetPossible(pk);
             foreach (var slot in slots)
             {
-                if (slot.Generation == 2 && slot.Type.HasFlag(SlotType.Headbutt))
+                if (slot.Generation == 2)
                 {
+                    if (slot.Type.HasFlag(SlotType.Safari))
+                        continue;
+
+                    if (slot.Type.HasFlag(SlotType.Headbutt))
                     if (Legal.GetGSCHeadbuttAvailability(slot, pk.TID) != TreeEncounterAvailable.ValidTree)
                         continue;
                 }
diff --git a/PKHeX.Core/Legality/RNG/PIDGenerator.cs b/PKHeX.Core/Legality/RNG/PIDGenerator.cs
index aa7f729c8..ade710db1 100644
--- a/PKHeX.Core/Legality/RNG/PIDGenerator.cs
+++ b/PKHeX.Core/Legality/RNG/PIDGenerator.cs
@@ -266,6 +266,7 @@ private static void SetRandomPIDIV(PKM pkm, uint seed)
         private static void SetRandomWildPID4(PKM pk, int nature, int ability, int gender, PIDType specific = PIDType.None)
         {
             pk.RefreshAbility(ability);
+            pk.Gender = gender;
             var type = GetPIDType(pk, specific);
             var method = GetGeneratorMethod(type);