From b4f763f7ef33975fda5399512b2a3dcf49bbe697 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 17 Mar 2021 18:11:07 -0700 Subject: [PATCH] Move bridge-stony copy logic to pkNX Also trims out empty slots (species=0), less size! https://github.com/kwsch/pkNX/commit/49efb96db9f9734bdc5a1814d6e65a661ce25222 --- .../Legality/Encounters/Data/Encounters8.cs | 23 ------------------ .../Resources/byte/encounter_sh_hidden.pkl | Bin 5468 -> 4780 bytes .../Resources/byte/encounter_sw_hidden.pkl | Bin 5484 -> 4796 bytes 3 files changed, 23 deletions(-) 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 c4120b7742bd0a1f7a728a1786634684523e74fb..7e0294576b9215b7507a2f1e7c4fcea928aa8b05 100644 GIT binary patch delta 1853 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 diff --git a/PKHeX.Core/Resources/byte/encounter_sw_hidden.pkl b/PKHeX.Core/Resources/byte/encounter_sw_hidden.pkl index bab011ca849331938ff15982689bf9f64789f551..97e1e549c6d23d558d30bfd7209d14c4c610f6f6 100644 GIT binary patch delta 1810 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 GTKo^GDy^pg