From 05dbe6d9e55f206a8f265c12d8cce0e2fab499ed Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 11:02:49 +0200 Subject: [PATCH] Rename `__MAIN_NOT_NULL_INF_LOOP` to `nuScPreNMIFlag` --- include/common.h | 2 +- linker_scripts/symbols/addr.txt | 2 +- src/_ob_past_brick.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/common.h b/include/common.h index f542af4..84fbc24 100644 --- a/include/common.h +++ b/include/common.h @@ -181,7 +181,7 @@ extern u8 D_594284; extern void (*SWAP_BUFFER_FUNC)(void** buffers); extern Stack__dma_load_loop *D_800E9178[0]; -extern u8 __MAIN_NOT_NULL_INF_LOOP; +extern u8 nuScPreNMIFlag; extern OSMesgQueue MQ_800B9C40; extern s8 D_800E918D; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 026aa43..d2f4e80 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -1,5 +1,6 @@ nusched = 0x800E917C; // size:0x67A nuScRetraceCounter = 0x800C4BCC; +nuScPreNMIFlag = 0x800C4800; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -690,7 +691,6 @@ __SCREEN_IS_NOT_BLACK = 0x800C4BD8; __calls_osViBlack = 0x80089BE4; __set_black = 0x80089BC0; -__MAIN_NOT_NULL_INF_LOOP = 0x800C4800; __MAIN_START_BUT_CHECK = 0x800E79B0; // size:0x14 __MAIN_START_BUT_STATE = 0x800E8214; diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c index 627aab7..21c08f7 100644 --- a/src/_ob_past_brick.c +++ b/src/_ob_past_brick.c @@ -26,7 +26,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", Stack__dma_load_loop_new); // D_800E9178[0] = arg0; -// if ((flags & 2) && (__MAIN_NOT_NULL_INF_LOOP != 0)) { +// if ((flags & 2) && (nuScPreNMIFlag != 0)) { // osSendMesg(mq, (u8*)(&D_800E9178) - 0x666, OS_MESG_NOBLOCK); // } @@ -60,7 +60,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", nuScExecuteGraphics); // while(1) { // osRecvMesg(&MQ_800E8B4C.field_0x0, &sp10, 1); -// if (!(__MAIN_NOT_NULL_INF_LOOP & 2)) { +// if (!(nuScPreNMIFlag & 2)) { // func_8008949C(sp10); // osWritebackDCacheAll(); // osSendMesg(&MQ_800B9C40, sp10, OS_MESG_BLOCK);