diff --git a/Assets/defctrl.json b/Assets/defctrl.json
index 8852f42fbd..c920fedd55 100644
--- a/Assets/defctrl.json
+++ b/Assets/defctrl.json
@@ -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"
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
index 6b0bd5154c..cc94b70c6d 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
@@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public abstract partial class CPCBase
{
///
- /// 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
///
protected List mediaImages { get; set; }
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs
index a8129c7154..e260ea1cfc 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs
@@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public abstract partial class CPCBase
{
///
- /// The calling ZXSpectrum class (piped in via constructor)
+ /// The calling AmstradCPC class (piped in via constructor)
///
public AmstradCPC CPC { get; set; }
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs
index df211b4e55..868d3e1b30 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs
@@ -2,7 +2,7 @@
namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
{
///
- /// The different disk formats ZXHawk currently supports
+ /// The different disk formats CPCHawk currently supports
///
public enum DiskType
{
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
index 61812b6030..ec6e98737c 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
@@ -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
{
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
index 1810940d18..53e2d50ed4 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
@@ -228,7 +228,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
BRWS,
PAUS,
- // zxhawk proprietry
+ // CPCHawk proprietary
PAUSE_BLOCK,
WAV_Recording
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
index 2e9c374741..98728babc9 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
}
///
- /// Represents a controller plugged into a controller port on the Colecovision
+ /// Represents a controller plugged into a controller port on the 2600
///
public interface IPort
{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
index 3aac2bba65..38b9b3a85a 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
@@ -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()
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
index 770b0c7c01..733f4ed976 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
@@ -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);