From 33c8808ee4f37322f20f4d6cf724a98d927d99d0 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 27 Sep 2020 09:59:05 -0500
Subject: [PATCH] PSX - initialize with a single controller + memcard instead
 of two, to be consistent with other cores

---
 src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index e5773895a5..43e566b53d 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -1177,12 +1177,13 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 
 			public SyncSettings()
 			{
-				//initialize with historical default settings
+				//initialize with single controller and memcard
 				var user = new OctoshockFIOConfigUser();
-				user.Memcards[0] = user.Memcards[1] = true;
+				user.Memcards[0] = true;
+				user.Memcards[1] = false;
 				user.Multitaps[0] = user.Multitaps[0] = false;
 				user.Devices8[0] = OctoshockDll.ePeripheralType.DualShock;
-				user.Devices8[4] = OctoshockDll.ePeripheralType.DualShock;
+				user.Devices8[4] = OctoshockDll.ePeripheralType.None;
 				FIOConfig = user;
 			}