From 37174b6be232f0e044144eb14601737c5fa7d72b Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 17 Dec 2022 17:21:20 +0000
Subject: [PATCH] Fix #67: Issue with the GUI when genning without RE1 assets

---
 IntelOrca.Biohazard/BgmRandomiser.cs     | 8 ++++----
 IntelOrca.Biohazard/RE1/Re1Randomiser.cs | 2 +-
 IntelOrca.Biohazard/RE2/Re2Randomiser.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IntelOrca.Biohazard/BgmRandomiser.cs b/IntelOrca.Biohazard/BgmRandomiser.cs
index 809c18539..447caddd1 100644
--- a/IntelOrca.Biohazard/BgmRandomiser.cs
+++ b/IntelOrca.Biohazard/BgmRandomiser.cs
@@ -62,10 +62,10 @@ public void AddCutomMusicToSelection(RandoConfig config)
                         good = true;
                     if (d == "re2" && config.IncludeBGMRE2)
                         good = true;
-                    if (d == "re3" && config.IncludeBGMRE3)
-                        good = true;
-                    if (d == "re4" && config.IncludeBGMRE4)
-                        good = true;
+                    // if (d == "re3" && config.IncludeBGMRE3)
+                    //     good = true;
+                    // if (d == "re4" && config.IncludeBGMRE4)
+                    //     good = true;
                 }
                 if (good)
                     AddCustomMusicToSelection(bgmList, dir);
diff --git a/IntelOrca.Biohazard/RE1/Re1Randomiser.cs b/IntelOrca.Biohazard/RE1/Re1Randomiser.cs
index dddebded7..f16a66534 100644
--- a/IntelOrca.Biohazard/RE1/Re1Randomiser.cs
+++ b/IntelOrca.Biohazard/RE1/Re1Randomiser.cs
@@ -84,7 +84,7 @@ protected override string GetRdtPath(string dataPath, RdtId rdtId, int player)
 
         public override void Generate(RandoConfig config, ReInstallConfig reConfig, string installPath, string modPath)
         {
-            if (config.IncludeBGMRE2)
+            if (config.RandomBgm && config.IncludeBGMRE2)
             {
                 if (!reConfig.IsEnabled(BioVersion.Biohazard2))
                 {
diff --git a/IntelOrca.Biohazard/RE2/Re2Randomiser.cs b/IntelOrca.Biohazard/RE2/Re2Randomiser.cs
index a6a16a36a..69ec8a5f3 100644
--- a/IntelOrca.Biohazard/RE2/Re2Randomiser.cs
+++ b/IntelOrca.Biohazard/RE2/Re2Randomiser.cs
@@ -80,7 +80,7 @@ public override void Generate(RandoConfig config, ReInstallConfig reConfig, stri
         {
             _reInstallConfig = reConfig;
 
-            if (config.IncludeBGMRE1 || config.IncludeNPCRE1)
+            if ((config.RandomBgm && config.IncludeBGMRE1) || (config.RandomNPCs && config.IncludeNPCRE1))
             {
                 if (!reConfig.IsEnabled(BioVersion.Biohazard1))
                 {