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

Fix docs/strings/identifiers copypasta'd between various Hawk cores 

A2600 standard controller and A7800 standard controller were using the same
keybinds, now only Atari2600Hawk uses those and A7800Hawk's are blank unless
configured manually or configured on config regen
This commit is contained in:
YoshiRulz 2020-09-08 12:01:58 +10:00
parent 6047a12ad8
commit 4bf50e6e51
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
9 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/defctrl.json
View File

@ -243,6 +243,20 @@
"P2 Right": "Keypad6, J1 Z+, X1 RStickRight",
"P2 Button": "Keypad1, J1 B2, X1 A"
},
"Atari 7800 Basic Controller": {
"Reset": "D, J1 B9, X1 Back",
"Select": "S, J1 B10, X1 Start",
"P1 Up": "Up, J1 POV1U, X1 DpadUp, X1 LStickUp",
"P1 Down": "Down, J1 POV1D, X1 DpadDown, X1 LStickDown",
"P1 Left": "Left, J1 POV1L, X1 DpadLeft, X1 LStickLeft",
"P1 Right": "Right, J1 POV1R, X1 DpadRight, X1 LStickRight",
"P1 Button": "Z, J1 B1, X1 X",
"P2 Up": "Keypad8, J1 RotationZ-, X1 RStickUp",
"P2 Down": "Keypad2, J1 RotationZ+, X1 RStickDown",
"P2 Left": "Keypad4, J1 Z-, X1 RStickLeft",
"P2 Right": "Keypad6, J1 Z+, X1 RStickRight",
"P2 Button": "Keypad1, J1 B2, X1 A"
},
"Atari 7800 ProLine Joystick Controller": {
"Reset": "D, J1 B9, X1 Back",
"Select": "S, J1 B10, X1 Start",
@ -1023,6 +1037,10 @@
"P1 Button": "A",
"P2 Button": "S"
},
"Atari 7800 Basic Controller": {
"P1 Button": "A",
"P2 Button": "S"
},
"PC Engine Controller": {
"P1 B2": "A",
"P1 B1": "S"

2
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
View File

@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public abstract partial class CPCBase
{
/// <summary>
/// The tape or disk image(s) that are passed in from the main ZXSpectrum class
/// The tape or disk image(s) that are passed in from the main AmstradCPC class
/// </summary>
protected List<byte[]> mediaImages { get; set; }

2
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public abstract partial class CPCBase
{
/// <summary>
/// The calling ZXSpectrum class (piped in via constructor)
/// The calling AmstradCPC class (piped in via constructor)
/// </summary>
public AmstradCPC CPC { get; set; }

2
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs
View File

@ -2,7 +2,7 @@
namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
{
/// <summary>
/// The different disk formats ZXHawk currently supports
/// The different disk formats CPCHawk currently supports
/// </summary>
public enum DiskType
{

14
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
View File

@ -1264,7 +1264,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
If you do not obey these rules, emulators may display your message in any way they like. */
private void ProcessBlockID31(byte[] data)
{
// currently not implemented properly in ZXHawk
// currently not implemented properly in CPCHawk
var t = new TapeDataBlock
{
BlockID = 0x31,
@ -1428,7 +1428,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
The list of hardware types and IDs is somewhat large, and may be found at the end of the format description. */
private void ProcessBlockID33(byte[] data)
{
// currently not implemented properly in ZXHawk
// currently not implemented properly in CPCHawk
TapeDataBlock t = new TapeDataBlock
{
@ -1531,11 +1531,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
_position += 4;
}
// These mostly should be ignored by ZXHawk - here for completeness
// These mostly should be ignored by CPCHawk - here for completeness
private void ProcessBlockID16(byte[] data)
{
// zxhawk will not implement this block. it will however handle it so subsequent blocks can be parsed
// CPCHawk will not implement this block. it will however handle it so subsequent blocks can be parsed
TapeDataBlock t = new TapeDataBlock
{
BlockID = 0x16,
@ -1554,7 +1554,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private void ProcessBlockID17(byte[] data)
{
// zxhawk will not implement this block. it will however handle it so subsequent blocks can be parsed
// CPCHawk will not implement this block. it will however handle it so subsequent blocks can be parsed
var t = new TapeDataBlock
{
BlockID = 0x17,
@ -1573,7 +1573,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private void ProcessBlockID34(byte[] data)
{
// currently not implemented properly in ZXHawk
// currently not implemented properly in CPCHawk
var t = new TapeDataBlock
{
BlockID = 0x34,
@ -1602,7 +1602,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
And when an emulator encounters the snapshot block it should load it and then continue with the next block. */
private void ProcessBlockID40(byte[] data)
{
// currently not implemented properly in ZXHawk
// currently not implemented properly in CPCHawk
TapeDataBlock t = new TapeDataBlock
{

2
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
View File

@ -228,7 +228,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
BRWS,
PAUS,
// zxhawk proprietry
// CPCHawk proprietary
PAUSE_BLOCK,
WAV_Recording

2
src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
}
/// <summary>
/// Represents a controller plugged into a controller port on the Colecovision
/// Represents a controller plugged into a controller port on the 2600
/// </summary>
public interface IPort
{

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

@ -93,7 +93,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
PortNum = portNum;
Definition = new ControllerDefinition
{
Name = "Atari 2600 Basic Controller",
Name = "Atari 7800 Basic Controller",
BoolButtons = BaseDefinition
.Select(b => "P" + PortNum + " " + b)
.ToList()

4
src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
View File

@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
ser.SyncEnum(nameof(_machineType), ref _machineType);
_cpu.SyncState(ser);
ser.BeginSection(nameof(ZXSpectrum));
ser.BeginSection(nameof(ChannelF));
_machine.SyncState(ser);
ser.Sync("Frame", ref _machine.FrameCount);
ser.Sync("LagCount", ref _lagCount);
@ -56,7 +56,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
else
{
_cpu.SyncState(ser);
ser.BeginSection(nameof(ZXSpectrum));
ser.BeginSection(nameof(ChannelF));
_machine.SyncState(ser);
ser.Sync("Frame", ref _machine.FrameCount);
ser.Sync("LagCount", ref _lagCount);