From eeddbc0da8b1f5f2db8ddd6ba4654f9a00d32d8d Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 10:46:50 +0200 Subject: [PATCH] Rename `D_800E7A18` to `nuIdleFunc` --- include/common.h | 2 +- linker_scripts/symbols/addr.txt | 11 +++++++---- src/boot.c | 7 +++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/common.h b/include/common.h index bdb1b8d..f542af4 100644 --- a/include/common.h +++ b/include/common.h @@ -357,7 +357,7 @@ extern void __some_logging(const char* format, ...); extern void nuBoot(void); extern void nuScCreateScheduler(u8 videoMode, u8 numFields); -extern void (*D_800E7A18)(); +extern void (*nuIdleFunc)(); extern void obIdle(void*); extern void obMain(void*); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index c7ab5ab..f47fc27 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -1,3 +1,10 @@ +nusched = 0x800E917C; // size:0x67A + +nuBoot = 0x8007F880; +nuScCreateScheduler = 0x80088C50; // rom:0x19050 +nuPiInit = 0x80089F40; +nuIdleFunc = 0x800E7A18; + obCurrentTime = 0x800C47D0; obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0 obGetCurrentTime = 0x8009C7CC; // rom:0x2CBCC @@ -685,10 +692,6 @@ __MAIN_START_BUT_STATE = 0x800E8214; __thread_80089358 = 0x80089358; -nusched = 0x800E917C; // size:0x67A -nuBoot = 0x8007F880; -nuScCreateScheduler = 0x80088C50; // rom:0x19050 -nuPiInit = 0x80089F40; __CONTROLLER_0_BUTTON = 0x800E8700; __menu_handle_input = 0x8019B8AC; // type:func diff --git a/src/boot.c b/src/boot.c index 2b00f7a..a619459 100644 --- a/src/boot.c +++ b/src/boot.c @@ -9,7 +9,7 @@ void nuBoot(void) { } void obIdle(void* arg) { - D_800E7A18 = NULL; + nuIdleFunc = NULL; nuPiInit(); nuScCreateScheduler(OS_VI_NTSC_LAN1, 1); @@ -22,8 +22,7 @@ void obIdle(void* arg) { osSetThreadPri(&obThreadIdle, OS_PRIORITY_IDLE); while(1) { - if (D_800E7A18 != NULL) { - D_800E7A18(); - } + if (nuIdleFunc != NULL) + nuIdleFunc(); } }