Fix some warnings

Makefile

@@ -466,6 +466,7 @@ build/us/src/global_asm/code_137C10.c.o: OPT_FLAGS = -g
 build/us/src/global_asm/code_13A750.c.o: OPT_FLAGS = -g
 build/us/src/global_asm/code_13A7A0.c.o: OPT_FLAGS = -g
 build/us/src/global_asm/code_13C920.c.o: OPT_FLAGS = -g
+build/us/src/global_asm/code_13CB30.c.o: OPT_FLAGS = -g
 build/us/src/global_asm/code_13CB50.c.o: OPT_FLAGS = -g
 build/us/src/global_asm/code_13CE70.c.o: OPT_FLAGS = -g
 build/us/src/global_asm/code_13CFA0.c.o: OPT_FLAGS = -g

include/functions.h

@@ -51,7 +51,8 @@ f32 func_80665E94(f32, f32, f32, f32, f32, f32, s16);
 // void func_8061130C(void *);
 
 // TODO: Signatures are suspect
-s32 func_80659470(s32); // Returns index into object model2 array
+ // Returns index into object model2 array
+s32 func_80659470(s32);
 s32 func_80659544(s32);
 
 s32 func_805FF800(Maps *arg0, s32 *arg1);
@@ -1564,11 +1565,8 @@ s32 func_8062A844(s32 arg0);
 void func_806B8B20(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
 void func_806B8BDC(s16 arg0, s16 arg1, s16 arg2);
 void func_80735A44(void);
-//void func_8070F2C8(s16 arg0, s16 arg1, u8 arg2, u8 arg3); // TODO: This signature is sus, arcade mismatch
 void func_80737E9C(void);
 void func_80737F38(void);
-void func_80737E38(void);
-void func_80737E40(void);
 void func_80627B58(f32 arg0);
 void func_80732924(void);
 void func_806BD094(s16 arg0, s8 arg1);
@@ -1644,6 +1642,287 @@ s32 func_8060042C(s16 arg0);
 u8 func_80600454(s16 arg0, u8 *arg1);
 s32 func_80600530(void);
 
+// Round 2
+s32 func_80737E30(ALSeqPlayer*);
+void func_80737E50(ALSeqPlayer*);
+void func_807382A0(s32, s32, u8, u8, u8);
+void func_807381D8(ALSeqPlayer *seqp, f32 arg1, f32 arg2);
+void func_806018D4(u8 arg0, u8 arg1, s32 arg2);
+void func_8060193C(u8 arg0, u8 arg1);
+void func_806019B8(u8 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
+void func_80699070(s16 *, s16 *, f32, f32, f32, f32, f32, f32);
+void func_806A1580(void);
+void func_807248B0(Actor*, f32);
+s32 func_806C9974(u8 arg0, s8 arg1);
+void func_80605314(Actor*, u8);
+void func_806EBE8C(void);
+void func_806EFA3C(void);
+void func_8066E8E4(Actor *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
+void func_80608528(Actor *arg0, s16 arg1, u8 arg2, s16 arg3, u8 arg4);
+void func_8069084C(s16 arg0, s16 arg1, f32 arg2, s16 arg3, f32 arg4, f32 arg5, s32 arg6);
+void func_8067C2B8(void);
+void func_8067E43C(void);
+void func_8067E510(void);
+void func_8067FAC8(void);
+void func_80681B14(void);
+void func_80681BD8(void);
+s32 func_806634A4(s32 arg0);
+s16 func_8060A7C0(s16 arg0, Actor *arg1, u8 arg2);
+s32 func_807146A4(s32 arg0);
+void func_80714708(u8 *arg0, s16 *arg1, s16 *arg2);
+void func_8071586C(Actor *arg0);
+void func_807158C0(void);
+void func_80661264(s32 arg0, u8 arg1);
+void func_80661520(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5);
+void func_8060AA04(void);
+void func_806335B0(s32, u8, s32, f32*, f32*, f32*);
+s32 func_806418E8(s16, s16, s16);
+void func_8063DA78(s16 arg0, s16 arg1, s16 arg2);
+void func_8063DFEC(s32 arg0, void *arg1);
+void func_80641B00(s16 arg0, s16 arg1, s16 arg2);
+u8 func_80641F70(s16 arg0);
+s32 func_806423A8(s16 arg0, s16 arg1, s16 arg2);
+void func_806085DC(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5, f32 arg6);
+void func_80647170(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
+void func_80649E00(GlobalASMStruct49 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void func_8064AAC4(s32 arg0, s16 arg1, s8 arg2, s32 arg3);
+void func_8064B4AC(s32 arg0, s32 arg1, s16 arg2, s16 arg3);
+void func_8064B5A4(s32 arg0, s32 arg1, s16 arg2, s16 arg3);
+u8 func_8064BBD8(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+s32 func_8064BD2C(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
+void func_8064C250(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+void func_80650D8C(s16 arg0, s16 arg1, s16 *arg2, f32 *arg3, u8 *arg4);
+void func_8064CC80(s32 **arg0, s16 arg1, s32 arg2, s32 arg3);
+void func_80650AD8(s16, s16, s16, f32);
+void func_8064D880(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
+void func_8064DB98(s32 **arg0, s16 arg1, s32 arg2, s32 arg3);
+u8 func_8064EB9C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+u8 func_8064F358(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+void func_80650684(OM2_unk78*);
+void func_8064F804(OM2_unk78 *arg0);
+void func_8065054C(OM2_unk78 *arg0, void *arg1, void *arg2);
+void func_806505F0(OM2_unk78 *arg0);
+void func_806506E8(OM2_unk78 *arg0);
+void func_80650794(s16 arg0, s16 arg1, u8 arg2, f32 arg3);
+void func_806508B4(s16 arg0, s16 arg1, s16 arg2);
+void func_80650998(s16 arg0, s16 arg1);
+void func_80650A04(s16 arg0, s16 arg1, s16 arg2);
+s16 func_80650A70(s16 arg0, s16 arg1);
+void func_80650B50(s16 arg0, s16 arg1, s16 arg2);
+void func_80650BBC(s16 arg0, s16 arg1, s16 arg2);
+void func_80650C28(s16 arg0, s16 arg1, s16 arg2);
+void func_80650C98(s16 arg0, s16 arg1, s16 arg2);
+u8 func_80650D04(s16 arg0, s16 arg1);
+void func_8060B430(Actor *arg0, DKTVExtraData *arg1);
+void func_8065F134(s32 arg0, u8 arg1);
+void func_806A3B78(s32 *arg0, AAD_806A4DDC *arg1, Struct806A57C0_2 *arg2, u8 arg3, u8 *arg4);
+void func_8070D9AC(Struct806A57C0_2 *arg0);
+void func_806A57C0(AAD_806A4DDC *arg0);
+void func_8070E808(Actor *arg0, Actor *arg1);
+void func_8070DA28(AAD_806A4DDC *arg0);
+void func_806891D8(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, s32 arg6, Struct807500B4 *arg7);
+void func_806A7600(s32 arg0);
+void func_8072EE7C(s32 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9, f32 argA, u8 argB, f32 argC, f32 argD, u8 argE);
+void func_8072EF7C(Actor *arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4, f32 arg5, f32 arg6, f32 arg7, u8 arg8, s16 arg9, s16 argA, s16 argB, s16 argC);
+f32 func_80611850(f32 arg0);
+void func_80675D70(Actor *arg0);
+void func_80675DD0(Actor *arg0, Actor *arg1);
+void func_80675AFC(Actor *arg0, Actor *arg1);
+void func_80675EE0(Actor *arg0);
+void func_8070C27C(Mtx *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
+void func_80724CA4(s16 arg0, s16 arg1);
+void func_806C7B50(u32 arg0, u8 arg1, Actor *arg2);
+void func_806AE394(f32 arg0, f32 arg1);
+void func_80724994(u8 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4);
+s32 func_80724A20(void);
+void func_80724A9C(u8 arg0, u8 arg1, u8 arg2);
+void func_80724B5C(u8 arg0, u8 arg1, f32 *arg2, f32 *arg3, f32 *arg4);
+void func_80724D28(s16 arg0, s16 arg1);
+void func_80724DB0(s16 arg0, s16 arg1);
+u8 func_80725B38(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5);
+u8 func_80725DC0(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6);
+u8 func_80726DEC(u8, u8);
+void func_80726E60(u16 arg0, u8 arg1);
+u8 func_80727194(Actor *arg0);
+void func_807273A8(s16 arg0, u8 arg1);
+void func_8072752C(s16 arg0, s16 x1, s16 y1, s16 z1, s16 x2, s16 y2, s16 z2, s16 arg7, s16 arg8);
+void func_807278C0(EnemyInfo *arg0);
+u8 func_80727F20(EnemyInfo *arg0, s32 arg1);
+u8 func_80728004(EnemyInfo *arg0, s32 arg1);
+u8 func_807280C8(EnemyInfo *arg0, s32 arg1);
+void func_8068B930(void);
+void func_8068B9B4(void);
+void func_8068BA2C(void);
+void func_8060B84C(f32);
+void func_8066EABC(Actor *arg0);
+void func_80732D80(s32 *arg0);
+f32 func_80732DAC(f32 arg0);
+void func_806C6530(void);
+void func_806C6884(s16 arg0, s16 arg1, u16 arg2);
+void func_80610268(s32 arg0);
+void func_807314F4(s16 arg0, s16 arg1);
+u8 func_807315D4(s16 arg0, s16 arg1);
+s32 func_807317FC(s16 arg0, s16 arg1);
+s32 func_807318AC(s16 arg0, s16 arg1);
+u8 func_8073198C(s16 arg0);
+void func_80688CC4(Actor *arg0, s16 arg1, f32 arg2);
+void func_80688CF4(Actor *arg0, s16 arg1, s32 arg2);
+void func_80737CF4(s32 arg0, s32 arg1);
+void func_80737C20(s32 arg0);
+void func_80659350(void);
+void func_80659574(void);
+void func_806595B0(void);
+void func_8070D8C0(Actor *arg0, u16 arg1, u8 arg2);
+void func_8070D970(u16 arg0);
+s32 func_8070DDDC(u16 arg0, s32 arg1);
+s16 func_80658B08(s8, u8*, s16);
+void func_80663DA0(void);
+s32 func_806CEB44(f32 arg0, f32 arg1);
+void func_806CF4B8(Actor *arg0);
+void func_806CF580(void);
+void func_806D6F64(void);
+void func_806D72D4(void);
+void func_806D7510(void);
+void func_806D7704(void);
+void func_806D7A28(void);
+void func_806D91A4(void);
+f32 func_80665E48(f32, f32, f32, f32);
+void func_806DED44(void);
+void func_806E341C(void);
+void func_806E384C(void);
+void func_806E7C70(void);
+void func_806E7DF4(void);
+void func_806E918C(void);
+void func_806E9ECC(void);
+void func_806E9F8C(void);
+s32 func_807383B0(ALSeqPlayer *arg0);
+void func_80735A50(s32 arg0, s32 arg1);
+void func_8073C9C0(s32 arg0, s16 arg1, s32 arg2);
+void func_8073BE54(Struct8073BC74 *arg0, f32 arg1);
+u8 func_806BDD90(void);
+void func_806C1734(void);
+void func_806C226C(void);
+void func_806C3A8C(void);
+void func_8068A404(Actor*, s32, s32);
+void func_8072DEA8(s32 arg0, u8 arg1, Actor *arg2);
+f32 func_80675234(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
+void func_80675380(Actor *arg0, Actor *arg1);
+void func_806F386C(u8, Actor*, Actor*, s16, u8);
+void func_806F39E8(Actor *arg0, ExitData *arg1, u8 arg2);
+void func_806F3BEC(Actor *arg0, s16 arg1, s16 arg2, u8 arg3);
+void func_8072EC94(s32 arg0, u8 arg1);
+void func_8072ECFC(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
+void func_80664CB0(s16 arg0);
+void func_80669588(s32 arg0, f32 arg1);
+s32 func_80669650(u8 arg0, u8 *arg1);
+void func_8066A584(s32 arg0, f32 arg1);
+void func_8066BAB8(s32 arg0, u8 arg1, u16 arg2);
+s16 func_8073F60C(f32 arg0, f32 arg1, s32 arg2, u16 *arg3);
+void func_806FB8B0(s32 arg0);
+void func_8072ED9C(Actor *arg0, u8 arg1, u8 arg2);
+void func_8072EE0C(Actor *arg0, u8 arg1, u8 arg2);
+void func_8072F09C(Actor *arg0);
+void func_8072F120(void);
+void func_8062D26C(Actor*);
+void func_807233B4(Actor*);
+s32 func_80677FA8(Actors arg0, s32 arg1);
+void func_806790F4(u8);
+void func_80678CC8(Actor *arg0);
+s32 func_80679010(Actor *arg0, Actor *arg1);
+void func_80679DC4(Actor *arg0, Actor *arg1, u8 arg2);
+void func_8067A170(Actor* arg0, u8 arg1);
+void func_806978FC(void);
+s32 func_807122B4(void);
+void func_8073B560(ALPlayer *arg0);
+void func_8073B5D0(ALPlayer *arg0);
+void func_8073B640(ALPlayer *arg0);
+void func_8069DA54(void);
+void func_806F5DF8(s32 arg0, s32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5);
+s32 func_806F5EB4(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+void func_806F603C(void);
+void func_806643C4(s32 arg0, s32 arg1, f32 arg2);
+void func_806641A0(void);
+void func_806644B0(s16 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5);
+void func_806645B8(s16 arg0);
+s32 func_8063C2A8(s16);
+void func_80664A38(s16 arg0);
+void func_80664834(s16 arg0);
+u8 func_8067641C(Actor*, Actor*, s32);
+u8 func_80676BCC(s32 arg0, Actor *arg1, s32 arg2);
+u8 func_80676C10(s32 arg0, Actor *arg1, s32 arg2);
+void func_806B640C(void);
+void func_8060E8CC(Struct807F0470*);
+void func_8060E4B0(Struct807F0470 *arg0);
+void func_806BD170(void);
+void func_80610B84(s32 arg0, s32 arg1, u32 arg2);
+s32 func_8061118C(void);
+void func_80636164(Model2Model*, u8);
+void func_80636210(Model2Model *arg0, u8 arg1);
+void func_8065214C(void);
+void func_806521F8(void);
+s32 func_806533C4(f32 arg0, f32 arg1, f32 arg2);
+void func_80654380(f32, f32, f32);
+void func_80653B80(f32 arg0, f32 arg1, f32 arg2);
+void func_80656E58(s16 arg0, s16 arg1, u8 arg2, u8 arg3);
+void func_80658BD0(void);
+void func_80658C10(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
+void func_80658CCC(void);
+u8 func_80658DAC(s32 arg0);
+void func_80631C3C(void);
+s32 func_80631D8C(u8 arg0);
+s32 func_8063254C(s32 arg0, s32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4, s16 *arg5, s16 *arg6);
+void func_80632E10(s16 arg0, u8 *arg1);
+u8 func_80632F74(f32 arg0, f32 arg1, f32 arg2);
+void func_80633570(GlobalASMStruct83 *arg0);
+void func_806338B4(OM2_unk74 *arg0);
+void func_806338F4(s32 arg0);
+void func_80634908(s32 arg0, void *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8);
+void func_806355DC(s32 arg0, u8 arg1);
+void func_80636074(ObjectModel2 *arg0);
+void func_806357F8(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7, f32 *arg8, u8 arg9);
+void func_806362C4(s32 arg0, u8 arg1);
+void func_806398E4(s32 arg0, u8 arg1, u8 arg2);
+void func_8063A8C4(s16 arg0, u8 arg1, f32 arg2);
+void func_80690AB0(s16 arg0, s16 arg1, s16 arg2, s16 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, s32 arg9);
+void func_80737990(u8 arg0);
+void func_80737A4C(void);
+void func_80737A74(void);
+void func_80737A9C(void);
+void func_80737AC4(s32 arg0, s16 arg1, s32 arg2);
+u16 func_80737B2C(u8 arg0);
+void func_80724874(Actor *arg0);
+void func_805FE7FC(void);
+void func_8072CFE8(s16 *arg0, s16 *arg1, s16 *arg2);
+void func_8072D08C(void);
+void func_8062B630(s16 arg0, u8 arg1);
+void func_8062B8E4(f32 *arg0);
+u8 func_8062BCC8(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4);
+void func_806B904C(void);
+void func_8070F2C8(s16 arg0, s16 arg1, u8 arg2, u8 arg3);
+u8 func_80602430(s16 arg0);
+void func_80602B60(s32 arg0, u8 arg1);
+void func_80602CE0(s32 arg0, s32 arg1, u8 arg2);
+void func_8073BB10(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4);
+void func_806C5FEC(void);
+void func_806C61C8(void);
+void func_806ABE3C(void);
+void func_806ACC00(u8 arg0);
+void func_806858E8(Actor*, s16, f32, f32, f32, f32, s32);
+void func_80684BB0(s16 arg0, s16 arg1, s16 arg2);
+void func_80685984(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
+void func_8068780C(u8 arg0, u8 arg1, u8 arg2, u8 arg3);
+s32 func_806639CC(Actor*, GlobalASMStruct83*);
+void func_80663A80(void);
+void func_80600B10(void);
+void func_80600BBC(void *arg0);
+void func_80600C68(void);
+void func_806FD950(void *arg0, s16 arg1, void *arg2, s16 arg3);
+void func_806FDAEC(s16 arg0);
+void func_807002AC(u16 *arg0, s16 **arg1, f32 arg2);
+void func_805FF1B0(s32 player_index);
+s32 func_80600340(s32 arg0, u8 arg1, s32 *arg2);
+void func_80738400(ALSeqPlayer *arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4);
+
 // TODO: Where is the best place to put this so it's available everywhere and doesn't conflict with internal libultra/gu stuff?
 #define	ABS(d)		((d) > 0) ? (d) : -(d)
 

include/structs.h

@@ -1717,6 +1717,36 @@ typedef struct {
     u8  pad2[0x1C8 - 0x88]; // total size 0x1C8
 } Chunk;
 
+typedef struct {
+    s32 unk0;
+    s32 unk4;
+    s32 unkC;
+    s32 unk8;
+    s32 unk10;
+    s32 unk14;
+    s32 unk1C;
+    s32 unk18;
+} Struct807500B4;
+
+typedef struct {
+    s16 unk0;
+    s16 unk2;
+    s16 unk4;
+    s16 unk6;
+    s16 unk8[1]; // TODO: How many elements?
+    s16 unkA;
+    s16 unkC;
+    s16 unkE;
+    s32 unk10;
+    s32 unk14;
+    s16 unk18;
+    s16 unk1A;
+    s32 unk1C;
+    s32 unk20;
+    s32 unk24;
+    s32 unk28;
+} Struct8073BC74;
+
 // func_80712944, func_8060AC34
 typedef struct global_asm_struct_12 {
     u16 unk0;

progress/progress.global_asm.csv

@@ -159,7 +159,7 @@ us,.code,func_807002AC,144,yes
 us,.code,func_80738230,104,yes
 us,.code,func_806FD094,1020,no
 us,.code,func_806E5044,472,yes
-us,.code,func_80737E30,8,yes
+us,.code,func_80737E30,24,yes
 us,.code,func_8060B84C,172,yes
 us,.code,func_806EE1C4,168,yes
 us,.code,func_80684D98,648,no
@@ -313,7 +313,6 @@ us,.code,func_80654BC0,268,no
 us,.code,func_806B3680,1456,no
 us,.code,func_806E4740,920,no
 us,.code,func_8060E930,40,yes
-us,.code,func_80737E38,8,yes
 us,.code,func_8063A38C,1212,no
 us,.code,func_806338B4,64,yes
 us,.code,func_8063B8D8,728,no
@@ -3029,7 +3028,6 @@ us,.code,func_8066AF40,224,yes
 us,.code,func_8069A750,120,no
 us,.code,func_806EBFD0,68,yes
 us,.code,func_80600590,228,no
-us,.code,func_80737E40,8,yes
 us,.code,func_806E9D1C,196,yes
 us,.code,func_806291B4,332,no
 us,.code,func_80709BC4,1628,no

progress/progress.total.csv

@@ -159,7 +159,7 @@ us,.code,func_807002AC,144,yes
 us,.code,func_80738230,104,yes
 us,.code,func_806FD094,1020,no
 us,.code,func_806E5044,472,yes
-us,.code,func_80737E30,8,yes
+us,.code,func_80737E30,24,yes
 us,.code,func_8060B84C,172,yes
 us,.code,func_806EE1C4,168,yes
 us,.code,func_80684D98,648,no
@@ -313,7 +313,6 @@ us,.code,func_80654BC0,268,no
 us,.code,func_806B3680,1456,no
 us,.code,func_806E4740,920,no
 us,.code,func_8060E930,40,yes
-us,.code,func_80737E38,8,yes
 us,.code,func_8063A38C,1212,no
 us,.code,func_806338B4,64,yes
 us,.code,func_8063B8D8,728,no
@@ -3029,7 +3028,6 @@ us,.code,func_8066AF40,224,yes
 us,.code,func_8069A750,120,no
 us,.code,func_806EBFD0,68,yes
 us,.code,func_80600590,228,no
-us,.code,func_80737E40,8,yes
 us,.code,func_806E9D1C,196,yes
 us,.code,func_806291B4,332,no
 us,.code,func_80709BC4,1628,no

src/arcade/code_0.c

@@ -13,8 +13,6 @@ extern Gfx *func_806FD490(Gfx *, s32, s32, s32, s32 *);
 extern void func_8070F2FC(Gfx **arg0, s16 arg1, s16 arg2);
 extern void func_8070E8F0(Gfx**, Sprite*);
 
-// TODO: This signature is sus
-extern void func_8070F2C8(s32, s16, s32, u8);
 
 void func_8002419C(void *arg0, Gfx **arg1);
 void func_80024940(Gfx **gpp);
@@ -1824,7 +1822,7 @@ void func_8002AFA4(Gfx **arg0, s32 arg1) {
     );
     sp4C = *arg0;
     func_8070E8F0(&sp4C, &D_8004AC00[D_807444FC].sprite[arg1]);
-    func_8070F2C8(0x400, phi_f0, 1 & D_8004BCD0[arg1].unk1A & 1, D_8004BCD0[arg1].unk1B);
+    func_8070F2C8(0x400, phi_f0, D_8004BCD0[arg1].unk1A & 1, D_8004BCD0[arg1].unk1B);
 
     if (D_8004A338[D_8004BCD0[arg1].unk18] & 2) {
         func_8070F2FC(&sp4C, 

src/bonus/code_2690.c

@@ -1,8 +1,6 @@
 #include <ultra64.h>
 #include "functions.h"
 
-s32 func_80677FA8(Actors arg0, void *arg1);
-
 // Displaylist stuff
 #pragma GLOBAL_ASM("asm/nonmatchings/bonus/code_2690/func_80026690.s")
 
@@ -521,7 +519,6 @@ typedef struct {
     s8 unk10;
 } AAD_80028E3C_2;
 
-void func_80608528(Actor*, s16, u8, s32, s32);
 
 /*
 // TODO: Very close

src/boss/code_9C60.c

@@ -207,8 +207,6 @@ void func_8002FEC0(Actor* arg0[], u8 arg1, s32 arg2) {
 // Jumptable
 #pragma GLOBAL_ASM("asm/nonmatchings/boss/code_9C60/func_8002FF74.s")
 
-void func_80724DB0(s32, s32);
-
 void func_80030888(void) {
     Actor* temp;
     Actor178* temp_2;

src/global_asm/code_0.c

@@ -584,7 +584,6 @@ void func_8066BDE0(void);
 
 void func_80701C90(void);
 void func_80629190(void);
-void func_80664CB0(s32 arg0);
 void func_80600590(s32 arg0);
 
 void func_806641A0();

src/global_asm/code_114270.c

@@ -346,9 +346,9 @@ void func_80712830(Actor *arg0, s32 exit) {
     }
     if (cc_number_of_players >= 2) {
         func_80026D40(arg0, exit);
-        return;
-    }
+    } else {
     func_805FF1B0(exit);
+    }
 }
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_114270/func_80712944.s")

src/global_asm/code_119370.c

@@ -101,6 +101,18 @@ typedef struct {
     f32 unk4;
 } Struct80717D84_unk384_80719EF4;
 
+typedef struct {
+    f32 unk0;
+    f32 unk4;
+    f32 unk8;
+    f32 unkC;
+} Struct80717D84_unk384_8071D0F0;
+
+typedef struct {
+    f32 unk0;
+    f32 unk4;
+} Struct80717D84_unk384_8071B2EC;
+
 typedef struct {
     u8 unk0[0x16 - 0x0];
     s16 unk16;
@@ -1120,11 +1132,6 @@ void func_8071B24C(Struct80717D84 *arg0, s32 arg1) {
 extern f32 D_8075E968;
 extern f64 D_8075E970;
 
-typedef struct {
-    f32 unk0;
-    f32 unk4;
-} Struct80717D84_unk384_8071B2EC;
-
 void func_8071B2EC(Struct80717D84 *arg0, s32 arg1) {
     f32 sp24;
     Struct80717D84_unk384_8071B2EC *var_v1;
@@ -1317,13 +1324,6 @@ void func_8071C818(Struct80717D84 *arg0, s8 *arg1) {
 
 extern u16 D_807FC930[];
 
-typedef struct {
-    f32 unk0;
-    f32 unk4;
-    f32 unk8;
-    f32 unkC;
-} Struct80717D84_unk384_8071D0F0;
-
 void func_8071D0F0(Struct80717D84 *arg0, s8 *arg1) {
     Struct80717D84_unk384_8071D0F0 *var_t0;
     u16 *temp_v1;
@@ -1759,17 +1759,7 @@ void func_8071EFDC(Struct80717D84 *arg0, s8 *arg1) {
     }
 }
 
-// TODO: Which struct is this?
-typedef struct {
-    u8 unk0[0x340 - 0x0];
-    f32 unk340;
-    f32 unk344;
-    f32 unk348;
-    s16 unk34C;
-    s16 unk34E;
-} Struct8071F034_arg0;
-
-void func_8071F034(Struct8071F034_arg0 *arg0, s32 arg1) {
+void func_8071F034(Struct80717D84 *arg0, s32 arg1) {
     if (arg0->unk34E == 0) {
         arg0->unk340 = player_pointer->x_position;
         arg0->unk344 = player_pointer->y_position;

src/global_asm/code_12E800.c

@@ -26,8 +26,6 @@ typedef struct {
     u16 unk18; // used
 } AAD_80729B00;
 
-void func_80608528(Actor *, s32, s32, s16, s32);
-void func_80605314(Actor *, s32);
 void func_806663F8(void);
 
 /*

src/global_asm/code_13C920.c

@@ -10,13 +10,13 @@ extern u8 D_807FF0F8[];
 
 void func_80737CF4(s32 arg0, s32 arg1);
 
-void func_80737C20(u8 arg0) {
+void func_80737C20(s32 arg0) {
     s32 sp24;
 
     D_807FF0F0 = 0;
     D_807FF0F1 = 0;
     D_807FF0F2 = 0;
-    switch (arg0) {
+    switch ((u8)arg0) {
         case 1:
             D_807FF0F1 = 1;
             break;

src/global_asm/code_13CB30.c

@@ -1,15 +1,6 @@
 #include <ultra64.h>
 #include "functions.h"
 
-
-s32 func_80737E30(s32 *arg0) {
-    return arg0[0xB];
-}
-
-void func_80737E38(void) {
-
-}
-
-void func_80737E40(void) {
-
+s32 func_80737E30(ALSeqPlayer *arg0) {
+    return arg0->state;
 }

src/global_asm/code_13CB50.c

@@ -1,18 +1,11 @@
 #include <ultra64.h>
 #include "functions.h"
 
-typedef struct {
-    u8 unk0[0x48 - 0x0];
-    s32 unk48;
-} Struct80737E50;
+void func_80737E50(ALSeqPlayer* arg0) {
+    ALEvent sp18;
 
-void func_80737E50(Struct80737E50 *arg0) {
-    s32 pad[3];
-    s16 pad2;
-    s16 sp18; // TODO: ALEvent struct
-
-    sp18 = 0xF;
-    alEvtqPostEvent(&arg0->unk48, &sp18, 0);
+    sp18.type = AL_SEQP_PLAY_EVT;
+    alEvtqPostEvent(&arg0->evtq, &sp18, 0);
 }
 
 typedef struct {
@@ -129,3 +122,4 @@ void func_80738118(s32 arg0, s32 arg1, u8 arg2) {
     func_807382A0(arg0, 0, arg1 | 0xB0, 0xFC, arg2);
 }
 */
+

src/global_asm/code_13CE70.c

@@ -1,12 +1,7 @@
 #include <ultra64.h>
 #include "functions.h"
 
-typedef struct {
-    u8 unk0[0x48 - 0x0];
-    ALEventQueue unk48;
-} Struct80738320;
-
-void func_80738170(Struct80738320 *arg0, u8 arg1, u8 arg2) {
+void func_80738170(ALSeqPlayer *seqp, u8 arg1, u8 arg2) {
     ALEvent sp18;
 
     sp18.type = AL_SEQP_MIDI_EVT;
@@ -14,19 +9,19 @@ void func_80738170(Struct80738320 *arg0, u8 arg1, u8 arg2) {
     sp18.msg.midi.status = arg1 | 0xB0;
     sp18.msg.midi.byte1 = 0x5B;
     sp18.msg.midi.byte2 = arg2;
-    alEvtqPostEvent(&arg0->unk48, &sp18, 0);
+    alEvtqPostEvent(&seqp->evtq, &sp18, 0);
 }
 
-void func_807381D8(Struct80738320 *arg0, f32 arg1, f32 arg2) {
+void func_807381D8(ALSeqPlayer *seqp, f32 arg1, f32 arg2) {
     ALEvent sp18;
 
     sp18.type = 0x18;
     sp18.msg.evt18.unk00 = arg1;
     sp18.msg.evt18.unk04 = arg2;
-    alEvtqPostEvent(&arg0->unk48, &sp18, 0);
+    alEvtqPostEvent(&seqp->evtq, &sp18, 0);
 }
 
-void func_80738230(Struct80738320 *arg0, u8 arg1, u8 arg2) {
+void func_80738230(ALSeqPlayer *seqp, u8 arg1, u8 arg2) {
     ALEvent sp18;
 
     sp18.type = AL_SEQP_MIDI_EVT;
@@ -34,5 +29,5 @@ void func_80738230(Struct80738320 *arg0, u8 arg1, u8 arg2) {
     sp18.msg.midi.status = arg1 | 0xB0;
     sp18.msg.midi.byte1 = 0x5C;
     sp18.msg.midi.byte2 = arg2;
-    alEvtqPostEvent(&arg0->unk48, &sp18, 0);
+    alEvtqPostEvent(&seqp->evtq, &sp18, 0);
 }

src/global_asm/code_13D100.c

@@ -1,12 +1,7 @@
 #include <ultra64.h>
 #include "functions.h"
 
-typedef struct {
-    u8 unk0[0x48 - 0x0];
-    ALEventQueue unk48;
-} Struct80738320;
-
-void func_80738400(Struct80738320 *arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4) {
+void func_80738400(ALSeqPlayer *arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4) {
     ALEvent sp18;
 
     sp18.type = 0x19;
@@ -14,5 +9,5 @@ void func_80738400(Struct80738320 *arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4) {
     sp18.msg.evt19.unk01 = arg2;
     sp18.msg.evt19.unk02 = arg3;
     sp18.msg.evt19.param = arg4;
-    alEvtqPostEvent(&arg0->unk48, &sp18, 0);
+    alEvtqPostEvent(&arg0->evtq, &sp18, 0);
 }

src/global_asm/code_140600.c

@@ -30,25 +30,6 @@ void func_8073BB10(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4) {
     arg4[2] = ((1.0f + sp38) - sp34) / (1.0f + sp38 + sp34);
 }
 
-typedef struct {
-    s16 unk0;
-    s16 unk2;
-    s16 unk4;
-    s16 unk6;
-    s16 unk8[1]; // TODO: How many elements?
-    s16 unkA;
-    s16 unkC;
-    s16 unkE;
-    s32 unk10;
-    s32 unk14;
-    s16 unk18;
-    s16 unk1A;
-    s32 unk1C;
-    s32 unk20;
-    s32 unk24;
-    s32 unk28;
-} Struct8073BC74;
-
 void func_8073BC74(Struct8073BC74 *arg0) {
     s32 sp14;
     s32 sp10;
@@ -137,7 +118,6 @@ void func_8073BE54(Struct8073BC74 *arg0, f32 arg1) {
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073C040.s")
 
 s16 *func_80732444(s32, s32, s32, u8, s32);
-void func_8073BC74(Struct8073BC74 *arg0);
 extern s32 D_80756458[];
 extern f32 D_807604C8;
 

src/global_asm/code_141520.c

@@ -16,7 +16,6 @@ void func_8073C9C0(s32 arg0, s16 arg1, s32 arg2) {
     func_8073DA30(sp1C, arg1, arg2);
 }
 
-s32 func_8073BE54(void *, f32);
 extern f32 D_807604D0;
 
 typedef struct {

src/global_asm/code_2F550.c

@@ -852,7 +852,6 @@ void func_8065E040(s32);
 /*
 ? func_8062B3C4(void *, s32 *);
 ? func_8062B478(s32);
-s32 func_8062BA74(void *);
 ? func_8062F318();
 ? func_8062F328(void *);
 ? func_8062F3A0(void *, void *);

src/global_asm/code_36880.c

@@ -660,7 +660,6 @@ void func_80635588(void) {
 void func_80605380(s16);
 
 void func_8063DE68(void*);
-void func_8072F09C(s32 arg0);
 void func_806645B8(s16 arg0);
 
 void func_806348B4(void *arg0);
@@ -668,8 +667,6 @@ void func_8066C904(void *arg0);
 
 Chunk14 *func_80630588(Chunk14 *arg0, s32 arg1, u8 arg2, u8 *arg3);
 
-void func_8064F804(void *arg0);
-
 void func_806593C8(s32 arg0, s32 arg1);
 void func_80636074(ObjectModel2 *arg0);
 

src/global_asm/code_3C10.c

@@ -186,7 +186,9 @@ extern u8 D_80744828;
 extern u16 D_8076AEF4;
 extern u8 D_8076AEF6;
 
-void func_805FF1B0(s8 player_index) {
+extern u16 D_80744748[];
+
+void func_805FF1B0(s32 player_index) {
     u16 pad;
     u16 new_map;
     s32 limit;
@@ -210,7 +212,7 @@ void func_805FF1B0(s8 player_index) {
             found_special_void = 0;
             new_exit = 0;
             level_index = getLevelIndex((u8)current_map, 0U);
-            new_map = *(u16*)(0x80744748 + (level_index << 1));
+            new_map = D_80744748[level_index];
             while ((!found_special_void) && (i < limit)) {
                 if (current_map == D_8074475C[i].void_map) {
                     new_map = D_8074475C[i].dest_map;
@@ -228,8 +230,6 @@ void func_805FF1B0(s8 player_index) {
     D_80744828 = 0;
 }
 
-
-
 void func_805FF2F4(void) {
     Maps map;
     s32 exit;

src/global_asm/code_42630.c

@@ -28,8 +28,6 @@ extern f32 D_807F6238;
 extern s8 D_807F6950;
 extern s8 D_807F6951;
 
-void func_806335B0(s16, s32, s32, f32*, f32*, f32*);
-
 s32 func_806418E8(s16, s16, s16);
 u8 func_8064EC60(s32, s16, s16, s16);
 extern void func_8064EE08(void);
@@ -851,8 +849,6 @@ block_8:
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_42630/func_80645A64.s")
 
-void func_806085DC(s16, u16, u8, u8, s32, s32, f32);
-
 void func_80645B9C(gASMStruct3 *arg0, s16 arg1, s32 arg2, s32 arg3) {
     if (((s32) (0x243 - arg0->unk44) % 60) == 0) {
         func_806085DC(arg1, 0x38, 0xFF, 0x7F, 0, 0x3C, 0.0f);
@@ -1535,8 +1531,6 @@ void func_8064C250(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
 
 extern f32 D_80758B28;
 
-void func_80650D8C(s16, s32, s16*, u16*, u8*);
-
 void func_8064CC80(s32 **arg0, s16 arg1, s32 arg2, s32 arg3) {
     s16 sp3E;
     u32 sp38;
@@ -1567,8 +1561,6 @@ void func_8064CC80(s32 **arg0, s16 arg1, s32 arg2, s32 arg3) {
 extern u16 D_807446C0[];
 extern u16 D_807FC930[];
 
-void func_80650AD8(s16, s32, s32, f32);
-
 void func_8064D880(s32 arg0, s16 arg1, s16 arg2, s32 arg3) {
     f32 phi_f0;
     s32 levelIndex;

src/global_asm/code_55B20.c

@@ -18,8 +18,7 @@ extern u16 D_807F735A;
 extern u16 D_807F735C;
 extern u16 D_807F735E;
 
-void func_80636164(s32, u8);
-void func_80636210(s32, u8);
+void func_80636210(Model2Model *arg0, u8 arg1);
 void func_8063B4C0(Chunk14*, u8);
 s32 func_8063A38C(Chunk14*, Chunk14*, f32, f32, f32);
 
@@ -382,6 +381,8 @@ void func_806526E0(u8 arg0) {
     }
 }
 
+Chunk14 *func_8063070C(Chunk14 *arg0);
+
 void func_80652790(u8 arg0) {
     s32 i;
 

src/global_asm/code_5A50.c

@@ -5,15 +5,12 @@
 extern s32 D_8000DDCC;
 extern s32 D_8076D200;
 
-s32 func_80737E30(ALSeqPlayer*, u8);
 void func_80737E50(ALSeqPlayer*);
 void func_80737F0C(s32, s32, u8);
 void func_80738080(s32, u8, u8);
 void func_807380CC(ALSeqPlayer*, s32, u8);
 void func_80738118(s32, s32, u8);
 void func_807382A0(s32, s32, u8, u8, u8);
-void func_80738400(s32, u8, u8, u8, s32);
-void func_807381D8(s32, f32, f32);
 void func_8060B140(s32, s32*, s32*, s32, s32, s32, s32);
 
 // Struct on the stack? Big malloc
@@ -30,13 +27,13 @@ void func_806010A0(void) {
 }
 
 void func_80601120(u8 arg0) {
-    if (func_80737E30(D_8076BF20[arg0], arg0) == 0) {
+    if (func_80737E30(D_8076BF20[arg0]) == 0) {
         func_80737E50(D_8076BF20[arg0]);
     }
 }
 
 void func_8060116C(u8 arg0) {
-    func_80737E30(D_8076BF20[arg0], arg0);
+    func_80737E30(D_8076BF20[arg0]);
 }
 
 void func_806011A0(u8 arg0, s32 arg1) {
@@ -142,7 +139,7 @@ void func_80601780(u8 arg0, s32 arg1) {
 }
 
 void func_806017B4(u8 arg0) {
-    func_807383B0(D_8076BF20[arg0], arg0);
+    func_807383B0(D_8076BF20[arg0]);
 }
 
 void func_806017E8(u8 arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4) {

src/global_asm/code_6710.c

@@ -30,8 +30,6 @@ typedef struct {
 
 extern Struct8074593C D_8074593C[];
 
-extern s32 func_80737E30(s32, u8);
-
 u8 func_80602430(s16 arg0);
 u8 func_8060245C(s16 arg0);
 void func_80602B60(s32 arg0, u8 arg1);
@@ -174,7 +172,7 @@ f32 func_80602D4C(s32 arg0) {
     u8 temp_v0 = func_80602430(arg0);
 
     if (arg0 == D_80770560[temp_v0]) {
-        if (func_80737E30(D_8076BF20[temp_v0], temp_v0) == 1) {
+        if (func_80737E30(D_8076BF20[temp_v0]) == 1) {
             return D_80770568[temp_v0];
         }
     }

src/global_asm/code_68AA0.c

@@ -2,7 +2,6 @@
 #include "functions.h"
 
 s8 func_806531B8(f32, f32, f32, s16);
-s16 func_80658B08(s8, void *, s16);
 extern s32 D_80747D70;
 extern s16 D_807F9424;
 

src/global_asm/code_7CA80.c

@@ -25,7 +25,6 @@ s16 func_8067AF74(Actor*);
 s32 func_806782E8(Actor *arg0);
 
 void func_806785D4(Actor*);
-void func_80605314(Actor*, u8);
 void func_8062D26C(Actor*);
 void func_806783BC();
 void func_806136B4();
@@ -35,7 +34,6 @@ void func_8067AEFC(Actor*);
 void func_8070DA74(Actor*);
 void func_8071586C(Actor*);
 void func_807233B4(Actor*);
-void func_8072F09C(void *);
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_7CA80/func_80677D80.s")
 
@@ -116,7 +114,7 @@ func_8067B2A0
 func_8067B2A8
 */
 
-extern s32 (*D_8074DA30[])(void*);
+extern s32 (*D_8074DA30[])(s32);
 extern u8 D_8074D8D4[];
 
 typedef struct {
@@ -154,7 +152,7 @@ s32 func_80677ED0(Struct80677ED0 *arg0) {
     return FALSE;
 }
 
-s32 func_80677FA8(Actors arg0, void *arg1) {
+s32 func_80677FA8(Actors arg0, s32 arg1) {
     s32 master_type;
 
     if (func_80678050(arg0)) {
@@ -174,7 +172,6 @@ s32 func_80678014(s32 arg0) {
     return FALSE;
 }
 
-
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_7CA80/func_80678050.s")
 
 extern u16 D_807FBB34;

src/global_asm/code_80150.c

@@ -358,7 +358,6 @@ extern s32 D_8071FEAC; // TODO: Datatype
 extern f64 D_80759550;
 
 u32 func_806119A0(void);
-void func_80608528(Actor*, s32, s32, s32, s32);
 
 /*
 // TODO: Pretty close

src/global_asm/code_89250.c

@@ -507,7 +507,6 @@ void func_80685F60(Actor *actor) {
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_89250/func_8068613C.s")
 
-void func_80608528(Actor *, s32, s32, s32, s32);
 s32 func_806119A0();
 extern s32 D_8071DB74; // TODO: Datatype
 extern s32 D_8071FC0C; // TODO: Datatype

src/global_asm/code_8D3E0.c

@@ -1,18 +1,6 @@
 #include <ultra64.h>
 #include "functions.h"
 
-
-typedef struct {
-    s32 unk0;
-    s32 unk4;
-    s32 unkC;
-    s32 unk8;
-    s32 unk10;
-    s32 unk14;
-    s32 unk1C;
-    s32 unk18;
-} Struct807500B4;
-
 extern Struct807500B4 D_807500B4; // TODO: Array?
 extern Struct807500B4 D_807500D4; // TODO: D_807500D4[1]?
 

src/global_asm/code_936B0.c

@@ -246,8 +246,6 @@ extern f32 D_807FC7B8;
 extern f64 D_8075A0C0;
 extern f64 D_8075A0C8;
 
-void func_806891D8(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, s32 arg6, f32 *arg7);
-
 void func_8069084C(s16 arg0, s16 arg1, f32 arg2, s16 arg3, f32 arg4, f32 arg5, s32 arg6) {
     s32 temp;
     s32 temp2;

src/global_asm/code_9BF30.c

@@ -99,7 +99,6 @@ void func_80697988(void) {
 
 void func_8065D254(Actor *, s32, s32, s32, s32, s32, s32, s32, s32, s32, f32);
 void func_806651FC(Actor *);
-void func_8066E8E4(Actor *, f32, f32, f32, f32, s32);
 extern s32 D_8071ABDC; // TODO: Datatype
 extern s32 D_8071FBA0; // TODO: Datatype
 extern s32 D_8071F758; // TODO: Datatype

src/global_asm/code_9CE20.c

@@ -3,11 +3,6 @@
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_9CE20/func_80698120.s")
 
-// void func_80608528(f32, Actor *, s32, s32, s32, s32);
-void func_80608528(Actor *arg0, s16 arg1, u8 arg2, s16 arg3, u8 arg4);
-// f32 func_80612D1C(f32, u32);
-// ? func_806319C4(void *, ?);
-void func_8072EE7C(Actor *, s32, s32, s32, f32, f32, f32, f32, f32, s32, f32, f32, s32);
 void func_8072EF7C(Actor *arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4, f32 arg5, f32 arg6, f32 arg7, u8 arg8, s16 arg9, s16 argA, s16 argB, s16 argC);
 extern s32 D_80744478;
 extern s16 D_8075037C;

src/global_asm/code_9DD70.c

@@ -5,8 +5,6 @@
 extern s8 D_807F6951;
 extern s8 D_807F6950;
 
-void func_8070D8C0(Actor*, s32, u8);
-
 f32 func_80611BB4(f32, f32);
 extern f64 D_8075A2D0;
 

src/global_asm/code_A2F10.c

@@ -69,7 +69,6 @@ typedef struct {
     u8 unk12; // Used
 } AAD_8069E774;
 
-void func_8066E8E4(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 f32 func_8066E9EC(Actor *arg0, s32 arg1, f32 arg2);
 void func_8066EB40(Actor *arg0, f32 arg1);
 void func_8065A708(f32, f32, f32, f32, f32, f32, f32, s32, s32, s32, s32);

src/global_asm/code_A8400.c

@@ -143,7 +143,6 @@ void func_806A495C(void *arg0, void *arg1, void *arg2) {
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_A8400/func_806A4B84.s")
 
-void func_8070D9AC(void *arg0);
 void func_806A4B84(f32 arg0, Actor *arg1, AAD_806A4DDC *arg2, Struct806A57C0_2 *arg3, u8 arg4, u8 *arg5);
 
 /*
@@ -326,7 +325,6 @@ int func_806A4284();
 void func_806A5174(Actor*, void*, f32);
 void func_8070DA74(Actor*);
 void func_8070E808(Actor *arg0, Actor *arg1);
-void func_8070DA28(void *arg0);
 void func_806A4DDC(Actor *arg0);
 
 /*
@@ -505,8 +503,6 @@ void func_806A5C60(Actor *arg0) {
 extern f32 D_8075A9A0;
 extern s32 D_807FBB68;
 
-void func_806891D8(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, s32 arg6, f32 *arg7);
-
 /*
 // TODO: Close, float regalloc
 void func_806A5DF0(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, u8 arg5, s16 arg6, s32 arg7) {
@@ -728,7 +724,6 @@ extern s32 D_8071EB70;
 
 s32 func_80723020(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, u8 arg6);
 void func_8066EB40(Actor*, f32);
-void func_8066E8E4(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 void func_8066E854(Actor*, f32, f32, f32, s32);
 void func_806F91B4(s32 HUDItemIndex, u8 playerIndex, s16 amount);
 void func_80723484(s32, Actor*);

src/global_asm/code_B1F60.c

@@ -9,7 +9,6 @@ void func_806782C0(Actor *);
 s32 func_8072881C(s32, s32);
 s32 func_8072AB74(u8, f32, f32, s32, f32);
 s32 func_8072D714(s32, s32);
-s32 func_8072DEA8(s32, s32, s32);
 
 extern f64 D_8075AE10;
 extern f32 D_8075AE18;

src/global_asm/code_B7490.c

@@ -9,7 +9,6 @@ extern f64 D_8075B710;
 
 extern u8 D_807FBD70;
 
-void func_8069084C(u8, s32, f32, s16, f32, f32, Actor*);
 void func_806907F0(f32, f32, f32);
 s32 func_80726164(Actor*, s16, s16, s16, void*);
 void func_806B3E7C();
@@ -391,7 +390,6 @@ void func_806B4958() {
 
 extern f32 D_807502EC;
 
-void func_80724CA4(s32, s32);
 void func_806B3F90(void *arg0, u8 arg1);
 
 /*

src/global_asm/code_BC3B0.c

@@ -203,10 +203,8 @@ extern s32 D_80717D4C; // TODO: Datatype
 extern s32 D_807201D4; // TODO: Datatype
 
 void func_8066EB40(Actor*, f32);
-void func_8066E8E4(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 void func_8066E854(Actor *arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4);
 void func_8065A708(f32, f32, f32, f32, f32, f32, f32, s32, s32, s32, s32);
-void func_80608528(void *arg0, s16 arg1, u8 arg2, s16 arg3, u8 arg4);
 
 void func_806B83E4(void) {
     u8 temp;
@@ -273,8 +271,6 @@ void func_806B8898(void) {
 
 extern f64 D_8075B8A8;
 
-void func_8069084C(s16 arg0, s16 arg1, f32 arg2, s16 arg3, f32 arg4, f32 arg5, s32 arg6);
-
 void func_806B88B8(void) {
     Actor178 *temp_v1;
     Actor178 *sp3C;

src/global_asm/code_C2A90.c

@@ -14,9 +14,6 @@ void func_80724E48(u8);
 void func_806F09F0(Actor*, u16);
 
 void func_806651FC(Actor*);
-void func_80724CA4(s32, s32);
-
-void func_8070D8C0(Actor*, s32, s32);
 
 u8 func_806BDD90(void) {
     s16 i;
@@ -251,8 +248,6 @@ extern s32 D_8071C818; // TODO: Proper datatype
 extern s32 D_8071FB08; // TODO: Proper datatype
 extern s32 D_807200D4; // TODO: Proper datatype
 
-void func_8069084C(s32, s32, f32, s16, f32, f32, Actor*);
-
 void func_806C1734(void) {
     s32 pad2; // TODO: Can we get rid of these?
     s32 pad; // TODO: Can we get rid of these?

src/global_asm/code_CC800.c

@@ -374,7 +374,6 @@ void func_806C90C4(s32 exitIndex) {
 }
 
 void func_806C9434(s32 arg0);
-void func_80605314(Actor*, u8);
 
 void func_806C92C4(s32 arg0) {
     func_80672C30(D_807FBB48);

src/global_asm/code_CEAE0.c

@@ -201,7 +201,6 @@ void func_806D3608(void);
 s16 func_806CE4E4(Actor*, f32, f32, s32);
 
 void func_806F142C(Actor*);
-void func_80608528(Actor*, s16, s32, s32, s32);
 
 void func_806DF494(s16*, s16, s16);
 
@@ -214,7 +213,6 @@ s32 func_806E9D1C(s16 arg0, u8 arg1, u8 arg2);
 void func_806EA568(void);
 s16 func_8062773C(s32);
 Actor *func_807270C0(s8, s32); // getSpawnerTiedActor()
-void func_80605314(Actor*, s32);
 s32 func_806FA7A4(s32); // TODO: Might return s16
 
 void func_806C9DE0(void) {
@@ -303,7 +301,7 @@ void func_806CA048(Actor *actor, PlayerAdditionalActorData *arg1) {
             arg1->unk249 = 0;
         } else if (actor->interactable & 2) {
             arg1->unk248 = -1;
-            arg1->unk249 = func_80727194();
+            arg1->unk249 = func_80727194(actor);
         } else {
             phi_v1 = TRUE;
         }

src/global_asm/code_EFDC0.c

@@ -2,13 +2,11 @@
 #include "functions.h"
 
 
-u8 func_806C9974(u8, s32);
 void func_80614D48(Actor*, f32, f32);
 extern s32 D_807FD6F0[];
 void func_806CD424(s16, f32, f32);
 extern void (*action_initiation_function_list[])(void);
 
-void func_80605314(Actor*, u8);
 void func_8062217C(Actor*, s32);
 void func_80627878(Actor*);
 void func_806F0D68(Actor*);

src/global_asm/code_F56F0.c

@@ -5,8 +5,6 @@
 // Jumptable
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_F56F0/func_806F09F0.s")
 
-void func_80608528(Actor*, s32, s32, s32, s32);
-
 void func_80614FD8(void*);
 void func_80614F28(void*);
 

src/menu/code_3E10.c

@@ -2,7 +2,6 @@
 #include "functions.h"
 
 
-void func_80737C20(s32);
 extern s8 D_80745844;
 void func_80030340(Actor*, s32, s32, s32);
 void func_8061D4E4(s32);

src/minecart/code_25F0.c

@@ -62,7 +62,6 @@ void func_80027CF4(void) {
 #pragma GLOBAL_ASM("asm/nonmatchings/minecart/code_25F0/func_80027EE8.s")
 
 f32 func_8000AC60(f32);
-void func_80608528(Actor *, s32, s32, s16, s32);
 f32 func_806119A0();
 extern f64 D_80028DD8;
 typedef struct MinecartStruct1 {

src/water/code_3340.c

@@ -174,7 +174,6 @@ s32 func_8061CB08();
 s32 func_8061CB38();
 s32 func_806A2A10(s32, s32, u8);
 u8 func_806FDB8C(s16, s32, s32, f32, f32, f32);
-s32 func_8070D8C0(void *, s32, u8);
 extern s32 D_80004520;
 extern s32 D_800046C0;
 extern s32 D_80006F10;

symbol_addrs.global_asm.us.txt

@@ -285,3 +285,5 @@ D_8075E8F8 = 0x8075E8F8;
 D_8075E900 = 0x8075E900;
 D_8075E908 = 0x8075E908;
 D_8075E970 = 0x8075E970;
+
+D_80744748 = 0x80744748;