Merge pull request #95 from AetiasHax/match-link-state-move

Match `LinkStateMove` in overlays 4 and 5

4 files changed, 15 insertions, 12 deletions

diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp
index bca6c796..14f4603d 100644
--- a/include/Player/LinkStateBase.hpp
+++ b/include/Player/LinkStateBase.hpp
@@ -14,13 +14,13 @@
 
 typedef unk32 LinkStateId;
 enum LinkStateId_ {
-    LinkStateId_Move    = 0,
-    LinkStateId_Item    = 1,
-    LinkStateId_Grab    = 2,
-    LinkStateId_Unk3    = 3,
-    LinkStateId_Unk4    = 4,
-    LinkStateId_Damage  = 5,
-    LinkStateId_ItemGet = 6,
+    LinkStateId_Move     = 0,
+    LinkStateId_Item     = 1,
+    LinkStateId_Interact = 2,
+    LinkStateId_Follow   = 3,
+    LinkStateId_Roll     = 4,
+    LinkStateId_Damage   = 5,
+    LinkStateId_Cutscene = 6,
     LinkStateId_COUNT
 };
 
@@ -60,7 +60,7 @@ public:
     void func_ov00_020a81b8(unk32 param1, unk32 param2);
     LinkStateItem *GetLinkItemState();
     void LookAt(Vec3p *target);
-    void func_ov00_020a81fc();
+    void func_ov00_020a81fc(Vec3p *param1, unk32 param2);
     void AddHealth(s16 amount);
     void func_ov00_020a8224(unk32 param1);
     void TurnTo(s16 angle, unk32 param2, unk32 speed);
@@ -82,7 +82,7 @@ public:
     void Clear_PlayerLinkBase_Unk48(u16 flags);
     void func_ov00_020a8680(unk32 param1, unk16 param2, bool param3);
     void PlayerLinkBase_func_ov00_020bccc8();
-    bool PlayerLinkBase_vfunc_58();
+    bool PlayerLinkBase_vfunc_58(unk32 param1, ActorRef *param2);
     bool func_ov00_020a8704(s16 *pAngle);
     bool func_ov00_020a8774(Vec3p *param1, s32 angle);
     void func_ov00_020a8844(Vec3p *param1, bool param2, bool param3);
@@ -90,7 +90,7 @@ public:
     void func_ov00_020a8994();
     void func_ov00_020a89bc(unk32 param1, unk32 param2);
     void func_ov00_020a8a08(unk32 param1);
-    void func_ov00_020a8a4c(unk32 param1, unk32 param2);
+    void func_ov00_020a8a4c(const void *param1, unk32 param2);
     void func_ov00_020a8a90(unk32 param1);
     void func_ov00_020a8ab0(unk32 param1);
     void func_ov00_020a8ad0(unk32 param1);
@@ -152,6 +152,6 @@ public:
     void func_ov005_021113c4(bool param1);
 };
 
-LinkStateBase *GetLinkState(s32 index);
+LinkStateBase *GetLinkState(LinkStateId index);
 
 extern LinkStateBase **gLinkStates;
diff --git a/include/Player/LinkStateDamage.hpp b/include/Player/LinkStateDamage.hpp
index 0e3a70a7..02e2c526 100644
--- a/include/Player/LinkStateDamage.hpp
+++ b/include/Player/LinkStateDamage.hpp
@@ -8,6 +8,7 @@
 #include "Render/ModelRender.hpp"
 
 class LinkStateDamage : public LinkStateBase {
+public:
     /* 00 (base) */
     /* 0c */ void *mUnk_0c;
     /* 10 */ unk32 mUnk_10;
diff --git a/include/Player/LinkStateMove.hpp b/include/Player/LinkStateMove.hpp
index 0b197a27..a782b22d 100644
--- a/include/Player/LinkStateMove.hpp
+++ b/include/Player/LinkStateMove.hpp
@@ -7,6 +7,8 @@
 
 class LinkStateMove : public LinkStateBase {
 public:
+    static unk32 data_ov000_020e56f0;
+
     /* 00 (base) */
     /* 0c */ s32 mUnk_0c;
     /* 10 */ unk16 mUnk_10;
diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp
index 5fe84a89..2e5ea7b6 100644
--- a/include/Unknown/UnkStruct_02037750.hpp
+++ b/include/Unknown/UnkStruct_02037750.hpp
@@ -31,7 +31,7 @@ public:
     /* 34 */
 
     UnkStruct_02037750(unk32 param1, unk32 param2);
-    LinkStateInteract *GetLinkStateInteract();
+    static LinkStateInteract *GetLinkStateInteract();
     void func_020385d0(s32 param1, unk32 *param2);
 };