Revise trash check for Japanese nickname

Closes #4750
This commit is contained in:
Kurt 2026-03-08 23:41:20 -05:00
parent 8b08f263e5
commit 7617f6dfa7

View File

@ -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));
}