From 2a951738a072cff1c2bc26f449e49469846a61f6 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 19:41:07 +0200
Subject: [PATCH] Rename `MQ_800C4A00` to `nuContWaitMesgQ`

---
 include/common.h                | 1 -
 linker_scripts/symbols/addr.txt | 2 +-
 src/_ob_prized_reading.c        | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/common.h b/include/common.h
index 397b359..91f0898 100644
--- a/include/common.h
+++ b/include/common.h
@@ -142,7 +142,6 @@ extern u8 D_800A9FF8;
 
 extern OSContStatus __GLOBAL_CONT_STATUS[MAXCONTROLLERS];
 extern void (*D_800A9FE0)(s16);
-extern OSMesgQueue MQ_800C4A00;
 
 extern OSContPad __GLOBAL_CONTROLLER_DATA[MAXCONTROLLERS];
 extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS];
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 70ded83..2865b67 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -31,6 +31,7 @@ nuStackIdle = 0x800B17A0;
 nuPiCartHandle = 0x800E7A20;
 nuPiMgrMesgQ = 0x800BE030;
 nuPiMesgBuf = 0x800BE048;
+nuContWaitMesgQ = 0x800C4A00;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -915,7 +916,6 @@ __MUS_MEM_800B1868 = 0x800B1868;
 
 MQ_SWAP_BUFFER = 0x800E9BA8;
 MQ_800E7988 = 0x800E7988;
-MQ_800C4A00 = 0x800C4A00;
 MQ_800E9BF0 = 0x800E9BF0;
 MQ_800C35A0 = 0x800C35A0;
 MQ_800AF320 = 0x800AF320;
diff --git a/src/_ob_prized_reading.c b/src/_ob_prized_reading.c
index 1037060..ff28268 100644
--- a/src/_ob_prized_reading.c
+++ b/src/_ob_prized_reading.c
@@ -14,7 +14,7 @@ u8 nuContMgrInit(void) {
     s32 var_v1;
 
     nuContDataUnLock();
-    osCreateMesgQueue(&MQ_800C4A00, &OSMESG_800BE190, 1);
+    osCreateMesgQueue(&nuContWaitMesgQ, &OSMESG_800BE190, 1);
     osCreateMesgQueue(&MQ_800E9BF0, &OSMESG_800BE194, 1);
     nuSiCallBackAdd(&D_800A9FF8);
     nuContQueryRead();
@@ -84,12 +84,12 @@ s32 __real_read_controller(void) {
 
 s32 __calls_read_controller_0(s16* arg0) {
     if (D_800C4B30 == 0) {
-        osRecvMesg(&MQ_800C4A00, NULL, 0);
+        osRecvMesg(&nuContWaitMesgQ, NULL, 0);
         __read_controller(__GLOBAL_CONTROLLER_DATA, 1);
         if (D_800A9FE0 != NULL) {
             D_800A9FE0(*arg0);
         }
-        osSendMesg(&MQ_800C4A00, NULL, 0);
+        osSendMesg(&nuContWaitMesgQ, NULL, 0);
     }
     return 0;
 }
@@ -106,7 +106,7 @@ void __calls_read_controller_1(Arg___calls_read_controller_1* arg) {
 s32 __calls_read_controller_2(s16* arg0) {
     s32 var_v0;
 
-    osRecvMesg(&MQ_800C4A00, NULL, 0);
+    osRecvMesg(&nuContWaitMesgQ, NULL, 0);
     var_v0 = __read_controller(__GLOBAL_CONTROLLER_DATA, 0);
     if (var_v0 == 0) {
         if (D_800A9FE0 != NULL) {