diff --git a/include/Player/EquipBomb.hpp b/include/Player/EquipBomb.hpp
index 2718c71b..0ea9793a 100644
--- a/include/Player/EquipBomb.hpp
+++ b/include/Player/EquipBomb.hpp
@@ -14,9 +14,8 @@ private:
 public:
     EquipBomb();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov55_02198d00
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_213d214
-    /* 08 */ virtual ~EquipBomb() override;
+    /* 00 */ virtual void vfunc_00() override; // func_ov55_02198d00
+    /* 04 */ virtual ~EquipBomb() override;
     /* 0c */ virtual ItemFlag GetId() const override;
 
     /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
diff --git a/include/Player/EquipBombchu.hpp b/include/Player/EquipBombchu.hpp
index 270b8c3f..a072f5ff 100644
--- a/include/Player/EquipBombchu.hpp
+++ b/include/Player/EquipBombchu.hpp
@@ -27,9 +27,8 @@ private:
 public:
     EquipBombchu();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov58_02198fc0
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213eb5c
-    /* 08 */ virtual ~EquipBombchu() override;
+    /* 00 */ virtual void vfunc_00() override; // func_ov58_02198fc0
+    /* 04 */ virtual ~EquipBombchu() override;
     /* 0c */ virtual ItemFlag GetId() const override;
 
     bool CheckUsable(unk32 param1) const;
diff --git a/include/Player/EquipBoomerang.hpp b/include/Player/EquipBoomerang.hpp
index cc341b16..863c99c6 100644
--- a/include/Player/EquipBoomerang.hpp
+++ b/include/Player/EquipBoomerang.hpp
@@ -18,8 +18,7 @@ private:
     /* 30 */
 
 public:
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_213d010
-    /* 08 */ virtual ~EquipBoomerang() override;
+    /* 04 */ virtual ~EquipBoomerang() override;
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 10 */ virtual void vfunc_10() override; // func_ov14_0213d078
 
diff --git a/include/Player/EquipBow.hpp b/include/Player/EquipBow.hpp
index 7156a8ad..8771f23f 100644
--- a/include/Player/EquipBow.hpp
+++ b/include/Player/EquipBow.hpp
@@ -16,9 +16,8 @@ private:
 public:
     EquipBow();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov56_02198d00
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213ead4
-    /* 08 */ virtual ~EquipBow() override;
+    /* 00 */ virtual void vfunc_00() override; // func_ov56_02198d00
+    /* 04 */ virtual ~EquipBow() override;
     /* 0c */ virtual ItemFlag GetId() const override;
 
     /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp
index 7a1a95e6..39d6cd1a 100644
--- a/include/Player/EquipHammer.hpp
+++ b/include/Player/EquipHammer.hpp
@@ -20,8 +20,7 @@ private:
 public:
     EquipHammer();
 
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213ede4
-    /* 08 */ virtual ~EquipHammer() override;
+    /* 04 */ virtual ~EquipHammer() override;
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 10 */ virtual void vfunc_10() override; // func_ov14_0213ee04
 
diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp
index 6f9fb623..895f335f 100644
--- a/include/Player/EquipItem.hpp
+++ b/include/Player/EquipItem.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+#include "global.h"
 #include "Item.hpp"
 #include "SysNew.hpp"
 
@@ -14,9 +15,8 @@ private:
 public:
     EquipItem();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3); // func_ov00_020be8dc
-    /* 04 */ virtual EquipItem* vfunc_04(); // func_ov04_0210ba74
-    /* 08 */ virtual ~EquipItem();
+    /* 00 */ virtual void vfunc_00(); // func_ov00_020be8dc
+    /* 04 */ virtual ~EquipItem();
     /* 0c */ virtual ItemFlag GetId() const = 0;
     /* 10 */ virtual void vfunc_10(); // func_ov04_0210ba88
 
diff --git a/include/Player/EquipPotion.hpp b/include/Player/EquipPotion.hpp
index ec1ef429..0cec8c87 100644
--- a/include/Player/EquipPotion.hpp
+++ b/include/Player/EquipPotion.hpp
@@ -13,9 +13,8 @@ private:
 public:
     EquipPotion();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov55_021991a8
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_02151564
-    /* 08 */ virtual ~EquipPotion() override;
+    /* 00 */ virtual void vfunc_00() override; // func_ov55_021991a8
+    /* 04 */ virtual ~EquipPotion() override;
 
     /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
     /* 18 */ virtual void vfunc_18() override; // func_ov55_021991ac
@@ -30,8 +29,7 @@ class EquipPotionA : public EquipPotion {
 public:
     EquipPotionA();
 
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_021515a8
-    /* 08 */ virtual ~EquipPotionA() override;
+    /* 04 */ virtual ~EquipPotionA() override;
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 50 */
 };
@@ -40,8 +38,7 @@ class EquipPotionB : public EquipPotion {
 public:
     EquipPotionB();
 
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_021515e8
-    /* 08 */ virtual ~EquipPotionB() override;
+    /* 04 */ virtual ~EquipPotionB() override;
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 50 */
 };
diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp
index b3efe986..f56919d4 100644
--- a/include/Player/EquipRope.hpp
+++ b/include/Player/EquipRope.hpp
@@ -24,8 +24,7 @@ private:
 public:
     EquipRope();
 
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213d314
-    /* 08 */ virtual ~EquipRope() override;
+    /* 04 */ virtual ~EquipRope() override;
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 10 */ virtual void vfunc_10() override; // func_ov14_0213d3a0
 
diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp
index d7893bb5..6b605824 100644
--- a/include/Player/EquipScoop.hpp
+++ b/include/Player/EquipScoop.hpp
@@ -10,9 +10,8 @@ private:
     /* c */
 
 public:
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov54_02198d00
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213cf9c
-    /* 08 */ virtual ~EquipScoop() override;
+    /* 00 */ virtual void vfunc_00() override; // func_ov54_02198d00
+    /* 04 */ virtual ~EquipScoop() override;
     /* 0c */ virtual ItemFlag GetId() const override;
 
     /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
diff --git a/include/Player/EquipShield.hpp b/include/Player/EquipShield.hpp
index 5a27dd1d..6578ea00 100644
--- a/include/Player/EquipShield.hpp
+++ b/include/Player/EquipShield.hpp
@@ -19,9 +19,8 @@ private:
 public:
     EquipShield();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov00_020c06d4
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov04_0210bc28
-    /* 08 */ virtual ~EquipShield() override; // func_ov04_0210bc94
+    /* 00 */ virtual void vfunc_00() override; // func_ov00_020c06d4
+    /* 04 */ virtual ~EquipShield() override; // func_ov04_0210bc94
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 10 */ virtual void vfunc_10() override; // func_ov00_020c076c
 
diff --git a/include/Player/EquipSword.hpp b/include/Player/EquipSword.hpp
index 47e046a1..7d0bece0 100644
--- a/include/Player/EquipSword.hpp
+++ b/include/Player/EquipSword.hpp
@@ -41,9 +41,8 @@ private:
 public:
     EquipSword();
 
-    /* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov00_020beffc
-    /* 04 */ virtual EquipItem* vfunc_04() override; // func_ov04_0210b918
-    /* 08 */ virtual ~EquipSword() override;
+    /* 00 */ virtual void vfunc_00() override; // func_ov00_020beffc
+    /* 04 */ virtual ~EquipSword() override;
     /* 0c */ virtual ItemFlag GetId() const override;
     /* 10 */ virtual void vfunc_10() override; // func_ov00_020bf18c