From b1dd98153765af2e479200ee8b805be827e29599 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 1 Mar 2026 22:09:25 -0600 Subject: [PATCH] Update MiscVerifierG3.cs eggs fixed --- PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs b/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs index a7def7b3a..281726dee 100644 --- a/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs +++ b/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs @@ -37,7 +37,7 @@ private void VerifyTrash(LegalityAnalysis data, PK3 pk) var enc = data.EncounterOriginal; if (enc is EncounterTrade3) VerifyTrashTrade(data, pk); - else if (pk.Japanese && !(pk.IsEgg && pk.OriginalTrainerTrash[^1] == 0x00)) + else if (pk.Japanese && !(pk.IsEgg && pk.OriginalTrainerTrash[^1] == 0xFF)) VerifyTrashJPN(data, pk); else VerifyTrashINT(data, pk); @@ -64,6 +64,8 @@ private void VerifyTrashJPN(LegalityAnalysis data, PK3 pk) data.AddLine(GetInvalid(TrashBytesMissingTerminator)); int len = TrashBytes8.GetStringLength(trash); + if (len >= trash.Length - 2) + return; // OK -- invalid lengths will get warned elsewhere if (trash[len..^2].ContainsAnyExcept(0xFF)) data.AddLine(GetInvalid(TrashBytesMissingTerminator)); }