Rename `EquipCollidesWith`, `Cylinder::Overlaps`

8 files changed, 9 insertions, 7 deletions

diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp
index e50fb673..d38e5fb9 100644
--- a/include/Item/ItemManager.hpp
+++ b/include/Item/ItemManager.hpp
@@ -251,7 +251,7 @@ public:
     void Sword_vfunc_38(unk32 param1);

     void Shield_vfunc_38(unk32 param1);

     void EquipItem_vfunc_38(unk32 param1);

-    bool EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId);

+    bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId);

     void EquipItem_vfunc_2c(ItemFlag equipId);

     EquipItem* GetEquipItem(ItemFlag equipId);

     bool func_ov00_020ad790(unk32 param1);

diff --git a/include/Physics/Cylinder.hpp b/include/Physics/Cylinder.hpp
index d25eaf22..353469aa 100644
--- a/include/Physics/Cylinder.hpp
+++ b/include/Physics/Cylinder.hpp
@@ -8,4 +8,6 @@
 struct Cylinder {
     Vec3p pos;
     q20 size; // height and radius
+
+    bool Overlaps(Cylinder *other);
 };
diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp
index 8015d5f4..934b3386 100644
--- a/include/Player/EquipHammer.hpp
+++ b/include/Player/EquipHammer.hpp
@@ -31,7 +31,7 @@ public:
     /* 2c */ virtual unk32 vfunc_2c() override; // func_ov59_02198fcc

     /* 30 */ virtual void vfunc_30() override; // func_ov59_02198e6c

     /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_0v59_02198fc8

-    /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const override; // func_ov14_0213ee10

+    /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov14_0213ee10

     /* 4c */ virtual s32 vfunc_4c() const override; // func_ov14_0213eea8

     /* 50 */

 };

diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp
index c4159185..93fe9e3e 100644
--- a/include/Player/EquipItem.hpp
+++ b/include/Player/EquipItem.hpp
@@ -4,6 +4,7 @@
 #include "global.h"

 

 #include "Item/Item.hpp"

+#include "Physics/Cylinder.hpp"

 #include "System/SysNew.hpp"

 

 class EquipItem : public SysObject {

@@ -33,7 +34,7 @@ public:
     /* 30 */ virtual void vfunc_30() = 0;

     /* 34 */ virtual void vfunc_34(unk16 *param1); // func_ov00_020be96c

     /* 38 */ virtual void vfunc_38(unk32 param1) = 0;

-    /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const; // func_ov00_020beb90

+    /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const; // func_ov00_020beb90

     /* 40 */ virtual unk32 vfunc_40() const; // func_ov00_020be970

     /* 44 */ virtual unk32 vfunc_44(unk32 param1) const; // func_ov00_020be978

     /* 48 */ virtual unk32 vfunc_48(unk32 param1) const; // func_ov00_020be980

diff --git a/include/Player/EquipShield.hpp b/include/Player/EquipShield.hpp
index a66da083..8bf435df 100644
--- a/include/Player/EquipShield.hpp
+++ b/include/Player/EquipShield.hpp
@@ -30,6 +30,6 @@ public:
 

     /* 30 */ virtual void vfunc_30() override; // func_ov00_020c0804

     /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov00_020c086c

-    /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const; // func_ov00_020c0a88

+    /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const; // func_ov00_020c0a88

     /* 50 */

 };

diff --git a/include/Player/EquipSword.hpp b/include/Player/EquipSword.hpp
index 57b64443..19bb4779 100644
--- a/include/Player/EquipSword.hpp
+++ b/include/Player/EquipSword.hpp
@@ -53,6 +53,6 @@ public:
     /* 2c */ virtual u32 vfunc_2c() override; // func_ov00_020c0674

     /* 30 */ virtual void vfunc_30() override; // func_ov00_020bf538

     /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov00_020bff94

-    /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const override; // func_ov00_020c01dc

+    /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov00_020c01dc

     /* 50 */

 };

diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp
index f618f740..0bb534ff 100644
--- a/include/Player/PlayerBase.hpp
+++ b/include/Player/PlayerBase.hpp
@@ -55,7 +55,7 @@ public:
     bool func_ov00_020a7c00(s32 param1);
     bool CollidesWith(Cylinder *cylinder);
     bool func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3);
-    void EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId);
+    bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId);
     void EquipItem_vfunc_2c();
     void SetHealth(s16 health);
 };
diff --git a/include/lib/math.h b/include/lib/math.h
index 04fd2db4..f4c2bafb 100644
--- a/include/lib/math.h
+++ b/include/lib/math.h
@@ -63,4 +63,3 @@ extern "C" u32 FastDivide(u32 a, u32 b);
 extern "C" u32 Divide(u32 a, u32 b);
 extern "C" bool Approach(unk32 *src, unk32 dest, unk32 step);
 extern "C" bool Approach_thunk(unk32 *src, unk32 dest, unk32 step);
-extern "C" bool func_01ffec34(Vec4p *param1, Vec4p *param2);