From 027d898f3d745ffbe8779d0fc765aea6f3553142 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 10 Jul 2018 12:37:40 -0700 Subject: [PATCH] Update Yancy Curtis trade OT checks Thanks paf! https://projectpokemon.org/home/forums/topic/46143-bug-in-last-update/ --- PKHeX.Core/Legality/Encounters/Data/Encounters5.cs | 3 ++- PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs index 6a1e790fb..72a396aba 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs @@ -675,7 +675,8 @@ private static void MarkG5Slots(ref EncounterArea[] Areas) new EncounterTrade { Species = 065, Level = 40, Ability = 1, TID = 17074, SID = 00001, OTGender = 1, Gender = 0, IVs = new[] {20,20,20,31,20,20}, Nature = Nature.Timid, }, // Alakazam }; - internal const int YancyCurtisTID = 10303; + internal const int YancyTID = 10303; + internal const int CurtisTID = 54118; internal static readonly EncounterTrade[] TradeGift_B2W2_YancyCurtis = { // player is male diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs index 80c75787d..b7ee39487 100644 --- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs @@ -312,8 +312,8 @@ private void VerifyTrade5(LegalityAnalysis data) } else // B2W2 { - if (EncounterMatch is EncounterTrade t && t.TID == Encounters5.YancyCurtisTID) - VerifyTradeOTOnly(data, pkm.OT_Gender == 0 ? Encounters5.TradeOT_B2W2_M : Encounters5.TradeOT_B2W2_F); + if (EncounterMatch is EncounterTrade t && (t.TID == Encounters5.YancyTID || t.TID == Encounters5.CurtisTID)) + VerifyTradeOTOnly(data, t.TrainerNames); else VerifyTradeTable(data, Encounters5.TradeB2W2, Encounters5.TradeGift_B2W2); }