From f6e05eb04fc178d423b0dc57d18bbab852222d8c Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Sun, 26 Jul 2026 14:25:28 +0200
Subject: [PATCH] Unhardcode sound effects wave bank in replacements

---
 libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h  | 2 +-
 libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h | 2 +-
 libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h       | 6 ++++++
 libs/JSystem/src/JAudio2/JASBank.cpp                     | 3 ++-
 libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp            | 2 +-
 libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp           | 2 +-
 libs/JSystem/src/JAudio2/JASWSParser.cpp                 | 4 ++--
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h
index cf739b18a2..ed4ddbf4cd 100644
--- a/libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h
+++ b/libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h
@@ -50,7 +50,7 @@ struct JASBasicWaveBank : public JASWaveBank {
         u32 getWaveCount() const { return mWaveCount; }
     };
 
-    JASBasicWaveBank();
+    JASBasicWaveBank(IF_DUSK(u32 bankId));
     ~JASBasicWaveBank();
     TWaveGroup* getWaveGroup(u32);
     void setGroupCount(u32, JKRHeap*);
diff --git a/libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h b/libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h
index 1dce0968a9..8ccbc659bd 100644
--- a/libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h
+++ b/libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h
@@ -21,7 +21,7 @@ struct JASSimpleWaveBank : JASWaveBank, JASWaveArc {
         /* 0x28 */ JASHeap* mHeap;
     };
 
-    JASSimpleWaveBank();
+    JASSimpleWaveBank(IF_DUSK(u32 bankId));
     ~JASSimpleWaveBank();
     void setWaveTableSize(u32, JKRHeap*);
     JASWaveHandle* getWaveHandle(u32) const;
diff --git a/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h b/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h
index 20b4be89fd..f559e86c4c 100644
--- a/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h
+++ b/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h
@@ -59,6 +59,12 @@ public:
  */
 class JASWaveBank {
 public:
+#if TARGET_PC
+    const u32 bankId;
+
+    JASWaveBank(u32 bankId) : bankId(bankId) { }
+#endif
+
     virtual ~JASWaveBank() {}
     virtual JASWaveHandle* getWaveHandle(u32) const = 0;
     virtual JASWaveArc* getWaveArc(u32) = 0;
diff --git a/libs/JSystem/src/JAudio2/JASBank.cpp b/libs/JSystem/src/JAudio2/JASBank.cpp
index e96b4df174..9491204cc7 100644
--- a/libs/JSystem/src/JAudio2/JASBank.cpp
+++ b/libs/JSystem/src/JAudio2/JASBank.cpp
@@ -33,7 +33,8 @@ JASChannel* JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8
         return NULL;
     }
 #if TARGET_PC
-    auto const found_replacement = s_replacements.find(AudioWaveKey(SoundEffects, stack_60.field_0x1a));
+    auto const key = AudioWaveKey(static_cast<AudioWaveBank>(waveBank->bankId), stack_60.field_0x1a);
+    auto const found_replacement = s_replacements.find(key);
     if (found_replacement != s_replacements.end()) {
         waveHandle = found_replacement->second.get();
     }
diff --git a/libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp b/libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp
index 80bda99ad9..9f9e16325c 100644
--- a/libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp
+++ b/libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include <stdint.h>
 
-JASBasicWaveBank::JASBasicWaveBank() {
+JASBasicWaveBank::JASBasicWaveBank(IF_DUSK(u32 bankId)) IF_DUSK(: JASWaveBank(bankId)) {
     mWaveTable = NULL;
     mWaveGroupArray = NULL;
     mHandleCount = 0;
diff --git a/libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp b/libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp
index fc49df148d..f9e4382512 100644
--- a/libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp
+++ b/libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp
@@ -3,7 +3,7 @@
 #include "JSystem/JAudio2/JASSimpleWaveBank.h"
 #include <stdint.h>
 
-JASSimpleWaveBank::JASSimpleWaveBank() {
+JASSimpleWaveBank::JASSimpleWaveBank(IF_DUSK(u32 bankId)) IF_DUSK(: JASWaveBank(bankId)) {
     mWaveTable = NULL;
     mWaveTableSize = 0;
 }
diff --git a/libs/JSystem/src/JAudio2/JASWSParser.cpp b/libs/JSystem/src/JAudio2/JASWSParser.cpp
index f097e93289..91552b24c5 100644
--- a/libs/JSystem/src/JAudio2/JASWSParser.cpp
+++ b/libs/JSystem/src/JAudio2/JASWSParser.cpp
@@ -30,7 +30,7 @@ JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap*
     u32 free_size = heap->getFreeSize();
 
     THeader* header = (THeader*)stream;
-    JASBasicWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASBasicWaveBank;
+    JASBasicWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASBasicWaveBank IF_DUSK((header->mId));
     if (wave_bank == NULL) {
         return NULL;
     }
@@ -82,7 +82,7 @@ JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap
         return NULL;
     }
 
-    JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank;
+    JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank IF_DUSK((header->mId));
     if (wave_bank == NULL) {
         return NULL;
     }