From 6ca2cb16dc7d65cee92af8f0694d68ae213b9f05 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 9 Jun 2017 21:30:17 -0700 Subject: [PATCH] Skip spiky eared pichu pidiv verification Closes #1199 --- PKHeX.Core/Legality/RNG/MethodFinder.cs | 2 ++ PKHeX.Core/Legality/Tables4.cs | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/RNG/MethodFinder.cs b/PKHeX.Core/Legality/RNG/MethodFinder.cs index a7df8304a..b930057ae 100644 --- a/PKHeX.Core/Legality/RNG/MethodFinder.cs +++ b/PKHeX.Core/Legality/RNG/MethodFinder.cs @@ -539,6 +539,8 @@ public static bool IsCompatible4(this PIDType val, IEncounterable encounter) switch (encounter) { case EncounterStatic s: + if (s == Legal.SpikyEaredPichu) // nonshiny forced nature, undocumented + return val == PIDType.None; return s.Shiny == true ? val == PIDType.ChainShiny : val == PIDType.Method_1; case EncounterSlot _: return val == PIDType.Method_1; diff --git a/PKHeX.Core/Legality/Tables4.cs b/PKHeX.Core/Legality/Tables4.cs index 2473fba47..8f41ebba6 100644 --- a/PKHeX.Core/Legality/Tables4.cs +++ b/PKHeX.Core/Legality/Tables4.cs @@ -675,6 +675,13 @@ public static partial class Legal new EncounterStaticTyped { Species = 380, Level = 35, Version = GameVersion.HG, Roaming = true, TypeEncounter = EncounterType.Surfing_Fishing, }, //Latias new EncounterStaticTyped { Species = 381, Level = 35, Version = GameVersion.SS, Roaming = true, TypeEncounter = EncounterType.Surfing_Fishing, }, //Latios }; + internal static readonly EncounterStatic SpikyEaredPichu = new EncounterStaticTyped // Spiky-Eared Pichu @ Ilex Forest + { + Species = 172, Level = 30, Gender = 1, Form = 1, + Location = 214, Moves = new[] {344, 270, 207, 220}, + TypeEncounter = EncounterType.Starter_Fossil_Gift_Pt_DPTrio, + Shiny = false + }; internal static readonly EncounterStatic[] Encounter_HGSS_Regular = { //Starters @@ -724,7 +731,7 @@ public static partial class Legal new EncounterStatic { Species = 143, Level = 50, Location = 159, }, //Snorlax @ Route 11 new EncounterStatic { Species = 143, Level = 50, Location = 160, }, //Snorlax @ Route 12 new EncounterStatic { Species = 185, Level = 20, Location = 184, }, //Sudowoodo @ Route 36, Encounter does not have type - new EncounterStaticTyped { Species = 172, Level = 30, Location = 214, Gender = 1, Form = 1, Moves = new[]{344,270,207,220}, TypeEncounter = EncounterType.Starter_Fossil_Gift_Pt_DPTrio, Shiny = false }, //Spiky-eared Pichu @ Ilex forest + SpikyEaredPichu, //Stationary Lengerdary new EncounterStaticTyped { Species = 144, Level = 50, Location = 203, TypeEncounter = EncounterType.Cave_HallOfOrigin }, //Articuno @ Seafoam Islands new EncounterStatic { Species = 145, Level = 50, Location = 158, }, //Zapdos @ Route 10