From 565a96db2a2bbdbf2368a061e032928bd5b34af6 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 25 May 2018 19:54:25 -0700
Subject: [PATCH] Flag maison banned species having maison ribbons

https://projectpokemon.org/home/forums/topic/45410-skillfulexpert-battler-ribbon/
Thanks Davil!
---
 PKHeX.Core/Legality/Ribbons/RibbonVerifier.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

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<RibbonResult> 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;