unknown_0348C0.h

src/particles.h

@@ -129,5 +129,6 @@ void func_800B2260(unk800B2260 *arg0);
 void func_800AF134(unk800B2260 *arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4, s16 arg5); // Non Matching
 void func_800AF404(s32 arg0); // Non Matching
 void func_800B263C(unk800B2260_C *arg0); // Non Matching
+void func_800AFC3C(Object *, s32); // Non Matching
 
 #endif

src/unknown_003260.c

@@ -285,7 +285,7 @@ void func_80004668(ALBank *bnk, s16 sndIndx, u8, s32){
 #endif
 
 //input typing not right (some type of struct)
-void func_8000488C(u8 *arg0){
+void func_8000488C(u8 *arg0) {
     ALEvent sp_18;
     sp_18.type = 1024;
     ((u32*)(&sp_18))[1] = (u32) arg0;

src/unknown_003260.h

@@ -83,5 +83,7 @@ extern s32 sfxVolumeSlider;
 extern s32 D_800DC6C4;
 
 void func_800049D8(void);
+//Causes issues with its type
+//void func_8000488C(u8 *arg0);
 
 #endif

src/unknown_008C40.h

@@ -1,6 +1,12 @@
 #ifndef _UNKNOWN_008C40_H_
 #define _UNKNOWN_008C40_H_
 
+#include "types.h"
+
 void func_80008168(void);
 
+void func_80009558(u16, f32 x, f32 y, f32 z, s32, s32 *); // Non Matching
+void func_80009968(f32, f32, f32, u8, u8, s32); // Non Matching
+void func_800096D8(s32, f32, f32, f32); // Non Matching
+
 #endif

src/unknown_00BC20.c

@@ -245,7 +245,7 @@ s32 D_8011B000;
 s32 D_8011B004;
 s32 D_8011B008;
 s32 D_8011B010[4];
-u32 *D_8011B020[10];
+Object *D_8011B020[10];
 s32 D_8011B048[4];
 s32 D_8011B058[4];
 s32 D_8011B068[4];
@@ -300,7 +300,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B38C.s")
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B750.s")
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000BADC.s")
 
-u32 *func_8000BF44(s32 arg0) {
+Object *func_8000BF44(s32 arg0) {
     if (arg0 == -1) {
         arg0 = D_800DC760;
     }
@@ -1868,7 +1868,7 @@ void run_object_loop_func(Object *obj, s32 arg1) {
         func_80039330(obj, arg1);
         break;
     case 64:
-        obj_loop_world_key(obj, arg1);
+        obj_loop_world_key(obj, arg1); //arg1=speed
         break;
     case 65:
         func_8003D3FC(obj, arg1);

src/unknown_00BC20.h

@@ -119,7 +119,7 @@ extern u16 D_800DC864;
 void free_tt_ghost_data(void); //unknown_043920.c
 f32 func_800707F8(s16); //?
 
-u32 *func_8000BF44(s32 arg0);
+Object *func_8000BF44(s32 arg0);
 void func_8000BF8C(void);
 void func_8000C460(void);
 void func_8000C604(void);
@@ -211,6 +211,7 @@ void func_800228EC(s32 arg0);
 s8 func_8002341C(void);
 s32 func_80023568(void);
 s8 func_800235C0(void);
+void func_800235D0(s32 arg0);
 void func_800238BC(Object *arg0);
 void run_object_loop_func(Object *obj, s32 arg1);
 void func_8002458C(s32 arg0);
@@ -230,5 +231,6 @@ void func_8001D5E0(f32 arg0, f32 arg1, f32 arg2);
 s32 func_80014814(s32 *);
 void func_80015348(s32, s32);
 Object *func_8000EA54(unk80027FC4*, s32);
+s32 func_8001F460(Object*, s32, Object*);
 
 #endif

src/unknown_043920.c

@@ -11,6 +11,7 @@
 #include "structs.h"
 #include "asset_sections.h"
 //#include "controller_pak.h"
+#include "unknown_008C40.h"
 
 /* Size: 8 bytes */
 typedef struct GhostHeader {
@@ -741,9 +742,6 @@ void func_800570A4(Object *arg0, s32 arg1, s32 arg2) {
 }
 
 #ifdef NON_MATCHING
-
-void func_80009558(u16, f32 x, f32 y, f32 z, s32, s32 *); //unknown_008C40
-
 typedef struct Object_64_800570B8 {
     u8 pad0[3];
     s8 unk3;
@@ -882,10 +880,6 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80058B84.s")
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80058D5C.s")
 
 #ifdef NON_MATCHING
-
-s32 func_8007066C(s32, s32);
-s16 get_level_segment_index_from_position(f32, f32, f32);
-
 void func_80058F44(f32 arg0, Object *arg1, Object *arg2) {
     s32 temp0, temp1;
     temp0 = (s32)arg0;
@@ -894,7 +888,6 @@ void func_80058F44(f32 arg0, Object *arg1, Object *arg2) {
     gCameraObject->z_rotation -= (gCameraObject->z_rotation * temp0) >> 4;
     gCameraObject->unk34 = get_level_segment_index_from_position(gCameraObject->x_position, arg2->unk3C_a.unk3C_f, gCameraObject->z_position);
 }
-
 #else
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80058F44.s")
 #endif

src/unknown_043920.h

@@ -2,6 +2,7 @@
 #define _UNKNOWN_043920_H_
 
 #include "types.h"
+#include "structs.h"
 
 extern s32 D_800DCB50;
 extern s16 D_800DCB54;
@@ -48,4 +49,6 @@ extern s16 D_800DCDD4[4];
 s32 func_80059B7C(s32 arg0, s32 arg1, s16 arg2, s16 arg3, s16 arg4);
 void func_8005A3D0(void);
 
+void set_ghost_position_and_rotation(Object *obj); // Non Matching
+
 #endif

src/unknown_05CEF0.c

@@ -9,6 +9,7 @@
 #include "audio.h"
 #include "unknown_00BC20.h"
 #include "unknown_005740.h"
+#include "unknown_008C40.h"
 
 /************ .data ************/
 

src/unknown_05CEF0.h

@@ -20,7 +20,6 @@ typedef struct unk8005D048 {
 
 extern s16 D_800DCDE0[16];
 
-void func_80009558(u16, f32 x, f32 y, f32 z, s32, s32 *); //unknown_008C40
 s32 get_random_number_from_range(s32, s32); //?
 
 void func_8005C2F0(Object *object, unk8005C2F0 *arg1);

src/waves.c

@@ -1,6 +1,7 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800B7D20 */
 
+#include "waves.h"
 #include "types.h"
 #include "macros.h"
 #include "libultra_internal.h"

src/waves.h

@@ -0,0 +1,10 @@
+#ifndef _WAVES_H_
+#define _WAVES_H_
+
+#include "types.h"
+#include "structs.h"
+
+Object_64 *func_800BE654(s16, f32, f32); // Non Matching
+f32 func_800BEEB4(Object_64 *); // Non Matching
+
+#endif