From 1c2a037909da54d45647b5f235075743ff31ed39 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 29 Sep 2023 02:00:16 +0200 Subject: [PATCH] Decompiled `func_8017BA2C` --- include/common.h | 1 + src/514B0.c | 117 ------------------------ src/segment_obdata/_ob_squeamish_mask.c | 8 +- 3 files changed, 6 insertions(+), 120 deletions(-) delete mode 100644 src/514B0.c diff --git a/include/common.h b/include/common.h index b5bd1a0..05e3f89 100644 --- a/include/common.h +++ b/include/common.h @@ -258,6 +258,7 @@ extern OverlaySomething* (*D_800AF028[24])(void); extern OverlaySomething* D_800E8294; extern OverlaySomething __OVERLAY_INFO_71280_65C8C; +extern OverlaySomething __OVERLAY_INFO_71280_65CA0; extern OverlaySomething *__get_overlay_info_71280_65C8C(void); diff --git a/src/514B0.c b/src/514B0.c deleted file mode 100644 index 03e56aa..0000000 --- a/src/514B0.c +++ /dev/null @@ -1,117 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "514B0", func_8017B5B0); - -INCLUDE_ASM(const s32, "514B0", func_8017B5BC); - -INCLUDE_ASM(const s32, "514B0", func_8017B5E0); - -INCLUDE_ASM(const s32, "514B0", __setup_overlay_79730); - -INCLUDE_ASM(const s32, "514B0", __setup_overlay_87200); - -INCLUDE_ASM(const s32, "514B0", __setup_overlay_71280); - -INCLUDE_ASM(const s32, "514B0", func_8017B838); - -INCLUDE_ASM(const s32, "514B0", func_8017B9A8); - -void func_8017BA2C(void) { } - -INCLUDE_ASM(const s32, "514B0", func_8017BA34); - -INCLUDE_ASM(const s32, "514B0", func_8017BA40); - -INCLUDE_ASM(const s32, "514B0", func_8017BB08); - -INCLUDE_ASM(const s32, "514B0", func_8017BB34); - -INCLUDE_ASM(const s32, "514B0", func_8017BB50); - -INCLUDE_ASM(const s32, "514B0", func_8017BD48); - -INCLUDE_ASM(const s32, "514B0", func_8017BDC0); - -INCLUDE_ASM(const s32, "514B0", func_8017BED4); - -INCLUDE_ASM(const s32, "514B0", func_8017BF10); - -INCLUDE_ASM(const s32, "514B0", func_8017BFB0); - -INCLUDE_ASM(const s32, "514B0", func_8017C074); - -INCLUDE_ASM(const s32, "514B0", func_8017C24C); - -INCLUDE_ASM(const s32, "514B0", func_8017C29C); - -INCLUDE_ASM(const s32, "514B0", func_8017C2FC); - -INCLUDE_ASM(const s32, "514B0", func_8017C384); - -INCLUDE_ASM(const s32, "514B0", func_8017C4B4); - -INCLUDE_ASM(const s32, "514B0", func_8017C584); - -INCLUDE_ASM(const s32, "514B0", func_8017CBE8); - -INCLUDE_ASM(const s32, "514B0", func_8017D6D0); - -INCLUDE_ASM(const s32, "514B0", func_8017E264); - -INCLUDE_ASM(const s32, "514B0", func_8017E80C); - -INCLUDE_ASM(const s32, "514B0", func_8017EAE8); - -INCLUDE_ASM(const s32, "514B0", func_8017EC84); - -INCLUDE_ASM(const s32, "514B0", func_8017EE64); - -INCLUDE_ASM(const s32, "514B0", func_8017EF24); - -INCLUDE_ASM(const s32, "514B0", func_8017F010); - -INCLUDE_ASM(const s32, "514B0", func_8017F114); - -INCLUDE_ASM(const s32, "514B0", func_8017F214); - -INCLUDE_ASM(const s32, "514B0", func_8017F334); - -INCLUDE_ASM(const s32, "514B0", func_8017F36C); - -INCLUDE_ASM(const s32, "514B0", func_8017F3C0); - -INCLUDE_ASM(const s32, "514B0", func_8017F408); - -INCLUDE_ASM(const s32, "514B0", func_8017F490); - -INCLUDE_ASM(const s32, "514B0", func_8017F554); - -INCLUDE_ASM(const s32, "514B0", func_8017FAF8); - -INCLUDE_ASM(const s32, "514B0", func_8017FC28); - -INCLUDE_ASM(const s32, "514B0", func_801805B4); - -INCLUDE_ASM(const s32, "514B0", func_801805D0); - -INCLUDE_ASM(const s32, "514B0", __handle_name_input); - -INCLUDE_ASM(const s32, "514B0", func_80180B1C); - -INCLUDE_ASM(const s32, "514B0", func_80180BDC); - -INCLUDE_ASM(const s32, "514B0", func_80181498); - -INCLUDE_ASM(const s32, "514B0", func_801814AC); - -INCLUDE_ASM(const s32, "514B0", func_80181504); - -INCLUDE_ASM(const s32, "514B0", func_801818A0); - -INCLUDE_ASM(const s32, "514B0", func_80181C2C); - -INCLUDE_ASM(const s32, "514B0", func_80182578); - -INCLUDE_ASM(const s32, "514B0", func_80184130); - -INCLUDE_ASM(const s32, "514B0", func_801841F4); diff --git a/src/segment_obdata/_ob_squeamish_mask.c b/src/segment_obdata/_ob_squeamish_mask.c index c27be44..18bfa3f 100644 --- a/src/segment_obdata/_ob_squeamish_mask.c +++ b/src/segment_obdata/_ob_squeamish_mask.c @@ -105,10 +105,12 @@ INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B838); INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B9A8); -void func_8017BA2C(void) { -} +void func_8017BA2C(void) { } -INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BA34); +/* 51934 8017BA34 */ +OverlaySomething *func_8017BA34(void) { + return &__OVERLAY_INFO_71280_65CA0; +} INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __setup_overlay_71280_51940);