From 35e46c4c4bdec9f3c3b7d0b5faecaa000856b56a Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 21 Dec 2023 17:42:11 -0800 Subject: [PATCH] Add mark deferral for partial match TimeOfDay --- .../Encounters/Templates/Gen9/EncounterSlot9.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterSlot9.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterSlot9.cs index 4ab517ec3..19f205256 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterSlot9.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterSlot9.cs @@ -225,6 +225,17 @@ public EncounterMatchRating GetMatchRating(PKM pk) bool isHidden = pk.AbilityNumber == 4; if (isHidden && this.IsPartialMatchHidden(pk.Species, Species)) return EncounterMatchRating.PartialMatch; + if (pk is IRibbonSetMark8 { HasMarkEncounter8: true } m) + { + if (m.RibbonMarkLunchtime && !CanSpawnAtTime(RibbonIndex.MarkLunchtime)) + return EncounterMatchRating.DeferredErrors; + if (m.RibbonMarkSleepyTime && !CanSpawnAtTime(RibbonIndex.MarkSleepyTime)) + return EncounterMatchRating.DeferredErrors; + if (m.RibbonMarkDusk && !CanSpawnAtTime(RibbonIndex.MarkDusk)) + return EncounterMatchRating.DeferredErrors; + if (m.RibbonMarkDawn && !CanSpawnAtTime(RibbonIndex.MarkDawn)) + return EncounterMatchRating.DeferredErrors; + } return EncounterMatchRating.Match; } #endregion