From 1243f1378934cc16b8f3a2e7873d4f0e402a37e4 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 18:36:46 +0200
Subject: [PATCH] Rename `MQ_800BE030` to `nuPiMgrMesgQ`

---
 include/common.h                | 1 -
 include/nu/nusys.h              | 1 +
 linker_scripts/symbols/addr.txt | 2 +-
 src/_ob_icy_coast.c             | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/common.h b/include/common.h
index f2bfb52..c97f399 100644
--- a/include/common.h
+++ b/include/common.h
@@ -133,7 +133,6 @@ extern s32 D_A9EF0;
 extern s32 D_800C4B30;
 
 extern OSPiHandle* CART_HANDLE;
-extern OSMesgQueue MQ_800BE030;
 extern OSMesg OSMESG_800BE048[0x32];
 
 extern OSMesgQueue MQ_800E7988;
diff --git a/include/nu/nusys.h b/include/nu/nusys.h
index 8e546d8..e15838a 100644
--- a/include/nu/nusys.h
+++ b/include/nu/nusys.h
@@ -728,6 +728,7 @@ extern NUCallBackList*	nuSiCallBackList;/* Callback function list */
 /*--------------------------------------*/
 /*  pi variables 			*/
 /*--------------------------------------*/
+extern OSMesgQueue	nuPiMgrMesgQ;	/* PI Manager queue */
 extern OSPiHandle*	nuPiCartHandle;
 extern OSPiHandle*	nuPiSramHandle;
 extern OSPiHandle*	nuPiDDRomHandle;
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 0b04878..2be48e8 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -29,6 +29,7 @@ siMgrThread = 0x800BBE80;
 nuThreadIdle = 0x800AF440;
 nuStackIdle = 0x800B17A0;
 nuPiCartHandle = 0x800E7A20;
+nuPiMgrMesgQ = 0x800BE030;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -916,7 +917,6 @@ MQ_800AF320 = 0x800AF320;
 MQ_800B1880 = 0x800B1880;
 MQ_800E79C8 = 0x800E79C8;
 MQ_800C49E8 = 0x800C49E8;
-MQ_800BE030 = 0x800BE030;
 
 OSMESG_800BE190 = 0x800BE190;
 OSMESG_800BE194 = 0x800BE194;
diff --git a/src/_ob_icy_coast.c b/src/_ob_icy_coast.c
index 2800d38..943dc1d 100644
--- a/src/_ob_icy_coast.c
+++ b/src/_ob_icy_coast.c
@@ -15,7 +15,7 @@ u8 nuSiMgrInit(void) {
     
     osContInit(&nuSiMesgQ, &pattern, status);
     
-    osCreateThread(&siMgrThread, 5, nuSiMgrThread, NULL, &MQ_800BE030, NU_SI_THREAD_PRI);
+    osCreateThread(&siMgrThread, 5, nuSiMgrThread, NULL, &nuPiMgrMesgQ, NU_SI_THREAD_PRI);
     osStartThread(&siMgrThread);
     
     return pattern;
@@ -48,7 +48,7 @@ void nuSiMgrRestart(void) {
 INCLUDE_ASM(const s32, "_ob_icy_coast", nuSiMgrThread);
 
 void nuPiInit(void) {
-    osCreatePiManager(OS_PRIORITY_PIMGR, &MQ_800BE030, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));
+    osCreatePiManager(OS_PRIORITY_PIMGR, &nuPiMgrMesgQ, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));
     nuPiCartHandle = osCartRomInit();
 }