diff --git a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs index b8003b465a..7288317064 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs @@ -219,10 +219,10 @@ namespace BizHawk.Client.Common { "A Left", 'L' }, { "A Right", 'R' }, - { "DPad Up", 'U' }, - { "DPad Down", 'D' }, - { "DPad Left", 'L' }, - { "DPad Right", 'R' }, + { "DPad U", 'U' }, + { "DPad D", 'D' }, + { "DPad L", 'L' }, + { "DPad R", 'R' }, } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs index 2a5c1205df..60544d9719 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs @@ -38,7 +38,7 @@ namespace BizHawk.Client.EmuHawk }, new PadSchema.ButtonScema { - Name = "P" + controller + " Up", + Name = "P" + controller + " DPad U", DisplayName = "", Icon = Properties.Resources.BlueUp, Location = new Point(24, 195), @@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk }, new PadSchema.ButtonScema { - Name = "P" + controller + " Down", + Name = "P" + controller + " DPad D", DisplayName = "", Icon = Properties.Resources.BlueDown, Location = new Point(24, 216), @@ -54,7 +54,7 @@ namespace BizHawk.Client.EmuHawk }, new PadSchema.ButtonScema { - Name = "P" + controller + " Left", + Name = "P" + controller + " DPad L", DisplayName = "", Icon = Properties.Resources.Back, Location = new Point(3, 207), @@ -62,7 +62,7 @@ namespace BizHawk.Client.EmuHawk }, new PadSchema.ButtonScema { - Name = "P" + controller + " Right", + Name = "P" + controller + " DPad R", DisplayName = "", Icon = Properties.Resources.Forward, Location = new Point(45, 207), diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index 3eccbda35f..6775d0084e 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -12,7 +12,7 @@ namespace BizHawk.Client.EmuHawk { for (var i = 0; i < Global.Emulator.ControllerDefinition.PlayerCount; i++) { - yield return StandardController(i); + yield return StandardController(i + 1); } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs index 1028ef481f..b83bd3d1f9 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs @@ -12,7 +12,7 @@ namespace BizHawk.Client.EmuHawk { for (var i = 0; i < Global.Emulator.ControllerDefinition.PlayerCount; i++) { - yield return StandardController(i); + yield return StandardController(i + 1); } yield return ConsoleButtons();