From 794dd3739a9a6d121884c949bde0dd960c8d83bd Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 11 Aug 2016 20:01:08 -0700 Subject: [PATCH] Fix gen3 set PPUps Was missing bitshift. Thanks edvin! --- PKHeX/PKM/PK3.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index 7dc83b479..a17104367 100644 --- a/PKHeX/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -64,10 +64,10 @@ public PK3(byte[] decryptedData = null, string ident = null) public override uint EXP { get { return BitConverter.ToUInt32(Data, 0x24); } set { BitConverter.GetBytes(value).CopyTo(Data, 0x24); } } private byte PPUps { get { return Data[0x28]; } set { Data[0x28] = value; } } - public override int Move1_PPUps { get { return (PPUps >> 0) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 0)) | value); } } - public override int Move2_PPUps { get { return (PPUps >> 2) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 2)) | value); } } - public override int Move3_PPUps { get { return (PPUps >> 4) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 4)) | value); } } - public override int Move4_PPUps { get { return (PPUps >> 6) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 6)) | value); } } + public override int Move1_PPUps { get { return (PPUps >> 0) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 0)) | value << 0); } } + public override int Move2_PPUps { get { return (PPUps >> 2) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 2)) | value << 2); } } + public override int Move3_PPUps { get { return (PPUps >> 4) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 4)) | value << 4); } } + public override int Move4_PPUps { get { return (PPUps >> 6) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 6)) | value << 6); } } public override int OT_Friendship { get { return Data[0x29]; } set { Data[0x29] = (byte)value; } } // Unused 0x2A 0x2B #endregion