Update Item stats

pk3DS.Core/Structures/Gen6/Item6.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.Runtime.InteropServices;
 
 namespace pk3DS.Core.Structures
@@ -15,18 +16,22 @@ public struct Item
 
         #region Structure
         private ushort Price;
+
         [Category(Battle)]
         public byte HeldEffect { get; set; }
+
         public byte HeldArgument { get; set; }
         public byte NaturalGiftEffect { get; set; }
         public byte FlingEffect { get; set; }
         public byte FlingPower { get; set; }
-        private byte NaturalGiftPower { get; set; }
-        public byte NaturalGiftTypeFlags { get; set; }
-        public byte KeyFlags { get; set; }
+        public byte NaturalGiftPower { get; set; }
+        public ushort Packed { get; set; }
+
         [Category(Field), Description("Routine # to call when used; 0=unusable.")]
-        public byte UseEffect { get; set; }
-        public byte _0xB { get; set; } // Battle Type
+        public byte EffectField { get; set; }
+
+        [Category(Battle), Description("Routine # to call when used; 0=unusable.")]
+        public byte EffectBattle { get; set; } // Battle Type
         public byte _0xC { get; set; } // 0 or 1
         public byte _0xD { get; set; } // Classification (0-3 Battle, 4 Balls, 5 Mail)
         public byte Consumable { get; set; }
@@ -35,25 +40,34 @@ public struct Item
         private byte Boost0; // Revive 1, Sacred Ash 3, Rare Candy 5, EvoStone 8, upper4 for BoostAtk
         private byte Boost1; // DEF, SPA
         private byte Boost2; // SPD, SPE
-        private byte Boost3; // ACC, CRIT
-        public byte FunctionFlags0 { get; set; }
-        public byte FunctionFlags1{ get; set; }
+        private byte Boost3; // ACC, CRIT PPUpFlags
+        public ItemFlags1 FunctionFlags0 { get; set; }
+        public ItemFlags2 FunctionFlags1 { get; set; }
+
         [Category(Field), Description("Adds EVs to the HP stat.")]
         public sbyte EVHP { get; set; }
+
         [Category(Field), Description("Adds EVs to the Attack stat.")]
         public sbyte EVATK { get; set; }
+
         [Category(Field), Description("Adds EVs to the Defense stat.")]
         public sbyte EVDEF { get; set; }
+
         [Category(Field), Description("Adds EVs to the Speed stat.")]
         public sbyte EVSPE { get; set; }
+
         [Category(Field), Description("Adds EVs to the Sp. Attack stat.")]
         public sbyte EVSPA { get; set; }
+
         [Category(Field), Description("Adds EVs to the Sp. Defense stat.")]
         public sbyte EVSPD { get; set; }
+
         [Category(Heal), Description("Determines the healing percent, or if a flat value is used."), RefreshProperties(RefreshProperties.All)]
         public HealValue HealAmount { get; set; }
+
         [Category(Field), Description("PP to be added to the move's current PP if used.")]
         public byte PPGain { get; set; }
+
         public sbyte Friendship1 { get; set; }
         public sbyte Friendship2 { get; set; }
         public sbyte Friendship3 { get; set; }
@@ -62,35 +76,51 @@ public struct Item
 
         [Category(Mart), RefreshProperties(RefreshProperties.All)]
         public int BuyPrice { get => Price * 10; set => Price = (ushort)(value / 10); }
+
         [Category(Mart), ReadOnly(true)]
         public int SellPrice { get => Price * 5; set => Price = (ushort)(value / 5); }
 
         [Category(Battle)]
-        public int NaturalGiftType { get => NaturalGiftTypeFlags & 0x1F; set => NaturalGiftTypeFlags = (byte)(NaturalGiftEffect & ~0x1F | value); }
-        [Category(Battle)]
-        public int U8Flags { get => NaturalGiftTypeFlags >> 5; set => NaturalGiftTypeFlags = (byte)(NaturalGiftEffect & 0x1F | (value << 5)); }
+        public int NaturalGiftType { get => Packed & 0x1F; set => Packed = (ushort)((NaturalGiftEffect & ~0x1F) | value); }
 
         [Category(Battle)]
-        public int FieldEffect { get => Boost0 & 0xF; set => Boost0 = (byte)(Boost0 & ~0xF | (value & 0xF)); }
-        [Category(Battle)]
-        public int BoostATK { get => Boost0 >> 4; set => Boost0 = (byte)(Boost0 & 0xF | (value << 4)); }
+        public bool Flag1 { get => ((Packed >> 5) & 1) == 1; set => Packed = (ushort)((Packed & ~(1 << 5)) | ((value ? 1 : 0) << 5)); }
 
         [Category(Battle)]
-        public int BoostDEF { get => Boost1 & 0xF; set => Boost1 = (byte)(Boost1 & ~0xF | (value & 0xF)); }
-        [Category(Battle)]
-        public int BoostSPA { get => Boost1 >> 4; set => Boost1 = (byte)(Boost1 & 0xF | (value << 4)); }
+        public bool Flag2 { get => ((Packed >> 6) & 1) == 1; set => Packed = (ushort)((Packed & ~(1 << 6)) | ((value ? 1 : 0) << 6)); }
+
+        [Category(Field)]
+        public int PocketField { get => (Packed >> 7) & 0xF; set => Packed = (ushort)((Packed & 0xF87F) | ((value & 0xF) << 7)); }
 
         [Category(Battle)]
-        public int BoostSPD { get => Boost2 & 0xF; set => Boost2 = (byte)(Boost2 & ~0xF | (value & 0xF)); }
-        [Category(Battle)]
-        public int BoostSPE { get => Boost2 >> 4; set => Boost2 = (byte)(Boost2 & 0xF | (value << 4)); }
+        public BattlePocket PocketBattle { get => (BattlePocket)(Packed >> 11); set => Packed = (ushort)((Packed & 0x077F) | (((byte)value & 0x1F) << 11)); }
 
         [Category(Battle)]
-        public int BoostACC { get => Boost0 & 0xF; set => Boost0 = (byte)(Boost3 & ~0xF | (value & 0xF)); }
+        public int FieldEffect { get => Boost0 & 0xF; set => Boost0 = (byte)((Boost0 & ~0xF) | (value & 0xF)); }
+
         [Category(Battle)]
-        public int BoostCRIT { get => (Boost3 >> 4) & 3; set => Boost3 = (byte)(Boost3 & ~0x30 | ((value & 3) << 4)); }
+        public int BoostATK { get => Boost0 >> 4; set => Boost0 = (byte)((Boost0 & 0xF) | (value << 4)); }
+
         [Category(Battle)]
-        public int BoostPP { get => (Boost3 >> 6) & 3; set => Boost3 = (byte)(Boost3 & 0x3F | ((value & 3) << 6)); }
+        public int BoostDEF { get => Boost1 & 0xF; set => Boost1 = (byte)((Boost1 & ~0xF) | (value & 0xF)); }
+
+        [Category(Battle)]
+        public int BoostSPA { get => Boost1 >> 4; set => Boost1 = (byte)((Boost1 & 0xF) | (value << 4)); }
+
+        [Category(Battle)]
+        public int BoostSPD { get => Boost2 & 0xF; set => Boost2 = (byte)((Boost2 & ~0xF) | (value & 0xF)); }
+
+        [Category(Battle)]
+        public int BoostSPE { get => Boost2 >> 4; set => Boost2 = (byte)((Boost2 & 0xF) | (value << 4)); }
+
+        [Category(Battle)]
+        public int BoostACC { get => Boost0 & 0xF; set => Boost0 = (byte)((Boost3 & ~0xF) | (value & 0xF)); }
+
+        [Category(Battle)]
+        public int BoostCRIT { get => (Boost3 >> 4) & 3; set => Boost3 = (byte)((Boost3 & ~0x30) | ((value & 3) << 4)); }
+
+        [Category(Battle), Description("1 = One PP Up, 3 = PP Max")]
+        public int BoostPP { get => (Boost3 >> 6) & 3; set => Boost3 = (byte)((Boost3 & 0x3F) | ((value & 3) << 6)); }
 
         [Category(Heal), Description("Raw value of the Heal enum."), RefreshProperties(RefreshProperties.All)]
         public int HealValue
@@ -99,4 +129,42 @@ public int HealValue
             set => HealAmount = (HealValue)value;
         }
     }
+
+    [Flags]
+    public enum ItemFlags1 : byte
+    {
+        None,
+        RestorePP    = 1 << 0,
+        RestorePPAll = 1 << 1,
+        RestoreHP    = 1 << 2,
+        AddEVHP      = 1 << 3,
+        AddEVAtk     = 1 << 4,
+        AddEVDef     = 1 << 5,
+        AddEVSpe     = 1 << 6,
+        AddEVSpA     = 1 << 7,
+    }
+
+    [Flags]
+    public enum ItemFlags2 : byte
+    {
+        None,
+        AddEVSpD       = 1 << 0,
+        AddEVAbove100  = 1 << 1,
+        AddFriendship1 = 1 << 2,
+        AddFriendship2 = 1 << 3,
+        AddFriendship3 = 1 << 4,
+        Unused1        = 1 << 5,
+        Unused2        = 1 << 6,
+        Unused3        = 1 << 7,
+    }
+
+    [Flags]
+    public enum BattlePocket : byte
+    {
+        None,
+        Ball = 1 << 0,
+        Boosts = 1 << 1,
+        Restore = 1 << 2,
+        Misc = 1 << 3,
+    }
 }