From 51edaac704958e268f05c762dfd757fd18f5676c Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 17 Jun 2022 16:38:05 -0700 Subject: [PATCH] Flag pokerus on LGPE, traded starter --- PKHeX.Core/Editing/Pokerus.cs | 3 ++- PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Editing/Pokerus.cs b/PKHeX.Core/Editing/Pokerus.cs index 657ae70d1..a4f966d3d 100644 --- a/PKHeX.Core/Editing/Pokerus.cs +++ b/PKHeX.Core/Editing/Pokerus.cs @@ -1,4 +1,4 @@ -namespace PKHeX.Core; +namespace PKHeX.Core; /// /// Logic pertaining to Pokérus -- the virus that doubles EVs gained from battle. @@ -20,6 +20,7 @@ public static class Pokerus public static bool IsObtainable(PKM pk) => pk switch { PA8 pa8 => HasVisitedBDSPorSWSH(pa8), + PB7 => false, _ => true, }; diff --git a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs index b44995e75..405b669b7 100644 --- a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs @@ -73,6 +73,8 @@ private void VerifyHandlerState(LegalityAnalysis data, bool neverOT) data.AddLine(GetInvalid(LegalityCheckStrings.LTransferHTMismatchName)); if (pkm is IHandlerLanguage h && h.HT_Language != tr.Language) data.AddLine(GetInvalid(LegalityCheckStrings.LTransferHTMismatchLanguage)); + if (Info.EncounterMatch is EncounterStatic7b { Location: 28 }) // Starter, untradeable + data.AddLine(GetInvalid(LegalityCheckStrings.LTransferCurrentHandlerInvalid)); } }