From 37df9533bcbfe6dc3e84e3c68844af44676a39f1 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Sat, 21 Oct 2023 17:38:58 +0200
Subject: [PATCH] Rename `D_800C4B30` to `nuContDataLockKey`

---
 include/common.h                |  3 ---
 linker_scripts/symbols/addr.txt |  1 +
 src/_ob_silly_cactus.c          | 16 ++++++++--------
 src/nu/nucontmgr.c              |  4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/common.h b/include/common.h
index 766ce40..4b75e09 100644
--- a/include/common.h
+++ b/include/common.h
@@ -130,14 +130,11 @@ extern void* D_800B1828;
 
 extern s32 D_800E8B14;
 extern s32 D_A9EF0;
-extern s32 D_800C4B30;
 
 extern OSPiHandle* CART_HANDLE;
 
 extern OSMesgQueue MQ_800E7988;
 
-extern s32 D_800C4B30;
-
 extern void (*D_800A9FE0)(s16);
 
 extern OSContPad __GLOBAL_CONTROLLER_DATA[MAXCONTROLLERS];
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 10a32f0..2fb17f8 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -38,6 +38,7 @@ nuContDataMutexBuf = 0x800BE194;
 nuContCallBack = 0x800A9FF8;
 nuContStatus = 0x800C4B38; // size:0x10 type:u32
 nuContNum = 0x800C6D60;
+nuContDataLockKey = 0x800C4B30;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
diff --git a/src/_ob_silly_cactus.c b/src/_ob_silly_cactus.c
index ca4751f..9288f06 100644
--- a/src/_ob_silly_cactus.c
+++ b/src/_ob_silly_cactus.c
@@ -3,18 +3,18 @@
 #include "nu/nusys.h"
 
 void nuContDataLock(void) {
-    s32 temp_v0;
+    s32 mask;
 
-    temp_v0 = osSetIntMask(OS_IM_NONE);
-    D_800C4B30 = 1;
-    osSetIntMask(temp_v0);
+    mask = osSetIntMask(OS_IM_NONE);
+    nuContDataLockKey = 1;
+    osSetIntMask(mask);
 }
 
 void nuContDataUnLock(void) {
-    s32 temp_v0;
+    s32 mask;
 
-    temp_v0 = osSetIntMask(OS_IM_NONE);
-    D_800C4B30 = 0;
-    osSetIntMask(temp_v0);
+    mask = osSetIntMask(OS_IM_NONE);
+    nuContDataLockKey = 0;
+    osSetIntMask(mask);
 }
 
diff --git a/src/nu/nucontmgr.c b/src/nu/nucontmgr.c
index 79a4519..3354a21 100644
--- a/src/nu/nucontmgr.c
+++ b/src/nu/nucontmgr.c
@@ -53,7 +53,7 @@ s32 __read_controller(OSContPad* data, u32 flags) {
         return res;
 
     osRecvMesg(&nuSiMesgQ, NULL, OS_MESG_BLOCK);
-    if (!(flags & D_800C4B30)) {
+    if (!(flags & nuContDataLockKey)) {
         func_8008A354();
         osContGetReadData(data);
         func_8008A37C();
@@ -78,7 +78,7 @@ s32 __real_read_controller(void) {
 
 
 s32 __calls_read_controller_0(s16* arg0) {
-    if (D_800C4B30 == 0) {
+    if (nuContDataLockKey == 0) {
         osRecvMesg(&nuContWaitMesgQ, NULL, 0);
         __read_controller(__GLOBAL_CONTROLLER_DATA, 1);
         if (D_800A9FE0 != NULL) {