From 13ebabbd5c4b8ac3b8cdca163f82b3a4244bf261 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Tue, 14 Sep 2021 15:24:59 -0400 Subject: [PATCH] unknown_09F8F0.h --- src/unknown_09F8F0.c | 52 ++---------------------------- src/unknown_09F8F0.h | 75 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 50 deletions(-) create mode 100644 src/unknown_09F8F0.h diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 7deb7aa5..f67a0df0 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -1,22 +1,12 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x8009ECF0 */ +#include "unknown_09F8F0.h" #include "types.h" #include "macros.h" #include "structs.h" #include "f3ddkr.h" - -typedef struct { - u8 unk0[0x4C4]; - u16 unk4C4; - u8 unk4C6[0x1B4]; - s8 unk67A; -} unk80126CDC; - -typedef struct { - u8 unk0[0x4C]; - s8 unk4C; -} unk80126D60; +#include "camera.h" extern u32 osTvType; @@ -25,17 +15,6 @@ extern u32 osTvType; // Unused? s32 D_800E1E60 = 0; -typedef struct unk800E1E64 { - s32 unk0; - s32 unk4; - f32 unk8; - f32 unkC; - f32 unk10; - s32 unk14; - s32 unk18; - s32 unk1C; -} unk800E1E64; - unk800E1E64 D_800E1E64[59] = { { 0, 0, 1.0f, 53.0f, 16.0f, 0, 127, 0 }, { 0, 3, 1.0f, 54.0f, 18.0f, 0, 0, 0 }, @@ -131,17 +110,6 @@ u16 D_800E2684[118] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0000 }; -/* Size: 0x10 bytes */ -typedef struct unk800E2770 { - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - s32 unk4; - s32 unk8; - s32 unkC; -} unk800E2770; - unk800E2770 D_800E2770[2] = { { 0, 0xFD, 0, 0, 0, 0, 0 }, { 0, 0xFF, 0, 0, 0, 0, 0 }, @@ -277,22 +245,6 @@ s32 D_801271B0[640]; /******************************/ -typedef struct { - u8 unk0[0x1D8]; - s8 unk1D8; -} unk800A0DC0_2; - -typedef struct { - u8 unk0[0x64]; - unk800A0DC0_2 *unk64; -} unk800A0DC0; - -void func_80068508(s32); -void func_800A14F0(unk800A0DC0 *, s32); -void func_800A3CE4(s32, s32); -void func_800A7520(unk800A0DC0 *, s32); - - GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_8009ECF0.s") GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_8009F034.s") GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A003C.s") diff --git a/src/unknown_09F8F0.h b/src/unknown_09F8F0.h new file mode 100644 index 00000000..8c1c60c1 --- /dev/null +++ b/src/unknown_09F8F0.h @@ -0,0 +1,75 @@ +#ifndef _UNKNOWN_09F8F0_H_ +#define _UNKNOWN_09F8F0_H_ + +#include "types.h" +#include "structs.h" + +typedef struct { + u8 unk0[0x4C4]; + u16 unk4C4; + u8 unk4C6[0x1B4]; + s8 unk67A; +} unk80126CDC; + +typedef struct { + u8 unk0[0x4C]; + s8 unk4C; +} unk80126D60; + +typedef struct unk800E1E64 { + s32 unk0; + s32 unk4; + f32 unk8; + f32 unkC; + f32 unk10; + s32 unk14; + s32 unk18; + s32 unk1C; +} unk800E1E64; + +/* Size: 0x10 bytes */ +typedef struct unk800E2770 { + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + s32 unk4; + s32 unk8; + s32 unkC; +} unk800E2770; + +typedef struct { + u8 unk0[0x1D8]; + s8 unk1D8; +} unk800A0DC0_2; + +//Probably Object +typedef struct { + u8 unk0[0x64]; + unk800A0DC0_2 *unk64; +} unk800A0DC0; + + +u8 func_800A0190(void); +void func_800A0B74(void); +void func_800A0DC0(s32 arg0, unk800A0DC0 *arg1, s32 arg2); +void func_800A1428(s32 arg0, unk800A0DC0 *arg1, s32 arg2); +void func_800A258C(s32 arg0, unk800A0DC0 *arg1, s32 arg2); +void func_800A263C(s32 arg0, unk800A0DC0 *arg1, s32 arg2); +void func_800A3870(void); +void func_800A6DB4(s16 *arg0); +void func_800A7484(u16 arg0, f32 arg1, s32 arg2); +void func_800A74EC(u16 arg0, s32 arg1); +void func_800A83B4(LevelModel *model); +s8 func_800A8458(void); +void func_800AB194(s32 arg0); +void func_800AB1AC(s32 arg0); +void func_800AB1C8(void); +void func_800AB1D4(u8 arg0); + +// Non Matching +void func_800A14F0(unk800A0DC0 *, s32); +void func_800A3CE4(s32, s32); +void func_800A7520(unk800A0DC0 *, s32); + +#endif