From 118c79854c32667ae6a7c175314b1a8ed3e9b832 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 19:47:12 +0200 Subject: [PATCH] Rename `D_800A9FF8` to `nuContCallBack` --- include/common.h | 1 - linker_scripts/symbols/addr.txt | 1 + src/_ob_prized_reading.c | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/common.h b/include/common.h index 0fceec8..6ca3961 100644 --- a/include/common.h +++ b/include/common.h @@ -137,7 +137,6 @@ extern OSPiHandle* CART_HANDLE; extern OSMesgQueue MQ_800E7988; extern s32 D_800C4B30; -extern u8 D_800A9FF8; extern OSContStatus __GLOBAL_CONT_STATUS[MAXCONTROLLERS]; extern void (*D_800A9FE0)(s16); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index fc557fe..e682125 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -35,6 +35,7 @@ nuContWaitMesgQ = 0x800C4A00; nuContWaitMesgBuf = 0x800BE190; nuContDataMutexQ = 0x800E9BF0; nuContDataMutexBuf = 0x800BE194; +nuContCallBack = 0x800A9FF8; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 diff --git a/src/_ob_prized_reading.c b/src/_ob_prized_reading.c index 6d0b144..dd48ac2 100644 --- a/src/_ob_prized_reading.c +++ b/src/_ob_prized_reading.c @@ -13,7 +13,7 @@ u8 nuContMgrInit(void) { nuContDataUnLock(); osCreateMesgQueue(&nuContWaitMesgQ, &nuContWaitMesgBuf, 1); osCreateMesgQueue(&nuContDataMutexQ, &nuContDataMutexBuf, 1); - nuSiCallBackAdd(&D_800A9FF8); + nuSiCallBackAdd(&nuContCallBack); nuContQueryRead(); var_a0 = 1; @@ -36,7 +36,7 @@ u8 nuContMgrInit(void) { void func_8008A334(void) { - func_8008B1D0(&D_800A9FF8); + func_8008B1D0(&nuContCallBack); } void __start_copy_global_controller_data(void) {