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;