diff options
| author | Aetias <aetias@outlook.com> | 2024-06-21 11:59:50 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-06-21 11:59:50 +0200 |
| commit | 4329a6892f959ba97995e36a371c4199fc514d2d (patch) | |
| tree | 54c49d1bcdd557b80a5371f34b5db9ca8796addd /include | |
| parent | 3306a9c7b4c1fe2a0df0549e81ab8ed0f3af5fe2 (diff) | |
| parent | 925505ed5dc1deb4bd9c3de281233b65dca55016 (diff) | |
Merge branch 'main' into actor
Diffstat (limited to 'include')
| -rw-r--r-- | include/Actor/ActorType.hpp | 1 | ||||
| -rw-r--r-- | include/Player/LinkStateRoll.hpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index 7e9e777b..06fd3b59 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -140,6 +140,7 @@ struct ActorType { /* 10 */ ActorType *next; /* 14 */ + inline ActorType() {} ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()); ~ActorType(); unk32 func_0203e7c8(); diff --git a/include/Player/LinkStateRoll.hpp b/include/Player/LinkStateRoll.hpp index 9ff28899..52b42b43 100644 --- a/include/Player/LinkStateRoll.hpp +++ b/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(); }; |