From a44edd578484e3d3cb224cc28e472b3b11047510 Mon Sep 17 00:00:00 2001
From: jarupxx <jarup@gmx.com>
Date: Sun, 23 Apr 2017 19:38:57 +0900
Subject: [PATCH] Improved the SetFormat (4721) Source: Dynasty Warriors 3

---
 src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 19 +++++++++++++++++++
 src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl | 20 +-------------------
 src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl
index c8abf67a5..9337f567e 100644
--- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl
+++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl
@@ -505,6 +505,24 @@ OOVPA_END;
 // ******************************************************************
 #define DirectSound_CDirectSoundVoice_SetFormat_4627 DirectSound_CDirectSoundVoice_SetFormat_4361
 
+// ******************************************************************
+// * DirectSound::CDirectSoundVoice::SetFormat
+// ******************************************************************
+OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 4721, 8,
+
+    XREF_DirectSound_CDirectSoundVoice_SetFormat,
+    XRefZero)
+
+        { 0x06, 0x4E },
+        { 0x0E, 0xE8 },
+        { 0x18, 0x4E },
+        { 0x25, 0xFF },
+        { 0x2E, 0x0C },
+        { 0x34, 0x85 },
+        { 0x38, 0x8B },
+        { 0x43, 0x00 },
+OOVPA_END;
+
 // ******************************************************************
 // * DirectSound::CDirectSoundBuffer::SetFormat
 // ******************************************************************
@@ -1563,6 +1581,7 @@ OOVPATable DSound_4627[] = {
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH),
 	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s
 	REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 4627, XREF),
+	REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 4721, XREF),
 	REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH),
 	REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetFormat, 4361, PATCH),
diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl
index 9000220bf..d9cb50e12 100644
--- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl
+++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl
@@ -32,24 +32,6 @@
 // *
 // ******************************************************************
 
-// ******************************************************************
-// * DirectSound::CDirectSoundVoice::SetFormat
-// ******************************************************************
-OOVPA_XREF(DirectSound_CDirectSoundVoice_SetFormat, 5028, 8,
-
-    XREF_DirectSound_CDirectSoundVoice_SetFormat,
-    XRefZero)
-
-        { 0x06, 0x4E },
-        { 0x0E, 0xE8 },
-        { 0x18, 0x4E },
-        { 0x25, 0xFF },
-        { 0x2E, 0x0C },
-        { 0x34, 0x85 },
-        { 0x38, 0x8B },
-        { 0x43, 0x00 },
-OOVPA_END;
-
 // ******************************************************************
 // * XFileCreateMediaObjectEx
 // ******************************************************************
@@ -198,7 +180,7 @@ OOVPATable DSound_5028[] = {
 	REGISTER_OOVPA(DirectSound_CDirectSoundStream_SetI3DL2Source, 4134, PATCH),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 4134, PATCH),
 	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s
-	REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 5028, XREF),
+	REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetFormat, 4721, XREF),
 	REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetFormat, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4627, PATCH),
 	REGISTER_OOVPA(DirectSound_CDirectSound_EnableHeadphones, 4627, XREF),
diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl
index 33f22a0e0..8cefecfb7 100644
--- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl
+++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl
@@ -192,7 +192,7 @@ OOVPA_END;
 // ******************************************************************
 // * DirectSound::CDirectSoundVoice::SetFormat
 // ******************************************************************
-#define DirectSound_CDirectSoundVoice_SetFormat_5233 DirectSound_CDirectSoundVoice_SetFormat_5028
+#define DirectSound_CDirectSoundVoice_SetFormat_5233 DirectSound_CDirectSoundVoice_SetFormat_4721
 
 // ******************************************************************
 // DirectSound_CDirectSoundVoice::SetMode