From b92b53f1e125b9dfebc66790a1b678cd784312fa Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sun, 25 May 2025 23:01:41 +0200
Subject: [PATCH] snd_RemoteSpeakerManager OK

---
 config/SOUE01/splits.txt  |  2 ++
 config/SOUE01/symbols.txt | 10 +++++-----
 configure.py              |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 3c007224..e94192e9 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -2991,6 +2991,8 @@ nw4r/snd/snd_RemoteSpeaker.cpp:
 
 nw4r/snd/snd_RemoteSpeakerManager.cpp:
 	.text       start:0x80470C90 end:0x80470ED8 align:16
+	.sbss       start:0x805766A0 end:0x805766A8
+	.bss        start:0x80659410 end:0x806596E8
 
 nw4r/snd/snd_SeqFile.cpp:
 	.text       start:0x80470EE0 end:0x80471018 align:16
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index efdbde41..2c386f32 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -21750,9 +21750,9 @@ fn_8039DBF0 = .text:0x8039DBF0; // type:function size:0x4
 fn_8039DC00 = .text:0x8039DC00; // type:function size:0xEC
 fn_8039DCF0 = .text:0x8039DCF0; // type:function size:0x1F8
 AXRegisterCallback = .text:0x8039DEF0; // type:function size:0x44
-fn_8039DF40 = .text:0x8039DF40; // type:function size:0x2C
-fn_8039DF70 = .text:0x8039DF70; // type:function size:0xC4
-fn_8039E040 = .text:0x8039E040; // type:function size:0x58
+AXRmtGetSamplesLeft = .text:0x8039DF40; // type:function size:0x2C
+AXRmtGetSamples = .text:0x8039DF70; // type:function size:0xC4
+AXRmtAdvancePtr = .text:0x8039E040; // type:function size:0x58
 fn_8039E0A0 = .text:0x8039E0A0; // type:function size:0xC
 fn_8039E0B0 = .text:0x8039E0B0; // type:function size:0x6C
 fn_8039E120 = .text:0x8039E120; // type:function size:0x6C
@@ -42430,7 +42430,7 @@ lbl_80576680 = .sbss:0x80576680; // type:object size:0x8 data:byte
 lbl_80576690 = .sbss:0x80576690; // type:object size:0x8 data:byte
 lbl_80576698 = .sbss:0x80576698; // type:object size:0x4 data:4byte
 lbl_8057669C = .sbss:0x8057669C; // type:object size:0x1 data:byte
-lbl_805766A0 = .sbss:0x805766A0; // type:object size:0x8 data:byte
+@GUARD@GetInstance__Q44nw4r3snd6detail20RemoteSpeakerManagerFv@instance = .sbss:0x805766A0; // type:object size:0x1 scope:weak data:byte
 lbl_805766A8 = .sbss:0x805766A8; // type:object size:0x8 data:4byte
 lbl_805766B0 = .sbss:0x805766B0; // type:object size:0x8 data:byte
 isSoundSystemInit = .sbss:0x805766B8; // type:object size:0x1 data:byte
@@ -51939,7 +51939,7 @@ lbl_806593C8 = .bss:0x806593C8; // type:object size:0x10
 lbl_806593D8 = .bss:0x806593D8; // type:object size:0x20 data:4byte
 @781 = .bss:0x806593F8; // type:object size:0xC scope:local
 @LOCAL@GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv@instance = .bss:0x80659404; // type:object size:0xC scope:weak data:4byte
-lbl_80659410 = .bss:0x80659410; // type:object size:0x2D8 data:byte
+@LOCAL@GetInstance__Q44nw4r3snd6detail20RemoteSpeakerManagerFv@instance = .bss:0x80659410; // type:object size:0x2D8 scope:weak data:byte
 lbl_806596E8 = .bss:0x806596E8; // type:object size:0x20 data:2byte
 lbl_80659708 = .bss:0x80659708; // type:object size:0x18
 lbl_80659720 = .bss:0x80659720; // type:object size:0x10
diff --git a/configure.py b/configure.py
index 166276f1..ed5324f2 100644
--- a/configure.py
+++ b/configure.py
@@ -1046,7 +1046,7 @@ config.libs = [
             Object(NonMatching, "nw4r/snd/snd_NandSoundArchive.cpp"),
             Object(Matching, "nw4r/snd/snd_PlayerHeap.cpp"),
             Object(Matching, "nw4r/snd/snd_RemoteSpeaker.cpp"),
-            Object(NonMatching, "nw4r/snd/snd_RemoteSpeakerManager.cpp"),
+            Object(Matching, "nw4r/snd/snd_RemoteSpeakerManager.cpp"),
             Object(NonMatching, "nw4r/snd/snd_SeqFile.cpp"),
             Object(NonMatching, "nw4r/snd/snd_SeqPlayer.cpp"),
             Object(NonMatching, "nw4r/snd/snd_SeqSound.cpp"),