From 0adce00abbbc7b1fa1e58bd772fd7110518db073 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 12:03:50 +0200
Subject: [PATCH] Rename `Stack__dma_load_loop_new` to `nuScAddClient`

---
 include/common.h                | 1 -
 linker_scripts/symbols/addr.txt | 2 +-
 src/_ob_grumpy_island.c         | 6 ++++--
 src/_ob_past_brick.c            | 6 +++---
 src/_ob_yielding_ice.c          | 6 ++++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/common.h b/include/common.h
index 42d4673..fa09e42 100644
--- a/include/common.h
+++ b/include/common.h
@@ -189,7 +189,6 @@ extern void romCopy(u32 devAddr, void* dramAddr, u32 size, s32 direction);
 extern void romCopy_512(void* src, void* dst, u32 len);
 extern void __calls_romCopy_8009DA50(void* src, void* dst, u32 len);
 
-extern void Stack__dma_load_loop_new(Stack__dma_load_loop* arg0, OSMesgQueue* arg1, s16 flags);
 extern void Stack__dma_load_loop_delete(Stack__dma_load_loop* arg0);
 
 extern void nuPiInit();
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index edd662d..06b1ca4 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -13,6 +13,7 @@ nuScExecuteGraphics = 0x800893C0;
 nuScEventBroadcast = 0x800891A0;
 nuScGetAudioMQ = 0x80088EF0;
 nuScGetGfxMQ = 0x80088EFC;
+nuScAddClient = 0x80089054;
 
 obCurrentTime = 0x800C47D0;
 obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0
@@ -921,7 +922,6 @@ __MAYBE_SONG_800EB290 = 0x800EB290; // size:0x50
 __MAYBE_SONG_ARRAY_800A8218 = 0x800A8218; // size:0x1C
 __initialize_song_mem = 0x80073FD4;
 
-Stack__dma_load_loop_new = 0x80089054;
 Stack__dma_load_loop_delete = 0x80089124;
 
 
diff --git a/src/_ob_grumpy_island.c b/src/_ob_grumpy_island.c
index 1290dc2..068bbca 100644
--- a/src/_ob_grumpy_island.c
+++ b/src/_ob_grumpy_island.c
@@ -1,13 +1,15 @@
 #include "common.h"
 
+#include "nu/nusys.h"
+
 /* 1B3E0 8008AFE0 */
 void __thread_8008AFE0(void* arg0) {
-    Stack__dma_load_loop sp10;
+    NUScClient sp10;
     u16* sp20;
     s16 temp_v0;
 
     osCreateMesgQueue(&MQ_800C4C28, OSMESG_800BE1A0, 8);
-    Stack__dma_load_loop_new(&sp10, &MQ_800C4C28, 3);
+    nuScAddClient(&sp10, &MQ_800C4C28, 3);
 
     while(1) {
         osRecvMesg(&MQ_800C4C28, &sp20, OS_MESG_BLOCK);
diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c
index 43631fa..db4bb6c 100644
--- a/src/_ob_past_brick.c
+++ b/src/_ob_past_brick.c
@@ -15,10 +15,10 @@ OSMesgQueue* nuScGetGfxMQ() {
 
 INCLUDE_ASM(const s32, "_ob_past_brick", nuScEventHandler);
 
-INCLUDE_ASM(const s32, "_ob_past_brick", Stack__dma_load_loop_new);
+INCLUDE_ASM(const s32, "_ob_past_brick", nuScAddClient);
 
 /* 19454 80089054 */
-// void Stack__dma_load_loop_new(Stack__dma_load_loop* arg0, OSMesgQueue* mq, s16 flags)
+// void nuScAddClient(Stack__dma_load_loop* arg0, OSMesgQueue* mq, s16 flags)
 // {
 //     s32 mask = osSetIntMask(OS_IM_NONE);
 
@@ -95,7 +95,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", func_8008949C);
 //     {
 //         while(osViGetNextFramebuffer() == temp_s0 || osViGetCurrentFramebuffer() == temp_s0)
 //         {
-//             Stack__dma_load_loop_new(&sp10, &D_800E8C2C.mq, 1);
+//             nuScAddClient(&sp10, &D_800E8C2C.mq, 1);
 //             osRecvMesg(&D_800E8C2C.mq, NULL, 1);
 //             Stack__dma_load_loop_delete(&sp10);
 //         }
diff --git a/src/_ob_yielding_ice.c b/src/_ob_yielding_ice.c
index a1e830a..329287a 100644
--- a/src/_ob_yielding_ice.c
+++ b/src/_ob_yielding_ice.c
@@ -1,13 +1,15 @@
 #include "common.h"
 
+#include "nu/nusys.h"
+
 /* 19E30 80089A30 */
 void __dma_load_loop(s32 count) {
-    Stack__dma_load_loop sp10;
+    NUScClient sp10;
     OSMesgQueue mq;
     OSMesg buf;
     
     osCreateMesgQueue(&mq, &buf, 1);
-    Stack__dma_load_loop_new(&sp10, &mq, 1);
+    nuScAddClient(&sp10, &mq, 1);
 
     for(; count != 0; count--)
         osRecvMesg(&mq, NULL, OS_MESG_BLOCK);