Merge pull request #53 from mike8699/decompile-LinkStateItem

Decompile `LinkStateItem`

7 files changed, 25 insertions, 6 deletions

diff --git a/include/Player/EquipBomb.hpp b/include/Player/EquipBomb.hpp
index d21e12f1..9eb26ec9 100644
--- a/include/Player/EquipBomb.hpp
+++ b/include/Player/EquipBomb.hpp
@@ -4,6 +4,8 @@
 

 #include "Player/EquipItem.hpp"

 

+class LinkStateItem;

+

 class EquipBomb : public EquipItem {

 private:

     /* 00 (base) */

@@ -26,4 +28,6 @@ public:
     /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov55_2198df8

     /* 50 */ virtual void vfunc_50(); // func_ov14_0213d228

     /* 54 */

+

+    static void StopUsing(LinkStateItem *param1, unk32 param2);

 };

diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp
index 4cf56a21..9d3f0394 100644
--- a/include/Player/EquipHammer.hpp
+++ b/include/Player/EquipHammer.hpp
@@ -4,6 +4,8 @@
 

 #include "Player/EquipItem.hpp"

 

+class LinkStateItem;

+

 class EquipHammer : public EquipItem {

 private:

     /* 00 (base) */

@@ -29,10 +31,12 @@ public:
     /* 18 */ virtual void vfunc_18() override; // func_ov59_02198e3c

     /* 1c */ virtual void vfunc_1c() override; // func_ov59_02198e58

 

-    /* 2c */ virtual unk32 vfunc_2c() override; // func_ov59_02198fcc

+    /* 2c */ virtual u32 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 GetHitbox(Cylinder *hitbox) const override; // func_ov14_0213ee10

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

     /* 50 */

+

+    static void StopUsing(LinkStateItem *param1);

 };

diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp
index 9eb7cdec..127eb974 100644
--- a/include/Player/EquipRope.hpp
+++ b/include/Player/EquipRope.hpp
@@ -15,6 +15,7 @@ struct EquipRope_Unk_18 {
 };

 

 class Actor;

+class LinkStateItem;

 

 class EquipRope : public EquipItem {

 public:

@@ -59,4 +60,6 @@ public:
     bool func_ov14_0213dadc(s32 index, Cylinder *cylinder);

     s32 func_ov14_0213ddd4(Actor *actor);

     bool func_ov14_0213defc(Actor *actor);

+

+    static void StopUsing(LinkStateItem *param1);

 };

diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp
index f0958df5..8c4694bc 100644
--- a/include/Player/EquipScoop.hpp
+++ b/include/Player/EquipScoop.hpp
@@ -4,6 +4,8 @@
 

 #include "Player/EquipItem.hpp"

 

+class LinkStateItem;

+

 class EquipScoop : public EquipItem {

 private:

     /* 0 (base) */

@@ -24,4 +26,6 @@ public:
     /* 44 */ virtual unk32 vfunc_44(unk32 param1) const override; // func_ov54_02198d38

     /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override; // func_ov54_02198d48

     /* 50 */

+

+    static void StopUsing(LinkStateItem *param1);

 };

diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp
index f4591991..3371b937 100644
--- a/include/Player/LinkStateBase.hpp
+++ b/include/Player/LinkStateBase.hpp
@@ -128,3 +128,7 @@ public:
     DebugHierarchy *GetDebugHierarchy0();
     DebugHierarchy *GetDebugHierarchy1();
 };
+
+LinkStateBase *GetLinkState(s32 index);
+
+extern LinkStateBase **gLinkStates;
diff --git a/include/Player/LinkStateItem.hpp b/include/Player/LinkStateItem.hpp
index 591614f2..0c5f4a4d 100644
--- a/include/Player/LinkStateItem.hpp
+++ b/include/Player/LinkStateItem.hpp
@@ -13,8 +13,8 @@ public:
     /* 00 (base) */
     /* 0c */ void *mUnk_0c;
     /* 10 */ unk32 mUnk_10;
-    /* 14 */ ItemId mEquipId;
-    /* 18 */ ItemId mNextEquip;
+    /* 14 */ ItemFlag mEquipId;
+    /* 18 */ ItemFlag mNextEquip;
     /* 1c */ unk32 mUnk_1c;
     /* 20 */ unk16 mUnk_20;
     /* 22 */ unk8 mUnk_22[2];
@@ -47,7 +47,7 @@ public:
     /* 44 */
 
     s32 IsHammerEquipped(); // returns 0 if hammer is equipped, otherwise -1
-    EquipBombchu *GetEquipBombchu();
-    LinkStateMove *GetLinkStateMove();
+    static EquipBombchu *GetEquipBombchu();
+    static LinkStateMove *GetLinkStateMove();
     bool func_ov00_020abf70();
 };
diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp
index 65831d20..2a353075 100644
--- a/include/Save/AdventureFlags.hpp
+++ b/include/Save/AdventureFlags.hpp
@@ -92,7 +92,7 @@ public:
     void func_Ov00_02097810(s32 param1);
     unk32 func_ov00_02097968(unk32 param1);
     unk32 func_ov00_02097a44(unk32 param1, s32 param2);
-    bool func_ov00_02097b9c();
+    bool func_ov00_02097b9c(s32 param1);
     bool func_ov00_02097bac();
     bool func_ov00_02097bbc();
     bool func_ov00_02097bcc();