From dc5f1a0b1789ad405bc8d8dd62c38a4dd96ea268 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 29 Jun 2024 11:38:30 -0500 Subject: [PATCH] Allow nicknaming ot-receive WC7; also WC6-link Closes #4308 --- PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs index f77498b45..b2e9290f0 100644 --- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs @@ -83,8 +83,9 @@ public sealed class NicknameVerifier : Verifier { PCD pcd => !pcd.Gift.PK.IsNicknamed, PGF pgf => !pgf.IsNicknamed, - WC6 wc6 => !wc6.IsNicknamed && wc6 is not { IsLinkGift: true, Species: (int)Species.Glalie or (int)Species.Steelix }, // Can nickname the demo gift - WC7 wc7 => !wc7.IsNicknamed, + WC6 wc6 => !wc6.IsNicknamed && wc6 is not ({ IsOriginalTrainerNameSet: false } + or { IsLinkGift: true, Species: (int)Species.Glalie or (int)Species.Steelix }), // Can nickname the demo gift + WC7 wc7 => !wc7.IsNicknamed && wc7 is not { IsOriginalTrainerNameSet: false }, _ => true, }; }