From ef200e5ff28825a18f17aec0b05a311e17ee6e9a Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Thu, 11 Nov 2010 01:40:32 +0000 Subject: [PATCH] Cleaned up many duplicate inputs and fixed others in a number of drivers. [Tafoid] --- src/mame/drivers/csplayh5.c | 2 +- src/mame/drivers/macs.c | 76 ++++++++++++++++++------------------- src/mame/drivers/maygay1b.c | 2 +- src/mame/drivers/maygayv1.c | 6 +-- src/mame/drivers/megadrvb.c | 4 +- src/mame/drivers/megaplay.c | 11 +++--- src/mame/drivers/metro.c | 4 +- src/mame/drivers/midyunit.c | 4 +- src/mame/drivers/mitchell.c | 26 ++++++------- src/mame/drivers/mlanding.c | 10 ++--- src/mame/drivers/multfish.c | 2 +- src/mame/drivers/murogmbl.c | 2 +- src/mame/drivers/mystwarr.c | 2 +- src/mame/drivers/pacman.c | 20 +++------- 14 files changed, 80 insertions(+), 91 deletions(-) diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c index df561e5cf0d..615976f868a 100644 --- a/src/mame/drivers/csplayh5.c +++ b/src/mame/drivers/csplayh5.c @@ -274,7 +274,7 @@ static INPUT_PORTS_START( csplayh5 ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(1) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2) diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 119e5e9da11..31552a773d6 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -183,25 +183,25 @@ static INPUT_PORTS_START( macs_base ) PORT_DIPNAME( 0x01, 0x01, "DSW0 - BIT 1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "BIT 2" ) + PORT_DIPNAME( 0x02, 0x02, "DSW0 - BIT 2" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, "BIT 4" ) + PORT_DIPNAME( 0x04, 0x04, "DSW0 - BIT 4" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "BIT 8" ) + PORT_DIPNAME( 0x08, 0x08, "DSW0 - BIT 8" ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "BIT 10" ) + PORT_DIPNAME( 0x10, 0x10, "DSW0 - BIT 10" ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "BIT 20" ) + PORT_DIPNAME( 0x20, 0x20, "DSW0 - BIT 20" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "BIT 40" ) + PORT_DIPNAME( 0x40, 0x40, "DSW0 - BIT 40" ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "BIT 80" ) + PORT_DIPNAME( 0x80, 0x80, "DSW0 - BIT 80" ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -210,52 +210,52 @@ static INPUT_PORTS_START( macs_base ) PORT_DIPNAME( 0x01, 0x01, "DSW1 - BIT 1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "BIT 2" ) + PORT_DIPNAME( 0x02, 0x02, "DSW1 - BIT 2" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, "BIT 4" ) + PORT_DIPNAME( 0x04, 0x04, "DSW1 - BIT 4" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "BIT 8" ) + PORT_DIPNAME( 0x08, 0x08, "DSW1 - BIT 8" ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "BIT 10" ) + PORT_DIPNAME( 0x10, 0x10, "DSW1 - BIT 10" ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "BIT 20" ) + PORT_DIPNAME( 0x20, 0x20, "DSW1 - BIT 20" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "BIT 40" ) + PORT_DIPNAME( 0x40, 0x40, "DSW1 - BIT 40" ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "BIT 80" ) + PORT_DIPNAME( 0x80, 0x80, "DSW1 - BIT 80" ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) /*2*/ PORT_START("DSW2") - PORT_DIPNAME( 0x01, 0x01, "DSW 2 - BIT 1" ) + PORT_DIPNAME( 0x01, 0x01, "DSW2 - BIT 1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "BIT 2" ) + PORT_DIPNAME( 0x02, 0x02, "DSW2 - BIT 2" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, "BIT 4" ) + PORT_DIPNAME( 0x04, 0x04, "DSW2 - BIT 4" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "BIT 8" ) + PORT_DIPNAME( 0x08, 0x08, "DSW2 - BIT 8" ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "BIT 10" ) + PORT_DIPNAME( 0x10, 0x10, "DSW2 - BIT 10" ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "BIT 20" ) + PORT_DIPNAME( 0x20, 0x20, "DSW2 - BIT 20" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "BIT 40" ) + PORT_DIPNAME( 0x40, 0x40, "DSW2 - BIT 40" ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "BIT 80" ) + PORT_DIPNAME( 0x80, 0x80, "DSW2 - BIT 80" ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -264,7 +264,7 @@ static INPUT_PORTS_START( macs_base ) PORT_DIPNAME( 0x01, 0x01, "DSW3 - BIT 1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "BIT 2" ) + PORT_DIPNAME( 0x02, 0x02, "DSW3 - BIT 2" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Demo_Sounds ) ) @@ -291,25 +291,25 @@ static INPUT_PORTS_START( macs_base ) PORT_DIPNAME( 0x01, 0x01, "DSW4 - BIT 1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "BIT 2" ) + PORT_DIPNAME( 0x02, 0x02, "DSW4 - BIT 2" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, "BIT 4" ) + PORT_DIPNAME( 0x04, 0x04, "DSW4 - BIT 4" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "BIT 8" ) + PORT_DIPNAME( 0x08, 0x08, "DSW4 - BIT 8" ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "BIT 10" ) + PORT_DIPNAME( 0x10, 0x10, "DSW4 - BIT 10" ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "BIT 20" ) + PORT_DIPNAME( 0x20, 0x20, "DSW4 - BIT 20" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "BIT 40" ) + PORT_DIPNAME( 0x40, 0x40, "DSW4 - BIT 40" ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x00, "BIT 80" ) + PORT_DIPNAME( 0x80, 0x00, "DSW4 - BIT 80" ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -323,8 +323,8 @@ static INPUT_PORTS_START( macs_base ) PORT_START("SYS1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Clear Coin Counter") PORT_CODE(KEYCODE_1_PAD) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Memory Reset") PORT_CODE(KEYCODE_2_PAD) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Analyzer") PORT_CODE(KEYCODE_3_PAD) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Memory Reset Key") PORT_CODE(KEYCODE_2_PAD) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Analyzer Key") PORT_CODE(KEYCODE_3_PAD) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -383,22 +383,22 @@ static INPUT_PORTS_START( kisekaem ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_DIPNAME( 0x04, 0x04, "BIT 4" ) + PORT_DIPNAME( 0x04, 0x04, "SYS1 - BIT 4" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "BIT 8" ) + PORT_DIPNAME( 0x08, 0x08, "SYS1 - BIT 8" ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "BIT 10" ) + PORT_DIPNAME( 0x10, 0x10, "SYS1 - BIT 10" ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "BIT 20" ) + PORT_DIPNAME( 0x20, 0x20, "SYS1 - BIT 20" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "BIT 40" ) + PORT_DIPNAME( 0x40, 0x40, "SYS1 - BIT 40" ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x00, "BIT 80" ) + PORT_DIPNAME( 0x80, 0x00, "SYS1 - BIT 80" ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index 950fd8ca6f4..b8caa9ef48f 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -599,7 +599,7 @@ static INPUT_PORTS_START( m1 ) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door") PORT_CODE(KEYCODE_Q) PORT_TOGGLE PORT_START("STROBE4") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Hi") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Hi2") PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SPECIAL)//50p Tube PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_SPECIAL)//100p Tube rear diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 0e0ece8a3ff..75103b4e6d4 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -785,13 +785,13 @@ static INPUT_PORTS_START( screenpl ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("STROBE3") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Unk Button") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Unknown 1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Nudge 1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Nudge 2") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Nudge 3") - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("?") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Unknown 2") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Collect") - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("?") + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Unknown 3") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON11 ) PORT_NAME("Spin") PORT_START("STROBE4") diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c index c2f453151b4..c277ffa29dd 100644 --- a/src/mame/drivers/megadrvb.c +++ b/src/mame/drivers/megadrvb.c @@ -513,8 +513,8 @@ INPUT_PORTS_START( srmdb ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) // start PORT_MODIFY("PAD2") - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P1 Shoot") // a - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P1 Jump") // b + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Shoot") // a + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Jump") // b PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // c (duplicate shoot button) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index f1e164ebcb4..5fdf4dc6ca4 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -339,12 +339,11 @@ static INPUT_PORTS_START ( mp_mazin ) PORT_INCLUDE( megaplay ) PORT_MODIFY("DSW1") /* DSW C (per game settings) */ - PORT_DIPNAME( 0x01, 0x01, "Initial Player" ) PORT_DIPLOCATION("SW3:1") - PORT_DIPSETTING( 0x01, "2" ) - PORT_DIPSETTING( 0x00, "1" ) - PORT_DIPNAME( 0x02, 0x02, "Initial Player" ) PORT_DIPLOCATION("SW3:2") - PORT_DIPSETTING( 0x02, "1" ) - PORT_DIPSETTING( 0x00, "4" ) + PORT_DIPNAME( 0x03, 0x02, "Initial Player" ) PORT_DIPLOCATION("SW3:1,2") + PORT_DIPSETTING( 0x00, "2" ) + PORT_DIPSETTING( 0x01, "1" ) + PORT_DIPSETTING( 0x02, "3" ) + PORT_DIPSETTING( 0x03, "4" ) PORT_DIPNAME( 0x04, 0x04, DEF_STR ( Difficulty ) ) PORT_DIPLOCATION("SW3:3") PORT_DIPSETTING( 0x04, DEF_STR ( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR ( Normal ) ) diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 5b9f019c218..b80f2c3bbb9 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -2390,7 +2390,7 @@ static INPUT_PORTS_START( gstrik2 ) PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "Extra Time" ) + PORT_DIPNAME( 0x0080, 0x0080, "Time Period" ) PORT_DIPSETTING( 0x0080, "Sudden Death" ) PORT_DIPSETTING( 0x0000, "Full" ) PORT_DIPNAME( 0x0700, 0x0400, DEF_STR( Difficulty ) ) @@ -3032,7 +3032,7 @@ static INPUT_PORTS_START( mouja ) PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Service_Mode ) ) + PORT_DIPNAME( 0x0004, 0x0004, "Test Mode" ) PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0008, 0x0000, DEF_STR( Demo_Sounds ) ) diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c index deca8591211..199152516db 100644 --- a/src/mame/drivers/midyunit.c +++ b/src/mame/drivers/midyunit.c @@ -518,7 +518,7 @@ static INPUT_PORTS_START( strkforc ) PORT_DIPSETTING( 0x0040, "Level 6" ) PORT_DIPSETTING( 0x0020, "Level 7" ) PORT_DIPSETTING( 0x0000, "Level 8" ) - PORT_DIPNAME( 0x0700, 0x0700, "Coin 2" ) + PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coin_B )) PORT_DIPSETTING( 0x0700, DEF_STR( 1C_1C )) PORT_DIPSETTING( 0x0600, DEF_STR( 1C_2C )) PORT_DIPSETTING( 0x0500, DEF_STR( 1C_3C )) @@ -527,7 +527,7 @@ static INPUT_PORTS_START( strkforc ) PORT_DIPSETTING( 0x0200, DEF_STR( 1C_6C )) PORT_DIPSETTING( 0x0100, "U.K. Elect." ) PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play )) - PORT_DIPNAME( 0x7800, 0x7800, "Coin 1" ) + PORT_DIPNAME( 0x7800, 0x7800, DEF_STR( Coin_A )) PORT_DIPSETTING( 0x3000, DEF_STR( 5C_1C )) PORT_DIPSETTING( 0x3800, DEF_STR( 4C_1C )) PORT_DIPSETTING( 0x4000, DEF_STR( 3C_1C )) diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 60e57273cd7..2a69b3b08d5 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -553,7 +553,7 @@ static INPUT_PORTS_START( mgakuen ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) // not IPT_VBLANK PORT_START("DSW0") - PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) + PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW0:1,2,3") PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) @@ -562,43 +562,41 @@ static INPUT_PORTS_START( mgakuen ) PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x08, 0x08, "Rules" ) + PORT_DIPNAME( 0x08, 0x08, "Rules" ) PORT_DIPLOCATION("DSW0:4") PORT_DIPSETTING( 0x08, "Kantou" ) PORT_DIPSETTING( 0x00, "Kansai" ) - PORT_DIPNAME( 0x10, 0x00, "Harness Type" ) + PORT_DIPNAME( 0x10, 0x00, "Harness Type" ) PORT_DIPLOCATION("DSW0:5") PORT_DIPSETTING( 0x10, "Generic" ) PORT_DIPSETTING( 0x00, "Royal Mahjong" ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("DSW0:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "Freeze" ) + PORT_DIPNAME( 0x40, 0x40, "Freeze" ) PORT_DIPLOCATION("DSW0:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) + PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) PORT_DIPLOCATION("DSW0:8") PORT_START("DSW1") - PORT_DIPNAME( 0x03, 0x03, "Player 1 Skill" ) + PORT_DIPNAME( 0x03, 0x03, "Player 1 Skill" ) PORT_DIPLOCATION("DSW1:1,2") PORT_DIPSETTING( 0x03, "Weak" ) PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x01, "Strong" ) PORT_DIPSETTING( 0x00, "Very Strong" ) - PORT_DIPNAME( 0x0c, 0x0c, "Player 1 Skill" ) + PORT_DIPNAME( 0x0c, 0x0c, "Player 2 Skill" ) PORT_DIPLOCATION("DSW1:3,4") PORT_DIPSETTING( 0x0c, "Weak" ) PORT_DIPSETTING( 0x08, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x04, "Strong" ) PORT_DIPSETTING( 0x00, "Very Strong" ) - PORT_DIPNAME( 0x10, 0x00, "Music" ) + PORT_DIPNAME( 0x10, 0x00, "Music" ) PORT_DIPLOCATION("DSW1:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x00, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x20, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSW1:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x00, "Help Mode" ) + PORT_DIPNAME( 0x40, 0x00, "Help Mode" ) PORT_DIPLOCATION("DSW1:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "DSW1:8" ) INPUT_PORTS_END static INPUT_PORTS_START( marukin ) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 121e8540e1f..cd9df879bf5 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -576,28 +576,28 @@ static INPUT_PORTS_START( mlanding ) PORT_DIPNAME( 0x80, 0x80, "$2000-7") PORT_DIPSETTING( 0x80, "H" ) PORT_DIPSETTING( 0x00, "L" ) - PORT_DIPNAME( 0x0100, 0x0100, "$2000-0") + PORT_DIPNAME( 0x0100, 0x0100, "$2001-0") PORT_DIPSETTING( 0x0100, "H" ) PORT_DIPSETTING( 0x0000, "L" ) - PORT_DIPNAME( 0x0200, 0x0200, "$2000-1") + PORT_DIPNAME( 0x0200, 0x0200, "$2001-1") PORT_DIPSETTING( 0x0200, "H" ) PORT_DIPSETTING( 0x0000, "L" ) PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Allow_Continue ) ) PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0800, 0x0800, "$2000-3") + PORT_DIPNAME( 0x0800, 0x0800, "$2001-3") PORT_DIPSETTING( 0x0800, "H" ) PORT_DIPSETTING( 0x0000, "L" ) PORT_DIPNAME( 0x1000, 0x1000, "Test Mode 2") PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, "$2000-5") + PORT_DIPNAME( 0x2000, 0x2000, "$2001-5") PORT_DIPSETTING( 0x2000, "H" ) PORT_DIPSETTING( 0x0000, "L" ) PORT_DIPNAME( 0x4000, 0x0000, DEF_STR( Language ) ) PORT_DIPSETTING( 0x4000, DEF_STR( Japanese ) ) PORT_DIPSETTING( 0x0000, DEF_STR( English ) ) - PORT_DIPNAME( 0x8000, 0x8000, "$2000-7") + PORT_DIPNAME( 0x8000, 0x8000, "$2001-7") PORT_DIPSETTING( 0x8000, "H" ) PORT_DIPSETTING( 0x0000, "L" ) diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index 25f924d89c1..e5c24a4c4e6 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -684,7 +684,7 @@ static INPUT_PORTS_START( multfish ) PORT_START("IN5") PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2) // COIN D (19 B) - PORT_DIPNAME( 0x04, 0x04, "S Reserve (16 B)" ) + PORT_DIPNAME( 0x04, 0x04, "S Reserve (15 B)" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Bet / Double / Cancel") diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index 5c106721639..c5adac3b058 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -132,7 +132,7 @@ static INPUT_PORTS_START( murogmbl ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, "Coin 2" ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x08, "10 credits" ) PORT_DIPSETTING( 0x00, "5 credits" ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index c0b011ed3ab..9f2d47d67d4 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -744,7 +744,7 @@ static INPUT_PORTS_START( dadandrn ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_SERVICE_NO_TOGGLE( 0x0800, IP_ACTIVE_LOW ) + PORT_SERVICE_NO_TOGGLE( 0x0800, IP_ACTIVE_LOW ) /* duplicate required for use */ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 45f29d4f4bb..06c81d55d23 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -2402,10 +2402,10 @@ static INPUT_PORTS_START( jumpshot ) PORT_DIPSETTING( 0x02, "2 Minutes" ) PORT_DIPSETTING( 0x03, "3 Minutes" ) PORT_DIPSETTING( 0x01, "4 Minutes" ) - PORT_DIPNAME( 0x04, 0x04, "Player Skin Tone" ) + PORT_DIPNAME( 0x04, 0x04, "Player 1 Skin Tone" ) PORT_DIPSETTING( 0x04, "Lighter" ) PORT_DIPSETTING( 0x00, "Darker" ) - PORT_DIPNAME( 0x08, 0x08, "Player Skin Tone" ) + PORT_DIPNAME( 0x08, 0x08, "Player 2 Skin Tone" ) PORT_DIPSETTING( 0x08, "Lighter" ) PORT_DIPSETTING( 0x00, "Darker" ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Free_Play ) ) @@ -2612,11 +2612,11 @@ static INPUT_PORTS_START( acitya ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("DSW1") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) + PORT_START("DSW1") /* Test mode shows 6 selection DIP */ + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSW1:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x1e, 0x1e, "Hands per Game" ) + PORT_DIPNAME( 0x1e, 0x1e, "Hands per Game" ) PORT_DIPLOCATION("DSW1:2,3,4,5") PORT_DIPSETTING( 0x1e, "3" ) PORT_DIPSETTING( 0x1c, "4" ) PORT_DIPSETTING( 0x1a, "5" ) @@ -2633,15 +2633,7 @@ static INPUT_PORTS_START( acitya ) PORT_DIPSETTING( 0x04, "16" ) PORT_DIPSETTING( 0x02, "17" ) PORT_DIPSETTING( 0x00, "18" ) - PORT_DIPNAME( 0x20, 0x00, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC(0x20, IP_ACTIVE_LOW, "DSW1:6") PORT_START("DSW2") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )