diff --git a/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs b/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs index 27f4c71cb..16a959ed0 100644 --- a/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs +++ b/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs @@ -46,7 +46,7 @@ private void VerifyTrash(LegalityAnalysis data, G3PKM pk) VerifyTrashCXD(data, pk); } - private void VerifyTrashCXD(LegalityAnalysis data, G3PKM pk) + private static void VerifyTrashCXD(LegalityAnalysis data, G3PKM pk) { // Buffers should be entirely clean. var ot = pk.OriginalTrainerTrash; @@ -133,6 +133,8 @@ private static void FlagIsNicknameClean(LegalityAnalysis data, PK3 pk) if (!pk.IsNicknamed || pk.IsEgg) return; var nick = pk.NicknameTrash; + if (pk.Japanese) + nick = nick[..5]; // Japanese only wipes the first 5 bytes; everything else is trash. if (!TrashByteRules3.IsTerminatedFF(nick)) data.AddLine(GetInvalid(Trainer, TrashBytesMismatchInitial)); }