summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mario.cpp
diff options
context:
space:
mode:
author Westley M. Martinez <anikom15@gmail.com>2016-05-31 00:27:49 -0700
committer Westley M. Martinez <anikom15@gmail.com>2016-05-31 00:27:49 -0700
commitf6d120ab2a761abe397ce98fecb2c707a25a9f1b (patch)
tree8deb6c5aa18481bb36461313242ca20c0cd7ea37 /src/mame/drivers/mario.cpp
parent0e8da3561ebf5459a52636cc603fc0b0bd1184bd (diff)
Fix DIP switch bonus life descriptions for marioe & marioo.
Diffstat (limited to 'src/mame/drivers/mario.cpp')
-rw-r--r--src/mame/drivers/mario.cpp46
1 files changed, 26 insertions, 20 deletions
diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp
index 68141c82022..23ad7696749 100644
--- a/src/mame/drivers/mario.cpp
+++ b/src/mame/drivers/mario.cpp
@@ -227,8 +227,8 @@ static INPUT_PORTS_START( mario )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- 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_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("DSW")
@@ -260,16 +260,33 @@ static INPUT_PORTS_START( mario )
INPUT_PORTS_END
+static INPUT_PORTS_START( marioe )
+ 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" )
+ PORT_DIPSETTING( 0x10, "30k only" )
+ PORT_DIPSETTING( 0x20, "40k only" )
+ PORT_DIPSETTING( 0x30, DEF_STR( None ) )
+INPUT_PORTS_END
+
static INPUT_PORTS_START( marioo )
PORT_INCLUDE( mario )
- PORT_MODIFY( "IN1" )
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
+ 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 ) )
INPUT_PORTS_END
static INPUT_PORTS_START( marioj )
- PORT_INCLUDE( mario )
+ PORT_INCLUDE( marioe )
PORT_MODIFY( "DSW" )
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!1,!2")
@@ -296,17 +313,6 @@ static INPUT_PORTS_START( marioj )
PORT_DIPSETTING( 0xc0, DEF_STR( None ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( masao )
- PORT_INCLUDE( marioo )
-
- PORT_MODIFY( "DSW" )
- PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5,!6")
- PORT_DIPSETTING( 0x00, "20k 40k 20k+" )
- PORT_DIPSETTING( 0x10, "30k 50k 20k+" )
- PORT_DIPSETTING( 0x20, "40k 60k 20k+" )
- PORT_DIPSETTING( 0x30, DEF_STR( None ) )
-INPUT_PORTS_END
-
static INPUT_PORTS_START( mariobl )
@@ -831,11 +837,11 @@ ROM_END
*
*************************************/
-GAME( 1983, mario, 0, mario, marioo, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, marioe, mario, mario, mario, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mario, 0, mario, mario, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, marioe, mario, mario, marioe, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, marioo, mario, mario, marioo, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Unknown Rev)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, marioj, mario, mario, marioj, driver_device, 0, ROT0, "Nintendo", "Mario Bros. (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, masao, mario, masao, masao, driver_device, 0, ROT0, "bootleg", "Masao", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, masao, mario, masao, mario, driver_device, 0, ROT0, "bootleg", "Masao", MACHINE_SUPPORTS_SAVE )
// todo, these might have a better home than in here
GAME( 1983, mariobl, mario, mariobl, mariobl,driver_device, 0, ROT180, "bootleg", "Mario Bros. (Japan, bootleg)", MACHINE_SUPPORTS_SAVE ) // was listed as 'on extended Ambush hardware' but doesn't seem similar apart from the sound system?