summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mario.cpp
diff options
context:
space:
mode:
author Westley M. Martinez <anikom15@gmail.com>2016-05-31 00:36:50 -0700
committer Westley M. Martinez <anikom15@gmail.com>2016-05-31 00:36:50 -0700
commit2eff47a12976e580a04475f3ec9a73f3d4c7aa31 (patch)
tree10943d0b5bd31c584ab25ac21f9ba75e0e34c7c2 /src/mame/drivers/mario.cpp
parentf6d120ab2a761abe397ce98fecb2c707a25a9f1b (diff)
Reorder port definitions in mario to make more sense.
Diffstat (limited to 'src/mame/drivers/mario.cpp')
-rw-r--r--src/mame/drivers/mario.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp
index 23ad7696749..b4d736fbfdc 100644
--- a/src/mame/drivers/mario.cpp
+++ b/src/mame/drivers/mario.cpp
@@ -260,12 +260,9 @@ static INPUT_PORTS_START( mario )
INPUT_PORTS_END
-static INPUT_PORTS_START( marioe )
+static INPUT_PORTS_START( marioo )
PORT_INCLUDE( mario )
- PORT_MODIFY ( "IN1" )
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) /* doesn't work in game, but does in service mode */
PORT_MODIFY( "DSW" )
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5,!6")
PORT_DIPSETTING( 0x00, "20k only" )
@@ -274,15 +271,13 @@ static INPUT_PORTS_START( marioe )
PORT_DIPSETTING( 0x30, DEF_STR( None ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( marioo )
- PORT_INCLUDE( mario )
- PORT_MODIFY( "DSW" )
- PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5,!6")
- PORT_DIPSETTING( 0x00, "20k only" )
- PORT_DIPSETTING( 0x10, "30k only" )
- PORT_DIPSETTING( 0x20, "40k only" )
- PORT_DIPSETTING( 0x30, DEF_STR( None ) )
+static INPUT_PORTS_START( marioe )
+ PORT_INCLUDE( marioo )
+
+ PORT_MODIFY ( "IN1" )
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) /* doesn't work in game, but does in service mode */
INPUT_PORTS_END
static INPUT_PORTS_START( marioj )