From 9e895d34af63ea9495091b7ff1573b87df541c9a Mon Sep 17 00:00:00 2001 From: Manu <52102823+Manu098vm@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:59:32 +0200 Subject: [PATCH] ReadUInt16 for WC9 TID/SID --- SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs b/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs index 78963d2..35120d6 100644 --- a/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs +++ b/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs @@ -12,6 +12,7 @@ public class WC9 : Wondercard private const int QuantityOffset = 0x1A; private const int ClothingOffset = 0x1C; private const int TIDOffset = 0x18; + private const int SIDOffset = 0x1A; private const int PIDOffset = 0x24; private const int SpeciesOffset = 0x238; private const int ShinyTypeOffset = 0x240; @@ -41,8 +42,8 @@ public class WC9 : Wondercard var species = BinaryPrimitives.ReadUInt16LittleEndian(Data.AsSpan(SpeciesOffset)); var pid = BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(PIDOffset)); - var tid = (ushort)((BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset))) & 0xFFFF); - var sid = (ushort)((BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset))) >> 16 & 0xFFFF); + var tid = BinaryPrimitives.ReadUInt16LittleEndian(Data.AsSpan(TIDOffset)); + var sid = BinaryPrimitives.ReadUInt16LittleEndian(Data.AsSpan(SIDOffset)); var test = (ShinyType9)Data![ShinyTypeOffset]; var pidtype = (ShinyType9)Data![ShinyTypeOffset] switch {