Merge branch 'main' into match_actor_rupee

include/Player/EquipBomb.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipBomb : public EquipItem {
@@ -9,7 +10,7 @@ private:
     /* 09 */ unk8 mUnk_09[3];
     /* 0c */ unk32 mUnk_0c;
     /* 10 */ unk8 mUnk_10[0x14];
-    /* 24 */ 
+    /* 24 */
 
 public:
     EquipBomb();

include/Player/EquipBombchu.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipBombchu : public EquipItem {

include/Player/EquipBoomerang.hpp

@@ -1,15 +1,20 @@
 #pragma once
 
+#include "global.h"
 #include "types.h"
+
+#include "Actor/ActorRef.hpp"
 #include "Player/EquipItem.hpp"
 
+class Actor;
+
 class EquipBoomerang : public EquipItem {
 private:
     /* 00 (base) */
     /* 09 */ u8 mUnk_09[3];
     /* 0c */ void *mUnk_0c;
-    /* 10 */ u32 mUnk_10;
-    /* 14 */ u8 mUnk_18[8];
+    /* 10 */ ActorRef mRef;
+    /* 18 */ u8 mUnk_18[8];
     /* 20 */ u32 mUnk_20;
     /* 24 */ u32 mUnk_24;
     /* 28 */ u32 mUnk_28;
@@ -29,4 +34,6 @@ public:
     /* 30 */ virtual void vfunc_30() override; // func_ov53_0219913c
     /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov53_02199318
     /* 50 */
+
+    Actor *GetActor();
 };

include/Player/EquipBow.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipBow : public EquipItem {

include/Player/EquipHammer.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipHammer : public EquipItem {
@@ -31,7 +32,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 */
 };

include/Player/EquipItem.hpp

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "types.h"
 #include "global.h"
+#include "types.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

include/Player/EquipPotion.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipPotion : public EquipItem {

include/Player/EquipRope.hpp

@@ -1,17 +1,32 @@
 #pragma once
 
+#include "global.h"
+#include "lib/math.h"
 #include "types.h"
+
+#include "Actor/ActorRef.hpp"
+#include "Physics/Cylinder.hpp"
 #include "Player/EquipItem.hpp"
 
+struct EquipRope_Unk_18 {
+    /* 00 */ Vec3p vec;
+    /* 0c */ unk8 mUnk_0c[0x10];
+    /* 1c */
+};
+
+class Actor;
+
 class EquipRope : public EquipItem {
-private:
+public:
     /* 00 (base) */
     /* 09 */ unk8 mUnk_09;
     /* 0a */ unk16 mUnk_0a;
     /* 0c */ unk8 mUnk_0c[4];
-    /* 10 */ unk32 mUnk_10;
-    /* 14 */ unk32 mUnk_14;
-    /* 18 */ unk8 mUnk_18[0x54];
+    /* 10 */ ActorRef mRef;
+    /* 18 */ EquipRope_Unk_18 mUnk_18[2];
+    /* 50 */ unk8 mUnk_50[0x1a];
+    /* 6a */ bool mUnk_6a;
+    /* 6b */ unk8 mUnk_6b;
     /* 6c */ unk16 mUnk_6c;
     /* 6e */ unk8 mUnk_6e[2];
     /* 70 */ unk16 mUnk_70;
@@ -21,7 +36,6 @@ private:
     /* a0 */ unk32 mUnk_a0;
     /* a4 */
 
-public:
     EquipRope();
 
     /* 04 */ virtual ~EquipRope() override;
@@ -31,9 +45,18 @@ public:
     u16 GetAmmo();
     /* 14 */ virtual bool IsUsable(unk32 param1) const override;
     /* 18 */ virtual void vfunc_18() override; // func_ov57_021992f4
-    /* 1c */ virtual void vfunc_1c() override; // func_ov57_0219935c    
+    /* 1c */ virtual void vfunc_1c() override; // func_ov57_0219935c
 
     /* 30 */ virtual void vfunc_30() override; // func_ov57_02199744
     /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov57_021998f0
     /* 50 */
+
+    Actor *func_ov14_0213d420();
+    s32 func_ov14_0213d440(s32 actorId);
+    s32 func_ov14_0213d480(s32 actorId);
+    bool func_ov14_0213d81c(s32 index, Vec3p *vec);
+    void func_ov14_0213d91c(s32 index);
+    bool func_ov14_0213dadc(s32 index, Cylinder *cylinder);
+    s32 func_ov14_0213ddd4(Actor *actor);
+    bool func_ov14_0213defc(Actor *actor);
 };

include/Player/EquipScoop.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipScoop : public EquipItem {
@@ -24,4 +25,3 @@ public:
     /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override; // func_ov54_02198d48
     /* 50 */
 };
-

include/Player/EquipShield.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
 
 class EquipShield {
@@ -30,6 +31,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 */
 };

include/Player/EquipSword.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
 #include "types.h"
+
 #include "Player/EquipItem.hpp"
+#include "Player/EquipRope.hpp"
 
 class EquipSword : public EquipItem {
 private:
@@ -53,6 +55,8 @@ 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 */
+
+    static EquipRope *GetEquipRope();
 };

include/Player/LinkStateBase.hpp

@@ -1,26 +1,25 @@
 #pragma once
 
 #include "global.h"
+#include "lib/math.h"
 #include "types.h"
 
-#include "lib/math.h"
-
-#include "System/SysNew.hpp"
-#include "Player/PlayerLinkBase.hpp"
-#include "Player/PlayerControlData.hpp"
 #include "Actor/Actor.hpp"
 #include "Actor/ActorManager.hpp"
-#include "Player/EquipItem.hpp"
 #include "Debug/DebugHierarchy.hpp"
+#include "Player/EquipItem.hpp"
+#include "Player/PlayerControlData.hpp"
+#include "Player/PlayerLinkBase.hpp"
+#include "System/SysNew.hpp"
 
 typedef unk32 LinkStateId;
 enum LinkStateId_ {
-    LinkStateId_Move = 0,
-    LinkStateId_Item = 1,
-    LinkStateId_Grab = 2,
-    LinkStateId_Unk3 = 3,
-    LinkStateId_Unk4 = 4,
-    LinkStateId_Damage = 5,
+    LinkStateId_Move    = 0,
+    LinkStateId_Item    = 1,
+    LinkStateId_Grab    = 2,
+    LinkStateId_Unk3    = 3,
+    LinkStateId_Unk4    = 4,
+    LinkStateId_Damage  = 5,
     LinkStateId_ItemGet = 6,
     LinkStateId_COUNT
 };
@@ -59,7 +58,7 @@ public:
     void EquipItem_vfunc_28();
     void UpdateSwordShieldInUse();
     void func_ov00_020a81b8(unk32 param1, unk32 param2);
-    LinkStateItem* GetLinkItemState();
+    LinkStateItem *GetLinkItemState();
     void LookAt(Vec3p *target);
     void func_ov00_020a81fc();
     void AddHealth(s16 amount);
@@ -102,30 +101,30 @@ public:
     unk8 Get_PlayerLinkBase_Unk5e();
     unk32 Get_PlayerControlData_Unk004();
     PlayerCharacter GetCurrentCharacter();
-    PlayerControlData* GetPlayerControlData();
+    PlayerControlData *GetPlayerControlData();
     LinkStateId GetStateId();
     s32 GetHealth();
     s32 GetCurrentCharacterHealth();
     bool func_ov00_020a8c34();
-    Vec3p* GetPlayerPos();
-    Vec3p* GetPlayerVel();
-    unk8* func_ov00_020a8c64();
-    s16* GetPlayerAngle();
-    void* GetPlayer_Unk18();
+    Vec3p *GetPlayerPos();
+    Vec3p *GetPlayerVel();
+    unk8 *func_ov00_020a8c64();
+    s16 *GetPlayerAngle();
+    void *GetPlayer_Unk18();
     s32 Get_PlayerControlData_Unk32();
-    Actor* GetGrabActor();
-    ActorRef* GetGrabActorRef();
+    Actor *GetGrabActor();
+    ActorRef *GetGrabActorRef();
     unk32 Grab();
     s32 Get_PlayerLinkBase_Unk44();
     bool IsEquipBeingUsed(ItemFlag id);
-    EquipItem* GetEquipItem(ItemFlag id);
-    void* func_ov00_020a8d40();
+    EquipItem *GetEquipItem(ItemFlag id);
+    void *func_ov00_020a8d40();
     unk32 func_ov00_020a8d50();
     unk32 func_ov00_020a8d6c();
     s32 PlayerControlData_vfunc_14(s32 param1);
     unk32 Get_PlayerControlData_Unk100();
     unk32 Get_PlayerControlData_Unk120();
     s32 Get_PlayerLinkBase_Unk38();
-    DebugHierarchy* GetDebugHierarchy0();
-    DebugHierarchy* GetDebugHierarchy1();
+    DebugHierarchy *GetDebugHierarchy0();
+    DebugHierarchy *GetDebugHierarchy1();
 };

include/Player/LinkStateCutscene.hpp

@@ -1,12 +1,11 @@
 #pragma once
 
 #include "global.h"
+#include "lib/math.h"
 #include "types.h"
 
-#include "lib/math.h"
-
-#include "Player/LinkStateBase.hpp"
 #include "Item/Item.hpp"
+#include "Player/LinkStateBase.hpp"
 
 class LinkStateCutscene : public LinkStateBase {
 public:

include/Player/LinkStateDamage.hpp

@@ -1,9 +1,8 @@
 #pragma once
 
 #include "global.h"
-#include "types.h"
-
 #include "lib/math.h"
+#include "types.h"
 
 #include "Player/LinkStateBase.hpp"
 #include "Render/ModelRender.hpp"

include/Player/LinkStateFollow.hpp

@@ -1,9 +1,8 @@
 #pragma once
 
 #include "global.h"
-#include "types.h"
-
 #include "lib/math.h"
+#include "types.h"
 
 #include "Actor/Actor.hpp"
 #include "Player/LinkStateBase.hpp"
@@ -35,7 +34,7 @@ public:
     /* 44 */
 
     void MoveTowardTarget();
-    LinkStateCutscene* GetLinkStateCutscene();
+    LinkStateCutscene *GetLinkStateCutscene();
     bool func_ov00_020a9180(Vec3p *param1);
     bool func_ov00_020a9210(Vec3p *param1, Actor *param2);
 };

include/Player/LinkStateInteract.hpp

@@ -1,14 +1,13 @@
 #pragma once
 
 #include "global.h"
+#include "lib/math.h"
 #include "types.h"
 
-#include "lib/math.h"
-
+#include "Actor/Actor.hpp"
+#include "Actor/ActorManager.hpp"
 #include "Player/LinkStateBase.hpp"
 #include "Player/LinkStateRoll.hpp"
-#include "Actor/ActorManager.hpp"
-#include "Actor/Actor.hpp"
 
 class LinkStateInteract : public LinkStateBase {
 public:
@@ -37,7 +36,7 @@ public:
     s32 GetGrabActorId();
     bool func_ov00_020aa818();
     void func_ov00_020aa844(Actor *param1);
-    LinkStateRoll* GetLinkStateRoll();
+    LinkStateRoll *GetLinkStateRoll();
     void SetGrabActorVelocity(Vec3p *velocity);
     void SetBombVelocity(Vec3p *velocity);
     void func_ov00_020ab6c8();

include/Player/LinkStateItem.hpp

@@ -3,10 +3,10 @@
 #include "global.h"
 #include "types.h"
 
+#include "Item/Item.hpp"
+#include "Player/EquipBombchu.hpp"
 #include "Player/LinkStateBase.hpp"
 #include "Player/LinkStateMove.hpp"
-#include "Player/EquipBombchu.hpp"
-#include "Item/Item.hpp"
 
 class LinkStateItem : public LinkStateBase {
 public:
@@ -47,7 +47,7 @@ public:
     /* 44 */
 
     s32 IsHammerEquipped(); // returns 0 if hammer is equipped, otherwise -1
-    EquipBombchu* GetEquipBombchu();
-    LinkStateMove* GetLinkStateMove();
+    EquipBombchu *GetEquipBombchu();
+    LinkStateMove *GetLinkStateMove();
     bool func_ov00_020abf70();
 };

include/Player/LinkStateRoll.hpp

@@ -42,4 +42,5 @@ public:
 
     void func_ov00_020aee58(s16 param1, u16 param2);
     void func_ov00_020aee84();
+    bool func_ov00_020aeeac();
 };

include/Player/MotionParams.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "global.h"
-#include "types.h"
 #include "lib/files.h"
+#include "types.h"
 
 struct MotionParams {
     /* 00 */ FileEntry motionBhio; // motion.bhio

include/Player/PlayerBase.hpp

@@ -4,10 +4,9 @@
 #include "types.h"
 
 #include "Item/Item.hpp"
-#include "Player/EquipSword.hpp"
-#include "Player/EquipShield.hpp"
-
 #include "Physics/Cylinder.hpp"
+#include "Player/EquipShield.hpp"
+#include "Player/EquipSword.hpp"
 #include "Render/FadeControl.hpp"
 #include "System/SysNew.hpp"
 
@@ -28,14 +27,14 @@ public:
     /* 04 */ virtual bool vfunc_04();
     /* 08 */ virtual ItemFlag GetEquipId();
     /* 0c */ virtual bool CanMove();
-    /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0;
-    /* 14 */ virtual void vfunc_14(Cylinder *param1) = 0;
-    /* 18 */ virtual void vfunc_18() = 0;
-    /* 1c */ virtual void Init() = 0;
-    /* 20 */ virtual void vfunc_20() = 0;
-    /* 24 */ virtual void vfunc_24() = 0;
-    /* 28 */ virtual void vfunc_28(s32 param1) = 0;
-    /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) = 0;
+    /* 10 */ virtual void vfunc_10(Cylinder *param1)                      = 0;
+    /* 14 */ virtual void vfunc_14(Cylinder *param1)                      = 0;
+    /* 18 */ virtual void vfunc_18()                                      = 0;
+    /* 1c */ virtual void Init()                                          = 0;
+    /* 20 */ virtual void vfunc_20()                                      = 0;
+    /* 24 */ virtual void vfunc_24()                                      = 0;
+    /* 28 */ virtual void vfunc_28(s32 param1)                            = 0;
+    /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2)               = 0;
     /* 30 */ virtual bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) = 0;
     /* 34 */ virtual bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5);
     /* 38 */ virtual bool TeleportToEntrance(unk32 entranceId, bool param2);
@@ -49,13 +48,18 @@ public:
 
     void SetUpdatePos(bool updatePos);
     void SetVisible(bool visible);
-    EquipSword* GetEquipSword();
-    EquipShield* GetEquipShield();
+    EquipSword *GetEquipSword();
+    EquipShield *GetEquipShield();
     void LookAt(Vec3p *target);
     bool func_ov00_020a7c00(s32 param1);
-    bool func_ov00_020a7c1c(Cylinder *cylinder);
+    bool CollidesWith(Cylinder *cylinder);
     bool func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3);
-    void EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId);
-    void EquipItem_vfunc_2c();
+    bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId);
+    s32 EquipItem_vfunc_2c();
     void SetHealth(s16 health);
 };
+
+extern PlayerBase *gPlayer;
+extern Vec3p gPlayerPos;
+extern Vec3p gPlayerVel;
+extern s16 gPlayerAngle;

include/Player/PlayerControl.hpp

@@ -1,23 +1,22 @@
 #pragma once
 
 #include "global.h"
+#include "lib/math.h"
 #include "types.h"
 
-#include "lib/math.h"
-
-#include "Player/TouchControl.hpp"
-#include "Player/TouchGesture.hpp"
-#include "Actor/ActorManager.hpp"
 #include "Actor/Actor.hpp"
+#include "Actor/ActorManager.hpp"
 #include "Debug/DebugHierarchy.hpp"
 #include "Item/Item.hpp"
+#include "Player/TouchControl.hpp"
+#include "Player/TouchGesture.hpp"
 
 typedef u16 TouchEdge;
 enum TouchEdge_ {
-    TouchEdge_Right = 0,
-    TouchEdge_Left = 1,
+    TouchEdge_Right  = 0,
+    TouchEdge_Left   = 1,
     TouchEdge_Bottom = 2,
-    TouchEdge_Top = 3,
+    TouchEdge_Top    = 3,
     TouchEdge_Middle = 4
 };
 
@@ -79,7 +78,7 @@ public:
     void func_ov00_020aeef8();
     void func_ov00_020aef30();
     void UpdateAim();
-    Actor* GetFollowActor();
+    Actor *GetFollowActor();
     bool func_ov00_020af01c(unk8 *param1);
     void SetUnk_80();
     void StopFollowing();
@@ -126,3 +125,5 @@ public:
     bool IsTappedNow();
     bool func_ov00_020b13c4();
 };
+
+extern PlayerControl *gPlayerControl;

include/Player/PlayerControlData.hpp

@@ -1,9 +1,8 @@
 #pragma once
 
 #include "global.h"
-#include "types.h"
-
 #include "lib/math.h"
+#include "types.h"
 
 #include "System/SysNew.hpp"
 

include/Player/PlayerLinkBase.hpp

@@ -1,24 +1,23 @@
 #pragma once
 
 #include "global.h"
-#include "types.h"
 #include "lib/math.h"
-
-#include "Player/PlayerBase.hpp"
-#include "Player/MotionParams.hpp"
+#include "types.h"
 
 #include "Actor/ActorManager.hpp"
-
 #include "Debug/DebugHierarchy.hpp"
+#include "Player/MotionParams.hpp"
+#include "Player/PlayerBase.hpp"
 
 typedef s32 PlayerCharacter;
 enum PlayerCharacter_ {
-    PlayerCharacter_Link = 0,
+    PlayerCharacter_Link     = 0,
     PlayerCharacter_Gongoron = 1,
-    PlayerCharacter_COUNT = 2,
+    PlayerCharacter_COUNT    = 2,
 };
 
-class PlayerLinkBase: public PlayerBase {
+class PlayerLinkBase : public PlayerBase {
+public:
     /* 00 (base) */
     /* 14 */ Vec3p mPos;
     /* 20 */ Vec3p mVel;
@@ -43,7 +42,7 @@ class PlayerLinkBase: public PlayerBase {
     /* 68 */ DebugHierarchy *mDebugHierarchy_1;
     /* 6c */ DebugHierarchy *mDebugHierarchy_2;
     /* 70 */
-    
+
     /* 00 */ s32 GetMaxHealth() override;
     /* 08 */ ItemFlag GetEquipId() override;
     /* 0c */ bool CanMove() override;
@@ -68,11 +67,19 @@ class PlayerLinkBase: public PlayerBase {
     /* 6c */ virtual void vfunc_6c();
     /* 70 */ virtual void vfunc_70(s32 param1, Vec3p *param2, unk32 param3);
     /* 74 */ virtual void vfunc_74();
-    /* 78 */ virtual bool vfunc_78();
+    /* 78 */ virtual unk32 vfunc_78();
     /* 7c */ virtual void vfunc_7c();
     /* 80 */ virtual void SetUnk_5e();
     /* 84 */ virtual void ResetUnk_5e();
     /* 88 */
-    public:
-        bool func_ov00_020bce48(ItemId cutsceneItemId); // PlayItemCutscene
+
+    bool func_ov00_020bbd80(s32 param1);
+    void func_ov00_020bc854(Vec3p *param1);
+    bool func_ov00_020bce48(ItemId cutsceneItemId); // PlayItemCutscene
+    bool func_ov00_020bd304();
+    bool GongoronCollidesWith(Cylinder *hitbox);
+    s32 GetGrabActorId();
+    PlayerCharacter GetCurrentCharacter();
 };
+
+extern PlayerLinkBase *gPlayerLink;

include/Player/TouchControl.hpp

@@ -1,14 +1,15 @@
 #pragma once
 
 #include "global.h"
-#include "types.h"
+#include "lib/math.h"
 #include "lib/touch.h"
+#include "types.h"
 
 typedef u16 TouchFlags;
 enum TouchFlag_ {
-    TouchFlag_TouchedNow = 0x0001,
+    TouchFlag_TouchedNow   = 0x0001,
     TouchFlag_UntouchedNow = 0x0002,
-    TouchFlag_Repeat = 0x0004,
+    TouchFlag_Repeat       = 0x0004,
 };
 
 class TouchControl {
@@ -43,4 +44,7 @@ public:
     void UpdateConditionally(TouchState *state, u16 speed);
     void func_ov00_0207af38(u16 speed, bool param2);
     ~TouchControl();
+
+    static bool func_0202b864(Vec3p *param1, s32 size, unk8 param3);
+    static bool func_0202b894(Vec3p *param1, s32 size, unk8 param3);
 };

include/Player/TouchGesture.hpp

@@ -29,7 +29,7 @@ public:
     /* 2c */ u16 mTouchX[GESTURE_BUFFER_LENGTH];
     /* 48 */ u16 mTouchY[GESTURE_BUFFER_LENGTH];
     /* 64 */
-    
+
     /* 00 */ virtual ~TouchGesture() override;
     /* 08 */ virtual void ResetTouchHistory() override;
     /* 0c */ virtual void Update(void *param1) override;