From 5ae2849cdb02f1b848de1597449ea14bc401f2f9 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 4 Mar 2017 21:52:39 -0800 Subject: [PATCH] Fix gen2 money/coin getset Wasn't Binary Coded Decimal (only gen1 was) --- PKHeX/Saves/SAV2.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index dd7b9ff8f..49eb8a0ec 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -397,23 +397,23 @@ public int TextSpeed } public override uint Money { - get { return (uint)BigEndian.BCDToInt32(Data, MoneyOffset, 3); } + get { return BigEndian.ToUInt32(Data, MoneyOffset-1) & 0xFFFFFF; } set { - value = (uint)Math.Min(value, MaxMoney); - BigEndian.Int32ToBCD((int)value, 3).CopyTo(Data, MoneyOffset); + byte[] data = BigEndian.GetBytes((uint) Math.Min(value, MaxMoney)); + Array.Copy(data, 1, Data, MoneyOffset, 3); } } public uint Coin { get { - return (uint)BigEndian.BCDToInt32(Data, MoneyOffset + 7, 2); + return BigEndian.ToUInt16(Data, MoneyOffset + 7); } set { value = (ushort)Math.Min(value, MaxCoins); - BigEndian.Int32ToBCD((int)value, 2).CopyTo(Data, MoneyOffset + 7); + BigEndian.GetBytes((ushort)value).CopyTo(Data, MoneyOffset + 7); } }