adjust for 2.9 again

TASEmulators · Apr 16, 2023 · ffc3115 · ffc3115
1 parent bb58063
commit ffc3115
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -67,11 +67,6 @@ public Gameboy(CoreComm comm, GameInfo game, byte[] file, GambatteSettings setti
 						break;
 				}
 
-				if (_syncSettings.MulticartCompat)
-				{
-					flags |= LibGambatte.LoadFlags.MULTICART_COMPAT;
-				}
-
 				IsCgb = (flags & LibGambatte.LoadFlags.CGB_MODE) == LibGambatte.LoadFlags.CGB_MODE;
 				if (_syncSettings.EnableBIOS)
 				{

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
@@ -51,7 +51,7 @@ public GambatteLink(CoreLoadParameters<GambatteLinkSettings, GambatteLinkSyncSet
 				_linkedCores[i].ConnectInputCallbackSystem(_inputCallbacks);
 				_linkedCores[i].ConnectMemoryCallbackSystem(_memoryCallbacks, i);
 				isAnySgb = isAnySgb || isSgb(i);
-				_linkedConts[i] = new SaveController(Gameboy.CreateControllerDefinition(sgb: isSgb(i), sub: false, tilt: false));
+				_linkedConts[i] = new SaveController(Gameboy.CreateControllerDefinition(sgb: isSgb(i), sub: false, tilt: false, rumble: false, remote: false));
 				_linkedBlips[i] = new BlipBuffer(1024);
 				_linkedBlips[i].SetRates(2097152 * 2, 44100);
 				_linkedOverflow[i] = 0;