diff options
| author | Aetias <aetias@outlook.com> | 2024-05-25 11:41:42 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-05-25 11:41:42 +0200 |
| commit | 165d7201fc7b5006dfee2fe9f0e7a159db36536e (patch) | |
| tree | 3ce1525d557beee6c69f0b757f9064e25d2b6bcf /include/Actor | |
| parent | 8e415b1cd8e4a6ad4ed615bbb403e984d3e0179a (diff) | |
Decomp `Actor`
Diffstat (limited to 'include/Actor')
| -rw-r--r-- | include/Actor/Actor.hpp | 5 | ||||
| -rw-r--r-- | include/Actor/ActorPlayerDummy.hpp | 25 | ||||
| -rw-r--r-- | include/Actor/ActorRef.hpp | 4 | ||||
| -rw-r--r-- | include/Actor/ActorType.hpp | 2 |
4 files changed, 31 insertions, 5 deletions
diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index d6c3b60f..f27ed6f8 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -119,7 +119,7 @@ public: /* 116 */ unk8 mUnk_116; /* 117 */ unk8 mUnk_117; /* 118 */ bool mAlive; - /* 119 */ unk8 mUnk_119; + /* 119 */ u8 mUnk_119; /* 11a */ bool mVisible; /* 11b */ bool mUnk_11b; /* 11c */ unk8 mUnk_11c; @@ -192,6 +192,9 @@ public: /* b4 */ Actor(); + + bool func_01fffd04(s32 param1, Vec3p *param2, s32 param3); + unk8 func_ov00_020c1788(); void SetUnk_129(bool value); void SetUnk_11c(unk8 value); diff --git a/include/Actor/ActorPlayerDummy.hpp b/include/Actor/ActorPlayerDummy.hpp new file mode 100644 index 00000000..ceedc688 --- /dev/null +++ b/include/Actor/ActorPlayerDummy.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Actor/Actor.hpp" +#include "Actor/ActorType.hpp" + +class ActorPlayerDummy : public Actor { +public: + static ActorType gType; + + /* 000 (base) */ + /* 158 */ void *mUnk_158; + /* 15c */ u32 mUnk_15c; + /* 160 */ unk32 mUnk_160; + /* 164 */ u32 mUnk_164; + /* 168 */ unk32 mUnk_168; + /* 16c */ unk16 mUnk_16c; + /* 16e */ unk16 mUnk_16e; + /* 170 */ unk16 mUnk_170; + /* 172 */ unk8 mUnk_172[2]; + /* 174 */ unk32 mUnk_174; + /* 178 */ +}; diff --git a/include/Actor/ActorRef.hpp b/include/Actor/ActorRef.hpp index c96f111f..94fe8ceb 100644 --- a/include/Actor/ActorRef.hpp +++ b/include/Actor/ActorRef.hpp @@ -8,10 +8,6 @@ struct ActorRef { /* 4 */ s32 index; /* 8 */ - inline ActorRef() { - this->Reset(); - } - inline void Reset() { id = -1; index = -1; diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index ca8c6558..7e9e777b 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -50,6 +50,8 @@ typedef u32 ActorTypeId; enum ActorTypeId_ { + ActorTypeId_Null = __ACTOR_TYPE_ID(N,U,L,L), + ActorTypeId_Navi = __ACTOR_TYPE_ID(N,A,V,I), ActorTypeId_ForceNavi = __ACTOR_TYPE_ID(F,C,N,V), ActorTypeId_WisdomNavi = __ACTOR_TYPE_ID(W,S,N,V), |