diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index fe533662a..ce2e28f6d 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -283,8 +283,6 @@ enum XRefDataBaseOffset XREF_DSVOICESETDISTANCEFACTOR, XREF_CDirectSoundVoice_SetConeAngles, XREF_DSVOICESETCONEORIENTATION, - XREF_DSVOICESETPOSITION, - XREF_DSVOICESETVELOCITY, XREF_CDirectSoundVoice_SetDopplerFactor, XREF_DSVOICESETI3DL2SOURCE, XREF_CMcpxVoiceClient_Set3dMode, @@ -295,7 +293,7 @@ enum XRefDataBaseOffset XREF_DSBUFFERSETROLLOFFCURVE, XREF_DSBUFFERSETROLLOFFFACTOR, XREF_DSBUFFERSETDISTANCEFACTOR, - XREF_DSBUFFERSETCONEANGLES, + XREF_CDirectSoundBuffer_SetConeAngles, XREF_CDirectSoundBuffer_SetConeOrientation, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XREF_CDirectSoundBuffer_SetPosition, @@ -315,7 +313,6 @@ enum XRefDataBaseOffset XREF_CMcpxBuffer_Play, XREF_CDirectSoundBuffer_PlayEx, XREF_WaveFormat_CreateXboxAdpcmFormat, - XREF_CDirectSoundBuffer_SetConeAngles, XREF_CDirectSoundVoice_CommitDeferredSettings, XREF_CDirectSoundBuffer_SetAllParameters, XREF_CDirectSound_GetOutputLevels, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 81443d012..cc172487d 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -2091,7 +2091,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetPosition, 4039, 12, - XREF_DSVOICESETPOSITION, + XREF_CDirectSoundVoice_SetPosition, XRefZero) { 0x05, 0x08 }, @@ -2119,7 +2119,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4039, 10, XRefOne) // CDirectSoundBuffer_SetPosition+0x49 : call [CDirectSoundVoice::SetPosition] - XREF_ENTRY( 0x49, XREF_DSVOICESETPOSITION ), + XREF_ENTRY( 0x49, XREF_CDirectSoundVoice_SetPosition ), // CDirectSoundBuffer_SetPosition+0x00 : push ebp { 0x00, 0x55 }, @@ -2172,7 +2172,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetVelocity, 4039, 12, - XREF_DSVOICESETVELOCITY, + XREF_CDirectSoundVoice_SetVelocity, XRefZero) { 0x05, 0x08 }, @@ -2200,7 +2200,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4039, 10, XRefOne) // CDirectSoundBuffer_SetVelocity+0x49 : call [CDirectSoundVoice::SetVelocity] - XREF_ENTRY( 0x49, XREF_DSVOICESETVELOCITY ), + XREF_ENTRY( 0x49, XREF_CDirectSoundVoice_SetVelocity ), // CDirectSoundBuffer_SetVelocity+0x00 : push ebp { 0x00, 0x55 }, @@ -2502,3 +2502,215 @@ OOVPA_XREF(CDirectSound_SetI3DL2Listener, 4039, 16, { 0x7F, 0xC2 }, { 0x80, 0x0C }, OOVPA_END; + +// ****************************************************************** +// * CDirectSoundVoice_SetAllParameters +// ****************************************************************** +OOVPA_XREF(CDirectSoundVoice_SetAllParameters, 4039, 12, + + XREF_CDirectSoundVoice_SetAllParameters, + XRefZero) + + // CDirectSoundVoice_SetAllParameters+0x00 : mov edx,[esp+04] + { 0x00, 0x8B }, + + // CDirectSoundVoice_SetAllParameters+0x0D : mov edi,[edx+10] + { 0x0D, 0x6A }, + { 0x0E, 0x10 }, + + // CDirectSoundVoice_SetAllParameters+0x16 : repe movsd + { 0x16, 0xF3 }, + { 0x17, 0xA5 }, + + // CDirectSoundVoice_SetAllParameters+0x18 : mov eax,[edx+10] + { 0x18, 0x8B }, + { 0x19, 0x42 }, + { 0x1A, 0x10 }, + + { 0x21, 0xFF }, + { 0x26, 0x01 }, + + // CDirectSoundVoice_SetAllParameters+0x33 : retn 0x0C + { 0x33, 0xC2 }, + { 0x34, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundBuffer::SetAllParameters +// ****************************************************************** +OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4039, 8, + + XREF_CDirectSoundBuffer_SetAllParameters, + XRefOne) + + XREF_ENTRY( 0x35, XREF_CDirectSoundVoice_SetAllParameters ), + + // CDirectSoundBuffer_SetAllParameters+0x00 : push esi + { 0x00, 0x56 }, + + { 0x2A, 0x24 }, + { 0x2E, 0x24 }, + { 0x32, 0x24 }, + { 0x34, 0xE8 }, + + // CDirectSoundBuffer_SetAllParameters+0x4E : retn 0x0C + { 0x4E, 0xC2 }, + { 0x4F, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundBuffer_SetAllParameters +// ****************************************************************** +//Generic OOVPA as of 4039 and newer. +OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4039, 9, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetAllParameters ), + + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x0A, 0xFF }, + { 0x0E, 0x83 }, + { 0x12, 0xD9 }, + { 0x16, 0xC8 }, + { 0x1D, 0xC2 }, + { 0x1E, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundVoice::SetConeAngles +// ****************************************************************** +OOVPA_XREF(CDirectSoundVoice_SetConeAngles, 4039, 14, + + XREF_CDirectSoundVoice_SetConeAngles, + XRefZero) + + { 0x00, 0x8B }, + { 0x03, 0x04 }, + + { 0x04, 0x8B }, + { 0x06, 0x10 }, + + { 0x07, 0x8B }, + { 0x0A, 0x08 }, + + { 0x0B, 0x89 }, + { 0x0C, 0x91 }, + + { 0x18, 0x89 }, + { 0x19, 0x91 }, + + { 0x27, 0x10 }, + { 0x2C, 0x01 }, + + // CDirectSoundVoice_SetConeAngles+0x37 : retn 10h + { 0x37, 0xC2 }, + { 0x38, 0x10 } +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundBuffer::SetConeAngles +// ****************************************************************** +OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4039, 12, + + XREF_CDirectSoundBuffer_SetConeAngles, + XRefOne) + + // CDirectSoundBuffer_SetConeAngles+0x39 : call [CDirectSoundVoice::SetConeAngles] + XREF_ENTRY( 0x39, XREF_CDirectSoundVoice_SetConeAngles ), + + // CDirectSoundBuffer_SetConeAngles+0x00 : push esi + { 0x00, 0x56 }, + + // CDirectSoundBuffer_SetConeAngles+0x20 : mov eax, 80004005h + { 0x21, 0x05 }, + { 0x22, 0x40 }, + { 0x23, 0x00 }, + { 0x24, 0x80 }, + + // CDirectSoundBuffer_SetConeAngles+0x28 : push [esp+0Ch+arg_4] + { 0x28, 0xFF }, + { 0x29, 0x74 }, + { 0x2A, 0x24 }, + { 0x2B, 0x18 }, + + // CDirectSoundBuffer_SetConeAngles+0x52 : retn 10h + { 0x52, 0xC2 }, + { 0x53, 0x10 } +OOVPA_END; + +// ****************************************************************** +// * IDirectSoundBuffer_SetConeAngles +// ****************************************************************** +//Generic OOVPA as of 4039 and newer. +OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4039, 10, + + XRefNoSaveIndex, + XRefOne) + + // IDirectSoundBuffer_SetConeAngles+0x1C : call [CDirectSoundBuffer::SetConeAngles] + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetConeAngles ), + + // IDirectSoundBuffer_SetConeAngles+0x04 : mov eax, [esp+4+arg_0] + { 0x04, 0x8B }, + { 0x05, 0x44 }, + { 0x06, 0x24 }, + { 0x07, 0x08 }, + + // IDirectSoundBuffer_SetConeAngles+0x12 : add eax, 0FFFFFFE4 + { 0x12, 0x83 }, + { 0x13, 0xC0 }, + { 0x14, 0xE4 }, + + // IDirectSoundBuffer_SetConeAngles+0x21 : retn 10h + { 0x21, 0xC2 }, + { 0x22, 0x10 } +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream_SetVelocity +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetVelocity, 4039, 11, + + XREF_CDirectSoundStream_SetVelocity, + XRefOne) + + XREF_ENTRY( 0x4D, XREF_CDirectSoundVoice_SetVelocity ), + + { 0x00, 0x55 }, + { 0x0F, 0x00 }, + { 0x16, 0x74 }, + { 0x23, 0xB8 }, + { 0x29, 0x3B }, + { 0x34, 0x83 }, + { 0x3F, 0x45 }, + { 0x62, 0x8B }, + + { 0x67, 0xC2 }, + { 0x68, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * CDirectSoundStream_SetPosition +// ****************************************************************** +OOVPA_XREF(CDirectSoundStream_SetPosition, 4039, 11, + + XREF_CDirectSoundStream_SetPosition, + XRefOne) + + XREF_ENTRY( 0x4D, XREF_CDirectSoundVoice_SetPosition ), + + { 0x00, 0x55 }, + { 0x0F, 0x00 }, + { 0x16, 0x74 }, + { 0x23, 0xB8 }, + { 0x29, 0x3B }, + { 0x38, 0xEC }, + { 0x57, 0x68 }, + { 0x62, 0x8B }, + + { 0x67, 0xC2 }, + { 0x68, 0x14 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index e73f4de71..2b13d9972 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -1594,14 +1594,17 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundBuffer::SetConeAngles // ****************************************************************** -OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4134, 11, +OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4134, 12, - XREF_DSBUFFERSETCONEANGLES, + XREF_CDirectSoundBuffer_SetConeAngles, XRefOne) // CDirectSoundBuffer_SetConeAngles+0x39 : call [CDirectSoundVoice::SetConeAngles] XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetConeAngles ), + // CDirectSoundBuffer_SetConeAngles+0x00 : push esi + { 0x00, 0x56 }, + // CDirectSoundBuffer_SetConeAngles+0x21 : mov eax, 80004005h { 0x22, 0x05 }, { 0x23, 0x40 }, @@ -1618,7 +1621,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetConeAngles, 4134, 11, { 0x54, 0x10 }, { 0x55, 0x00 } OOVPA_END; - +#if 0 // Moved to 4039 // ****************************************************************** // * IDirectSoundBuffer_SetConeAngles // ****************************************************************** @@ -1628,7 +1631,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4134, 10, XRefOne) // IDirectSoundBuffer_SetConeAngles+0x1C : call [CDirectSoundBuffer::SetConeAngles] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETCONEANGLES ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetConeAngles ), // IDirectSoundBuffer_SetConeAngles+0x04 : mov eax, [esp+4+arg_0] { 0x04, 0x8B }, @@ -1645,7 +1648,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 4134, 10, { 0x22, 0x10 }, { 0x23, 0x00 } OOVPA_END; - +#endif // ****************************************************************** // * CDirectSoundVoice::SetConeOrientation // ****************************************************************** @@ -1796,7 +1799,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetPosition, 4134, 8, - XREF_DSVOICESETPOSITION, + XREF_CDirectSoundVoice_SetPosition, XRefZero) // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] @@ -1823,7 +1826,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetPosition, 4134, 9, XRefOne) // CDirectSoundBuffer_SetPosition+0x49 : call [CDirectSoundVoice::SetPosition] - XREF_ENTRY( 0x4A, XREF_DSVOICESETPOSITION ), + XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetPosition ), // CDirectSoundBuffer_SetPosition+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, @@ -1843,12 +1846,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetPosition // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetPosition, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetPosition, 4134, 11, - XRefNoSaveIndex, + XREF_CDirectSoundStream_SetPosition, XRefOne) - XREF_ENTRY( 0x4E, XREF_DSVOICESETPOSITION ), + XREF_ENTRY( 0x4E, XREF_CDirectSoundVoice_SetPosition ), { 0x00, 0x55 }, { 0x0F, 0x00 }, @@ -1858,6 +1861,9 @@ OOVPA_XREF(CDirectSoundStream_SetPosition, 4134, 9, { 0x39, 0xEC }, { 0x58, 0x68 }, { 0x63, 0x8B }, + + { 0x68, 0xC2 }, + { 0x69, 0x14 }, OOVPA_END; // ****************************************************************** @@ -1865,7 +1871,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetVelocity, 4134, 8, - XREF_DSVOICESETVELOCITY, + XREF_CDirectSoundVoice_SetVelocity, XRefZero) // CDirectSoundVoice_SetVelocity+0x0F : mov edx, [ebp+arg_4] @@ -1892,7 +1898,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 4134, 9, XRefOne) // CDirectSoundBuffer_SetVelocity+0x49 : call [CDirectSoundVoice::SetVelocity] - XREF_ENTRY( 0x4A, XREF_DSVOICESETVELOCITY ), + XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetVelocity ), // CDirectSoundBuffer_SetVelocity+0x2B : fld [ebp+arg_C] { 0x2B, 0xD9 }, @@ -1912,12 +1918,12 @@ OOVPA_END; // ****************************************************************** // * CDirectSoundStream_SetVelocity // ****************************************************************** -OOVPA_XREF(CDirectSoundStream_SetVelocity, 4134, 9, +OOVPA_XREF(CDirectSoundStream_SetVelocity, 4134, 11, - XRefNoSaveIndex, + XREF_CDirectSoundStream_SetVelocity, XRefOne) - XREF_ENTRY( 0x4E, XREF_DSVOICESETVELOCITY ), + XREF_ENTRY( 0x4E, XREF_CDirectSoundVoice_SetVelocity ), { 0x00, 0x55 }, { 0x0F, 0x00 }, @@ -1927,6 +1933,9 @@ OOVPA_XREF(CDirectSoundStream_SetVelocity, 4134, 9, { 0x35, 0x83 }, { 0x40, 0x45 }, { 0x63, 0x8B }, + + { 0x68, 0xC2 }, + { 0x69, 0x14 }, OOVPA_END; // ****************************************************************** @@ -2175,7 +2184,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetAllParameters, 4134, 8, { 0x40, 0x68 }, { 0x4B, 0x8B }, OOVPA_END; - +#if 0 // Moved to 4039 // ****************************************************************** // * IDirectSoundBuffer_SetAllParameters // ****************************************************************** @@ -2195,7 +2204,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetAllParameters, 4134, 9, { 0x1D, 0xC2 }, { 0x1E, 0x0C }, OOVPA_END; - +#endif // ****************************************************************** // * CDirectSoundStream_SetAllParameters // ****************************************************************** @@ -3110,7 +3119,7 @@ OOVPATable DSound_4134[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), @@ -3141,7 +3150,7 @@ OOVPATable DSound_4134[] = { REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal... + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetAllParameters, 4134, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_GetStatus, 3911, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetMode, 4134, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index e3808a458..36286f129 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -450,7 +450,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetPosition, 4627, 8, - XREF_DSVOICESETPOSITION, + XREF_CDirectSoundVoice_SetPosition, XRefZero) // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] @@ -1576,7 +1576,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), @@ -1612,7 +1612,7 @@ OOVPATable DSound_4627[] = { REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal... + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl index 82325d97c..200e635fe 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl @@ -155,7 +155,7 @@ OOVPATable DSound_5028[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetDistanceFactor, 4134, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOrientation, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3911, PATCH), @@ -193,7 +193,7 @@ OOVPATable DSound_5028[] = { REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal... + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetAllParameters, 4134, PATCH), REGISTER_OOVPA(CMcpxBuffer_Pause, 4831, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Pause, 4928, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index fa252df1d..878140585 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -515,12 +515,12 @@ OOVPATable DSound_5233[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetOutputBuffer, 3911, PATCH), REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index 0f2709665..f0d2f0fcc 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -480,7 +480,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetPosition, 5344, 8, - XREF_DSVOICESETPOSITION, + XREF_CDirectSoundVoice_SetPosition, XRefZero) // CDirectSoundVoice_SetPosition+0x0F : mov edx, [ebp+arg_4] @@ -503,7 +503,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5344, 8, - XREF_DSVOICESETVELOCITY, + XREF_CDirectSoundVoice_SetVelocity, XRefZero) // CDirectSoundVoice_SetVelocity+0x0F : mov edx, [ebp+arg_4] @@ -1028,7 +1028,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(CDirectSoundStream_SetOutputBuffer, 4627, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5344, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeOutsideVolume, 5344, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 4134, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 4039, PATCH), @@ -1037,7 +1037,7 @@ OOVPATable DSound_5344[] = { REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3911, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 5344, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetConeAngles, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 4039, PATCH), REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH), REGISTER_OOVPA(XAudioDownloadEffectsImage, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 0ae11919b..50ebf433d 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -808,7 +808,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetPosition, 5558, 7, - XREF_DSVOICESETPOSITION, + XREF_CDirectSoundVoice_SetPosition, XRefZero) { 0x09, 0x8B }, @@ -828,7 +828,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetPosition, 5558, 9, XREF_CDirectSoundBuffer_SetPosition, XRefOne) - XREF_ENTRY( 0x4A, XREF_DSVOICESETPOSITION ), + XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetPosition ), { 0x0F, 0x00 }, { 0x18, 0x0B }, @@ -864,7 +864,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetVelocity, 5558, 7, - XREF_DSVOICESETVELOCITY, + XREF_CDirectSoundVoice_SetVelocity, XRefZero) { 0x09, 0x8B }, @@ -884,7 +884,7 @@ OOVPA_XREF(CDirectSoundBuffer_SetVelocity, 5558, 9, XREF_CDirectSoundBuffer_SetVelocity, XRefOne) - XREF_ENTRY( 0x4A, XREF_DSVOICESETVELOCITY ), + XREF_ENTRY( 0x4A, XREF_CDirectSoundVoice_SetVelocity ), { 0x0F, 0x00 }, { 0x18, 0x0B }, @@ -1747,7 +1747,7 @@ OOVPATable DSound_5558[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index b2c045715..66245fbbc 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -608,7 +608,7 @@ OOVPATable DSound_5788[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(IDirectSoundBuffer_Lock, 5558, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetI3DL2Source, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetI3DL2Source, 5558, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index b8e7db1e1..40073ea21 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -233,7 +233,7 @@ OOVPATable DSound_5849[] = { REGISTER_OOVPA(IDirectSoundBuffer_SetI3DL2Source, 5558, PATCH), REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF), - REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), + REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4039, PATCH), REGISTER_OOVPA(CDirectSoundVoice_Use3DVoiceData, 5558, XREF), REGISTER_OOVPA(CDirectSoundBuffer_Use3DVoiceData, 5558, XREF), REGISTER_OOVPA(IDirectSoundBuffer_Use3DVoiceData, 5558, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl index 006308b3b..3207c93ea 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl @@ -159,8 +159,8 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundVoiceSettings_SetMixBins, XREF, 4039, 4134, 5344, 5558), REGISTER_OOVPAS(CDirectSoundVoiceSettings_SetMixBinVolumes, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundVoice_CommitDeferredSettings, XREF, 5558), - REGISTER_OOVPAS(CDirectSoundVoice_SetAllParameters, XREF, 3911, 4134, 5344, 5558), - REGISTER_OOVPAS(CDirectSoundVoice_SetConeAngles, XREF, 3911, 4134, 5344, 5558), + REGISTER_OOVPAS(CDirectSoundVoice_SetAllParameters, XREF, 3911, 4039, 4134, 5344, 5558), + REGISTER_OOVPAS(CDirectSoundVoice_SetConeAngles, XREF, 3911, 4039, 4134, 5344, 5558), REGISTER_OOVPAS(CDirectSoundVoice_SetConeOrientation, XREF, 3911, 4039, 4134, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetConeOutsideVolume, XREF, 3911, 4039, 4134, 4361, 5344), REGISTER_OOVPAS(CDirectSoundVoice_SetDistanceFactor, XREF, 4134, 4361, 4627, 5344, 5558), @@ -191,9 +191,9 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundBuffer_Pause, XREF, 4928), REGISTER_OOVPAS(CDirectSoundBuffer_Play, XREF, 3911, 4039, 4134, 4361, 5558, 5788), REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3911, 4361, 5788), - REGISTER_OOVPAS(CDirectSoundBuffer_SetAllParameters, XREF, 4134), + REGISTER_OOVPAS(CDirectSoundBuffer_SetAllParameters, XREF, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetBufferData, XREF, 3911, 4039, 4134, 5558, 5788), - REGISTER_OOVPAS(CDirectSoundBuffer_SetConeAngles, XREF, 4134, 5558), + REGISTER_OOVPAS(CDirectSoundBuffer_SetConeAngles, XREF, 4039, 4134, 5558), REGISTER_OOVPAS(CDirectSoundBuffer_SetConeOrientation, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetConeOutsideVolume, XREF, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundBuffer_SetCurrentPosition, XREF, 3911, 4039, 4134, 5558, 5788), @@ -252,10 +252,10 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(CDirectSoundStream_SetMode, PATCH, 3911, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetOutputBuffer, PATCH, 3911, 4627), REGISTER_OOVPAS(CDirectSoundStream_SetPitch, PATCH, 3911, 4134), - REGISTER_OOVPAS(CDirectSoundStream_SetPosition, PATCH, 3911, 4134), + REGISTER_OOVPAS(CDirectSoundStream_SetPosition, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetRolloffCurve, XREF, 4627, 5558), REGISTER_OOVPAS(CDirectSoundStream_SetRolloffFactor, PATCH, 4134), - REGISTER_OOVPAS(CDirectSoundStream_SetVelocity, PATCH, 3911, 4134), + REGISTER_OOVPAS(CDirectSoundStream_SetVelocity, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_SetVolume, PATCH, 3911, 4039, 4134), REGISTER_OOVPAS(CDirectSoundStream_Use3DVoiceData, XREF, 5558), REGISTER_OOVPAS(CDirectSound_CommitDeferredSettings, XREF, 3911, 4039, 4134, 5344, 5558, 5788), @@ -290,9 +290,9 @@ OOVPATable DSound_OOVPAV2[] = { REGISTER_OOVPAS(IDirectSoundBuffer_Play, PATCH, 3911, 4361, 5558), REGISTER_OOVPAS(IDirectSoundBuffer_PlayEx, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_Release, PATCH, 3911), - REGISTER_OOVPAS(IDirectSoundBuffer_SetAllParameters, PATCH, 3911, 4134), // Use that for now. Okay, it's your call pal... (from 4134's comment) + REGISTER_OOVPAS(IDirectSoundBuffer_SetAllParameters, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetBufferData, PATCH, 3911, 4134, 5558, 5788), - REGISTER_OOVPAS(IDirectSoundBuffer_SetConeAngles, PATCH, 3911, 4134, 5558), + REGISTER_OOVPAS(IDirectSoundBuffer_SetConeAngles, PATCH, 3911, 4039, 5558), REGISTER_OOVPAS(IDirectSoundBuffer_SetConeOrientation, PATCH, 3911), REGISTER_OOVPAS(IDirectSoundBuffer_SetConeOutsideVolume, PATCH, 3911, 4039), REGISTER_OOVPAS(IDirectSoundBuffer_SetCurrentPosition, PATCH, 3911, 4134, 5558, 5788),