diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index ab533de1a6a..4f5af606adc 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -133,30 +133,28 @@ ADDRESS_MAP_END static INPUT_PORTS_START( rockrage ) PORT_START("DSW1") - KONAMI_COINAGE(DEF_STR( Free_Play ), "Invalid" ) + KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "Invalid", SW1) /* Invalid = both coin slots disabled */ PORT_START("DSW2") - PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x01, "3" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x08, "30k and every 70k" ) - PORT_DIPSETTING( 0x00, "40k and every 80k" ) - PORT_DIPNAME( 0x10, 0x10, "Freeze Screen" ) + PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW2:3" ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4") + PORT_DIPSETTING( 0x08, "30k & Every 70k" ) + PORT_DIPSETTING( 0x00, "40k & Every 80k" ) + PORT_DIPNAME( 0x10, 0x10, "Freeze Screen" ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x40, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x20, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -166,13 +164,11 @@ static INPUT_PORTS_START( rockrage ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) + PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW3:2" ) + PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:3" ) PORT_START("P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index dc40ca49800..5cf58fa7023 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -86,63 +86,60 @@ static INPUT_PORTS_START( rocnrope ) KONAMI8_COCKTAIL_4WAY_B12_UNK PORT_START("DSW1") - KONAMI_COINAGE(DEF_STR( Free_Play ), "No Coin B") + KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1) /* "No Coin B" = coins produce sound, but no effect on coin counter */ PORT_START("DSW2") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW2:1,2") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "3" ) PORT_DIPSETTING( 0x02, "4" ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x00, "255 (Cheat)") - PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("DSW2:3") + PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:3") PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x04, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x78, 0x58, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("DSW2:4,5,6,7") - PORT_DIPSETTING( 0x78, "Easy 1" ) - PORT_DIPSETTING( 0x70, "Easy 2" ) - PORT_DIPSETTING( 0x68, "Easy 3" ) - PORT_DIPSETTING( 0x60, "Easy 4" ) - PORT_DIPSETTING( 0x58, "Normal 1" ) - PORT_DIPSETTING( 0x50, "Normal 2" ) - PORT_DIPSETTING( 0x48, "Normal 3" ) - PORT_DIPSETTING( 0x40, "Normal 4" ) - PORT_DIPSETTING( 0x38, "Normal 5" ) - PORT_DIPSETTING( 0x30, "Normal 6" ) - PORT_DIPSETTING( 0x28, "Normal 7" ) - PORT_DIPSETTING( 0x20, "Normal 8" ) - PORT_DIPSETTING( 0x18, "Difficult 1" ) - PORT_DIPSETTING( 0x10, "Difficult 2" ) - PORT_DIPSETTING( 0x08, "Difficult 3" ) - PORT_DIPSETTING( 0x00, "Difficult 4" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSW2:8") + PORT_DIPNAME( 0x78, 0x58, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4,5,6,7") + PORT_DIPSETTING( 0x78, "1 (Easy)" ) + PORT_DIPSETTING( 0x70, "2" ) + PORT_DIPSETTING( 0x68, "3" ) + PORT_DIPSETTING( 0x60, "4" ) + PORT_DIPSETTING( 0x58, "5" ) + PORT_DIPSETTING( 0x50, "6" ) + PORT_DIPSETTING( 0x48, "7" ) + PORT_DIPSETTING( 0x40, "8" ) + PORT_DIPSETTING( 0x38, "9" ) + PORT_DIPSETTING( 0x30, "10" ) + PORT_DIPSETTING( 0x28, "11" ) + PORT_DIPSETTING( 0x20, "12" ) + PORT_DIPSETTING( 0x18, "13" ) + PORT_DIPSETTING( 0x10, "14" ) + PORT_DIPSETTING( 0x08, "15" ) + PORT_DIPSETTING( 0x00, "16 (Difficult)" ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("DSW3") - PORT_DIPNAME( 0x07, 0x07, "First Bonus" ) PORT_DIPLOCATION("DSW3:1,2,3") - PORT_DIPSETTING( 0x07, "20000" ) + PORT_DIPNAME( 0x07, 0x06, "First Bonus" ) PORT_DIPLOCATION("SW3:1,2,3") +// PORT_DIPSETTING( 0x07, "20000" ) // unused + PORT_DIPSETTING( 0x06, "20000" ) PORT_DIPSETTING( 0x05, "30000" ) PORT_DIPSETTING( 0x04, "40000" ) PORT_DIPSETTING( 0x03, "50000" ) PORT_DIPSETTING( 0x02, "60000" ) PORT_DIPSETTING( 0x01, "70000" ) PORT_DIPSETTING( 0x00, "80000" ) - /* 0x06 gives 20000 */ - PORT_DIPNAME( 0x38, 0x10, "Repeated Bonus" ) PORT_DIPLOCATION("DSW3:4,5,6") - PORT_DIPSETTING( 0x38, "40000" ) + PORT_DIPNAME( 0x38, 0x10, "Repeated Bonus" ) PORT_DIPLOCATION("SW3:4,5,6") + /* 0x28, 0x30 and 0x38 (unused) all gives 40000 */ + PORT_DIPSETTING( 0x20, "40000" ) PORT_DIPSETTING( 0x18, "50000" ) PORT_DIPSETTING( 0x10, "60000" ) PORT_DIPSETTING( 0x08, "70000" ) PORT_DIPSETTING( 0x00, "80000" ) - /* 0x20, 0x28 and 0x30 all gives 40000 */ - PORT_DIPNAME( 0x40, 0x00, "Grant Repeated Bonus" ) PORT_DIPLOCATION("DSW3:7") + PORT_DIPNAME( 0x40, 0x00, "Grant Repeated Bonus" ) PORT_DIPLOCATION("SW3:7") PORT_DIPSETTING( 0x40, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "DSW3:8" ) -// PORT_DIPNAME( 0x80, 0x00, "Unknown DSW 8" ) -// PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:8" ) INPUT_PORTS_END diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index 9c4e7668892..647d5c906d7 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -115,40 +115,40 @@ static INPUT_PORTS_START( scotrsht ) KONAMI8_B1_UNK(2) PORT_START("DSW1") /* $3303 -> $196e */ - KONAMI_COINAGE(DEF_STR( Free_Play ), "Invalid") + KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "Invalid", SW1) /* "Invalid" = both coin slots disabled */ PORT_START("DSW2") /* $3100 -> $196f */ - PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) PORT_DIPSETTING( 0x01, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_DIPNAME( 0x04, 0x04, "Dip MUST be OFF !" ) /* see notes */ + PORT_DIPNAME( 0x04, 0x04, "Dip MUST be OFF !" ) PORT_DIPLOCATION("SW2:3") /* see notes */ PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) /* code at 0x40f4 */ + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4") /* code at 0x40f4 */ PORT_DIPSETTING( 0x08, "30k 110k 80k+" ) PORT_DIPSETTING( 0x00, "40k 120k 90k+" ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x30, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x20, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) + PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW2:7" ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("DSW3") /* $3200 -> $1970 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "Dip MUST be OFF !" ) /* see notes */ + PORT_DIPNAME( 0x02, 0x02, "Dip MUST be OFF !" ) PORT_DIPLOCATION("SW3:2") /* see notes */ PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNUSED( 0x04, IP_ACTIVE_LOW ) - PORT_DIPUNUSED( 0x08, IP_ACTIVE_LOW ) + PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW3:4" ) INPUT_PORTS_END