From da9e316cd8616f20a3171c6ddf4b93ebb15232ff Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 29 Oct 2017 19:17:53 -0700 Subject: [PATCH] Add rock smash encounter type flagging I don't believe rock smash (EncounterType 1) exists, tests at Route 19 and Vermillion yielded None & City. Closes #1379 Opens #1502 --- PKHeX.Core/Legality/Encounters/Data/Encounters4.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs index 089509f6c..d3f332b61 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs @@ -223,7 +223,11 @@ private static EncounterType GetEncounterTypeBySlotHGSS(SlotType Type, Encounter case SlotType.Super_Rod_Safari: return EncounterType.Surfing_Fishing; case SlotType.Rock_Smash: - case SlotType.Rock_Smash_Safari: return EncounterType.RockSmash; + if (HeadbuttType == EncounterType.Building_EnigmaStone) + return HeadbuttType; + if (GrassType == EncounterType.Cave_HallOfOrigin) + return GrassType; + return EncounterType.None; case SlotType.Headbutt: return HeadbuttType; case SlotType.Headbutt_Special: return EncounterType.None;