diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index dcbc9409..07f1c493 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -75,6 +75,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(); }; diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index 18401b58..a8a202b3 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -6,7 +6,7 @@ void ActorManager::Actor_vfunc_10(u32 param1) {} Actor* ActorManager::FindActorById(u32 id) {} Actor* ActorManager::GetActor(ActorRef *ref) {} bool FilterActor::Filter(Actor *actor) {} -s32 ActorManager::FilterActors(ActorFilterBase *filter, ActorList *filteredActors) {} +s32 ActorManager::FilterActors(FilterActorBase *filter, ActorList *filteredActors) {} void ActorManager::FindActorByType(ActorRef *ref, ActorManager *manager, u32 type) {} void ActorManager::FindNearestActorOfType(ActorRef *ref, ActorManager *manager, u32 type, Vec3p *pos) {} void ActorManager::func_ov00_020c398c() {} diff --git a/src/14_Land/Actor/ActorRupee.cpp b/src/14_Land/Actor/ActorRupee.cpp index d2641f38..5288f3bd 100644 --- a/src/14_Land/Actor/ActorRupee.cpp +++ b/src/14_Land/Actor/ActorRupee.cpp @@ -1,6 +1,5 @@ #include "Actor/ActorRupee.hpp" -Resource ActorRupee::gResource; ActorType ActorRupee::gType; ActorRupee* ActorRupee::Create() {}