diff options
-rw-r--r-- | src/mame/drivers/spy.c | 28 | ||||
-rw-r--r-- | src/mame/drivers/surpratk.c | 28 | ||||
-rw-r--r-- | src/mame/drivers/thunderx.c | 56 | ||||
-rw-r--r-- | src/mame/drivers/timeplt.c | 16 | ||||
-rw-r--r-- | src/mame/drivers/tmnt.c | 99 | ||||
-rw-r--r-- | src/mame/drivers/tp84.c | 18 |
6 files changed, 86 insertions, 159 deletions
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index a6a81afa55c..4b7d77f28bf 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -421,29 +421,27 @@ static INPUT_PORTS_START( spy ) KONAMI8_ALT_B21(2) /* button 3 unused */ 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, 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, "5" ) PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x18, 0x08, DEF_STR( Bonus_Life ) ) + PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW2:3" ) + PORT_DIPNAME( 0x18, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x18, "10k and every 20k" ) PORT_DIPSETTING( 0x10, "20k and every 30k" ) PORT_DIPSETTING( 0x08, "20k only" ) PORT_DIPSETTING( 0x00, "30k only" ) - PORT_DIPNAME( 0x60, 0x40, 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( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) - 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 ) ) @@ -451,17 +449,15 @@ static INPUT_PORTS_START( spy ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) /* PMCFIRQ signal from the PMC */ - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) /* PMCFIRQ signal from the PMC */ + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Continues ) ) - PORT_DIPSETTING( 0x80, "Unlimited" ) + PORT_DIPUNUSED_DIPLOC( 0x20, IP_ACTIVE_LOW, "SW3:2" ) + PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW3:3" ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW3:4") PORT_DIPSETTING( 0x00, "5 Times" ) + PORT_DIPSETTING( 0x80, "Unlimited" ) INPUT_PORTS_END diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index deffc516d89..c62d7dbd466 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -123,29 +123,25 @@ static INPUT_PORTS_START( surpratk ) KONAMI8_ALT_B12(2) PORT_START("DSW1") - KONAMI_COINAGE(DEF_STR( Free_Play ), DEF_STR( Free_Play )) + KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), DEF_STR( Free_Play ), SW1) PORT_START("DSW2") - 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, "5" ) PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) + 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( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) + PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_LOW, "SW2:5" ) + PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) - 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 ) ) @@ -154,16 +150,14 @@ static INPUT_PORTS_START( surpratk ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "Upright Controls" ) + PORT_DIPNAME( 0x20, 0x20, "Upright Controls" ) PORT_DIPLOCATION("SW3:2") PORT_DIPSETTING( 0x20, DEF_STR( Single ) ) PORT_DIPSETTING( 0x00, DEF_STR( Dual ) ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW3:3" ) + PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:4" ) INPUT_PORTS_END diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index b282b6670b6..655d42b0bd4 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -479,40 +479,39 @@ static INPUT_PORTS_START( scontra ) KONAMI8_B12_UNK(2) 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, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "2" ) - PORT_DIPSETTING( 0x02, "3" ) // factory default + PORT_DIPSETTING( 0x02, "3" ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x00, "SW2:3" ) // test mode calls it cabinet type, but this is a 2 players game - // US manual default = "ON : Upright" / Japanese manual default = "OFF : Table" , but not work? + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x00, "SW2:3" ) // test mode calls it cabinet type, but this is a 2 players game PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "30000 200000" ) // factory default. Japanese manual has typo "30000 300000" - PORT_DIPSETTING( 0x10, "50000 300000" ) // "50000 200000" + PORT_DIPSETTING( 0x18, "30000 200000" ) + PORT_DIPSETTING( 0x10, "50000 300000" ) PORT_DIPSETTING( 0x08, "30000" ) PORT_DIPSETTING( 0x00, "50000" ) PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // factory default + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_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 ) ) // factory default + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("DSW3") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) // factory default + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW3:2" ) - PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) // TYPO on US manual "OFF : Game mode / ON : Game mode" + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) PORT_DIPNAME( 0x08, 0x00, "Continue Limit (1Player/2Players)" ) PORT_DIPLOCATION("SW3:4") PORT_DIPSETTING( 0x08, "3times / Twice altogether" ) - PORT_DIPSETTING( 0x00, "5times / 4times altogether" ) // factory default + PORT_DIPSETTING( 0x00, "5times / 4times altogether" ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -530,17 +529,17 @@ static INPUT_PORTS_START( thunderx ) KONAMI8_B12_UNK(2) 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, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "2" ) - PORT_DIPSETTING( 0x02, "3" ) // factory default + PORT_DIPSETTING( 0x02, "3" ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x00, "7" ) PORT_DIPNAME( 0x04, 0x00, "Award Bonus Life" ) PORT_DIPLOCATION("SW2:3") - PORT_DIPSETTING( 0x04, DEF_STR( No ) ) // factory default + PORT_DIPSETTING( 0x04, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x18, "30000 200000" ) // Japanese default @@ -549,20 +548,20 @@ static INPUT_PORTS_START( thunderx ) PORT_DIPSETTING( 0x00, "50000" ) PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // factory default + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_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 ) ) // factory default + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("DSW3") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) // factory default + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW3:2" ) - PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) - PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW3:4" ) + PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW3:2" ) + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW3:4" ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -570,25 +569,14 @@ static INPUT_PORTS_START( thnderxj ) PORT_INCLUDE( thunderx ) PORT_MODIFY("DSW2") - PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW2:3" ) // manual says "OFF=Table On=Upright", but not work? + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW2:3" ) // manual says "OFF=Table On=Upright", but not work? PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "30000 200000" ) // Japanese MS - PORT_DIPSETTING( 0x10, "50000 300000" ) // US MS + PORT_DIPSETTING( 0x18, "30000 200000" ) // Japanese default + PORT_DIPSETTING( 0x10, "50000 300000" ) // US default PORT_DIPSETTING( 0x08, "30000" ) PORT_DIPSETTING( 0x00, "50000" ) INPUT_PORTS_END -/* -static INPUT_PORTS_START( thndrxja ) // for Japanese later revision (not dumped yet) - PORT_INCLUDE( thnderxj ) - - PORT_MODIFY("DSW3") - PORT_DIPNAME( 0x08, 0x08, "All Stage Clear Loop" ) PORT_DIPLOCATION("SW3:4") - PORT_DIPSETTING( 0x08, "Game ends after 3 loops" ) // factory default - PORT_DIPSETTING( 0x00, "Endless" ) -INPUT_PORTS_END -*/ - /*************************************************************************** diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index 1c8c2d676ad..83f99eee9a1 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -199,30 +199,30 @@ static INPUT_PORTS_START( timeplt ) KONAMI8_COCKTAIL_B1_UNK PORT_START("DSW0") - KONAMI_COINAGE(DEF_STR( Free_Play ), DEF_STR( Free_Play )) + KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), DEF_STR( Free_Play ), SW1) PORT_START("DSW1") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) + 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_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:3") PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x04, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x08, 0x08, "Bonus" ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4") PORT_DIPSETTING( 0x08, "10000 50000" ) PORT_DIPSETTING( 0x00, "20000 60000" ) - PORT_DIPNAME( 0x70, 0x70, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x70, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6,7") PORT_DIPSETTING( 0x70, "1 (Easiest)" ) PORT_DIPSETTING( 0x60, "2" ) PORT_DIPSETTING( 0x50, "3" ) PORT_DIPSETTING( 0x40, "4" ) - PORT_DIPSETTING( 0x30, "5 (Average)" ) + PORT_DIPSETTING( 0x30, "5" ) PORT_DIPSETTING( 0x20, "6" ) PORT_DIPSETTING( 0x10, "7" ) - PORT_DIPSETTING( 0x00, "8 (Hardest)" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) + PORT_DIPSETTING( 0x00, "8 (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 ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index af29fb10a58..257c4135b22 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -1236,11 +1236,11 @@ static INPUT_PORTS_START( cuebrick ) PORT_DIPNAME( 0x18, 0x08, "Machine Name" ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x18, DEF_STR( None ) ) PORT_DIPSETTING( 0x10, "Lewis" ) - PORT_DIPSETTING( 0x08, "Johnson" ) // Japan factory default = "Johnson" + PORT_DIPSETTING( 0x08, "Johnson" ) PORT_DIPSETTING( 0x00, "George" ) PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // Japan factory default = "Normal" + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") @@ -1282,19 +1282,19 @@ static INPUT_PORTS_START( mia ) PORT_START("DSW2") PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "2" ) - PORT_DIPSETTING( 0x02, "3" ) // US and Japan factory default = "3" + PORT_DIPSETTING( 0x02, "3" ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x00, "7" ) PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW2:3" ) PORT_DIPNAME( 0x18, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "30K, Every 80K" ) // Japan factory default = "30K, Every 80K" + PORT_DIPSETTING( 0x18, "30K, Every 80K" ) // Japan factory default PORT_DIPSETTING( 0x10, "50K, Every 100K" ) - PORT_DIPSETTING( 0x08, "50K Only" ) // US factory default = "50K Only" (struck off "50K, Every 100K") + PORT_DIPSETTING( 0x08, "50K Only" ) // US factory default PORT_DIPSETTING( 0x00, "100K Only" ) PORT_DIPNAME( 0x60, 0x20, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // Japan factory default = "Normal" - PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) // US factory default = "Difficult" (struck off "Normal") + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // Japan factory default + PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) // US factory default PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) @@ -1304,9 +1304,9 @@ static INPUT_PORTS_START( mia ) 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, "VRAM Character Check" ) PORT_DIPLOCATION("SW3:2") - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) // US manual says "VRAM Character Check" - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // Japanese manual says "not used" + PORT_DIPNAME( 0x02, 0x02, "VRAM Character Check" ) PORT_DIPLOCATION("SW3:2") // JP manual says "not used" + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW3:4" ) INPUT_PORTS_END @@ -1423,7 +1423,7 @@ static INPUT_PORTS_START( tmnt2p ) PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_LOW, "SW2:5" ) // ditto PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // US and Japan factory default = "Normal" + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") @@ -1447,13 +1447,13 @@ static INPUT_PORTS_START( punkshtj ) // Japan 2 Players PORT_DIPUNUSED_DIPLOC( 0x0200, IP_ACTIVE_LOW, "SW2:2" ) // manual says "not used", but doesn't "should be kept OFF" PORT_DIPNAME( 0x0c00, 0x0800, "Period Length" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x0c00, "1 Minutes" ) - PORT_DIPSETTING( 0x0800, "2 Minutes" ) // Japan factory default = "2 Minutes" + PORT_DIPSETTING( 0x0800, "2 Minutes" ) PORT_DIPSETTING( 0x0400, "3 Minutes" ) PORT_DIPSETTING( 0x0000, "4 Minutes" ) PORT_DIPUNUSED_DIPLOC( 0x1000, IP_ACTIVE_LOW, "SW2:5" ) // manual says "not used", but doesn't "should be kept OFF" PORT_DIPNAME( 0x6000, 0x4000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x6000, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) // Japan factory default = "Normal" + PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x2000, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Very_Difficult ) ) PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") @@ -1544,73 +1544,22 @@ static INPUT_PORTS_START( punkshot ) // US 4 Players set1 PORT_MODIFY("DSW1/DSW2") PORT_DIPNAME( 0x0300, 0x0300, "Energy" ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x0300, "30" ) // US set1 factory default = "30" + PORT_DIPSETTING( 0x0300, "30" ) PORT_DIPSETTING( 0x0200, "40" ) PORT_DIPSETTING( 0x0100, "50" ) PORT_DIPSETTING( 0x0000, "60" ) PORT_DIPNAME( 0x0c00, 0x0800, "Period Length" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x0c00, "2 Minutes" ) - PORT_DIPSETTING( 0x0800, "3 Minutes" ) // US set1 factory default = "3 Minutes" + PORT_DIPSETTING( 0x0800, "3 Minutes" ) PORT_DIPSETTING( 0x0400, "4 Minutes" ) PORT_DIPSETTING( 0x0000, "5 Minutes" ) PORT_DIPNAME( 0x6000, 0x6000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") - PORT_DIPSETTING( 0x6000, DEF_STR( Easy ) ) // US factory default = "Easy" + PORT_DIPSETTING( 0x6000, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x2000, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Very_Difficult ) ) INPUT_PORTS_END -/* -static INPUT_PORTS_START( punkshot2o ) // US 2 Players set1 - PORT_INCLUDE( punkshtj ) - PORT_INCLUDE( punksht_us_coinage ) - - PORT_MODIFY("DSW1/DSW2") - PORT_DIPNAME( 0x0300, 0x0300, "Energy" ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x0300, "30" ) // US set1 factory default = "30" - PORT_DIPSETTING( 0x0200, "40" ) - PORT_DIPSETTING( 0x0100, "50" ) - PORT_DIPSETTING( 0x0000, "60" ) - PORT_DIPNAME( 0x0c00, 0x0800, "Period Length" ) PORT_DIPLOCATION("SW2:3,4") - PORT_DIPSETTING( 0x0c00, "2 Minutes" ) - PORT_DIPSETTING( 0x0800, "3 Minutes" ) // US set1 factory default = "3 Minutes" - PORT_DIPSETTING( 0x0400, "4 Minutes" ) - PORT_DIPSETTING( 0x0000, "5 Minutes" ) - PORT_DIPNAME( 0x6000, 0x6000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") - PORT_DIPSETTING( 0x6000, DEF_STR( Easy ) ) // US set1 factory default = "Easy" - PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Difficult ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Very_Difficult ) ) -INPUT_PORTS_END -*/ - -/* -static INPUT_PORTS_START( punksht4n ) // US 4 Players set2 - PORT_INCLUDE( punkshtj4 ) - PORT_INCLUDE( punksht_us_coinage ) - - PORT_MODIFY("DSW1/DSW2") - PORT_DIPNAME( 0x0300, 0x0300, "Energy" ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x0300, "40" ) - PORT_DIPSETTING( 0x0200, "50" ) - PORT_DIPSETTING( 0x0100, "60" ) - PORT_DIPSETTING( 0x0000, "70" ) - PORT_DIPNAME( 0x0c00, 0x0c00, "Period Length" ) PORT_DIPLOCATION("SW2:3,4") - PORT_DIPSETTING( 0x0c00, "3 Minutes" ) - PORT_DIPSETTING( 0x0800, "4 Minutes" ) - PORT_DIPSETTING( 0x0400, "5 Minutes" ) - PORT_DIPSETTING( 0x0000, "6 Minutes" ) - PORT_DIPNAME( 0x6000, 0x6000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") - PORT_DIPSETTING( 0x6000, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Difficult ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Very_Difficult ) ) - PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) -INPUT_PORTS_END -*/ - static INPUT_PORTS_START( punksht2 ) // US 2 Players set2 PORT_INCLUDE( punkshtj ) PORT_INCLUDE( punksht_us_coinage ) @@ -1660,18 +1609,18 @@ static INPUT_PORTS_START( lgtnfght ) PORT_START("DSW1") PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "2" ) - PORT_DIPSETTING( 0x02, "3" ) // US and Japan factory default = "3" + PORT_DIPSETTING( 0x02, "3" ) PORT_DIPSETTING( 0x01, "5" ) PORT_DIPSETTING( 0x00, "7" ) PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW2:3" ) // manual says "not used" PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "100K, 400K" ) // US factory default = "100K, 400K" - PORT_DIPSETTING( 0x10, "150K, 500K" ) // Japan factory default = "150K, 500K" + PORT_DIPSETTING( 0x18, "100K, 400K" ) + PORT_DIPSETTING( 0x10, "150K, 500K" ) PORT_DIPSETTING( 0x08, "200K Only" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // US and Japan factory default = "Normal" + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") @@ -1695,8 +1644,8 @@ static INPUT_PORTS_START( trigon ) PORT_MODIFY("DSW1") PORT_DIPNAME( 0x18, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "100K, 400K" ) // US factory default = "100K, 400K" - PORT_DIPSETTING( 0x10, "150K, 500K" ) // Japan factory default = "150K, 500K" + PORT_DIPSETTING( 0x18, "100K, 400K" ) // US factory default + PORT_DIPSETTING( 0x10, "150K, 500K" ) // JP factory default PORT_DIPSETTING( 0x08, "200K Only" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) INPUT_PORTS_END @@ -1748,7 +1697,7 @@ static INPUT_PORTS_START( glfgreat ) PORT_DIPSETTING( 0x0000, "3/5" ) PORT_DIPNAME( 0x6000, 0x4000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x6000, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) // Japan factory default = "Normal" + PORT_DIPSETTING( 0x4000, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x2000, DEF_STR( Difficult ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Very_Difficult ) ) PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") @@ -1797,7 +1746,7 @@ static INPUT_PORTS_START( glfgreatj ) PORT_DIPSETTING( 0x0000, "4/4" ) // Cocktail (P1&P2 <-> P3&P4) PORT_DIPNAME( 0x1800, 0x1000, "Initial/Maximum Credit" ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x1800, "2/2" ) - PORT_DIPSETTING( 0x1000, "2/3" ) // Japan factory default = "Maximum 3" + PORT_DIPSETTING( 0x1000, "2/3" ) PORT_DIPSETTING( 0x0800, "2/4" ) PORT_DIPSETTING( 0x0000, "2/5" ) diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index a1c9967f50e..e2cebd59ede 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -213,29 +213,29 @@ static INPUT_PORTS_START( tp84 ) KONAMI8_COCKTAIL_B12_UNK 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, 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, "5" ) PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) + 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( 0x18, 0x10, DEF_STR( Bonus_Life ) ) + PORT_DIPNAME( 0x18, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x18, "10000 and every 50000" ) PORT_DIPSETTING( 0x10, "20000 and every 60000" ) PORT_DIPSETTING( 0x08, "30000 and every 70000" ) PORT_DIPSETTING( 0x00, "40000 and every 80000" ) - PORT_DIPNAME( 0x60, 0x20, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x60, 0x20, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) // JP default + PORT_DIPSETTING( 0x20, DEF_STR( Hard ) ) // US default 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 ) ) INPUT_PORTS_END @@ -244,7 +244,7 @@ static INPUT_PORTS_START( tp84a ) PORT_INCLUDE( tp84 ) PORT_MODIFY("DSW2") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "3" ) PORT_DIPSETTING( 0x02, "4" ) PORT_DIPSETTING( 0x01, "5" ) |