Flag maison banned species having maison ribbons

https://projectpokemon.org/home/forums/topic/45410-skillfulexpert-battler-ribbon/ Thanks Davil!
kwsch · May 26, 2018 · 565a96d · 565a96d
1 parent abe3567
commit 565a96d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git 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;