From d4b40689b4ac66139b34b7ba98f62863de722188 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Sat, 21 Oct 2023 18:09:21 +0200
Subject: [PATCH] Rename `_ob_dull_silver.c` to `nucontpakmgr.c`

Rename `func_8008A6A0` to `nuContPakMgrInit`
Rename `func_8008A6C0` to `nuContPakMgrRemove`
Rename `D_800AA040` to `nuContPakCallBack`
---
 include/common.h                |  1 -
 linker_scripts/symbols/addr.txt |  3 +++
 splat.yaml                      |  2 +-
 src/_ob_dull_silver.c           | 28 ----------------------------
 src/nu/nucontpakmgr.c           | 28 ++++++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 src/_ob_dull_silver.c
 create mode 100644 src/nu/nucontpakmgr.c

diff --git a/include/common.h b/include/common.h
index f144cb4..7f21961 100644
--- a/include/common.h
+++ b/include/common.h
@@ -137,7 +137,6 @@ extern OSMesgQueue MQ_800E7988;
 
 extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[MAXCONTROLLERS];
 
-extern u8 D_800AA040;
 extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers);
 
 extern u8 SP_THREAD_800BE1C0[1];
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index f35530d..dd189b0 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -41,6 +41,7 @@ nuContNum = 0x800C6D60;
 nuContDataLockKey = 0x800C4B30;
 nuContData = 0x0800C4BF0; // size:0x18
 nuContReadFunc = 0x800A9FE0;
+nuContPakCallBack = 0x800AA040;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -90,6 +91,8 @@ nuContDataOpen = 0x8008A37C;
 nuContDataGetAll = 0x8008A600;
 nuContRetrace = 0x8008A47C;
 nuContReadFuncSet = 0x8008A660;
+nuContPakMgrInit = 0x8008A6A0;
+nuContPakMgrRemove = 0x8008A6C0;
 
 
 obCurrentTime = 0x800C47D0;
diff --git a/splat.yaml b/splat.yaml
index c787740..d5b6b94 100644
--- a/splat.yaml
+++ b/splat.yaml
@@ -131,7 +131,7 @@ segments:
       - [0x1AA00, c, "nu/nucontdatagetall"]
       - [0x1AA40, c, "nu/nucontqueryread"]
       - [0x1AA60, c, "nu/nucontreadfuncset"]
-      - [0x1AAA0, c, "_ob_dull_silver"]
+      - [0x1AAA0, c, "nu/nucontpakmgr"]
       - [0x1AD10, asm]
       - [0x1AFD0, asm]
       - [0x1B030, asm]
diff --git a/src/_ob_dull_silver.c b/src/_ob_dull_silver.c
deleted file mode 100644
index 25c86ba..0000000
--- a/src/_ob_dull_silver.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-
-#include "nu/nusys.h"
-
-void func_8008A6A0(void) {
-    nuSiCallBackAdd(&D_800AA040);
-}
-
-
-void func_8008A6C0(void) {
-    nuSiCallBackRemove(&D_800AA040);
-}
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A6E0);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A730);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A758);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A798);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A850);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A890);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A8BC);
-
-INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A8E8);
diff --git a/src/nu/nucontpakmgr.c b/src/nu/nucontpakmgr.c
new file mode 100644
index 0000000..fabee73
--- /dev/null
+++ b/src/nu/nucontpakmgr.c
@@ -0,0 +1,28 @@
+#include "common.h"
+
+#include "nu/nusys.h"
+
+void nuContPakMgrInit(void) {
+    nuSiCallBackAdd(&nuContPakCallBack);
+}
+
+
+void nuContPakMgrRemove(void) {
+    nuSiCallBackRemove(&nuContPakCallBack);
+}
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A6E0);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A730);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A758);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A798);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A850);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A890);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A8BC);
+
+INCLUDE_ASM(const s32, "nu/nucontpakmgr", func_8008A8E8);