ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove useless "Tilt Controls" dropdown from GBHawk sync settings 

hack or don't
This commit is contained in:
YoshiRulz 2021-08-18 06:38:48 +10:00 committed by James Groom
parent 34ec13635b
commit c09370ab44
2 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
View File

@ -84,31 +84,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public class GBSyncSettings
{
[JsonIgnore]
public string Port1 = GBHawkControllerDeck.DefaultControllerName;
public enum ControllerType
{
Tilt
}
[JsonIgnore]
private ControllerType _GBController;
[DisplayName("Tilt Controls")]
[Description("Choose Tilt Control mode, when Applicable (MBC7 games)")]
[DefaultValue(ControllerType.Tilt)]
public ControllerType GBController
{
get => _GBController;
set
{
if (value == ControllerType.Tilt) { Port1 = "Gameboy Controller + Tilt"; }
_GBController = value;
}
}
public enum ConsoleModeType
{
Auto,

15
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -8,6 +8,8 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using BizHawk.Common.ReflectionExtensions;
// TODO: mode1_disableint_gbc.gbc behaves differently between GBC and GBA, why?
// TODO: Window Position A6 behaves differently
// TODO: Verify open bus behaviour for bad SRAM accesses for other MBCs
@ -195,15 +197,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
var mppr = Setup_Mapper(romHashMD5, romHashSHA1);
if (cart_RAM != null) { cart_RAM_vbls = new byte[cart_RAM.Length]; }
if (mppr == "MBC7")
{
_controllerDeck = new GBHawkControllerDeck(_syncSettings.Port1);
}
else
{
_controllerDeck = new GBHawkControllerDeck(GBHawkControllerDeck.DefaultControllerName);
}
_controllerDeck = new(mppr is "MBC7"
? typeof(StandardTilt).DisplayName()
: GBHawkControllerDeck.DefaultControllerName);
timer.Core = this;
audio.Core = this;
ppu.Core = this;