diff --git a/PKHeX.Core/Legality/Encounters/Data/Live/EncounterServerDate.cs b/PKHeX.Core/Legality/Encounters/Data/Live/EncounterServerDate.cs index c79672d3d..c5ff51d49 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Live/EncounterServerDate.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Live/EncounterServerDate.cs @@ -192,7 +192,7 @@ public static bool IsValidDateWC9(WC9 card, DateOnly obtained) => (WC9Gifts.TryG {1529, (new(2023, 12, 07), new(2023, 12, 22))}, // Darkrai {1530, (new(2023, 12, 07), new(2024, 01, 04))}, // Shiny Lucario {1527, (new(2023, 12, 13), new(2024, 12, 01))}, // Paldea Gimmighoul - {0036, (new(2023, 12, 15), new(2024, 02, 14))}, // コロコロ Roaring Moon and Iron Valiant + {0036, (new(2023, 12, 14), new(2024, 02, 14))}, // コロコロ Roaring Moon and Iron Valiant {1007, (new(2023, 12, 29), new(2024, 02, 11))}, // 윈터페스타 Baxcalibur {9021, HOME3_ML}, // Hidden Ability Sprigatito diff --git a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs index 4094c3354..66fe59d37 100644 --- a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs +++ b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs @@ -127,119 +127,15 @@ private static bool IsRibbonValidMasterRankSWSH(PKM pk, IEncounterTemplate enc) private static bool IsRibbonValidMasterRankSV(ISpeciesForm pk) { var species = pk.Species; - if (species is (int)WalkingWake or (int)IronLeaves) - return false; if (species is (int)Greninja) return pk.Form == 0; // Disallow Ash-Greninja if (SpeciesCategory.IsLegendary(species)) return false; if (SpeciesCategory.IsMythical(species)) return false; - if (TempBanRegE.Contains(species)) - return false; return true; } - private static ReadOnlySpan TempBanRegE => - [ - 0001, // Bulbasaur - 0002, // Ivysaur - 0003, // Venusaur - 0007, // Squirtle - 0008, // Wartortle - 0009, // Blastoise - 0043, // Oddish - 0044, // Gloom - 0045, // Vileplume - 0084, // Doduo - 0085, // Dodrio - 0086, // Seel - 0087, // Dewgong - 0102, // Exeggcute - 0103, // Exeggutor - 0103, // Exeggutor - 0106, // Hitmonlee - 0107, // Hitmonchan - 0111, // Rhyhorn - 0112, // Rhydon - 0126, // Magmar - 0131, // Lapras - 0152, // Chikorita - 0153, // Bayleef - 0154, // Meganium - 0158, // Totodile - 0159, // Croconaw - 0160, // Feraligatr - 0182, // Bellossom - 0227, // Skarmory - 0235, // Smeargle - 0236, // Tyrogue - 0237, // Hitmontop - 0240, // Magby - 0252, // Treecko - 0253, // Grovyle - 0254, // Sceptile - 0255, // Torchic - 0256, // Combusken - 0257, // Blaziken - 0258, // Mudkip - 0259, // Marshtomp - 0260, // Swampert - 0328, // Trapinch - 0329, // Vibrava - 0330, // Flygon - 0374, // Beldum - 0375, // Metang - 0376, // Metagross - 0408, // Cranidos - 0409, // Rampardos - 0410, // Shieldon - 0411, // Bastiodon - 0464, // Rhyperior - 0467, // Magmortar - 0495, // Snivy - 0496, // Servine - 0497, // Serperior - 0498, // Tepig - 0499, // Pignite - 0500, // Emboar - 0522, // Blitzle - 0523, // Zebstrika - 0546, // Cottonee - 0547, // Whimsicott - 0572, // Minccino - 0573, // Cinccino - 0577, // Solosis - 0578, // Duosion - 0579, // Reuniclus - 0622, // Golett - 0623, // Golurk - 0677, // Espurr - 0678, // Meowstic - 0686, // Inkay - 0687, // Malamar - 0725, // Litten - 0726, // Torracat - 0727, // Incineroar - 0728, // Popplio - 0729, // Brionne - 0730, // Primarina - 0731, // Pikipek - 0732, // Trumbeak - 0733, // Toucannon - 0868, // Milcery - 0869, // Alcremie - 0884, // Duraludon - - // New Species - (ushort)Archaludon, - //(ushort)Hydrapple, - (ushort)GougingFire, - (ushort)RagingBolt, - (ushort)IronBoulder, - (ushort)IronCrown, - ]; - /// /// Checks if the input can receive the ribbon. ///