From 12496030a6892776f2949d42aadeb6a0c3d9a405 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 17:57:15 +0200
Subject: [PATCH] Rename `THREAD_CONTROLLER` to `siMgrThread`

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

diff --git a/include/common.h b/include/common.h
index bfee182..5c2e794 100644
--- a/include/common.h
+++ b/include/common.h
@@ -135,10 +135,8 @@ extern s32 D_800C4B30;
 extern OSPiHandle* CART_HANDLE;
 extern OSMesgQueue MQ_800BE030;
 extern OSMesg OSMESG_800BE048[0x32];
-extern OSThread THREAD_CONTROLLER;
 
 extern OSMesgQueue MQ_800E7988;
-extern OSThread THREAD_CONTROLLER;
 
 extern OSPiHandle* PTR_CART_ROM_HANDLE;
 
diff --git a/include/nu/nusys.h b/include/nu/nusys.h
index cb55de5..f9a748d 100644
--- a/include/nu/nusys.h
+++ b/include/nu/nusys.h
@@ -721,6 +721,7 @@ extern NUCallBackList	nuVrsCallBack;
 /*--------------------------------------*/
 extern OSMesgQueue	nuSiMesgQ;	/* SI event  message queue */
 extern OSMesg nuSiMesgBuf[NU_SC_MAX_MESGS];
+extern OSThread siMgrThread;
 extern OSMesgQueue	nuSiMgrMesgQ;	/* SI Manager queue */
 extern NUCallBackList*	nuSiCallBackList;/* Callback function list */
 
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index efee53b..efc4601 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -25,6 +25,7 @@ rdpstateinit_dl = 0x800A9EF0; // rom:0x3A2F0
 nuGfxDisplay = 0x800C4BD8;
 nuSiMesgQ = 0x800E9B88;
 nuSiMesgBuf = 0x800BBE60;
+siMgrThread = 0x800BBE80;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -921,7 +922,6 @@ OSMESG_800B9C80 = 0x800B9C80;
 SP_THREAD_800BE1C0 = 0x800C2370;
 SP_THREAD_800B9C88 = 0x800BBE40;
 
-THREAD_CONTROLLER = 0x800BBE80;
 THREAD_800B7A90 = 0x800B7A90;
 THREAD_800B9C88 = 0x800B9C88;
 
diff --git a/src/_ob_icy_coast.c b/src/_ob_icy_coast.c
index a88d440..788ee0d 100644
--- a/src/_ob_icy_coast.c
+++ b/src/_ob_icy_coast.c
@@ -12,8 +12,8 @@ u8 nuSiMgrInit(void) {
     
     osContInit(&nuSiMesgQ, &pattern, status);
     
-    osCreateThread(&THREAD_CONTROLLER, 5, __controller_thread_80089D9C, NULL, &MQ_800BE030, 0x73);
-    osStartThread(&THREAD_CONTROLLER);
+    osCreateThread(&siMgrThread, 5, __controller_thread_80089D9C, NULL, &MQ_800BE030, 0x73);
+    osStartThread(&siMgrThread);
     
     return pattern;
 }
@@ -47,7 +47,7 @@ void func_80089D5C(void) {
 
 
 void __start_controller_thread(void) {
-    osStartThread(&THREAD_CONTROLLER);
+    osStartThread(&siMgrThread);
 }
 
 INCLUDE_ASM(const s32, "_ob_icy_coast", __controller_thread_80089D9C);