From 92fd0c221337772eb9feaae46b414ba8f63248c5 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 21:17:55 +0200
Subject: [PATCH] Rename `func_8008B1D0` to `nuSiCallBackRemove`

---
 include/common.h                | 3 ---
 linker_scripts/symbols/addr.txt | 3 ++-
 src/_ob_dull_silver.c           | 2 +-
 src/_ob_prized_reading.c        | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/common.h b/include/common.h
index 0630e59..092f5c6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -173,10 +173,7 @@ extern s32 __calls_read_controller_0(s16* arg0);
 extern void func_8008A354();
 extern void func_8008A37C();
 
-extern void func_8008B1D0(u8*);
-
 extern void func_8008350C();
-extern void func_8008B1D0(u8*);
 
 extern void __set_vi_mode(s32);
 
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 291d91a..4e086a5 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -38,7 +38,6 @@ nuContDataMutexBuf = 0x800BE194;
 nuContCallBack = 0x800A9FF8;
 nuContStatus = 0x800C4B38; // size:0x10 type:u32
 nuContNum = 0x800C6D60;
-nuContMgrRemove = 0x8008A334;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -80,6 +79,8 @@ nuContQueryRead = 0x8008A640;
 nuContMgrInit = 0x8008A260;
 nuContDataUnLock = 0x8008A5D0;
 nuSiCallBackAdd = 0x8008B130;
+nuContMgrRemove = 0x8008A334;
+nuSiCallBackRemove = 0x8008B1D0;
 
 
 obCurrentTime = 0x800C47D0;
diff --git a/src/_ob_dull_silver.c b/src/_ob_dull_silver.c
index 970af1d..25c86ba 100644
--- a/src/_ob_dull_silver.c
+++ b/src/_ob_dull_silver.c
@@ -8,7 +8,7 @@ void func_8008A6A0(void) {
 
 
 void func_8008A6C0(void) {
-    func_8008B1D0(&D_800AA040);
+    nuSiCallBackRemove(&D_800AA040);
 }
 
 INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A6E0);
diff --git a/src/_ob_prized_reading.c b/src/_ob_prized_reading.c
index d5d2c70..08aede4 100644
--- a/src/_ob_prized_reading.c
+++ b/src/_ob_prized_reading.c
@@ -34,7 +34,7 @@ u8 nuContMgrInit(void) {
 }
 
 void nuContMgrRemove(void) {
-    func_8008B1D0(&nuContCallBack);
+    nuSiCallBackRemove(&nuContCallBack);
 }
 
 void __start_copy_global_controller_data(void) {