From e07ba849593dd1cbeb4f184e6193951dc4b07862 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Tue, 14 Sep 2021 11:31:22 -0400 Subject: [PATCH] unknown_05CEF9.h --- src/unknown_0348C0.c | 2 +- src/unknown_043920.c | 2 +- src/unknown_05CEF0.c | 26 ++++++-------------------- src/unknown_05CEF0.h | 24 ++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 5b05df05..cb2d500b 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -126,7 +126,7 @@ extern u32 osTvType; Settings *get_settings(); Object_64 *func_800BE654(s16, f32, f32); void func_80000FDC(s32, s32, f32); -void func_80009558(s32, f32, f32, f32, s32, s32*); +void func_80009558(u16, f32 x, f32 y, f32 z, s32, s32 *); //unknown_008C40 void func_80009968(f32, f32, f32, u8, u8, s32); s32 func_8001F460(Object*, s32, Object*); f32 func_800707C4(s16); diff --git a/src/unknown_043920.c b/src/unknown_043920.c index de08b30d..07d2d5c1 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -742,7 +742,7 @@ void func_800570A4(Object *arg0, s32 arg1, s32 arg2) { #ifdef NON_MATCHING -void func_80009558(u16, f32, f32, f32, s32, s32 *); +void func_80009558(u16, f32 x, f32 y, f32 z, s32, s32 *); //unknown_008C40 typedef struct Object_64_800570B8 { u8 pad0[3]; diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index 33742c02..fe2ab85e 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -6,6 +6,9 @@ #include "structs.h" #include "types.h" #include "macros.h" +#include "audio.h" +#include "unknown_00BC20.h" +#include "unknown_005740.h" /************ .data ************/ @@ -13,7 +16,7 @@ s16 D_800DCDE0[16] = { 0x022B, 0x00A3, 0x00A4, 0x00B3, 0x00B4, 0x00F0, 0x00F1, 0x00F6, 0x00F7, 0x0225, 0x0226, 0x002E, - 0x002F, 0x0030, 0x0000, 0x0000 + 0x002F, 0x0030, 0x0000, 0x0000, }; /*******************************/ @@ -27,17 +30,6 @@ s32 D_8011D5CC; /******************************/ -void func_80009558(u16, f32, f32, f32, s32, s32); -s32 get_random_number_from_range(s32, s32); - -/* Unknown size */ -typedef struct unk8005C2F0 { - u8 pad0[0xC]; - f32 unkC; - u8 pad10[0x108]; - s32 unk118; -} unk8005C2F0; - void func_8005C2F0(Object *object, unk8005C2F0 *arg1) { object->unk4C->unk14 = 5; object->unk4C->unk11 = 0; @@ -57,13 +49,13 @@ void func_8005CA78(s32 arg0) { D_8011D5C8 = arg0; } -void func_8005CA84(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { +void func_8005CA84(f32 x, f32 y, f32 z, s32 arg3) { s8 phi_v1 = get_random_number_from_range(0, 1); if (arg3 == 0) { phi_v1 = 0; } arg3 += phi_v1; - func_80009558(D_8011D5C8[arg3], arg0, arg1, arg2, 4, 0); + func_80009558(D_8011D5C8[arg3], x, y, z, 4, 0); } void func_8005CB04(s32 arg0) { @@ -77,12 +69,6 @@ void func_8005CB04(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CB68.s") -/* Unknown size */ -typedef struct unk8005D048 { - u8 pad0[0x1F7]; - u8 unk1F7; -} unk8005D048; - void func_8005D048(Object *object, unk8005D048 *arg1, s32 arg2) { Object *sp1C = get_object_struct(0); arg1->unk1F7 = 0xFF; diff --git a/src/unknown_05CEF0.h b/src/unknown_05CEF0.h index 5588c183..e8b8895b 100644 --- a/src/unknown_05CEF0.h +++ b/src/unknown_05CEF0.h @@ -2,7 +2,31 @@ #define _UNKNOWN_05CEF0_H_ #include "types.h" +#include "structs.h" + +/* Unknown size */ +typedef struct unk8005C2F0 { + u8 pad0[0xC]; + f32 unkC; + u8 pad10[0x108]; + s32 unk118; +} unk8005C2F0; + +/* Unknown size */ +typedef struct unk8005D048 { + u8 pad0[0x1F7]; + u8 unk1F7; +} 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); +void func_8005CA78(s32 arg0); +void func_8005CA84(f32 x, f32 y, f32 z, s32 arg3); +void func_8005CB04(s32 arg0); +void func_8005D048(Object *object, unk8005D048 *arg1, s32 arg2); + #endif \ No newline at end of file