diff --git a/PKHeX.Core/Saves/Encryption/SwishCrypto/SCBlock.cs b/PKHeX.Core/Saves/Encryption/SwishCrypto/SCBlock.cs index 9ca19992a..fcce448f8 100644 --- a/PKHeX.Core/Saves/Encryption/SwishCrypto/SCBlock.cs +++ b/PKHeX.Core/Saves/Encryption/SwishCrypto/SCBlock.cs @@ -202,5 +202,13 @@ namespace PKHeX.Core } } } + + public void CopyFrom(SCBlock other) + { + if (Type.IsBoolean()) + ChangeBooleanType(other.Type); + else + ChangeData(other.Data); + } } } diff --git a/PKHeX.Core/Saves/SAV8LA.cs b/PKHeX.Core/Saves/SAV8LA.cs index 610aaaaba..5c9037428 100644 --- a/PKHeX.Core/Saves/SAV8LA.cs +++ b/PKHeX.Core/Saves/SAV8LA.cs @@ -44,7 +44,7 @@ public sealed class SAV8LA : SaveFile, ISaveBlock8LA, ISCBlockArray var mine = AllBlocks; var newB = z.AllBlocks; for (int i = 0; i < mine.Count; i++) - newB[i].Data.CopyTo(mine[i].Data, 0); + mine[i].CopyFrom(newB[i]); State.Edited = true; } diff --git a/PKHeX.Core/Saves/SAV8SWSH.cs b/PKHeX.Core/Saves/SAV8SWSH.cs index 9c8b460cf..fdee592fc 100644 --- a/PKHeX.Core/Saves/SAV8SWSH.cs +++ b/PKHeX.Core/Saves/SAV8SWSH.cs @@ -42,7 +42,7 @@ namespace PKHeX.Core var mine = AllBlocks; var newB = z.AllBlocks; for (int i = 0; i < mine.Count; i++) - newB[i].Data.CopyTo(mine[i].Data, 0); + mine[i].CopyFrom(newB[i]); State.Edited = true; }