From 05c4a0f286ba3a93c553fb00ffb44d0fa6d9c6bb Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 7 Feb 2018 19:56:02 -0800 Subject: [PATCH] partner cap pikachu update great job gamefreak allow current handler to be 0, remove static encounter as the data was sneakily faked as a WC7 in the events gallery. Closes #1817 ; still needs to update with new pikachu pid method allowing shinies (next update). --- PKHeX.Core/Legality/Checks.cs | 2 +- PKHeX.Core/Legality/Encounters/Data/Encounters7.cs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index cabcef326..5f074fcb0 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -1577,7 +1577,7 @@ private CheckResult VerifyHistory() if (pkm.CurrentHandler != 1) return new CheckResult(Severity.Invalid, V134, CheckIdentifier.History); } - else if (EncounterMatch is WC7 wc7 && wc7.OT_Name.Length > 0) + else if (EncounterMatch is WC7 wc7 && wc7.OT_Name.Length > 0 && wc7.TID != 18075) // Ash Pikachu QR Gift doesn't set Current Handler { if (pkm.OT_Friendship != PersonalTable.USUM[EncounterMatch.Species].BaseFriendship) return new CheckResult(Severity.Invalid, V132, CheckIdentifier.History); diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs index 643a3df7e..dc73d3fc7 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs @@ -221,11 +221,6 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas) Gift = true, Species = 801, Level = 50, Location = 40001, Shiny = false, IV3 = true, HeldItem = 795, Ability = 2, Fateful = true, RibbonWishing = true, Relearn = new [] {705, 430, 381, 270}, Ball = 0x10, // Cherish }, - new EncounterStatic // Pikachu (Pretty Wing), should probably be a fake mystery gift as it has OT details - { - Gift = true, Species = 25, Level = 21, Location = 40005, Form = 7, HeldItem = 571, Ability = 1, - Fateful = true, RibbonWishing = true, Relearn = new[] {85, 98, 87, 231}, Nature = Nature.Hardy, - }, new EncounterStatic { Gift = true, Species = 718, Form = 0, Level = 50, Shiny = false, Location = 118, IV3 = true, }, // Zygarde new EncounterStatic { Gift = true, Species = 718, Form = 1, Level = 50, Shiny = false, Location = 118, IV3 = true, }, // Zygarde