From f839da25815838c698c09f3940f2ea8565ba8323 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 29 Sep 2023 02:06:11 +0200 Subject: [PATCH] Decompiled `func_8017B5BC` --- include/common.h | 3 +++ src/segment_obdata/_ob_squeamish_mask.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/common.h b/include/common.h index 05e3f89..4e10c36 100644 --- a/include/common.h +++ b/include/common.h @@ -257,6 +257,9 @@ extern OverlaySomething* (*D_800AF028[24])(void); extern OverlaySomething* D_800E8294; +extern OverlaySomething __OVERLAY_INFO_79730_65C50; +extern OverlaySomething __OVERLAY_INFO_87200_65C64; +extern OverlaySomething __OVERLAY_INFO_87200_65C78; extern OverlaySomething __OVERLAY_INFO_71280_65C8C; extern OverlaySomething __OVERLAY_INFO_71280_65CA0; diff --git a/src/segment_obdata/_ob_squeamish_mask.c b/src/segment_obdata/_ob_squeamish_mask.c index 18bfa3f..e527949 100644 --- a/src/segment_obdata/_ob_squeamish_mask.c +++ b/src/segment_obdata/_ob_squeamish_mask.c @@ -4,9 +4,23 @@ extern void func_801C1990(); extern void func_8019A7A0(); extern u32 D_801977C8; -INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B5B0); +extern u8 D_801936E0; -INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B5BC); +/* 514B0 8017B5B0 */ +OverlaySomething *func_8017B5B0(void) { + return &__OVERLAY_INFO_79730_65C50; +} + +/* 514BC 8017B5BC */ +OverlaySomething* func_8017B5BC(void) { + OverlaySomething* ret; + + ret = &__OVERLAY_INFO_87200_65C64; + if (D_801936E0 != 0) + ret = &__OVERLAY_INFO_87200_65C78; + + return ret; +} /* 514E0 8017B5E0 */ OverlaySomething *__get_overlay_info_71280_65C8C(void) {