From aeb83c826906212f4e6e9d570bc0b8b174f5c7b4 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 9 Jul 2021 10:09:57 -0700 Subject: [PATCH] Update EncounterSlot8.cs Closes #3232 --- .../Encounters/EncounterSlot/EncounterSlot8.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs index 2dd43ed39..00e06865c 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs @@ -19,16 +19,20 @@ public EncounterSlot8(EncounterArea8 area, int species, int form, int min, int m protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk) { - base.ApplyDetails(sav, criteria, pk); - if (Location is 30 or 54 && !((EncounterArea8)Area).PermitCrossover && (Weather & AreaWeather8.Fishing) == 0) + bool symbol = ((EncounterArea8)Area).PermitCrossover; + var c = symbol ? EncounterCriteria.Unrestricted : criteria; + if (!symbol && Location is 30 or 54 && (Weather & AreaWeather8.Fishing) == 0) ((PK8)pk).RibbonMarkCurry = true; + + base.ApplyDetails(sav, c, pk); var req = GetRequirement(pk); if (req != MustHave) { pk.SetRandomEC(); return; } - Overworld8RNG.ApplyDetails(pk, criteria); + if (symbol) + Overworld8RNG.ApplyDetails(pk, c, c.Shiny); } public OverworldCorrelation8Requirement GetRequirement(PKM pk)