4 files changed, 22 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h
index 27ed57045..c94325cd5 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -473,7 +473,7 @@ struct sideTimer
     u8 lightscreenTimer;    //0x1
     u8 mistTimer;           //0x2
     u8 field3;              //0x3
-    u16 field4;              //0x4
+    u16 field4;             //0x4
     u8 spikesAmount;        //0x6
     u8 safeguardTimer;      //0x7
     u8 followmeTimer;       //0x8
diff --git a/include/constants/items.h b/include/constants/items.h
index cde5c7141..9b88db1da 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -2,6 +2,8 @@
 #define GUARD_CONSTANTS_ITEMS_H
 
 #define ITEM_NONE 0
+
+// Balls
 #define ITEM_MASTER_BALL 1
 #define ITEM_ULTRA_BALL 2
 #define ITEM_GREAT_BALL 3
@@ -14,6 +16,8 @@
 #define ITEM_TIMER_BALL 10
 #define ITEM_LUXURY_BALL 11
 #define ITEM_PREMIER_BALL 12
+
+// Pokemon Items
 #define ITEM_POTION 13
 #define ITEM_ANTIDOTE 14
 #define ITEM_BURN_HEAL 15
@@ -180,6 +184,8 @@
 #define ITEM_0B0 176
 #define ITEM_0B1 177
 #define ITEM_0B2 178
+
+// hold items
 #define ITEM_BRIGHT_POWDER 179
 #define ITEM_WHITE_HERB 180
 #define ITEM_MACHO_BRACE 181
@@ -260,6 +266,8 @@
 #define ITEM_PINK_SCARF 256
 #define ITEM_GREEN_SCARF 257
 #define ITEM_YELLOW_SCARF 258
+
+// Key Items
 #define ITEM_MACH_BIKE 259
 #define ITEM_COIN_CASE 260
 #define ITEM_ITEMFINDER 261
@@ -290,6 +298,8 @@
 #define ITEM_ROOT_FOSSIL 286
 #define ITEM_CLAW_FOSSIL 287
 #define ITEM_DEVON_SCOPE 288
+
+// TMs/HMs
 #define ITEM_TM01_FOCUS_PUNCH 289
 #define ITEM_TM02_DRAGON_CLAW 290
 #define ITEM_TM03_WATER_PULSE 291
@@ -348,6 +358,8 @@
 #define ITEM_HM06_ROCK_SMASH 344
 #define ITEM_HM07_WATERFALL 345
 #define ITEM_HM08_DIVE 346
+
+// Unknown
 #define ITEM_15B 347
 #define ITEM_15C 348
 
@@ -386,4 +398,7 @@
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8
 
+// Check if the item is one that can be used on a Pokemon.
+#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
+
 #endif  // GUARD_CONSTANTS_ITEMS_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 539323bdb..8f1b46387 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -351,6 +351,8 @@ struct BattlePokemon
     /*0x54*/ u32 otId;
 };
 
+// Shouldn't these be the same enum?
+
 enum
 {
     STAT_STAGE_HP,       // 0
@@ -628,5 +630,8 @@ void PartySpreadPokerus(struct Pokemon *party);
 
 struct Sprite *sub_80F7920(u16, u16, const u16 *);
 
+bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId);
+
+
 
 #endif // GUARD_POKEMON_H
diff --git a/include/pokemon_item_effect.h b/include/pokemon_item_effect.h
index c09649aff..014612b05 100644
--- a/include/pokemon_item_effect.h
+++ b/include/pokemon_item_effect.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_POKEMON_ITEM_EFFECT_H
 #define GUARD_POKEMON_ITEM_EFFECT_H
 
-bool8 ExecuteTableBasedItemEffect_(struct Pokemon *mon, u16, u8, u16);
+bool8 ExecuteTableBasedItemEffect_(struct Pokemon *mon, u16, u8, u8);
 
 #endif // GUARD_POKEMON_ITEM_EFFECT_H