From 8d24b16fe3d6cf3b0d58cbedf63603ee714b8e35 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 3 Apr 2026 01:07:51 -0500 Subject: [PATCH] Misc tweaks the final "TODO ZA" and "TODO HOME ZA" remove champions from blank save selection (would need PC9 docs first) --- PKHeX.Core/Legality/Restrictions/Memories/MemoryRules.cs | 3 +-- PKHeX.Core/Legality/Verifiers/Ribbons/MarkRules.cs | 2 +- PKHeX.WinForms/Subforms/SettingsEditor.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Restrictions/Memories/MemoryRules.cs b/PKHeX.Core/Legality/Restrictions/Memories/MemoryRules.cs index d033a3526..d00f55f5a 100644 --- a/PKHeX.Core/Legality/Restrictions/Memories/MemoryRules.cs +++ b/PKHeX.Core/Legality/Restrictions/Memories/MemoryRules.cs @@ -20,9 +20,8 @@ public static MemorySource GetPossibleSources(EvolutionHistory history) sources |= MemorySource.Bank; // Trade encounters from Gen7 also come with hardcoded memories. if (history.HasVisitedSWSH) sources |= MemorySource.Gen8; - if (history.HasVisitedGen9) + if (history.HasVisitedGen9 || history.HasVisitedZA) sources |= MemorySource.Deleted; - // TODO HOME ZA return sources; } diff --git a/PKHeX.Core/Legality/Verifiers/Ribbons/MarkRules.cs b/PKHeX.Core/Legality/Verifiers/Ribbons/MarkRules.cs index b35789bc8..e7b883788 100644 --- a/PKHeX.Core/Legality/Verifiers/Ribbons/MarkRules.cs +++ b/PKHeX.Core/Legality/Verifiers/Ribbons/MarkRules.cs @@ -172,7 +172,7 @@ private static bool HasEnteredHOME_Alpha(PKM pk) /// public static bool IsMarkValidAlpha(IEncounterTemplate enc, PKM pk) { - var expect = enc is IAlphaReadOnly { IsAlpha: true } && enc.Context != EntityContext.Gen9a; // TODO ZA HOME + var expect = enc is IAlphaReadOnly { IsAlpha: true }; return IsMarkValidAlpha(pk, expect); } diff --git a/PKHeX.WinForms/Subforms/SettingsEditor.cs b/PKHeX.WinForms/Subforms/SettingsEditor.cs index 002dfeae9..601233418 100644 --- a/PKHeX.WinForms/Subforms/SettingsEditor.cs +++ b/PKHeX.WinForms/Subforms/SettingsEditor.cs @@ -22,7 +22,7 @@ public SettingsEditor(object obj) if (obj is PKHeXSettings s) { - static bool IsInvalidSaveFileVersion(GameVersion value) => value is 0 or GameVersion.GO; + static bool IsInvalidSaveFileVersion(GameVersion value) => value is 0 or GameVersion.GO or GameVersion.CP; CB_Blank.InitializeBinding(); CB_Blank.DataSource = GameInfo.Sources.VersionDataSource.Where(z => !IsInvalidSaveFileVersion((GameVersion)z.Value)).ToList(); CB_Blank.SelectedValue = (int)s.Startup.DefaultSaveVersion;