From e54e94a734343f96d18deba7946a962e43ff4d50 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 1 Dec 2020 07:19:21 -0800 Subject: [PATCH] Don't waste alloc on clearing titlescreen slot Revisiting #3098 #3086 --- PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs | 4 +++- PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs b/PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs index 48ea25a39..86b08832f 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs @@ -30,7 +30,7 @@ public void LoadTeamData(IList party) for (int i = 0; i < party.Count; i++) ViewPoke(i).LoadFrom(party[i]); for (int i = party.Count; i < 6; i++) - ViewPoke(i).LoadFrom(new PK8()); + ViewPoke(i).Clear(); } } @@ -106,6 +106,8 @@ public uint Unknown24 set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x24); } + public void Clear() => Array.Clear(Data, Offset, SIZE); + public void LoadFrom(PKM pkm) { Species = pkm.Species; diff --git a/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs b/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs index 828014f8e..74e6911e2 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs @@ -245,7 +245,7 @@ public void LoadTeamData(IList party) for (int i = 0; i < party.Count; i++) ViewPoke(i).LoadFrom(party[i]); for (int i = party.Count; i < 6; i++) - ViewPoke(i).LoadFrom(new PK8()); + ViewPoke(i).Clear(); } public ushort Year @@ -328,6 +328,8 @@ public int FormArgument set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x18); } + public void Clear() => Array.Clear(Data, Offset, SIZE); + public void LoadFrom(PKM pkm) { Species = pkm.Species;