diff --git a/include/unknown_0255E0.h b/include/unknown_0255E0.h new file mode 100644 index 00000000..21d9402c --- /dev/null +++ b/include/unknown_0255E0.h @@ -0,0 +1,82 @@ +#ifndef _UNKNOWN_0255E0_H_ +#define _UNKNOWN_0255E0_H_ + +#include "types.h" +#include "structs.h" + +/* Size: 0x8 bytes */ +typedef struct unknown800DC874 { + union { + s8 unk00; + s32 dummy_force_alignment; // Not sure of a better way to do this. + }; + u16 unk04; + s16 unk06; +} unknown800DC874; + +extern s32 D_800DC870; +extern unknown800DC874 D_800DC874; +extern unknown800DC874 D_800DC87C; + +extern f32 D_800DC884[10]; + +extern f32 D_800DC8AC[27]; + +typedef struct{ + u8 pad00[0x12]; + u16 unk12; + u16 unk14; +} unk800DC918_00_00; + +typedef struct{ + unk800DC918_00_00 *unk00; + u8 pad00[0x04]; +} unk800DC918_00; + +typedef struct{ + u8 unk00; + u8 pad01[0x05]; + u8 unk06; + u8 unk07; + u32 unk08; +} unk800DC918_04_0C; + +typedef struct{ + u8 pad00[0x0C]; + unk800DC918_04_0C* unk0C; + u8 pad0C[0x10]; + s16 unk20; + u8 pad22[0x09]; + s8 unk2B; + u8 pad2C[0x14]; + u8 unk40; + u8 pad41[0x3]; +} unk800DC918_04; + +typedef struct{ + s16 unk00; //sx + s16 unk02; //sy + s16 unk04; //sz + s16 unk06; //lx + s16 unk08; //ly + s16 unk0A; //lz +} unk800DC918_08; //bounding box + +typedef struct{ + unk800DC918_00 *unk00; + unk800DC918_04 *unk04; + unk800DC918_08 *unk08; + u8 pad0C[0x0E]; + s16 count; +} unk800DC918; + +extern unk800DC918* D_800DC918; +extern LevelHeader *D_800DC91C; + +extern s32 D_800DC920; +extern s32 D_800DC924; +extern s32 D_800DC928; + +extern s8 D_800DC92C[24]; + +#endif \ No newline at end of file diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index 20efb5c5..4a3a0808 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -1,6 +1,8 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800249E0 */ +#include "unknown_0255E0.h" + #include "types.h" #include "macros.h" #include "structs.h" @@ -31,16 +33,6 @@ typedef struct unk80120AC0 { /************ .data ************/ -/* Size: 0x8 bytes */ -typedef struct unknown800DC874 { - union { - s8 unk00; - s32 dummy_force_alignment; // Not sure of a better way to do this. - }; - u16 unk04; - s16 unk06; -} unknown800DC874; - s32 D_800DC870 = 0; // Currently unknown, might be a different type. unknown800DC874 D_800DC874 = { -128, 40, -1 }; unknown800DC874 D_800DC87C = { -125, 70, -1 }; @@ -60,54 +52,6 @@ f32 D_800DC8AC[27] = { -130.0f, 60.0f, -68.0f }; -typedef struct{ - u8 pad00[0x12]; - u16 unk12; - u16 unk14; -} unk800DC918_00_00; - -typedef struct{ - unk800DC918_00_00 *unk00; - u8 pad00[0x04]; -} unk800DC918_00; - -typedef struct{ - u8 unk00; - u8 pad01[0x05]; - u8 unk06; - u8 unk07; - u32 unk08; -} unk800DC918_04_0C; - -typedef struct{ - u8 pad00[0x0C]; - unk800DC918_04_0C* unk0C; - u8 pad0C[0x10]; - s16 unk20; - u8 pad22[0x09]; - s8 unk2B; - u8 pad2C[0x14]; - u8 unk40; - u8 pad41[0x3]; -} unk800DC918_04; - -typedef struct{ - s16 unk00; //sx - s16 unk02; //sy - s16 unk04; //sz - s16 unk06; //lx - s16 unk08; //ly - s16 unk0A; //lz -} unk800DC918_08; //bounding box - -typedef struct{ - unk800DC918_00 *unk00; - unk800DC918_04 *unk04; - unk800DC918_08 *unk08; - u8 pad0C[0x0E]; - s16 count; -} unk800DC918; - unk800DC918* D_800DC918 = NULL; LevelHeader *D_800DC91C = NULL; diff --git a/undefined_syms.txt b/undefined_syms.txt index a2a11ac3..33dd0daa 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -67,14 +67,6 @@ D_800D84C0 = 0x800D84C0; D_800D8590 = 0x800D8590; D_800D9790 = 0x800D9790; D_800DA970 = 0x800DA970; -D_800DC874 = 0x800DC874; -D_800DC87C = 0x800DC87C; -D_800DC884 = 0x800DC884; -D_800DC8AC = 0x800DC8AC; -D_800DC918 = 0x800DC918; -D_800DC91C = 0x800DC91C; -D_800DC924 = 0x800DC924; -D_800DC92C = 0x800DC92C; D_800DC950 = 0x800DC950; D_800DC954 = 0x800DC954; D_800DC958 = 0x800DC958;