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
kwsch · Oct 30, 2017 · da9e316 · da9e316
1 parent 3f53339
commit da9e316
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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;