diff --git a/src/BizHawk.Client.Common/movie/import/GmvImport.cs b/src/BizHawk.Client.Common/movie/import/GmvImport.cs
index 4331daa7c3..59212d0c24 100644
--- a/src/BizHawk.Client.Common/movie/import/GmvImport.cs
+++ b/src/BizHawk.Client.Common/movie/import/GmvImport.cs
@@ -72,7 +72,8 @@ namespace BizHawk.Client.Common.movie.import
 			var ss = new GPGX.GPGXSyncSettings
 			{
 				UseSixButton = player1Config == '6' || player2Config == '6',
-				ControlType = GPGX.ControlType.Normal
+				ControlTypeLeft = GPGX.ControlType.Normal,
+				ControlTypeRight = GPGX.ControlType.Normal
 			};
 
 			input.dev[2] = input.dev[3] = input.dev[4] = input.dev[5] = input.dev[6] = input.dev[7] = LibGPGX.INPUT_DEVICE.DEVICE_NONE;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
index 802f7fdd16..f16277236f 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
@@ -233,10 +233,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			[DefaultValue(true)]
 			public bool UseSixButton { get; set; }
 
-			[DisplayName("Control Type")]
+			[DisplayName("Control Type - Left Port")]
 			[Description("Sets the type of controls that are plugged into the console.  Some games will automatically load with a different control type.")]
 			[DefaultValue(ControlType.Normal)]
-			public ControlType ControlType { get; set; }
+			public ControlType ControlTypeLeft { get; set; }
+
+			[DisplayName("Control Type - Right Port")]
+			[Description("Sets the type of controls that are plugged into the console.  Some games will automatically load with a different control type.")]
+			[DefaultValue(ControlType.Normal)]
+			public ControlType ControlTypeRight { get; set; }
 
 			[DisplayName("Autodetect Region")]
 			[Description("Sets the region of the emulated console.  Many games can run on multiple regions and will behave differently on different ones.  Some games may require a particular region.")]
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
index a3f9ba6336..42c0ecb02d 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
@@ -77,42 +77,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 					DriveLightEnabled = true;
 				}
 
-				LibGPGX.INPUT_SYSTEM system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_NONE;
-				LibGPGX.INPUT_SYSTEM system_b = LibGPGX.INPUT_SYSTEM.SYSTEM_NONE;
-
-				switch (_syncSettings.ControlType)
-				{
-					case ControlType.None:
-					default:
-						break;
-					case ControlType.Activator:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_ACTIVATOR;
-						system_b = LibGPGX.INPUT_SYSTEM.SYSTEM_ACTIVATOR;
-						break;
-					case ControlType.Normal:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_MD_GAMEPAD;
-						system_b = LibGPGX.INPUT_SYSTEM.SYSTEM_MD_GAMEPAD;
-						break;
-					case ControlType.OnePlayer:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_MD_GAMEPAD;
-						break;
-					case ControlType.Xea1p:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_XE_A1P;
-						break;
-					case ControlType.Teamplayer:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_TEAMPLAYER;
-						system_b = LibGPGX.INPUT_SYSTEM.SYSTEM_TEAMPLAYER;
-						break;
-					case ControlType.Wayplay:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_WAYPLAY;
-						system_b = LibGPGX.INPUT_SYSTEM.SYSTEM_WAYPLAY;
-						break;
-					case ControlType.Mouse:
-						system_a = LibGPGX.INPUT_SYSTEM.SYSTEM_MD_GAMEPAD;
-						// seems like mouse in port 1 would be supported, but not both at the same time
-						system_b = LibGPGX.INPUT_SYSTEM.SYSTEM_MOUSE;
-						break;
-				}
+				LibGPGX.INPUT_SYSTEM system_a = SystemForSystem(_syncSettings.ControlTypeLeft);
+				LibGPGX.INPUT_SYSTEM system_b = SystemForSystem(_syncSettings.ControlTypeRight);
 
 				var initResult = Core.gpgx_init(
 					romextension,
@@ -165,6 +131,28 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			_romfile = null;
 		}
 
+		private static LibGPGX.INPUT_SYSTEM SystemForSystem(ControlType c)
+		{
+			switch (c)
+			{
+				default:
+				case ControlType.None:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_NONE;
+				case ControlType.Normal:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_MD_GAMEPAD;
+				case ControlType.Xea1p:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_XE_A1P;
+				case ControlType.Activator:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_ACTIVATOR;
+				case ControlType.Teamplayer:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_TEAMPLAYER;
+				case ControlType.Wayplay:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_WAYPLAY;
+				case ControlType.Mouse:
+					return LibGPGX.INPUT_SYSTEM.SYSTEM_MOUSE;
+			}
+		}
+
 		private LibGPGX Core;
 		private WaterboxHost _elf;
 
@@ -185,7 +173,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 		public enum ControlType
 		{
 			None,
-			OnePlayer,
 			Normal,
 			Xea1p,
 			Activator,