psxmem: backport fixes from pcsxr

[pcsx_rearmed.git] / libpcsxcore / psxhw.c

diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index f265e19..8069c07 100644 (file)
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -432,7 +432,7 @@ void psxHwWrite16(u32 add, u16 value) {
 #endif
                        psxHu16ref(0x1074) = SWAPu16(value);
                        if (psxHu16ref(0x1070) & value)
-                               new_dyna_set_event(6, 1);
+                               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
                        return;
 
                case 0x1f801100:
@@ -546,7 +546,7 @@ void psxHwWrite32(u32 add, u32 value) {
 #endif
                        psxHu32ref(0x1074) = SWAPu32(value);
                        if (psxHu32ref(0x1070) & value)
-                               new_dyna_set_event(6, 1);
+                               new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
                        return;
 
 #ifdef PSXHW_LOG
@@ -728,6 +728,13 @@ void psxHwWrite32(u32 add, u32 value) {
                        psxRcntWtarget(2, value & 0xffff); return;
 
                default:
+                       // Dukes of Hazard 2 - car engine noise
+                       if (add>=0x1f801c00 && add<0x1f801e00) {
+                               SPU_writeRegister(add, value&0xffff);
+                               SPU_writeRegister(add + 2, value>>16);
+                               return;
+                       }
+
                        psxHu32ref(add) = SWAPu32(value);
 #ifdef PSXHW_LOG
                        PSXHW_LOG("*Unknown 32bit write at address %x value %x\n", add, value);