From 0bc2ee0938ebb5c652e7b038f0694991e89d5ef8 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 28 Nov 2017 19:29:22 -0800 Subject: [PATCH] Skip scatterbug static encounter forme check closes #1668 add 2/3 pkms provided as test cases (spewpa can be ignored, close enough. just want an evo & orig). --- .../Legality/Encounters/Data/Encounters7.cs | 2 +- .../664-07 - Scatterbug - 6703815D4F75.pk7 | Bin 0 -> 232 bytes .../666-07 - Vivillon - 6560815D4F75.pk7 | Bin 0 -> 232 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Static/664-07 - Scatterbug - 6703815D4F75.pk7 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Static/666-07 - Vivillon - 6560815D4F75.pk7 diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs index ec774f8c4..2a738108a 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs @@ -234,7 +234,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas) new EncounterStatic { Species = 007, Level = 12, Location = 042, Relearn = new[] {453,110,055,033}, }, // Squirtle @ Seaward Cave new EncounterStatic { Species = 095, Level = 14, Location = 034, Relearn = new[] {563,099,317,088}, }, // Onix @ Ten Carat Hill new EncounterStatic { Species = 116, Level = 18, Location = 014, Relearn = new[] {352,239,055,043}, }, // Horsea @ Kala'e Bay - new EncounterStatic { Species = 664, Level = 09, Location = 020, Relearn = new[] {476,081,078,033}, }, // Scatterbug @ Hau'oli City + new EncounterStatic { Species = 664, Level = 09, Location = 020, Relearn = new[] {476,081,078,033}, SkipFormCheck = true, }, // Scatterbug @ Hau'oli City new EncounterStatic { Species = 001, Level = 10, Location = 012, Relearn = new[] {580,022,045,033}, }, // Bulbasaur @ Route 2 new EncounterStatic { Species = 607, Level = 09, Location = 038, Relearn = new[] {203,052,083,123}, }, // Litwick @ Hau'oli Cemetery diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Static/664-07 - Scatterbug - 6703815D4F75.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Static/664-07 - Scatterbug - 6703815D4F75.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..2d223220e36d299570d252581375406b589e9077 GIT binary patch literal 232 zcmXT*k8NaNU{0UG#K54Ydp+wWkmdv8le4SKMXeYJf?$SZhD3%EAWUT_Vn|{rWk`qW zxx*O9;K!iIAfh3s3=)Fz85ou?@RcTLFb)Ml4EYSsSmoT{qJrGwK(+`23nzo3p&=vC HHw+8_8vqk& literal 0 HcmV?d00001 diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Static/666-07 - Vivillon - 6560815D4F75.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Static/666-07 - Vivillon - 6560815D4F75.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..3eadeedb50c1b2475b1d05d5d4906ba4e8fa8dcf GIT binary patch literal 232 zcmXT*k8NaNNJyQ<#K54Ydp+v_8v_F$kbQD?b-Ab&13?hRkjYR6#5q8i&yWXHpAOY? zhf#pRk3o?^L|IN5By@){5X@&_SiZnl8mfq7DhOzcGge)pa8W^SaUffSfrXPn(a?|) I=o