From 210476c77ec6d0160e66ab6e9a45ad64fe5e50ce Mon Sep 17 00:00:00 2001
From: gameblabla
Date: Thu, 7 Mar 2019 20:47:17 +0100
Subject: Diablo Music fix for PCSX Rearmed. (optional hack)

Let's also allow it to be changed from the menu.
Set to off by default as it could cause issues in some other games.
---
 frontend/main.c | 1 +
 frontend/menu.c | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'frontend')

diff --git a/frontend/main.c b/frontend/main.c
index a824fdc..43a5548 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -138,6 +138,7 @@ void emu_set_default_config(void)
 	pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
 
 	spu_config.iUseReverb = 1;
+	spu_config.idiablofix = 0;
 	spu_config.iUseInterpolation = 1;
 	spu_config.iXAPitch = 0;
 	spu_config.iVolume = 768;
diff --git a/frontend/menu.c b/frontend/menu.c
index cf9382a..0b3f553 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -443,6 +443,7 @@ static const struct {
 	CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection),
 	CE_INTVAL_P(gpu_peopsgl.dwActFixes),
 	CE_INTVAL(spu_config.iUseReverb),
+	CE_INTVAL(spu_config.idiablofix),
 	CE_INTVAL(spu_config.iXAPitch),
 	CE_INTVAL(spu_config.iUseInterpolation),
 	CE_INTVAL(spu_config.iTempo),
@@ -1454,6 +1455,7 @@ static menu_entry e_menu_plugin_spu[] =
 	mee_range_h   ("Volume boost",              0, volume_boost, -5, 30, h_spu_volboost),
 	mee_onoff     ("Reverb",                    0, spu_config.iUseReverb, 1),
 	mee_enum      ("Interpolation",             0, spu_config.iUseInterpolation, men_spu_interp),
+	mee_onoff     ("Diablo Music fix",          0, spu_config.idiablofix, 1),
 	mee_onoff     ("Adjust XA pitch",           0, spu_config.iXAPitch, 1),
 	mee_onoff_h   ("Adjust tempo",              0, spu_config.iTempo, 1, h_spu_tempo),
 	mee_end,
-- 
cgit v1.2.3


From 1d6abe26ddb1f893cf96ccd3e251f25b1afbba2a Mon Sep 17 00:00:00 2001
From: retro-wertz
Date: Wed, 13 Mar 2019 09:47:58 +0800
Subject: Add Diablo Music fix hack to core options

---
 frontend/libretro.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index a5ec2c2..06b66b1 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -500,6 +500,7 @@ void retro_set_environment(retro_environment_t cb)
       { "pcsx_rearmed_show_bios_bootlogo", "Show Bios Bootlogo(Breaks some games); disabled|enabled" },
       { "pcsx_rearmed_spu_reverb", "Sound: Reverb; enabled|disabled" },
       { "pcsx_rearmed_spu_interpolation", "Sound: Interpolation; simple|gaussian|cubic|off" },
+      { "pcsx_rearmed_idiablofix", "Diablo Music Fix; disabled|enabled" },
       { "pcsx_rearmed_pe2_fix", "Parasite Eve 2/Vandal Hearts 1/2 Fix; disabled|enabled" },
       { "pcsx_rearmed_inuyasha_fix", "InuYasha Sengoku Battle Fix; disabled|enabled" },
       { NULL, NULL },
@@ -1557,6 +1558,17 @@ static void update_variables(bool in_flight)
          Config.RCntFix = 1;
    }
 
+   var.value = "NULL";
+   var.key = "pcsx_rearmed_idiablofix";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      if (strcmp(var.value, "disabled") == 0)
+         spu_config.idiablofix = 0;
+      else if (strcmp(var.value, "enabled") == 0)
+         spu_config.idiablofix = 1;
+   }
+
    var.value = "NULL";
    var.key = "pcsx_rearmed_inuyasha_fix";
 
-- 
cgit v1.2.3