From aa430b48ca53ed2ebb951f48f9cdb9a397b76037 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 7 Feb 2023 21:56:25 -0800 Subject: [PATCH] Disallow LGPE event gift OT handling --- PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs | 1 + PKHeX.Core/MysteryGifts/WB7.cs | 2 +- PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs index 2a9b7df7c..0b3f68b13 100644 --- a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs @@ -248,6 +248,7 @@ public static bool GetCanOTHandle(IEncounterTemplate enc, PKM pk, int generation EncounterSlot8GO => false, WC6 { OT_Name.Length: > 0 } => false, WC7 { OT_Name.Length: > 0, TID16: not 18075 } => false, // Ash Pikachu QR Gift doesn't set Current Handler + WB7 wb7 when wb7.GetHasOT(pk.Language) => false, WC8 wc8 when wc8.GetHasOT(pk.Language) => false, WB8 wb8 when wb8.GetHasOT(pk.Language) => false, WA8 wa8 when wa8.GetHasOT(pk.Language) => false, diff --git a/PKHeX.Core/MysteryGifts/WB7.cs b/PKHeX.Core/MysteryGifts/WB7.cs index 68ad7c36b..5c0771c9d 100644 --- a/PKHeX.Core/MysteryGifts/WB7.cs +++ b/PKHeX.Core/MysteryGifts/WB7.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Generation 7 Mystery Gift Template File +/// Generation 7 Mystery Gift Template File (LGP/E) /// public sealed class WB7 : DataMysteryGift, ILangNick, IAwakened, INature, ILangNicknamedTemplate { diff --git a/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs b/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs index 16585b1e1..479e66672 100644 --- a/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs +++ b/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs @@ -104,7 +104,6 @@ public void Initialize(SaveFile sav) /// Is currently in an egg /// Is it shiny /// Context the sprite is for - /// public Image GetSprite(ushort species, byte form, int gender, uint formarg, int heldItem, bool isEgg, Shiny shiny = Shiny.Never, EntityContext context = EntityContext.None) { if (species == 0)