From 63add7d9293a495eb72fac4bf1cdc0febb11a151 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 20 Jun 2020 06:20:19 +0200 Subject: [PATCH] Fix Master Rank Ribbon (#2874) --- .../Legality/Verifiers/Ribbons/RibbonVerifier.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifier.cs b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifier.cs index 772d395c4..8a25dc53f 100644 --- a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifier.cs @@ -395,14 +395,20 @@ private static bool CanParticipateInRankedSWSH(PKM pkm) // Clamp to permitted species var spec = pkm.Species; + + if (638 <= spec && spec <= 640) + return true; // Sub Legends if (722 <= spec && spec <= 730) return true; // Gen7 starters var pi = (PersonalInfoSWSH)PersonalTable.SWSH[spec]; var galarDex = pi.PokeDexIndex; - if (0 == galarDex || galarDex > 210) - return false; + var armorDex = pi.ArmorDexIndex; + if (1 <= galarDex && galarDex <= 397) + return true; + if (1 <= armorDex && armorDex <= 210) + return true; - return true; + return false; } private static IEnumerable GetInvalidRibbonsEvent1(PKM pkm, object encounterContent)