From af653725bbd4683192e7ddb3914ec99189646bbb Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 14 Jul 2017 19:46:05 -0500
Subject: [PATCH] PCFX - multi-disc support

---
 BizHawk.Client.Common/RomLoader.cs                     | 10 ++++++++++
 .../MultiDiskBundler/MultiDiskBundler.Designer.cs      |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index 5f9ed9afa9..19804b7352 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -719,6 +719,16 @@ namespace BizHawk.Client.Common
 									nextEmulator = new Saturnus(nextComm, saturnDiscs, Deterministic,
 									(Saturnus.Settings)GetCoreSettings<Saturnus>(), (Saturnus.SyncSettings)GetCoreSyncSettings<Saturnus>());
 									break;
+								case "PCFX":
+									var pcfxDiscs = DiscsFromXml(xmlGame, "PCFX", DiscType.PCFX);
+									if (!pcfxDiscs.Any())
+									{
+										return false;
+									}
+
+									nextEmulator = new Tst(nextComm, pcfxDiscs,
+										(Tst.Settings)GetCoreSettings<Tst>(), (Tst.SyncSettings)GetCoreSyncSettings<Tst>());
+									break;
 								default:
 									return false;
 							}
diff --git a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs
index 2abadcb47d..def046ab2e 100644
--- a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs
@@ -142,7 +142,8 @@
             "AppleII",
             "PSX",
             "C64",
-            "SAT"});
+            "SAT",
+            "PCFX"});
             this.SystemDropDown.Location = new System.Drawing.Point(425, 75);
             this.SystemDropDown.Name = "SystemDropDown";
             this.SystemDropDown.Size = new System.Drawing.Size(69, 21);