diff options
| author | Aetias <aetias@outlook.com> | 2024-05-23 22:53:54 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-05-23 22:53:54 +0200 |
| commit | 66cd1914feeefe9b5c6f645bbb0cdd06b6bc601a (patch) | |
| tree | e2cc71d9049e5af3e9818991c3faf730f1a6fa19 /include/Actor | |
| parent | b32a2702e8582c03aaf2aa1574b8ebaa0e968844 (diff) | |
Decomp `Actor`
Diffstat (limited to 'include/Actor')
| -rw-r--r-- | include/Actor/Actor.hpp | 2 | ||||
| -rw-r--r-- | include/Actor/ActorType.hpp | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 59b6f93f..43bf8b43 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -212,7 +212,7 @@ public: bool CollidesWithPlayer(PlayerCollide flags); static void func_ov00_020c23c4(ActorRef *ref, Actor *actor); static void func_ov00_020c23d4(ActorRef *ref, Actor *actor, Cylinder *cylinder); - bool func_ov00_020c243c(ActorTypeId *actorTypes, s32 *param2); + bool func_ov00_020c243c(ActorTypeId *actorTypes, Actor **result); bool func_ov00_020c27a8(unk32 param1); bool IsFollowedByLink(); void StopLinkFollow(); diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index ed6a3b74..ca8c6558 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -34,7 +34,6 @@ #define __ACTOR_TYPE_2 '2' #define __ACTOR_TYPE_3 '3' #define __ACTOR_TYPE_4 '4' -#define __ACTOR_TYPE_4 '4' #define __ACTOR_TYPE_5 '5' #define __ACTOR_TYPE_6 '6' #define __ACTOR_TYPE_7 '7' @@ -106,13 +105,25 @@ enum ActorTypeId_ { ActorTypeId_Mailbox = __ACTOR_TYPE_ID(P,O,S,T), ActorTypeId_Postman = __ACTOR_TYPE_ID(P,S,T,M), + ActorTypeId_BIGR = __ACTOR_TYPE_ID(B,I,G,R), + ActorTypeId_BKEY = __ACTOR_TYPE_ID(B,K,E,Y), + ActorTypeId_BLST = __ACTOR_TYPE_ID(B,L,S,T), ActorTypeId_BMRN = __ACTOR_TYPE_ID(B,M,R,N), ActorTypeId_BMTY = __ACTOR_TYPE_ID(B,M,T,Y), + ActorTypeId_BTRF = __ACTOR_TYPE_ID(B,T,R,F), + ActorTypeId_CBLS = __ACTOR_TYPE_ID(C,B,L,S), ActorTypeId_FLAL = __ACTOR_TYPE_ID(F,L,A,L), ActorTypeId_FLBM = __ACTOR_TYPE_ID(F,L,B,M), ActorTypeId_FLBT = __ACTOR_TYPE_ID(F,L,B,T), + ActorTypeId_FLTB = __ACTOR_TYPE_ID(F,L,T,B), ActorTypeId_FLTM = __ACTOR_TYPE_ID(F,L,T,M), + ActorTypeId_FORC = __ACTOR_TYPE_ID(F,O,R,C), + ActorTypeId_ROPE = __ACTOR_TYPE_ID(R,O,P,E), ActorTypeId_SBEM = __ACTOR_TYPE_ID(S,B,E,M), + ActorTypeId_STNE = __ACTOR_TYPE_ID(S,T,N,E), + ActorTypeId_TARU = __ACTOR_TYPE_ID(T,A,R,U), + ActorTypeId_TSBH = __ACTOR_TYPE_ID(T,S,B,H), + ActorTypeId_TSUB = __ACTOR_TYPE_ID(T,S,U,B), ActorTypeId_VLR0 = __ACTOR_TYPE_ID(V,L,R,0), }; |