Move ov058 documentation from Ghidra

2 files changed, 41 insertions, 9 deletions

diff --git a/include/Player/EquipBombchu.hpp b/include/Player/EquipBombchu.hpp
index eba684fb..c2e924b5 100644
--- a/include/Player/EquipBombchu.hpp
+++ b/include/Player/EquipBombchu.hpp
@@ -4,6 +4,8 @@
 

 #include "Actor/Actor.hpp"

 #include "Player/EquipItem.hpp"

+#include "Render/ModelRender.hpp"

+#include "Unknown/UnkStruct_ov000_020beba8.hpp"

 

 struct EquipBombchu_Unk1 {

     /* 0 */ unk8 mUnk_0;

@@ -13,20 +15,38 @@ struct EquipBombchu_Unk1 {
     EquipBombchu_Unk1();

 };

 

+class EquipBombchu_Unk_02198d00 : public UnkStruct_ov000_020beba8 {

+public:

+    /* 0 (base) */

+    /* c */

+

+    /* 00 */ virtual ~EquipBombchu_Unk_02198d00() override;

+    /* 08 */ virtual void vfunc_08(unk16 *param1) override;

+    /* 0c */ virtual void vfunc_0c(unk16 *param1) override;

+    /* 10 */ virtual void vfunc_10(s32 *param1) override;

+    /* 14 */ virtual void vfunc_14(u16 *param1) override;

+    /* 1c */

+

+    inline EquipBombchu_Unk_02198d00() :

+        UnkStruct_ov000_020beba8(3) {}

+};

+

 class EquipBombchu : public EquipItem {

-private:

+public:

+    static ModelRender gModelRenderBombchu;

+    static ModelRender gModelRenderBombchuPt;

+

     /* 00 (base) */

     /* 09 */ u8 mUnk_09[3];

-    /* 0c */ u8 mUnk_0c[0x0c];

+    /* 0c */ ActorRef mUnk_0c;

+    /* 0c */ u8 mUnk_14[0x4];

     /* 18 */ u32 mUnk_18;

     /* 1c */ EquipBombchu_Unk1 *mUnk_1c;

-    /* 20 */ void *mUnk_20;

-    /* 24 */ u32 mUnk_24;

-    /* 28 */ u32 mUnk_28;

+    /* 20 */ Vec3p mUnk_20;

     /* 2c */ void *mUnk_2c;

     /* 30 */ u32 mUnk_30;

     /* 34 */ u32 mUnk_34;

-    /* 38 */ u8 mUnk_38[0xc];

+    /* 38 */ Vec3p mUnk_38;

     /* 44 */ u16 mUnk_44;

     /* 46 */ u8 mUnk_46;

     /* 47 */ char mUnk_47;

@@ -34,7 +54,6 @@ private:
     /* 49 */ unk8 mUnk_49[3];

     /* 4c */

 

-public:

     /* 00 */ virtual void vfunc_00() override;

     /* 04 */ virtual ~EquipBombchu() override;

     /* 0c */ virtual ItemFlag GetId() const override;

@@ -46,8 +65,6 @@ public:
     /* 38 */ virtual void vfunc_38(unk32 param1) override;

     /* 50 */

 

-    bool CheckUsable(unk32 param1) const;

-

     EquipBombchu();

     void func_ov014_0213eba4();

     void func_ov014_0213ec40();

@@ -55,4 +72,16 @@ public:
     Actor *func_ov014_0213ed74();

     void *func_ov014_0213ed94(s32 param1);

     void func_ov014_0213eda0();

+

+    void func_ov058_02199220();

+    void func_ov058_02199228();

+    void func_ov058_02199264();

+    void func_ov058_0219926c();

+    bool CheckUsable(unk32 param1) const;

+    Actor *func_ov058_02199400();

+    bool func_ov058_02199498(Vec3p *vec);

+    void func_ov058_02199ef0(unk16 param1);

+    void func_ov058_02199fd8(u32 param1);

+    unk32 func_ov058_0219a084(unk16 param1);

+    bool func_ov058_0219a3b4(unk16 param1);

 };

diff --git a/include/Player/LinkStateItem.hpp b/include/Player/LinkStateItem.hpp
index f8c424b2..6946f736 100644
--- a/include/Player/LinkStateItem.hpp
+++ b/include/Player/LinkStateItem.hpp
@@ -85,4 +85,7 @@ public:
     void func_ov057_0219a208();
     void StopUsingRope();
     bool func_ov057_0219a364();
+
+    void func_ov058_0219a454();
+    void func_ov058_0219a47c();
 };