From 6b9c7701fe475de8456b7fd67969486c604fc834 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 6 Jan 2025 22:09:32 +0100 Subject: PlayerControl: Decomp 5% --- include/Player/PlayerControl.hpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 0e0da8ae..015c22bd 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -57,8 +57,8 @@ public: /* 84 */ ActorRef mFollowRef; /* 8c */ ActorRef mNextFollowRef; /* 94 */ ActorRef mLastFollowRef; - /* 9c */ unk8 mUnk_9c; - /* 9d */ unk8 mUnk_9d; + /* 9c */ u8 mUnk_9c; + /* 9d */ u8 mUnk_9d; /* 9e */ unk8 mUnk_9e[2]; /* a0 */ void *mFollowActor; /* a4 */ q20 mFollowDist; @@ -75,7 +75,7 @@ public: /* d8 */ static bool func_ov00_020aeeac(); - void func_ov00_020aeef8(); + bool func_ov00_020aeef8(); void func_ov00_020aef30(); void UpdateAim(); Actor *GetFollowActor(); @@ -124,6 +124,13 @@ public: bool IsTouchingFast(); bool IsTappedNow(); bool func_ov00_020b13c4(); + + // More methods starting from 020b78a0, different TU? + void ResetTouchWorld(); + void InitTouchMovement(); + void func_ov000_020b7924(s32 param1); + void ApplyTouchWorld(Vec3p *result, q20 scale); + bool func_ov000_020b7d6c(); }; extern PlayerControl *gPlayerControl; -- cgit v1.2.3 From a76eefa1a52f9d985ad5352c13cae1d4299cecb2 Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 9 Jan 2025 08:24:32 +0100 Subject: PlayerControl: Decomp 7% --- include/Player/PlayerControl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 015c22bd..e00aafaa 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -48,7 +48,7 @@ public: /* 7b */ bool mUnk_7b; /* 7c */ s8 mUnk_7c; /* 7d */ bool mUnk_7d; - /* 7e */ s8 mUnk_7e; + /* 7e */ u8 mUnk_7e; /* 7f */ bool mUnk_7f; /* 80 */ bool mUnk_80; /* 81 */ bool mFollowing; -- cgit v1.2.3 From 8cda3ca2d7f5fe424cc1a649baec2ff992368e62 Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 10 Jan 2025 09:27:01 +0100 Subject: PlayerControl: Decomp 9% --- include/Player/PlayerControl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index e00aafaa..de2dd560 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -46,7 +46,7 @@ public: /* 79 */ bool mUsingEquipItem; /* 7a */ bool mUnk_7a; /* 7b */ bool mUnk_7b; - /* 7c */ s8 mUnk_7c; + /* 7c */ u8 mUnk_7c; /* 7d */ bool mUnk_7d; /* 7e */ u8 mUnk_7e; /* 7f */ bool mUnk_7f; -- cgit v1.2.3 From 57de07939724a1a1762422c915814ca2f9dc760c Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 9 Feb 2025 09:38:23 +0100 Subject: PlayerControl: Decomp 27% --- include/Player/PlayerControl.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 39e118da..1bfdd833 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -28,7 +28,7 @@ public: /* 50 */ q20 mTouchSpeedX; // how fast the stylus moves /* 54 */ q20 mTouchSpeedY; /* 58 */ q20 mTouchDist; // pixel distance from touch to link, deadzone is 20 pixels - /* 5c */ unk32 mUnk_5c; + /* 5c */ q20 mTouchSpeed; /* 60 */ s16 mTouchDuration; /* 62 */ s16 mTouchSlowDuration; // resets to 0 if stylus is fast enough /* 64 */ s16 mTouchFastTime; // gets set to mTouchDuration if stylus is fast enough @@ -57,13 +57,12 @@ public: /* 84 */ ActorRef mFollowRef; /* 8c */ ActorRef mNextFollowRef; /* 94 */ ActorRef mLastFollowRef; - /* 9c */ u8 mUnk_9c; - /* 9d */ u8 mUnk_9d; + /* 9c */ Vec2b mUnk_9c; /* 9e */ unk8 mUnk_9e[2]; /* a0 */ void *mFollowActor; /* a4 */ q20 mFollowDist; /* a8 */ u16 mFollowStuckTimer; - /* aa */ u16 mCutsceneEndTimer; + /* aa */ s16 mCutsceneEndTimer; /* ac */ s16 mUnk_ac; /* ae */ unk16 mUnk_ae; /* b0 */ Vec3p mAim; // used by boomerang, bow and rope @@ -75,11 +74,11 @@ public: /* d8 */ static bool func_ov00_020aeeac(); - bool func_ov00_020aeef8(); + static bool func_ov00_020aeef8(); void func_ov00_020aef30(); void UpdateAim(); Actor *GetFollowActor(); - bool func_ov00_020af01c(unk8 *param1); + bool func_ov00_020af01c(Vec2b *param1); void SetUnk_80(); void StopFollowing(); void func_ov00_020af06c(); @@ -90,14 +89,14 @@ public: bool CheckTouching(u32 param1); bool CheckTouchFast(u32 param1); bool func_ov00_020af4a4(); - void func_ov00_020af538(); + void func_ov00_020af538(bool param1, u8 param2); void func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4); bool func_ov00_020af778(); bool func_ov00_020afad8(Vec3p *param1); void func_ov00_020afb6c(); bool func_ov00_020afe88(s32 param1, bool param2); bool func_ov00_020afeec(unk32 param1, bool param2); - void func_ov00_020aff90(unk32 param1, unk32 param2); + void func_ov00_020aff90(Cylinder *param1, unk32 param2); void func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4); void func_ov00_020b014c(); void SetAim(); -- cgit v1.2.3 From d057996378f1235c67d93014595e9fd929a4efb6 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 10 Feb 2025 23:07:55 +0100 Subject: PlayerControl: Decomp 38% --- include/Player/PlayerControl.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 1bfdd833..c11ad0ce 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -59,7 +59,7 @@ public: /* 94 */ ActorRef mLastFollowRef; /* 9c */ Vec2b mUnk_9c; /* 9e */ unk8 mUnk_9e[2]; - /* a0 */ void *mFollowActor; + /* a0 */ void *mFollowObject; /* a4 */ q20 mFollowDist; /* a8 */ u16 mFollowStuckTimer; /* aa */ s16 mCutsceneEndTimer; @@ -98,8 +98,8 @@ public: bool func_ov00_020afeec(unk32 param1, bool param2); void func_ov00_020aff90(Cylinder *param1, unk32 param2); void func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4); - void func_ov00_020b014c(); - void SetAim(); + void func_ov00_020b014c(Vec3p *param1); + void ResetAim(); bool UpdateAimWorld(Vec3p *param1); s16 GetTouchAngle(); u32 func_ov00_020b034c(); @@ -137,6 +137,8 @@ public: void Init(); void func_ov004_0210b1d0(); static void func_ov004_0210b1f0(); + + bool func_ov024_02178348(Vec3p *param1); }; extern PlayerControl *gPlayerControl; -- cgit v1.2.3 From 83bdfdb8925d84d85b36ffbe69f256cc87da8116 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 16 Feb 2025 16:07:22 +0100 Subject: PlayerControl: Decomp 68% --- include/Player/PlayerControl.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index c11ad0ce..962a3fe0 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -11,7 +11,7 @@ #include "Player/TouchControl.hpp" #include "Player/TouchGesture.hpp" -typedef u16 TouchEdge; +typedef s16 TouchEdge; enum TouchEdge_ { TouchEdge_Right = 0, TouchEdge_Left = 1, @@ -52,7 +52,7 @@ public: /* 7f */ bool mUnk_7f; /* 80 */ bool mUnk_80; /* 81 */ bool mFollowing; - /* 82 */ unk8 mUnk_82; + /* 82 */ bool mUnk_82; /* 83 */ bool mUnk_83; /* 84 */ ActorRef mFollowRef; /* 8c */ ActorRef mNextFollowRef; @@ -106,13 +106,13 @@ public: s32 func_ov00_020b0418(); bool func_ov00_020b049c(Vec3p *param1, bool param2); bool func_ov00_020b05e8(Vec3p *param1); - bool func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 param3); + bool func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 *param3); bool CheckNotTouching(); bool func_ov00_020b0ad0(Actor *actor); bool func_ov00_020b0b0c(s16 *pAngle, ItemFlag *pEquipId, unk32 *pCardinal, bool *pFast); bool func_ov00_020b0de8(Vec3p *param1); bool func_ov00_020b0e54(Vec3p *param1, Vec3p *param2); - bool func_ov00_020b0f88(Vec3p *param1, unk32 param2, Vec3p *param3); + bool func_ov00_020b0f88(Vec3p *param1, unk32 scale, Vec3p *param3); bool func_ov00_020b1058(Vec3p *param1, unk32 param2, Vec3p *param3, Vec3p *param4); bool IsUntouchedNow(); bool IsNotUntouchedNow(); -- cgit v1.2.3 From 4a764f9d58cb16343c02afb3592aad7aabf66d6d Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 18 Feb 2025 18:33:12 +0100 Subject: PlayerControl: Decomp 80% --- include/Player/PlayerControl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/Player/PlayerControl.hpp') diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 962a3fe0..11dd6488 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -61,7 +61,7 @@ public: /* 9e */ unk8 mUnk_9e[2]; /* a0 */ void *mFollowObject; /* a4 */ q20 mFollowDist; - /* a8 */ u16 mFollowStuckTimer; + /* a8 */ s16 mFollowStuckTimer; /* aa */ s16 mCutsceneEndTimer; /* ac */ s16 mUnk_ac; /* ae */ unk16 mUnk_ae; @@ -96,7 +96,7 @@ public: void func_ov00_020afb6c(); bool func_ov00_020afe88(s32 param1, bool param2); bool func_ov00_020afeec(unk32 param1, bool param2); - void func_ov00_020aff90(Cylinder *param1, unk32 param2); + void func_ov00_020aff90(Vec3p *param1, unk32 param2); void func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4); void func_ov00_020b014c(Vec3p *param1); void ResetAim(); -- cgit v1.2.3