From 6b281cbefebce5afb18cfe2c2448b8e7f31e3acb Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 18 Nov 2017 20:08:11 -0800 Subject: [PATCH] more rockruff 1 handling y u do dis gf Closes #1630 --- PKHeX.Core/Legality/Encounters/EncounterGenerator.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs index 07656ef32..76545e614 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs @@ -1360,6 +1360,17 @@ private static bool GetIsMatchWC7(PKM pkm, WC7 wc, IEnumerable vs) if (wc.PIDType == 2 && !pkm.IsShiny) return false; if (wc.PIDType == 3 && pkm.IsShiny) return false; + if (wc.CardID == 1624) + { + if (pkm.Species == 745 && pkm.AltForm != 2) + return false; + if (pkm.Version == (int)GameVersion.US) + return wc.Move3 == 424; // Fire Fang + if (pkm.Version == (int)GameVersion.UM) + return wc.Move3 == 422; // Thunder Fang + return false; + } + return true; }