From 7b0cc70821d604f2a118d496e6c1d434edf8fa4f Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 16:35:17 +0200 Subject: [PATCH] Rename `MQ_800C4C28` to `nuGfxMesgQ` --- include/common.h | 1 - linker_scripts/symbols/addr.txt | 2 +- src/_ob_grumpy_island.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index aed973f..c172990 100644 --- a/include/common.h +++ b/include/common.h @@ -170,7 +170,6 @@ extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers); extern void (*D_800AA090)(s32); extern void (*D_800AA094)(); extern s32 D_800E79A4; -extern OSMesgQueue MQ_800C4C28; extern OSMesg OSMESG_800BE1A0[8]; extern u8 SP_THREAD_800BE1C0[1]; extern OSThread THREAD_800BE1C0; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index f2a090e..5fb74e8 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -6,6 +6,7 @@ nuGfxCfb = 0x800E8290; nuGfxCfbNum = 0x800A9E80; nuGfxCfbCounter = 0x800C4BC4; nuGfxCfb_ptr = 0x800E8210; +nuGfxMesgQ = 0x800C4C28; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -883,7 +884,6 @@ MQ_SWAP_BUFFER = 0x800E9BA8; MQ_800E7988 = 0x800E7988; MQ_800C4A00 = 0x800C4A00; MQ_800E9BF0 = 0x800E9BF0; -MQ_800C4C28 = 0x800C4C28; MQ_800C35A0 = 0x800C35A0; MQ_800AF320 = 0x800AF320; MQ_800B1880 = 0x800B1880; diff --git a/src/_ob_grumpy_island.c b/src/_ob_grumpy_island.c index fb08eb6..3f748f0 100644 --- a/src/_ob_grumpy_island.c +++ b/src/_ob_grumpy_island.c @@ -8,11 +8,11 @@ void gfxThread(void* arg0) { NUScMsg* mesgType; s16 temp_v0; - osCreateMesgQueue(&MQ_800C4C28, OSMESG_800BE1A0, NU_GFX_MESGS); - nuScAddClient(&gfxClient, &MQ_800C4C28, NU_SC_RETRACE_MSG | NU_SC_PRENMI_MSG); + osCreateMesgQueue(&nuGfxMesgQ, OSMESG_800BE1A0, NU_GFX_MESGS); + nuScAddClient(&gfxClient, &nuGfxMesgQ, NU_SC_RETRACE_MSG | NU_SC_PRENMI_MSG); while(1) { - osRecvMesg(&MQ_800C4C28, (OSMesg)&mesgType, OS_MESG_BLOCK); + osRecvMesg(&nuGfxMesgQ, (OSMesg)&mesgType, OS_MESG_BLOCK); temp_v0 = *mesgType; switch(temp_v0) {