From 630d186b6a4bcf0bda8d6903476cf40853a4c29e Mon Sep 17 00:00:00 2001 From: Manu <52102823+Manu098vm@users.noreply.github.com> Date: Tue, 6 Jun 2023 00:01:17 +0200 Subject: [PATCH] Use decimals --- SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs b/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs index 635832e..519d3c4 100644 --- a/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs +++ b/SwitchGiftDataManager.Core/Classes/WCManager/WC9.cs @@ -34,8 +34,8 @@ namespace SwitchGiftDataManager.Core { var species = BinaryPrimitives.ReadUInt16LittleEndian(Data.AsSpan(SpeciesOffset)); var pid = BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(PIDOffset)); - var tid = (ushort)((BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset)) - (0xF4240 * WCID)) & 0xFFFF); - var sid = (ushort)((BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset)) - (0xF4240 * WCID)) >> 16 & 0xFFFF); + var tid = (ushort)((BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset)) - (1000000u * WCID)) & 0xFFFF); + var sid = (ushort)((BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset)) - (1000000u * WCID)) >> 16 & 0xFFFF); var test = (ShinyType9)Data![ShinyTypeOffset]; var pidtype = (ShinyType9)Data![ShinyTypeOffset] switch { @@ -131,7 +131,7 @@ namespace SwitchGiftDataManager.Core if (Type is GiftType9 t9 && t9 is GiftType9.Pokemon) { //Old FullTID - var ftid = BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset)) - (0xF4240 * (uint)WCID); + var ftid = BinaryPrimitives.ReadUInt32LittleEndian(Data.AsSpan(TIDOffset)) - (1000000u * (uint)WCID); //Recalculate the TID and SID (FullTID) to account for the new Wondercard ID BinaryPrimitives.WriteUInt32LittleEndian(Data.AsSpan(TIDOffset), ftid + (1000000u * (uint)wcid));