From 5c21f71aaaee6ffffc2a5e7f115a6584f6b56a5f Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Sun, 22 Oct 2023 01:08:08 +0200
Subject: [PATCH] Rename `SP_THREAD_800BE1C0` to `nuStackGfxThread`

Fix the stack of `gfxThread`
---
 include/common.h                | 1 -
 linker_scripts/symbols/addr.txt | 4 ++--
 src/nu/nugfxthread.c            | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/common.h b/include/common.h
index b9d296f..1a5809d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -143,7 +143,6 @@ extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS];
 
 extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers);
 
-extern u8 SP_THREAD_800BE1C0[1];
 extern void* D_800AA41C;
 extern u8 D_594284;
 
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 81ee3a9..81135d8 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -11,7 +11,7 @@ nuGfxMesgBuf = 0x800BE1A0;
 nuGfxFunc = 0x800AA090;
 nuGfxPreNMIFunc = 0x800AA094;
 nuGfxTaskSpool = 0x800E79A4;
-nuGfxThread = 0x800BE1C0;
+nuGfxThread = 0x800BE1C0; // size:0x1B0
 nuGfxSwapCfbFunc = 0x800A9E84;
 nuGfxSwapCfb = 0x8008B110;
 nuGfxZBuffer = 0x800C4B20;
@@ -47,6 +47,7 @@ nuContPakGameCode = 0x800AA014;
 nuSiCallBackList = 0x800A9EA0;
 nuGfxTaskEndFunc = 0x800A9E88;
 nuStackSiMgrThread = 0x800BC030;
+nuStackGfxThread = 0x800C0370;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -960,7 +961,6 @@ OSMESG_800B17E0 = 0x800B17E0;
 OSMESG_800B9C58 = 0x800B9C58;
 OSMESG_800B9C80 = 0x800B9C80;
 
-SP_THREAD_800BE1C0 = 0x800C2370;
 SP_THREAD_800B9C88 = 0x800BBE40;
 
 THREAD_800B7A90 = 0x800B7A90;
diff --git a/src/nu/nugfxthread.c b/src/nu/nugfxthread.c
index 0cc5948..4f5f4a5 100644
--- a/src/nu/nugfxthread.c
+++ b/src/nu/nugfxthread.c
@@ -2,6 +2,8 @@
 
 #include "nu/nusys.h"
 
+extern DECLARE_STACK(nuStackGfxThread, NU_GFX_STACK_SIZE);
+
 /* 1B3E0 8008AFE0 */
 void gfxThread(void* arg0) {
     NUScClient gfxClient;
@@ -32,6 +34,6 @@ void gfxThread(void* arg0) {
 }
 
 void nuGfxThreadStart(void) {
-    osCreateThread(&nuGfxThread, 4, gfxThread, NULL, SP_THREAD_800BE1C0, 0x32);
+    osCreateThread(&nuGfxThread, 4, gfxThread, NULL, STACK_START(nuStackGfxThread), 0x32);
     osStartThread(&nuGfxThread);
 }