diff options
author | 2022-06-14 16:33:21 +1000 | |
---|---|---|
committer | 2022-06-14 16:33:21 +1000 | |
commit | 1f26ec6836364ef523aa4e375c63186bd8fe323f (patch) | |
tree | 883f691395a7fbe71865a624844942d28124d7a8 /src/mame/drivers/punchout.cpp | |
parent | 4a4b718bc9d32b4cd55a90762c960165be2f6043 (diff) | |
parent | 6741eca4d61627072710dc86f458f34a3acf7c5c (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# scripts/build/verinfo.py
# scripts/resources/windows/mame/mame.rc
# scripts/src/main.lua
# src/mame/drivers/8080bw.cpp
Diffstat (limited to 'src/mame/drivers/punchout.cpp')
-rw-r--r-- | src/mame/drivers/punchout.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index 23887ed219d..dcc456f951f 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -286,8 +286,8 @@ static INPUT_PORTS_START( punchout ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // this should be COIN2? only works on Italian bootleg though + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_START("DSW2") @@ -343,6 +343,9 @@ static INPUT_PORTS_START( spnchout ) PORT_MODIFY("IN0") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) + PORT_MODIFY("IN1") + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_MODIFY("DSW1") PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2,!3,!4") PORT_DIPSETTING( 0x08, DEF_STR( 6C_1C ) ) /* Not documented */ @@ -377,7 +380,6 @@ static INPUT_PORTS_START( armwrest ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Coinage: |