summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2015-11-04 09:23:49 -0500
committer R. Belmont <rb6502@users.noreply.github.com>2015-11-04 09:23:49 -0500
commitf41b11f86a4b3c22d59c87fb5cb9d308897bc6df (patch)
treead3dcdb51cfa4d2c8e3889fa85f3d3a57235f20a /src
parent479143e14fa815ac71f4c0d8763d6da93ce60ebd (diff)
parent3f5830e13342aa29d724e73636291d1746623ec0 (diff)
Merge pull request #455 from MisterTea/patch-1
Make SNES controls match other systems
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/snes_ctrl/joypad.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/bus/snes_ctrl/joypad.c b/src/devices/bus/snes_ctrl/joypad.c
index 6c638a321b8..3ccd5e6343c 100644
--- a/src/devices/bus/snes_ctrl/joypad.c
+++ b/src/devices/bus/snes_ctrl/joypad.c
@@ -17,18 +17,18 @@ const device_type SNES_JOYPAD = &device_creator<snes_joypad_device>;
static INPUT_PORTS_START( snes_joypad )
PORT_START("JOYPAD")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B")
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Y")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("B")
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Y")
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Select")
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
- PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A")
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("X")
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("A")
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("X")
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("L")
- PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("R")
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("R")
PORT_BIT( 0xf000, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END