From e0f5679536276642507b0270a0873efd67f33998 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 16:38:50 +0200 Subject: [PATCH] Rename `D_800AA090` to `nuGfxFunc` --- include/common.h | 1 - linker_scripts/symbols/addr.txt | 1 + src/_ob_grumpy_island.c | 4 ++-- src/_ob_past_brick.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/common.h b/include/common.h index fb99e6b..9cebada 100644 --- a/include/common.h +++ b/include/common.h @@ -167,7 +167,6 @@ extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS]; extern u8 D_800AA040; extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers); -extern void (*D_800AA090)(s32); extern void (*D_800AA094)(); extern s32 D_800E79A4; extern u8 SP_THREAD_800BE1C0[1]; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index b72262b..4f6548d 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -8,6 +8,7 @@ nuGfxCfbCounter = 0x800C4BC4; nuGfxCfb_ptr = 0x800E8210; nuGfxMesgQ = 0x800C4C28; nuGfxMesgBuf = 0x800BE1A0; +nuGfxFunc = 0x800AA090; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 diff --git a/src/_ob_grumpy_island.c b/src/_ob_grumpy_island.c index ee3103d..ea17483 100644 --- a/src/_ob_grumpy_island.c +++ b/src/_ob_grumpy_island.c @@ -17,8 +17,8 @@ void gfxThread(void* arg0) { switch(temp_v0) { case NU_SC_RETRACE_MSG: - if (D_800AA090 != NULL) { - D_800AA090(D_800E79A4); + if (nuGfxFunc != NULL) { + nuGfxFunc(D_800E79A4); } break; diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c index 0fc2a08..2c1f06e 100644 --- a/src/_ob_past_brick.c +++ b/src/_ob_past_brick.c @@ -187,7 +187,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", func_80089990); // func_80089A10(); // mask = osSetIntMask(OS_IM_NONE); -// D_800AA090 = arg0; +// nuGfxFunc = arg0; // osSetIntMask(mask); // }