summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Actor/Navi/ActorNaviBase.hpp34
-rw-r--r--include/Actor/Player/ActorArrow.hpp16
-rw-r--r--include/Actor/Player/ActorBlast.hpp8
-rw-r--r--include/Actor/Player/ActorBomb.hpp20
-rw-r--r--include/DTCM/UnkStruct_027e0fd4.hpp12
-rw-r--r--include/Debug/DebugHierarchy.hpp2
-rw-r--r--include/Map/TriggerAABB_Unk2.hpp30
-rw-r--r--include/Player/Battle/PlayerBattleLinkControlData.hpp36
-rw-r--r--include/Player/LinkStateCutscene.hpp8
-rw-r--r--include/Player/PlayerLink.hpp34
-rw-r--r--include/Player/PlayerLinkBase.hpp32
11 files changed, 116 insertions, 116 deletions
diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp
index 62e74c16..f3a45e8a 100644
--- a/include/Actor/Navi/ActorNaviBase.hpp
+++ b/include/Actor/Navi/ActorNaviBase.hpp
@@ -50,23 +50,23 @@ class ActorNaviBase : public Actor {
/* 3c0 */ unk8 mUnk_3c0[0x8];
/* 3c8 */
- /* 00 */ ~ActorNaviBase() override;
- /* 08 */ bool vfunc_08() override;
- /* 10 */ void vfunc_10(u32 param1) override;
- /* 14 */ void vfunc_14(u32 param1) override;
- /* 18 */ void vfunc_18(u32 param1) override;
- /* 20 */ void vfunc_20(bool param1) override;
- /* 30 */ unk32 vfunc_30() override;
- /* 34 */ void GetOffsetPos(Vec3p *pos) override;
- /* 38 */ unk32 vfunc_38() override;
- /* 74 */ void vfunc_74() override;
- /* 78 */ bool vfunc_78() override;
- /* 80 */ void vfunc_80() override;
- /* 84 */ void vfunc_84() override;
- /* 90 */ bool vfunc_90() override;
- /* 94 */ void vfunc_94() override;
- /* a0 */ bool TrySetTransform(Transform *transform) override;
- /* b0 */ void SetTransform(Transform *transform) override;
+ /* 00 */ virtual ~ActorNaviBase() override;
+ /* 08 */ virtual bool vfunc_08() override;
+ /* 10 */ virtual void vfunc_10(u32 param1) override;
+ /* 14 */ virtual void vfunc_14(u32 param1) override;
+ /* 18 */ virtual void vfunc_18(u32 param1) override;
+ /* 20 */ virtual void vfunc_20(bool param1) override;
+ /* 30 */ virtual unk32 vfunc_30() override;
+ /* 34 */ virtual void GetOffsetPos(Vec3p *pos) override;
+ /* 38 */ virtual unk32 vfunc_38() override;
+ /* 74 */ virtual void vfunc_74() override;
+ /* 78 */ virtual bool vfunc_78() override;
+ /* 80 */ virtual void vfunc_80() override;
+ /* 84 */ virtual void vfunc_84() override;
+ /* 90 */ virtual bool vfunc_90() override;
+ /* 94 */ virtual void vfunc_94() override;
+ /* a0 */ virtual bool TrySetTransform(Transform *transform) override;
+ /* b0 */ virtual void SetTransform(Transform *transform) override;
/* b4 */ virtual void vfunc_b4() = 0;
/* b8 */ virtual s32 vfunc_b8();
/* bc */ virtual bool vfunc_bc(unk32 param1, unk8 param2, s32 param3);
diff --git a/include/Actor/Player/ActorArrow.hpp b/include/Actor/Player/ActorArrow.hpp
index 031e35cc..a0ced1e3 100644
--- a/include/Actor/Player/ActorArrow.hpp
+++ b/include/Actor/Player/ActorArrow.hpp
@@ -35,14 +35,14 @@ public:
/* 1b7 */ bool mUnk_1b7;
/* 1b8 */
- /* 00 */ ~ActorArrow() override;
- /* 08 */ bool vfunc_08() override;
- /* 10 */ void vfunc_10(u32 param1) override;
- /* 14 */ void vfunc_14(u32 param1) override;
- /* 18 */ void vfunc_18(u32 param1) override;
- /* 20 */ void vfunc_20(bool param1) override;
- /* 44 */ bool CollidesWith(Actor *other) override;
- /* 48 */ bool vfunc_48(Knockback *param1) override;
+ /* 00 */ virtual ~ActorArrow() override;
+ /* 08 */ virtual bool vfunc_08() override;
+ /* 10 */ virtual void vfunc_10(u32 param1) override;
+ /* 14 */ virtual void vfunc_14(u32 param1) override;
+ /* 18 */ virtual void vfunc_18(u32 param1) override;
+ /* 20 */ virtual void vfunc_20(bool param1) override;
+ /* 44 */ virtual bool CollidesWith(Actor *other) override;
+ /* 48 */ virtual bool vfunc_48(Knockback *param1) override;
/* b4 */
static ActorArrow *Create();
diff --git a/include/Actor/Player/ActorBlast.hpp b/include/Actor/Player/ActorBlast.hpp
index 8b019515..a1e8b5fe 100644
--- a/include/Actor/Player/ActorBlast.hpp
+++ b/include/Actor/Player/ActorBlast.hpp
@@ -18,10 +18,10 @@ public:
/* 160 */ s32 mUnk_160;
/* 164 */
- /* 00 */ ~ActorBlast() override;
- /* 08 */ bool vfunc_08() override;
- /* 14 */ void vfunc_14(u32 param1) override;
- /* 18 */ void vfunc_18(u32 param1) override;
+ /* 00 */ virtual ~ActorBlast() override;
+ /* 08 */ virtual bool vfunc_08() override;
+ /* 14 */ virtual void vfunc_14(u32 param1) override;
+ /* 18 */ virtual void vfunc_18(u32 param1) override;
/* b4 */
static ActorBlast *Create();
diff --git a/include/Actor/Player/ActorBomb.hpp b/include/Actor/Player/ActorBomb.hpp
index cd5fa969..17538bf8 100644
--- a/include/Actor/Player/ActorBomb.hpp
+++ b/include/Actor/Player/ActorBomb.hpp
@@ -14,9 +14,9 @@ public:
/* 0c */ unk32 mUnk_0c;
/* 10 */
- /* 00 */ ~ActorBomb_Unk1() override;
- /* 08 */ void vfunc_0c(unk16 *param1) override;
- /* 0c */ void vfunc_10(s32 *param1) override;
+ /* 00 */ virtual ~ActorBomb_Unk1() override;
+ /* 08 */ virtual void vfunc_0c(unk16 *param1) override;
+ /* 0c */ virtual void vfunc_10(s32 *param1) override;
/* 18 */
};
@@ -53,13 +53,13 @@ public:
/* 264 */ unk8 mUnk_264[0x8];
/* 26c */
- /* 00 */ ~ActorBomb() override;
- /* 08 */ bool vfunc_08() override;
- /* 14 */ void vfunc_14(u32 param1) override;
- /* 18 */ void vfunc_18(u32 param1) override;
- /* 20 */ void vfunc_20(bool param1) override;
- /* 54 */ void vfunc_54() override;
- /* 5c */ bool SetVelocity(Vec3p *vel) override;
+ /* 00 */ virtual ~ActorBomb() override;
+ /* 08 */ virtual bool vfunc_08() override;
+ /* 14 */ virtual void vfunc_14(u32 param1) override;
+ /* 18 */ virtual void vfunc_18(u32 param1) override;
+ /* 20 */ virtual void vfunc_20(bool param1) override;
+ /* 54 */ virtual void vfunc_54() override;
+ /* 5c */ virtual bool SetVelocity(Vec3p *vel) override;
/* b4 */
static ActorBomb *Create();
diff --git a/include/DTCM/UnkStruct_027e0fd4.hpp b/include/DTCM/UnkStruct_027e0fd4.hpp
index 1b57252e..4d931bd5 100644
--- a/include/DTCM/UnkStruct_027e0fd4.hpp
+++ b/include/DTCM/UnkStruct_027e0fd4.hpp
@@ -96,12 +96,12 @@ public:
/* 120 */ Vec3p mUnk_120;
/* 12c */
- /* 00 */ ~UnkStruct_027e0fd4() override;
- /* 08 */ bool vfunc_08() override;
- /* 0c */ bool vfunc_0c() override;
- /* 10 */ bool vfunc_10(s32 *param1) override;
- /* 14 */ bool vfunc_14(u16 *index, unk32 param2) override;
- /* 18 */ void Clear() override;
+ /* 00 */ virtual ~UnkStruct_027e0fd4() override;
+ /* 08 */ virtual bool vfunc_08() override;
+ /* 0c */ virtual bool vfunc_0c() override;
+ /* 10 */ virtual bool vfunc_10(s32 *param1) override;
+ /* 14 */ virtual bool vfunc_14(u16 *index, unk32 param2) override;
+ /* 18 */ virtual void Clear() override;
/* 1c */ virtual void vfunc_1c();
/* 20 */
diff --git a/include/Debug/DebugHierarchy.hpp b/include/Debug/DebugHierarchy.hpp
index fcbc0f50..70e4de9c 100644
--- a/include/Debug/DebugHierarchy.hpp
+++ b/include/Debug/DebugHierarchy.hpp
@@ -10,6 +10,6 @@ public:
/* 00 (base) */
/* 08 */
- /* 00 */ ~DebugHierarchy() override;
+ /* 00 */ virtual ~DebugHierarchy() override;
/* 40 */
};
diff --git a/include/Map/TriggerAABB_Unk2.hpp b/include/Map/TriggerAABB_Unk2.hpp
index 93030c31..f3a2f075 100644
--- a/include/Map/TriggerAABB_Unk2.hpp
+++ b/include/Map/TriggerAABB_Unk2.hpp
@@ -13,21 +13,21 @@ public:
/* 14 */ AABB mUnk_14;
/* 2c */
- /* 00 */ ~TriggerAABB_Unk2_Unk1() override;
- /* 08 */ unk32 vfunc_08() override;
- /* 14 */ void vfunc_14(AABB *param1, unk32 param2, unk32 param3, unk32 param4) override;
- /* 20 */ void SetBoundingBox(AABB *param1) override;
- /* 2c */ void GetBoundingBox(AABB *bbox) override;
- /* 30 */ void SetPosition(Vec3p *pos) override;
- /* 34 */ void vfunc_34() override;
- /* 38 */ void vfunc_38() override;
- /* 3c */ void GetPosition(Vec3p *pos) override;
- /* 40 */ q20 GetSizeXZ() override;
- /* 44 */ q20 GetHeight() override;
- /* 48 */ bool ContainsInXZ(Vec3p *pos) override;
- /* 4c */ bool Contains(Vec3p *pos) override;
- /* 50 */ bool IntersectsCube(Cube *cube) override;
- /* 54 */ void vfunc_54(Cube *param1, Vec3p *param2, u32 *param3) override;
+ /* 00 */ virtual ~TriggerAABB_Unk2_Unk1() override;
+ /* 08 */ virtual unk32 vfunc_08() override;
+ /* 14 */ virtual void vfunc_14(AABB *param1, unk32 param2, unk32 param3, unk32 param4) override;
+ /* 20 */ virtual void SetBoundingBox(AABB *param1) override;
+ /* 2c */ virtual void GetBoundingBox(AABB *bbox) override;
+ /* 30 */ virtual void SetPosition(Vec3p *pos) override;
+ /* 34 */ virtual void vfunc_34() override;
+ /* 38 */ virtual void vfunc_38() override;
+ /* 3c */ virtual void GetPosition(Vec3p *pos) override;
+ /* 40 */ virtual q20 GetSizeXZ() override;
+ /* 44 */ virtual q20 GetHeight() override;
+ /* 48 */ virtual bool ContainsInXZ(Vec3p *pos) override;
+ /* 4c */ virtual bool Contains(Vec3p *pos) override;
+ /* 50 */ virtual bool IntersectsCube(Cube *cube) override;
+ /* 54 */ virtual void vfunc_54(Cube *param1, Vec3p *param2, u32 *param3) override;
/* 5c */
TriggerAABB_Unk2_Unk1();
diff --git a/include/Player/Battle/PlayerBattleLinkControlData.hpp b/include/Player/Battle/PlayerBattleLinkControlData.hpp
index 5c895618..f3f9deaf 100644
--- a/include/Player/Battle/PlayerBattleLinkControlData.hpp
+++ b/include/Player/Battle/PlayerBattleLinkControlData.hpp
@@ -24,24 +24,24 @@ public:
/* 247 */ unk8 mUnk_247;
/* 248 */
- /* 04 */ ~PlayerBattleLinkControlData() override;
- /* 10 */ unk32 GetCharacterId() override;
- /* 14 */ void vfunc_14(s32 param1) override;
- /* 18 */ void vfunc_18() override;
- /* 20 */ void vfunc_20() override;
- /* 2c */ void vfunc_2c() override;
- /* 30 */ void vfunc_30() override;
- /* 38 */ void vfunc_38(s32 param1, s32 param2) override;
- /* 3c */ void vfunc_3c(s32 param1, s32 param2) override;
- /* 40 */ void vfunc_40(u16 *param1, Vec3p *param2, unk32 param3, char param4) override;
- /* 44 */ void vfunc_44(unk32 param1, unk32 *param2, unk32 param3, unk16 param4) override;
- /* 4c */ void vfunc_4c(unk32 param1, Vec3p *param2) override;
- /* 60 */ void vfunc_60(unk32 param1, unk32 param2, s32 param3) override;
- /* 64 */ void vfunc_64(u32 param1) override;
- /* 68 */ void vfunc_68(unk32 param1, unk32 param2) override;
- /* 6c */ void vfunc_6c(s32 param1, Vec3p *param2) override;
- /* 70 */ void vfunc_70(s32 param1) override;
- /* 80 */ void vfunc_80(s32 param1) override;
+ /* 04 */ virtual ~PlayerBattleLinkControlData() override;
+ /* 10 */ virtual unk32 GetCharacterId() override;
+ /* 14 */ virtual void vfunc_14(s32 param1) override;
+ /* 18 */ virtual void vfunc_18() override;
+ /* 20 */ virtual void vfunc_20() override;
+ /* 2c */ virtual void vfunc_2c() override;
+ /* 30 */ virtual void vfunc_30() override;
+ /* 38 */ virtual void vfunc_38(s32 param1, s32 param2) override;
+ /* 3c */ virtual void vfunc_3c(s32 param1, s32 param2) override;
+ /* 40 */ virtual void vfunc_40(u16 *param1, Vec3p *param2, unk32 param3, char param4) override;
+ /* 44 */ virtual void vfunc_44(unk32 param1, unk32 *param2, unk32 param3, unk16 param4) override;
+ /* 4c */ virtual void vfunc_4c(unk32 param1, Vec3p *param2) override;
+ /* 60 */ virtual void vfunc_60(unk32 param1, unk32 param2, s32 param3) override;
+ /* 64 */ virtual void vfunc_64(u32 param1) override;
+ /* 68 */ virtual void vfunc_68(unk32 param1, unk32 param2) override;
+ /* 6c */ virtual void vfunc_6c(s32 param1, Vec3p *param2) override;
+ /* 70 */ virtual void vfunc_70(s32 param1) override;
+ /* 80 */ virtual void vfunc_80(s32 param1) override;
/* 84 */
PlayerBattleLinkControlData();
diff --git a/include/Player/LinkStateCutscene.hpp b/include/Player/LinkStateCutscene.hpp
index b676b035..224350fd 100644
--- a/include/Player/LinkStateCutscene.hpp
+++ b/include/Player/LinkStateCutscene.hpp
@@ -14,10 +14,10 @@ public:
/* 20 */ unk32 mUnk_20;
/* 24 */
- /* 00 */ ~UnkStruct_ov004_0210abb8() override;
- /* 08 */ void vfunc_08(unk32 param1) override;
- /* 24 */ void vfunc_24(unk32 param1) override;
- /* 2c */ unk32 vfunc_2c(s32 param1) override;
+ /* 00 */ virtual ~UnkStruct_ov004_0210abb8() override;
+ /* 08 */ virtual void vfunc_08(unk32 param1) override;
+ /* 24 */ virtual void vfunc_24(unk32 param1) override;
+ /* 2c */ virtual unk32 vfunc_2c(s32 param1) override;
/* 34 */
};
diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp
index 08f37469..51429cea 100644
--- a/include/Player/PlayerLink.hpp
+++ b/include/Player/PlayerLink.hpp
@@ -21,23 +21,23 @@ public:
/* 81 */ unk8 mUnk_81[0x3];
/* 84 */
- /* 00 */ s32 GetMaxHealth() override;
- /* 04 */ bool vfunc_04() override;
- /* 1c */ void Init() override;
- /* 24 */ void UpdatePos() override;
- /* 2c */ void vfunc_2c(s32 param1, unk8 param2) override;
- /* 40 */ void AddHealth(s16 amount) override;
- /* 44 */ void vfunc_44() override;
- /* 48 */ void vfunc_48() override;
- /* 4c */ void vfunc_4c() override;
- /* 50 */ ~PlayerLink() override;
- /* 68 */ void vfunc_68() override;
- /* 6c */ void vfunc_6c() override;
- /* 74 */ void vfunc_74() override;
- /* 78 */ unk32 vfunc_78() override;
- /* 7c */ void vfunc_7c() override;
- /* 80 */ void SetUnk_5e() override;
- /* 84 */ void ResetUnk_5e() override;
+ /* 00 */ virtual s32 GetMaxHealth() override;
+ /* 04 */ virtual bool vfunc_04() override;
+ /* 1c */ virtual void Init() override;
+ /* 24 */ virtual void UpdatePos() override;
+ /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) override;
+ /* 40 */ virtual void AddHealth(s16 amount) override;
+ /* 44 */ virtual void vfunc_44() override;
+ /* 48 */ virtual void vfunc_48() override;
+ /* 4c */ virtual void vfunc_4c() override;
+ /* 50 */ virtual ~PlayerLink() override;
+ /* 68 */ virtual void vfunc_68() override;
+ /* 6c */ virtual void vfunc_6c() override;
+ /* 74 */ virtual void vfunc_74() override;
+ /* 78 */ virtual unk32 vfunc_78() override;
+ /* 7c */ virtual void vfunc_7c() override;
+ /* 80 */ virtual void SetUnk_5e() override;
+ /* 84 */ virtual void ResetUnk_5e() override;
/* 88 */ virtual void OnDeath(bool param1);
/* 8c */
diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp
index 4732e63f..2a208365 100644
--- a/include/Player/PlayerLinkBase.hpp
+++ b/include/Player/PlayerLinkBase.hpp
@@ -45,22 +45,22 @@ public:
/* 6c */ DebugHierarchy *mDebugHierarchy_2;
/* 70 */
- /* 00 */ s32 GetMaxHealth() override;
- /* 08 */ ItemFlag GetEquipId() override;
- /* 0c */ bool CanMove() override;
- /* 10 */ void vfunc_10(Cylinder *param1) override;
- /* 14 */ void vfunc_14(Cylinder *param1) override;
- /* 18 */ void vfunc_18(s32 param1) override;
- /* 1c */ void Init() override;
- /* 20 */ void vfunc_20() override;
- /* 24 */ void UpdatePos() override;
- /* 28 */ void vfunc_28(s32 param1) override;
- /* 2c */ void vfunc_2c(s32 param1, unk8 param2) override;
- /* 30 */ bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) override;
- /* 34 */ bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) override;
- /* 38 */ bool TeleportToEntrance(unk32 entranceId, bool param2) override;
- /* 3c */ bool TeleportToLastEntrance(bool param1) override;
- /* 50 */ ~PlayerLinkBase() override;
+ /* 00 */ virtual s32 GetMaxHealth() override;
+ /* 08 */ virtual ItemFlag GetEquipId() override;
+ /* 0c */ virtual bool CanMove() override;
+ /* 10 */ virtual void vfunc_10(Cylinder *param1) override;
+ /* 14 */ virtual void vfunc_14(Cylinder *param1) override;
+ /* 18 */ virtual void vfunc_18(s32 param1) override;
+ /* 1c */ virtual void Init() override;
+ /* 20 */ virtual void vfunc_20() override;
+ /* 24 */ virtual void UpdatePos() override;
+ /* 28 */ virtual void vfunc_28(s32 param1) override;
+ /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) override;
+ /* 30 */ virtual bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) override;
+ /* 34 */ virtual bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) override;
+ /* 38 */ virtual bool TeleportToEntrance(unk32 entranceId, bool param2) override;
+ /* 3c */ virtual bool TeleportToLastEntrance(bool param1) override;
+ /* 50 */ virtual ~PlayerLinkBase() override;
/* 58 */ virtual bool vfunc_58();
/* 5c */ virtual bool vfunc_5c();
/* 60 */ virtual bool vfunc_60();
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:31:17 +0000