From 0d4532eda3bedda27133fc8c96bfe1e642f41213 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 12:09:18 +0200
Subject: [PATCH] Rename `Stack__dma_load_loop_delete` to `nuScRemoveClient`

---
 include/common.h                | 2 --
 linker_scripts/symbols/addr.txt | 4 +---
 src/_ob_past_brick.c            | 4 ++--
 src/_ob_yielding_ice.c          | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/common.h b/include/common.h
index fa09e42..2785c64 100644
--- a/include/common.h
+++ b/include/common.h
@@ -189,8 +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_delete(Stack__dma_load_loop* arg0);
-
 extern void nuPiInit();
 
 extern void __set_black();
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index d36358a..cbb6327 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -14,6 +14,7 @@ nuScEventBroadcast = 0x800891A0;
 nuScGetAudioMQ = 0x80088EF0;
 nuScGetGfxMQ = 0x80088EFC;
 nuScAddClient = 0x80089054;
+nuScRemoveClient = 0x80089124;
 nuScSetFrameBufferNum = 0x80089528;
 
 obCurrentTime = 0x800C47D0;
@@ -923,9 +924,6 @@ __MAYBE_SONG_800EB290 = 0x800EB290; // size:0x50
 __MAYBE_SONG_ARRAY_800A8218 = 0x800A8218; // size:0x1C
 __initialize_song_mem = 0x80073FD4;
 
-Stack__dma_load_loop_delete = 0x80089124;
-
-
 __thread_8008AFE0 = 0x8008AFE0;
 __thread_80089540 = 0x80089540;
 
diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c
index 90675a7..11ab913 100644
--- a/src/_ob_past_brick.c
+++ b/src/_ob_past_brick.c
@@ -38,7 +38,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", nuScAddClient);
 
 INCLUDE_ASM(const s32, "_ob_past_brick", func_800890E4);
 
-INCLUDE_ASM(const s32, "_ob_past_brick", Stack__dma_load_loop_delete);
+INCLUDE_ASM(const s32, "_ob_past_brick", nuScRemoveClient);
 
 INCLUDE_ASM(const s32, "_ob_past_brick", nuScEventBroadcast);
 
@@ -97,7 +97,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", func_8008949C);
 //         {
 //             nuScAddClient(&sp10, &D_800E8C2C.mq, 1);
 //             osRecvMesg(&D_800E8C2C.mq, NULL, 1);
-//             Stack__dma_load_loop_delete(&sp10);
+//             nuScRemoveClient(&sp10);
 //         }
 //     }
 // }
diff --git a/src/_ob_yielding_ice.c b/src/_ob_yielding_ice.c
index 329287a..bb28aec 100644
--- a/src/_ob_yielding_ice.c
+++ b/src/_ob_yielding_ice.c
@@ -14,5 +14,5 @@ void __dma_load_loop(s32 count) {
     for(; count != 0; count--)
         osRecvMesg(&mq, NULL, OS_MESG_BLOCK);
     
-    Stack__dma_load_loop_delete(&sp10);
+    nuScRemoveClient(&sp10);
 }