diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs index 5e128a757..a8f7672d6 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs @@ -31,29 +31,6 @@ static Encounters8() t.TrainerNames = TradeOT_R1; MarkEncounterTradeStrings(TradeGift_SWSH, TradeSWSH); - - // Include Nest Tables for both versions -- online play can share them across versions! In the IsMatch method we check if it's a valid share. - - CopyBerryTreeFromBridgeFieldToStony(SlotsSW_Hidden, 26); - CopyBerryTreeFromBridgeFieldToStony(SlotsSH_Hidden, 25); - } - - private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList arr, int start) - { - // The Berry Trees in Bridge Field are right against the map boundary, and can be accessed on the adjacent Map ID (Stony Wilderness) - // Copy the two Berry Tree encounters from Bridge to Stony, as these aren't overworld (wandering) crossover encounters. - var bridge = arr[13]; - Debug.Assert(bridge.Location == 142); - var stony = arr[31]; - Debug.Assert(stony.Location == 144); - - var ss = stony.Slots; - var ssl = ss.Length; - Array.Resize(ref ss, ssl + 2); - Array.Copy(bridge.Slots, start, ss, ssl, 2); - Debug.Assert(((EncounterSlot8)ss[ssl]).Weather == Shaking_Trees); - Debug.Assert(((EncounterSlot8)ss[ssl+1]).Weather == Shaking_Trees); - stony.Slots = ss; } private static readonly EncounterStatic8[] Encounter_SWSH = diff --git a/PKHeX.Core/Resources/byte/encounter_sh_hidden.pkl b/PKHeX.Core/Resources/byte/encounter_sh_hidden.pkl index c4120b774..7e0294576 100644 Binary files a/PKHeX.Core/Resources/byte/encounter_sh_hidden.pkl and b/PKHeX.Core/Resources/byte/encounter_sh_hidden.pkl differ diff --git a/PKHeX.Core/Resources/byte/encounter_sw_hidden.pkl b/PKHeX.Core/Resources/byte/encounter_sw_hidden.pkl index bab011ca8..97e1e549c 100644 Binary files a/PKHeX.Core/Resources/byte/encounter_sw_hidden.pkl and b/PKHeX.Core/Resources/byte/encounter_sw_hidden.pkl differ