diff --git a/PKHeX.Core/Legality/Ribbons/RibbonVerifier.cs b/PKHeX.Core/Legality/Ribbons/RibbonVerifier.cs index 014c8c8a0..b75d5aaed 100644 --- a/PKHeX.Core/Legality/Ribbons/RibbonVerifier.cs +++ b/PKHeX.Core/Legality/Ribbons/RibbonVerifier.cs @@ -184,6 +184,14 @@ private static IEnumerable GetInvalidRibbons6Any(PKM pkm, IRibbonS const int mem_Chatelaine = 30; bool hasChampMemory = pkm.HT_Memory == mem_Chatelaine || pkm.OT_Memory == mem_Chatelaine; + if (!IsAllowedBattleFrontier(pkm.Species)) + { + if (hasChampMemory || s6.RibbonBattlerSkillful) // having memory and not ribbon is too rare, just flag here. + yield return new RibbonResult(nameof(s6.RibbonBattlerSkillful)); + if (s6.RibbonBattlerExpert) + yield return new RibbonResult(nameof(s6.RibbonBattlerExpert)); + yield break; + } if (!hasChampMemory || s6.RibbonBattlerSkillful || s6.RibbonBattlerExpert) yield break;