Match code_80040E50 (#220)

This required making some minor adjustments to a struct in
 common_structs.h, which further required a couple tiny updates to
 some functions in a couple other files. Nothing too crazy.

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

src/code_80040E50.h

@@ -1,6 +1,7 @@
 #ifndef CODE_80040E50_H
 #define CODE_80040E50_H
 
+#include "types.h"
 #include "common_structs.h"
 
 /* Function Prototypes */
@@ -18,8 +19,22 @@ s32 s32_step_down_towards_alternate(s32*, s32, s32*);
 s32 s16_step_up_towards_alternate(s16*, s16, s16*);
 s32 s16_step_down_towards_alternate(s16*, s16, s16*);
 s32 s32_step_towards(s32*, s32, s32);
+s32 func_80041608(f32, f32, f32, f32, f32);
 s32 func_80041680(f32, f32);
 s32 func_800416AC(f32, f32);
+void func_80041A70();
+void func_80041F54(s32, s32);
+void func_80042000(u16);
+void func_800420A8(f32);
+void func_8004214C(u16, f32);
+void func_800421FC(s32, s32, f32);
+void func_800423F0(Mat4, u16, u16, u16);
+void func_8004252C(Mat4, u16, u16);
+void func_80042984(Mat4, f32);
+void func_800429B8(Mat4, f32);
+void func_800429EC(Mat4, f32);
+void func_80042B5C(Vec3f, Vec3f, Vec3s);
+void func_80042EB8(Vec3f, Vec3f, f32);
 
 
 void func_80040EC4(Vec3f, Vec3f);
@@ -34,16 +49,46 @@ s32 u16_step_down_towards(u16*, s32, s32);
 s32 s16_step_towards(s16*, s16, s16);
 s32 f32_step_towards(f32*, f32, f32);
 void func_80041480(s16*, s16, s16, s16*);
-s32 func_80041500(Vec3f, f32, f32, f32);
+s32 vec3f_set_dupe_2_electric_boogaloo(Vec3f, f32, f32, f32);
+Vec3f *func_80041530(Vec3f dest);
 Vec3f *func_80041594(Vec3f, Vec3f, Vec3f);
 s32 func_80041658(f32, f32);
 f32 func_800416D8(f32, f32, u16);
 f32 func_80041724(f32, f32, u16);
 s32 func_80041770(f32, f32, f32, f32);
+u16 func_800417B4(u16, u16);
 s32 func_800418AC(f32, f32, Vec3f);
 s32 func_800418E8(f32, f32, Vec3f);
+s32 func_80041924(UnkActorInner*, Vec3f);
+s32 func_80041980(Vec3f, Camera*, u16);
+void func_800419F8();
+void func_80041A78(Mat4, s32, s32);
+void func_80041AD8(Mat4, u16);
+void func_80041B68(Mat4, f32);
+void func_80041BBC(Mat4, u16, f32);
+void func_80041C64(Mat4, s32, s32, u16, f32);
+void func_80041D24();
+void func_80041D34();
 void func_80041EF4();
+void func_80042330(s32, s32, u16, f32);
+void func_800425D0(Mat4, Vec3f, Vec3s, f32);
+void func_80042760(Mat4, Vec3f, Vec3f, f32);
+void func_800427DC(s32, Mat4);
+void func_80042A20(Mat4, Vec3f, Vec3f, u16, f32);
+void func_80042D14(Vec3f, Vec3f, Vec3s);
+void func_80042E00(Vec3f, Vec3s, f32);
+void func_80042F70(Vec3f, Vec3s, f32);
+void func_80043050(Vec3f, Vec3f, f32);
+void func_80043104(s32);
 
 /* This is where I'd put my static data, if I had any */
 
+extern Vec3s D_80165834;
+extern s8    D_80165840[];
+extern s8    D_801658FE;
+extern s32   D_8018D120;
+
+// This is also used in 80071F00
+extern struct_80165C18_entry D_80165C18[];
+
 #endif

src/code_80071F00.c

@@ -2,6 +2,7 @@
 #include <macros.h>
 #include <defines.h>
 #include <functions.h>
+#include "code_80040E50.h"
 #include "code_80071F00.h"
 
 s32 find_unused_obj_index(s32* arg0) {
@@ -2277,7 +2278,7 @@ void func_8007601C(s32 arg0) {
     if (D_80165C18[arg0].unk_048 > 0) {
         --D_80165C18[arg0].unk_048;
         if (D_80165C18[arg0].unk_048 == 0) {
-            func_800C9EF4(&D_80165C18[arg0].unk_004, 0x5102800A);
+            func_800C9EF4(D_80165C18[arg0].unk_004, 0x5102800A);
         }
     }
 
@@ -2285,8 +2286,8 @@ void func_8007601C(s32 arg0) {
         func_8008A6DC(arg0, 300.0f);
         if ((func_8007223C(arg0, 0x40000) != 0) && (func_80072354(arg0, 1) != 0)) {
             func_800722A4(arg0, 1);
-            func_80075F98(&D_80165C18[arg0].unk_004, (u16) D_80165C18[arg0].unk_0C0, 1.0f);
-            func_800C9D80(&D_80165C18[arg0].unk_004, &D_80165C18[arg0].unk_038, 0x5102800A);
+            func_80075F98(D_80165C18[arg0].unk_004, (u16) D_80165C18[arg0].unk_0C0, 1.0f);
+            func_800C9D80(D_80165C18[arg0].unk_004, &D_80165C18[arg0].unk_038, 0x5102800A);
             if (D_80165C18[arg0].unk_0A4 > 0) {
                 --D_80165C18[arg0].unk_0A4;
                 D_80165C18[arg0].unk_04C = 0x5A;

src/code_80071F00.h

@@ -3,9 +3,6 @@
 
 #include "common_structs.h"
 
-s32  f32_step_up_towards(f32*, f32, f32);
-s32  s16_step_down_towards(s16*, s16, s16);
-void func_80041480(s16*, s16, s16, s16*);
 s32  func_80072044(s32*, s32*, s32);
 void func_800721C0(s32, s32);
 void func_800721E8(s32, s32);
@@ -38,15 +35,19 @@ void func_80075698(s32);
 void func_800759EC(s32, s32*, f32);
 void func_80075B08(s32);
 void func_80075E5C(s32, void*, u16, s32, s32);
-void func_80075F98(s32, s32, f32);
+void func_80075F98(Vec3f, s32, f32);
 void func_80086E70(s32);
 void func_80086F60(s32);
 void func_800877C4(s32);
 void func_8008A6DC(s32, f32);
 s32  func_8008A8B0(s16, s16);
+
+// code_80086E70.c
 void func_8008BF18(s32);
-void func_800C9D80(s32*, f32*, s32);
-void func_800C9EF4(s32*, s32);
+
+// audio/external.c
+void func_800C9D80(Vec3f, f32*, s32);
+void func_800C9EF4(Vec3f, s32);
 
 s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq);
 s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32);

src/code_80296A50.h

@@ -108,7 +108,7 @@ extern void func_800C98B8(Vec3f, Vec3f, u32);
 extern void func_800C9060(u8, s32);
 extern void func_800C90F4(u8, uintptr_t);
 extern void func_800C99E0(Vec3f, s32);
-extern void func_800C9D80(Vec3f*, Vec3f*, u32);
+extern void func_800C9D80(Vec3f, Vec3f, u32);
 
 extern struct Actor gActorList[];
 extern Player gPlayers[];