Fix deleteActor sig

include/functions.h

@@ -1754,7 +1754,7 @@ void func_global_asm_80677EC8(s32 arg0);
 s32 spawnActor(Actors actorIndex, s32 modelIndex);
 s32 func_global_asm_80678014(s32 arg0);
 s32 func_global_asm_80678050(u16);
-// TODO: deleteActor has no documented signature but has been matched
+s32 deleteActor(Actor*);
 s32 func_global_asm_806782E8(Actor *arg0);
 void func_global_asm_806783BC(void);
 void func_global_asm_80678428(Actor *arg0);

include/s32deleteactor.h

@@ -1 +0,0 @@
-s32 deleteActor(Actor *);

include/voiddeleteactor.h

@@ -1,2 +0,0 @@
-void deleteActor(Actor *);
-

src/bonus/code_2690.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 // TODO: Is there a file split somewhere in here? Rodata messes up around D_bonus_8002DDD4
 //rodata

src/boss/KRoolDiddy.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 void func_global_asm_80613CA8(Actor*, s16, f32, f32);
 

src/boss/KRoolLanky.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 void func_global_asm_80613CA8(Actor*, s16, f32, f32);
 

src/boss/KutOut.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s16 D_boss_80035B00[];
 extern s16 D_boss_80035B08[];

src/boss/MadJack.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 const s32 D_boss_80036C10[] = {
     0x4F230825,

src/global_asm/code_0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_dk64_boot_8000DDCC;
 extern s32 D_dk64_boot_8000DDE4;

src/global_asm/code_1295B0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct Struct80755690_unk4 Struct80755690_unk4;
 

src/global_asm/code_42630.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern u8 D_global_asm_80750AB4;
 

src/global_asm/code_684C0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct {
     s16 min_x; // 0

src/global_asm/code_80150.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FC8C;
 

src/global_asm/code_89250.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 int func_global_asm_8071827C(); // TODO: Signature
 int func_global_asm_807197B4(); // TODO: Signature

src/global_asm/code_8D3E0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern Struct807500B4 D_global_asm_807500B4; // TODO: Array?
 extern Struct807500B4 D_global_asm_807500D4; // TODO: D_global_asm_807500D4[1]?

src/global_asm/code_936B0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FFA0;
 extern s32 D_global_asm_80720020; // TODO: Type
@@ -1456,7 +1455,6 @@ void func_global_asm_80696A6C(void) {
     AAD_80696A6C *sp44;
     s16 temp_v0;
     s16 var_a3;
-    Actor *temp;
     s32 temp2;
 
     sp44 = current_actor_pointer->additional_actor_data;
@@ -1498,8 +1496,7 @@ void func_global_asm_80696A6C(void) {
         func_global_asm_8067E278(0, 1);
         func_global_asm_80605314(current_actor_pointer, 0);
         deleteActor(current_actor_pointer);
-        temp = current_actor_pointer->unk11C;
-        if ((temp != NULL) && (temp->unk58 == ACTOR_BOSS_ARMY_DILLO) && (temp->control_state != 0x37)) {
+        if ((current_actor_pointer->unk11C != NULL) && (current_actor_pointer->unk11C->unk58 == ACTOR_BOSS_ARMY_DILLO) && (current_actor_pointer->unk11C->control_state != 0x37)) {
             current_actor_pointer->unk11C->control_state_progress++;
         }
     }

src/global_asm/code_9BF30.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FBA0; // TODO: Datatype
 

src/global_asm/code_9DD70.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s8 D_global_asm_807F6951;
 extern s8 D_global_asm_807F6950;

src/global_asm/code_A2F10.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "s32deleteactor.h"
 
 extern s32 D_global_asm_80720BE8;
 

src/global_asm/code_ACDC0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s8 D_global_asm_80750560[];
 extern s8 D_global_asm_80750530[];

src/global_asm/code_B1F60.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 s32 func_global_asm_8072881C(s32, s32);
 

src/global_asm/code_B2CE0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FBC8;
 extern s32 D_global_asm_8072073C; // TODO: Proper datatype

src/global_asm/code_BB300.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern f32 D_global_asm_807502E8;
 extern s16 D_global_asm_807502E0;

src/global_asm/code_C2A90.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FB08; // TODO: Proper datatype
 extern s32 D_global_asm_8071FBA0;

src/global_asm/code_C8C10.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 void func_global_asm_806C3F10(u8 arg0, u8 arg1, u8 arg2) {
     Actor178 *a178;

src/global_asm/code_CEAE0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct {
     void *unk0; // function pointer

src/global_asm/done/code_A6280.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FFA0;
 extern s32 D_global_asm_8071FF18;

src/global_asm/done/code_AAAF0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_807203B0; // TODO: Sprite
 extern s32 D_global_asm_807203D4; // TODO: Sprite

src/global_asm/done/code_B6C50.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8072030C;
 extern s32 D_global_asm_80720340; // Sprite

src/global_asm/done/code_CB230.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct {
     s16 unk0;

src/menu/code_3E10.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s8 D_global_asm_80745844;
 extern s8 opening_cutscene_transition;

src/minecart/code_25F0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 /* structs */
 typedef struct {

src/race/code_7BD0.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 /*
 rodata