Remove nonmatching function, fix static function type

1 files changed, 1 insertions, 61 deletions

diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp
index 6408d6aa..d3e7f13f 100644
--- a/src/00_Core/Actor/ActorManager.cpp
+++ b/src/00_Core/Actor/ActorManager.cpp
@@ -1,7 +1,6 @@
 #include "Actor/ActorManager.hpp"
 
 void ActorManager::func_ov00_020c3484(ActorRef *ref, Actor *actor, unk32 param3) {}
-Actor* ActorManager::FindActorById(u32 id) {}
 Actor* ActorManager::GetActor(ActorRef *ref) {}
 bool FilterActor::Filter(Actor *actor) {}
 s32 ActorManager::FilterActors(FilterActorBase *filter, ActorList *filteredActors) {}
@@ -14,7 +13,6 @@ s32 ActorManager::func_ov00_020c3b2c(s32 *param1) {}
 s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) {}
 void ActorManager::func_ov00_020c3ce8(unk32 param1, unk32 param2) {}
 void ActorManager::Actor_vfunc_28() {}
-bool ActorManager::ActorTypeIsOneOf(u32 type, ActorTypeId *types) {}
 
 
 extern void func_ov00_020c3f54(void *, u32 param2);
@@ -57,64 +55,6 @@ ARM void ActorManager::DeleteActor(u32 index, bool param2) {
     return;
 }
 
-static void NONMATCH(func_ov00_020c3484)(ActorRef *ref, Actor *actor, unk32 param3) {
-    #ifndef NONMATCHING
-    #include "../asm/ov00/Actor/ActorManager_func_ov00_020c3484.inc"
-    #else
-    char bVar1;
-    s32 iVar3;
-    s32 iVar4;
-    u32 uVar7;
-    Actor **ppAVar5;
-    Actor **ppAVar6;
-    Actor *pActor;
-
-    ref->id = 0xffffffff;
-
-    int *puVar2 = data_027e103c;
-
-    ref->index = 0xffffffff;
-
-    if (*(char *)(*puVar2 + 0x24) == '\0') {
-        return;
-    }
-
-    ppAVar5 = *(Actor ***)&actor->mUnk_010;
-
-    bVar1 = data_02056be4[*data_027e077c];
-
-    iVar4 = 0x7fffffff;
-    ppAVar6 = ppAVar5 + actor->mType;
-
-    for (; ppAVar5 < ppAVar6; ppAVar5++) {
-        pActor = *ppAVar5;
-        if (pActor != NULL) {
-            actor = (Actor *)(u32)actor->mAlive;
-        }
-        if (pActor != NULL && actor != NULL) {
-            uVar7 = pActor->func_ov00_020c27a8(param3);
-            actor = (Actor *)(uVar7 >> 0x20);
-            if (uVar7 != 0) {
-                pActor = *ppAVar5;
-                actor = (Actor *)(u32)(pActor->mUnk_0a4.mUnk_00);
-            }
-            if (actor != NULL || (bVar1 & 1) != 0) {
-                uVar7 = pActor->mUnk_040(0);
-                pActor = (Actor *)(uVar7 >> 0x20);
-                iVar3 = (*ppAVar5)->DistanceToLink();
-                if (uVar7 != 0 && iVar3 < iVar4) {
-                    pActor = *ppAVar5;
-                    ref->id = actor->mId;
-                    ref->index = actor->mIndex;
-                    iVar4 = iVar3;
-                }
-            }
-        }
-    }
-    return;
-    #endif
-}
-
 ARM void ActorManager::Actor_vfunc_10(u32 param1) {
     Actor *actor;
     int i;
@@ -210,7 +150,7 @@ void ActorManager::Actor_vfunc_28() {
 
 char nullStr[] = "LLUN";
 
-ARM bool ActorManager::ActorTypeIsOneOf(char *type, char **types) {
+ARM static bool ActorTypeIsOneOf(char *type, char **types) {
     int i;
     bool found = false;