diff --git a/include/common.h b/include/common.h index d26a0ef..21d4b10 100644 --- a/include/common.h +++ b/include/common.h @@ -244,10 +244,10 @@ extern u8* __SOME_OVERLAY_ID_ARRAY[11]; extern OverlayEntry __SOME_OVERLAY_TABLE[11]; typedef struct { - /* 0x00 */ u32 field_0x0; - /* 0x04 */ u32 field_0x4; - /* 0x08 */ u32 field_0x8; - /* 0x0c */ u32 field_0xc; + /* 0x00 */ void* field_0x0; + /* 0x04 */ void* field_0x4; + /* 0x08 */ void* field_0x8; + /* 0x0c */ void* field_0xc; /* 0x10 */ u32 field_0x10; } OverlaySomething; // size:0x14 diff --git a/splat.yaml b/splat.yaml index 8e12cb9..6f8bc2c 100644 --- a/splat.yaml +++ b/splat.yaml @@ -447,7 +447,7 @@ segments: - [0x65B00, data] - [0x65B80, .data, "gfx/_ob_long_skirt"] - [0x65C10, .data, "gfx/_ob_pointless_account"] - - [0x65C50, data] + - [0x65C50, .data, "overlay_info"] - [0x65CC0, data] - [0x65D60, .rodata, "segment_obdata/_ob_blushing_ship"] diff --git a/src/overlay_info.c b/src/overlay_info.c new file mode 100644 index 0000000..fc27c3a --- /dev/null +++ b/src/overlay_info.c @@ -0,0 +1,57 @@ +#include "common.h" + +extern u32 __setup_overlay_79730[]; +extern u32 __setup_overlay_87200[]; +extern u32 __setup_overlay_71280_51674[]; +extern u32 __setup_overlay_71280_51940[]; + +extern u32 func_8017B838[]; +extern u32 func_8017B9A8[]; +extern u32 func_8017BA2C[]; +extern u32 func_8017BB08[]; +extern u32 func_8017BB34[]; + +/* 65C50 8018FD50 */ +OverlaySomething __OVERLAY_INFO_79730_65C50 = { + __setup_overlay_79730, + func_8017B838, + func_8017B9A8, + func_8017BA2C, + 0x00000002 +}; + +/* 65C64 8018FD64 */ +OverlaySomething __OVERLAY_INFO_87200_65C64 = { + __setup_overlay_87200, + func_8017B838, + func_8017B9A8, + 0x00000000, + 0x00000002 +}; + +/* 65C78 8018FD78 */ +OverlaySomething __OVERLAY_INFO_87200_65C78 = { + __setup_overlay_87200, + func_8017B838, + func_8017B9A8, + 0x00000000, + 0x00040002 +}; + +/* 65C8C 8018FD8C */ +OverlaySomething __OVERLAY_INFO_71280_65C8C = { + __setup_overlay_71280_51674, + func_8017B838, + func_8017B9A8, + 0x00000000, + 0x00000002 +}; + +/* 65CA0 8018FDA0 */ +OverlaySomething __OVERLAY_INFO_71280_65CA0 = { + __setup_overlay_71280_51940, + func_8017BB08, + func_8017BB34, + 0x00000000, + 0x00000002 +}; \ No newline at end of file