diff --git a/PKHeX.Core/Legality/Verifiers/TrashByteVerifier.cs b/PKHeX.Core/Legality/Verifiers/TrashByteVerifier.cs index babd2c59e..29c0205e3 100644 --- a/PKHeX.Core/Legality/Verifiers/TrashByteVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/TrashByteVerifier.cs @@ -86,9 +86,17 @@ public sealed class TrashByteVerifier : Verifier VerifyTrashNotEmpty(data, pk.HandlingTrainerTrash, HandlingTrainer); VerifyTrashNone(data, pk.OriginalTrainerTrash, OriginalTrainer); - // Species name is overwritten by "Egg" - var origName = SpeciesName.GetSpeciesName(pk.Species, pk.Language); - VerifyTrashSpecific(data, pk.NicknameTrash, origName, Nickname); + if (IsTrashCleanContext(pk.Context)) + { + VerifyTrashNone(data, pk.NicknameTrash, Nickname); + VerifyTrashNone(data, pk.HandlingTrainerTrash, HandlingTrainer); + } + else + { + // Species name is overwritten by "Egg" + var origName = SpeciesName.GetSpeciesName(pk.Species, pk.Language); + VerifyTrashSpecific(data, pk.NicknameTrash, origName, Nickname); + } return; } @@ -112,6 +120,11 @@ public sealed class TrashByteVerifier : Verifier } } + private static bool IsTrashCleanContext(EntityContext context) + { + return context is EntityContext.Gen8b; + } + private void VerifyTrashNickname(LegalityAnalysis data, ReadOnlySpan span) { var pk = data.Entity;