From 721b5a2236b0819f69e0986f7ed83bc4d246753e Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 29 Sep 2023 01:56:50 +0200 Subject: [PATCH] Changed `OverlaySomething` to contain function pointer --- include/common.h | 7 ++++++- src/overlay_info.c | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/common.h b/include/common.h index 21d4b10..b5bd1a0 100644 --- a/include/common.h +++ b/include/common.h @@ -244,7 +244,7 @@ extern u8* __SOME_OVERLAY_ID_ARRAY[11]; extern OverlayEntry __SOME_OVERLAY_TABLE[11]; typedef struct { - /* 0x00 */ void* field_0x0; + /* 0x00 */ void (*setup)(void); /* 0x04 */ void* field_0x4; /* 0x08 */ void* field_0x8; /* 0x0c */ void* field_0xc; @@ -261,6 +261,11 @@ extern OverlaySomething __OVERLAY_INFO_71280_65C8C; extern OverlaySomething *__get_overlay_info_71280_65C8C(void); +extern void __setup_overlay_79730(void); +extern void __setup_overlay_87200(void); +extern void __setup_overlay_71280_51674(void); +extern void __setup_overlay_71280_51940(void); + extern u8* func_80076188(void); extern void func_80076194(void); extern void func_800761A4(void); diff --git a/src/overlay_info.c b/src/overlay_info.c index fc27c3a..f3d1e3f 100644 --- a/src/overlay_info.c +++ b/src/overlay_info.c @@ -1,10 +1,5 @@ #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[];