diff --git a/lib/src/unknown_0CE200.c b/lib/src/unknown_0CE200.c index da2a628a..25b26541 100644 --- a/lib/src/unknown_0CE200.c +++ b/lib/src/unknown_0CE200.c @@ -4,7 +4,7 @@ #include "types.h" #include "macros.h" #include "libultra_internal.h" -#include "memory.h" +#include "../src/memory.h" s32 D_800E38D0 = 0; diff --git a/src/audio.c b/src/audio.c index 4eba2df4..df9690fb 100644 --- a/src/audio.c +++ b/src/audio.c @@ -683,13 +683,21 @@ u16 func_80001CB8(u16 arg0) { GLOBAL_ASM("asm/non_matchings/audio/func_80001D04.s") -void func_80001EA8(u16 arg0, unknown_struct_80001EA8 arg1, u32 *arg2) { - if(arg2 == NULL){ - arg2 = &D_80115F84; +void func_80001EA8(u16 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4) { + s32 temp; + + //Possible "if (debug)"? + if (0) { } + + if (arg4 == NULL) { + arg4 = &D_80115F84; } - func_80001D04(arg0, arg2); - if(*arg2){ - func_80009B7C(*arg2, arg1.unk00, arg1.unk04, arg1.unk08); + + func_80001D04(arg0, arg4); + + temp = *arg4; + if (temp) { + func_80009B7C((s32 *)temp, arg1, arg2, arg3); } } diff --git a/src/audio.h b/src/audio.h index dcf4e8b6..77e7dce1 100644 --- a/src/audio.h +++ b/src/audio.h @@ -23,12 +23,6 @@ extern s32 D_800DC66C; extern u8 D_800DC670; extern u8 D_800DC65C; -typedef struct unknown_struct_80001EA8_s{ - u32 unk00; - u32 unk04; - u32 unk08; -}unknown_struct_80001EA8; - /* Size: 0x0A bytes */ typedef struct unk80115D18 { u8 pad0[6]; @@ -112,7 +106,7 @@ void play_sound(u8 arg0); u32 func_80001C08(void); void func_80001C5C(u16 arg0); u16 func_80001CB8(u16 arg0); -void func_80001EA8(u16 arg0, unknown_struct_80001EA8 arg1, u32 *arg2); +void func_80001EA8(u16 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4); void func_80001F14(u16 sndIndx, u32 *arg1); u16 ALBankFile_80115D14_GetSoundCount(void); u8 ALSeqFile_80115CF8_GetSeqCount(void); diff --git a/src/memory.c b/src/memory.c index 4b2a51e9..797d8045 100644 --- a/src/memory.c +++ b/src/memory.c @@ -40,7 +40,7 @@ s32 D_80123ED0[64]; s32 D_80123FD0[8]; s32 D_80123FF0[8]; -extern MemoryPoolSlot *gMainMemoryPool; +extern MemoryPoolSlot gMainMemoryPool; /******************************/ diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 392a3485..ca8c129c 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -735,7 +735,7 @@ void play_char_horn_sound(Object *arg0, Object_64 *arg1) { GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005698C.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80056E2C.s") - +void func_80001EA8(u16 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4); void func_80057048(unk800570A4_2 *arg0, s32 arg1) { unk800570A4 *temp = arg0->unk64; u16 temp2 = arg1;