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

A7800Hawk: Controller convention fixes 

-Revert setting system ID to A78 (it broke controller selection)
-Fix some button names to match nemonics
-Fix controller names to match images (still some missing though)
This commit is contained in:
alyosha-tas 2017-07-24 17:41:22 -04:00 committed by GitHub
parent d1a78f4fcb
commit 42b379b486
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
View File

@ -42,6 +42,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public void FrameAdvance(IController controller, bool render, bool rendersound)
{
Console.WriteLine("-----------------------FRAME-----------------------");
if (_tracer.Enabled)
{
cpu.TraceCallback = s => _tracer.Put(s);
@ -225,7 +226,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public int Frame => _frame;
public string SystemId => "A78";
public string SystemId => "A7800";
public bool DeterministicEmulation { get; set; }

8
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllerDeck.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
Definition = new ControllerDefinition
{
Name = "A7800 Controller",
Name = Port1.Definition.Name,
BoolButtons = Port1.Definition.BoolButtons
.Concat(Port2.Definition.BoolButtons)
.Concat(new[]
@ -35,9 +35,9 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
"Power",
"Reset",
"Select",
"BW",
"Left Difficulty", // better not put P# on these as they might not correspond to player numbers
"Right Difficulty",
"BW",
"Toggle Left Difficulty", // better not put P# on these as they might not correspond to player numbers
"Toggle Right Difficulty",
"Pause"
})
.ToList()

6
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
View File

@ -78,6 +78,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
PortNum = portNum;
Definition = new ControllerDefinition
{
Name = "Atari 2600 Basic Controller",
BoolButtons = BaseDefinition
.Select(b => "P" + PortNum + " " + b)
.ToList()
@ -134,7 +135,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
private static readonly string[] BaseDefinition =
{
"U", "D", "L", "R", "Fire"
"U", "D", "L", "R", "Trigger"
};
private static byte[] HandControllerButtons =
@ -154,6 +155,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
PortNum = portNum;
Definition = new ControllerDefinition
{
Name = "Atari 7800 ProLine Joystick Controller",
BoolButtons = BaseDefinition
.Select(b => "P" + PortNum + " " + b)
.ToList()
@ -219,7 +221,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
private static readonly string[] BaseDefinition =
{
"U", "D", "L", "R", "Fire", "Fire2"
"U", "D", "L", "R", "Trigger", "Trigger 2"
};
private static byte[] HandControllerButtons =