From 16582cf7f20a9589cf03259945c16ab11c3e5a25 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Wed, 7 Feb 2024 18:35:16 +0100 Subject: [PATCH] midway/midyunit.cpp: updated dip definitions / locations [Guru] --- src/mame/midway/midyunit.cpp | 592 ++++++++++++++++------------------- src/mame/misc/goldnpkr.cpp | 6 +- src/mame/misc/jackhouse.cpp | 80 ++--- 3 files changed, 306 insertions(+), 372 deletions(-) diff --git a/src/mame/midway/midyunit.cpp b/src/mame/midway/midyunit.cpp index 66fb7254164..744074ecb69 100644 --- a/src/mame/midway/midyunit.cpp +++ b/src/mame/midway/midyunit.cpp @@ -332,50 +332,51 @@ static INPUT_PORTS_START( trog ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW") // DSW1 and DSW2 on D0-D15 - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused )) - PORT_DIPSETTING( 0x0001, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused )) - PORT_DIPSETTING( 0x0002, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused )) - PORT_DIPSETTING( 0x0004, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coinage )) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Cabinet )) PORT_DIPLOCATION("DS1:1") + PORT_DIPSETTING( 0x0080, DEF_STR( Upright )) + PORT_DIPSETTING( 0x0000, DEF_STR( Cocktail )) + PORT_DIPNAME( 0x0040, 0x0040, "Coinage Source" ) PORT_DIPLOCATION("DS1:2") + PORT_DIPSETTING( 0x0040, "Dipswitch" ) + PORT_DIPSETTING( 0x0000, "CMOS" ) + PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coinage )) PORT_DIPLOCATION("DS1:5,4,3") PORT_DIPSETTING( 0x0038, "1" ) PORT_DIPSETTING( 0x0018, "2" ) PORT_DIPSETTING( 0x0028, "3" ) PORT_DIPSETTING( 0x0008, "4" ) PORT_DIPSETTING( 0x0030, "ECA" ) PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play )) - PORT_DIPNAME( 0x0040, 0x0000, "Coinage Source" ) - PORT_DIPSETTING( 0x0040, "Dipswitch" ) - PORT_DIPSETTING( 0x0000, "CMOS" ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Cabinet )) - PORT_DIPSETTING( 0x0080, DEF_STR( Upright )) - PORT_DIPSETTING( 0x0000, DEF_STR( Cocktail )) - PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:6") + PORT_DIPSETTING( 0x0004, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0200, 0x0200, "Video Freeze" ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off )) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:7") + PORT_DIPSETTING( 0x0002, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Players ) ) + PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:8") + PORT_DIPSETTING( 0x0001, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + + PORT_DIPNAME( 0xc000, 0xc000, "Country" ) PORT_DIPLOCATION("DS2:2,1") + PORT_DIPSETTING( 0xc000, DEF_STR( USA ) ) + PORT_DIPSETTING( 0x8000, DEF_STR( French ) ) + PORT_DIPSETTING( 0x4000, DEF_STR( German ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Unused )) + PORT_DIPNAME( 0x2000, 0x0000, "Power-Up Test" ) PORT_DIPLOCATION("DS2:3") + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) + PORT_DIPSETTING( 0x2000, DEF_STR( On )) + PORT_DIPNAME( 0x1000, 0x1000, "Coin Counters" ) PORT_DIPLOCATION("DS2:4") + PORT_DIPSETTING( 0x1000, "One" ) + PORT_DIPSETTING( 0x0000, "Two" ) + PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Players ) ) PORT_DIPLOCATION("DS2:6,5") PORT_DIPSETTING( 0x0c00, "4 Players" ) PORT_DIPSETTING( 0x0400, "3 Players" ) PORT_DIPSETTING( 0x0800, "2 Players" ) PORT_DIPSETTING( 0x0000, "1 Player" ) - PORT_DIPNAME( 0x1000, 0x0000, "Coin Counters" ) - PORT_DIPSETTING( 0x1000, "One Counter" ) - PORT_DIPSETTING( 0x0000, "Two Counters" ) - PORT_DIPNAME( 0x2000, 0x0000, "Powerup Test" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x2000, DEF_STR( On )) - PORT_DIPNAME( 0xc000, 0xc000, "Country" ) - PORT_DIPSETTING( 0xc000, DEF_STR( USA ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( French ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( German ) ) -// PORT_DIPSETTING( 0x0000, DEF_STR( Unused )) + PORT_DIPNAME( 0x0200, 0x0200, "Video Freeze" ) PORT_DIPLOCATION("DS2:7") + PORT_DIPSETTING( 0x0200, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) PORT_DIPLOCATION("DS2:8") + PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) PORT_START("UNK0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -458,10 +459,10 @@ static INPUT_PORTS_START( hiimpact ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW") - PORT_DIPUNUSED_DIPLOC ( 0x0001, 0x0001, "SW1:8" ) - PORT_DIPUNUSED_DIPLOC ( 0x0002, 0x0002, "SW1:7" ) - PORT_DIPUNUSED_DIPLOC ( 0x0004, 0x0004, "SW1:6" ) - PORT_DIPNAME( 0x0078, 0x0078, DEF_STR( Coinage )) PORT_DIPLOCATION("SW1:5,4,3,2") + PORT_DIPUNUSED_DIPLOC ( 0x0001, 0x0001, "DS1:8" ) + PORT_DIPUNUSED_DIPLOC ( 0x0002, 0x0002, "DS1:7" ) + PORT_DIPUNUSED_DIPLOC ( 0x0004, 0x0004, "DS1:6" ) + PORT_DIPNAME( 0x0078, 0x0078, DEF_STR( Coinage )) PORT_DIPLOCATION("DS1:5,4,3,2") PORT_DIPSETTING( 0x0078, DEF_STR( 1C_1C )) PORT_CONDITION("DSW", 0xc000, EQUALS, 0xc000) /* Generic coinage (no denomination); 2 identical chutes */ PORT_DIPSETTING( 0x0058, DEF_STR( 2C_1C )) PORT_CONDITION("DSW", 0xc000, EQUALS, 0xc000) PORT_DIPSETTING( 0x0068, "2 Coins/1 Credit 4/3" ) PORT_CONDITION("DSW", 0xc000, EQUALS, 0xc000) @@ -478,26 +479,27 @@ static INPUT_PORTS_START( hiimpact ) PORT_DIPSETTING( 0x0048, "5F/1 Credit" ) PORT_CONDITION("DSW", 0xc000, EQUALS, 0x8000) PORT_DIPSETTING( 0x0070, "ECA" ) PORT_CONDITION("DSW", 0xc000, EQUALS, 0x8000) /* 1/3F 2/5F 5/10F; 3 chutes (1F/5F/10F) */ PORT_DIPSETTING( 0x0040, DEF_STR( Free_Play )) - PORT_DIPSETTING( 0x0038, "Other (See Service Menu)" ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Players )) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Players )) PORT_DIPLOCATION("DS1:1") PORT_DIPSETTING( 0x0080, "4" ) PORT_DIPSETTING( 0x0000, "2" ) - PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) PORT_DIPLOCATION("SW2:8") + + PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) PORT_DIPLOCATION("DS2:8") PORT_DIPSETTING( 0x0100, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPUNUSED_DIPLOC (0x0200, 0x0200, "SW2:7") - PORT_DIPUNUSED_DIPLOC (0x0400, 0x0400, "SW2:6") - PORT_DIPUNUSED_DIPLOC (0x0800, 0x0800, "SW2:5") - PORT_DIPNAME( 0x1000, 0x1000, "Coin Counters" ) PORT_DIPLOCATION("SW2:4") - PORT_DIPSETTING( 0x1000, "1" ) - PORT_DIPSETTING( 0x0000, "2" ) - PORT_DIPNAME( 0x2000, 0x2000, "Power-Up Test" ) PORT_DIPLOCATION("SW2:3") /* Manual says "unused", service menu says "eat time" */ - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) /* "Eat Time" */ - PORT_DIPSETTING( 0x2000, DEF_STR( On )) /* "Don't Eat Time" */ - PORT_DIPNAME( 0xc000, 0xc000, "Country" ) PORT_DIPLOCATION("SW2:2,1") /* Affects currency used. Language remains in English */ + PORT_DIPUNUSED_DIPLOC (0x0200, 0x0200, "DS2:7") + PORT_DIPUNUSED_DIPLOC (0x0400, 0x0400, "DS2:6") + PORT_DIPUNUSED_DIPLOC (0x0800, 0x0800, "DS2:5") + PORT_DIPNAME( 0x1000, 0x1000, "Coin Counters" ) PORT_DIPLOCATION("DS2:4") + PORT_DIPSETTING( 0x1000, "One" ) + PORT_DIPSETTING( 0x0000, "Two" ) + PORT_DIPNAME( 0x2000, 0x2000, "Power-Up Test" ) PORT_DIPLOCATION("DS2:3") // Manual says "unused" + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) // Service menu says "Eat time" + PORT_DIPSETTING( 0x2000, DEF_STR( On )) // Service menu says "Don't eat time" + PORT_DIPNAME( 0xc000, 0xc000, "Country" ) PORT_DIPLOCATION("DS2:2,1") // Affects currency used. Language remains in English PORT_DIPSETTING( 0xc000, DEF_STR( USA )) PORT_DIPSETTING( 0x4000, DEF_STR( German )) PORT_DIPSETTING( 0x8000, DEF_STR( French )) + PORT_DIPSETTING( 0x0000, DEF_STR( Unused )) PORT_START("UNK0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -509,7 +511,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( shimpact ) PORT_INCLUDE( hiimpact ) PORT_MODIFY("DSW") - PORT_DIPNAME( 0x0001, 0x0000, "Card Dispenser" ) PORT_DIPLOCATION("SW1:8") + PORT_DIPNAME( 0x0001, 0x0000, "Card Dispenser" ) PORT_DIPLOCATION("DS1:8") PORT_DIPSETTING( 0x0001, DEF_STR( On )) PORT_DIPSETTING( 0x0000, DEF_STR( Off )) INPUT_PORTS_END @@ -552,56 +554,66 @@ static INPUT_PORTS_START( smashtv ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_DIPNAME( 0x0001, 0x0001, "1-8" ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0002, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0004, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0008, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0010, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0020, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0040, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown )) + + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown )) PORT_DIPLOCATION("DS1:1") PORT_DIPSETTING( 0x0080, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0100, 0x0100, "2-8" ) /* Coinage? */ - PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown )) PORT_DIPLOCATION("DS1:2") + PORT_DIPSETTING( 0x0040, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown )) /* Coinage? */ - PORT_DIPSETTING( 0x0200, DEF_STR( Off )) + PORT_DIPNAME( 0x003f, 0x003f, DEF_STR( Coinage )) PORT_DIPLOCATION("DS1:8,7,6,5,4,3") // To activate any coinage changes go to Test / Utilities + PORT_DIPSETTING( 0x003f, "USA 1" ) // 1 Coin 1 Credit and select 'FULL FACTORY RESTORE' + PORT_DIPSETTING( 0x003e, "USA 2" ) // Then exit test mode and the new coinage will be active. + PORT_DIPSETTING( 0x003d, "USA 3" ) // This actually checks the dipswitch and puts the coin/credit value + PORT_DIPSETTING( 0x003c, "German 1" ) // into CMOS. But it only checks when doing a full factory restore. + PORT_DIPSETTING( 0x003b, "German 2" ) + PORT_DIPSETTING( 0x003a, "German 3" ) + PORT_DIPSETTING( 0x0039, "France 1" ) + PORT_DIPSETTING( 0x0038, "France 2" ) + PORT_DIPSETTING( 0x0037, "France 3" ) + PORT_DIPSETTING( 0x0036, "Swiss 1" ) + PORT_DIPSETTING( 0x0035, "Italy" ) + PORT_DIPSETTING( 0x0034, "U.K. 1" ) + PORT_DIPSETTING( 0x0033, "U.K. 2" ) + PORT_DIPSETTING( 0x0032, "U.K. ECA" ) + PORT_DIPSETTING( 0x0031, "Spain 1" ) + PORT_DIPSETTING( 0x0030, "Australia 1" ) + PORT_DIPSETTING( 0x002f, "Japan 1" ) + PORT_DIPSETTING( 0x002e, "Japan 2" ) + PORT_DIPSETTING( 0x002d, "Austria 1" ) + PORT_DIPSETTING( 0x002c, "Belgium 1" ) + PORT_DIPSETTING( 0x002b, "Belgium 2" ) + PORT_DIPSETTING( 0x002a, "Sweden" ) + PORT_DIPSETTING( 0x0029, "New Zealand 1" ) + PORT_DIPSETTING( 0x0028, "Netherlands" ) + PORT_DIPSETTING( 0x0027, "Finland" ) + PORT_DIPSETTING( 0x0026, "Norway" ) + PORT_DIPSETTING( 0x0025, "Denmark 1" ) + + PORT_DIPNAME( 0x8000, 0x8000, "Test Switch" ) PORT_DIPLOCATION("DS2:1") // Listed in kit manual as 'kit test' but only works on rev 6 and rev 8. F2 service is working on all versions. + PORT_DIPSETTING( 0x8000, DEF_STR( Off )) // Maybe rev 6 and 8 are kit versions? PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown )) /* Coinage? */ - PORT_DIPSETTING( 0x0400, DEF_STR( Off )) + PORT_DIPNAME( 0x4000, 0x4000, "Rotary Joystick Enable?" ) PORT_DIPLOCATION("DS2:2") // Is rotary joystick supported in the code? + PORT_DIPSETTING( 0x4000, DEF_STR( Off )) // Might be in a later undumped ROM version or not implemented? PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown )) /* Coinage? */ - PORT_DIPSETTING( 0x0800, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown )) /* Coinage? */ - PORT_DIPSETTING( 0x1000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown )) /* Coinage? */ + PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:3") // Later 'kit' manuals include the DIPs. 3-8 is unlisted so not used? PORT_DIPSETTING( 0x2000, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown )) /* Rotary Joystick enable? */ - PORT_DIPSETTING( 0x4000, DEF_STR( Off )) + PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:4") + PORT_DIPSETTING( 0x1000, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Service_Mode )) - PORT_DIPSETTING( 0x8000, DEF_STR( Off )) + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:5") + PORT_DIPSETTING( 0x0800, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:6") + PORT_DIPSETTING( 0x0400, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:7") + PORT_DIPSETTING( 0x0200, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:8") + PORT_DIPSETTING( 0x0100, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) -/* I cannot figure out how to enable dip coinage -Does the Rotary Joystick Dip do anything? */ PORT_START("UNK0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -647,21 +659,7 @@ static INPUT_PORTS_START( strkforc ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_DIPNAME( 0x0001, 0x0001, "Coin Meter" ) - PORT_DIPSETTING( 0x0001, "Shared" ) - PORT_DIPSETTING( 0x0000, "Independent" ) - PORT_DIPNAME( 0x0002, 0x0002, "Credits to Start" ) - PORT_DIPSETTING( 0x0002, "1" ) - PORT_DIPSETTING( 0x0000, "2" ) - PORT_DIPNAME( 0x000c, 0x000c, "Points for Ship" ) - PORT_DIPSETTING( 0x0008, "40000" ) - PORT_DIPSETTING( 0x000c, "50000" ) - PORT_DIPSETTING( 0x0004, "75000" ) - PORT_DIPSETTING( 0x0000, "100000" ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Lives )) - PORT_DIPSETTING( 0x0010, "3" ) - PORT_DIPSETTING( 0x0000, "4" ) - PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Difficulty )) + PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Difficulty )) PORT_DIPLOCATION("DS1:3,2,1") PORT_DIPSETTING( 0x0080, "Level 1" ) PORT_DIPSETTING( 0x00c0, "Level 2" ) PORT_DIPSETTING( 0x00a0, "Level 3" ) @@ -670,16 +668,25 @@ static INPUT_PORTS_START( strkforc ) PORT_DIPSETTING( 0x0040, "Level 6" ) PORT_DIPSETTING( 0x0020, "Level 7" ) PORT_DIPSETTING( 0x0000, "Level 8" ) - 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 )) - PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C )) - PORT_DIPSETTING( 0x0300, DEF_STR( 1C_5C )) - PORT_DIPSETTING( 0x0200, DEF_STR( 1C_6C )) - PORT_DIPSETTING( 0x0100, "U.K. Elect." ) - PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play )) - PORT_DIPNAME( 0x7800, 0x7800, DEF_STR( Coin_A )) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Lives )) PORT_DIPLOCATION("DS1:4") + PORT_DIPSETTING( 0x0010, "3" ) + PORT_DIPSETTING( 0x0000, "4" ) + PORT_DIPNAME( 0x000c, 0x000c, "Points for Extra Ship" ) PORT_DIPLOCATION("DS1:6,5") + PORT_DIPSETTING( 0x0008, "40000" ) + PORT_DIPSETTING( 0x000c, "50000" ) + PORT_DIPSETTING( 0x0004, "75000" ) + PORT_DIPSETTING( 0x0000, "100000" ) + PORT_DIPNAME( 0x0002, 0x0002, "Credits to Start" ) PORT_DIPLOCATION("DS1:7") + PORT_DIPSETTING( 0x0002, "1" ) + PORT_DIPSETTING( 0x0000, "2" ) + PORT_DIPNAME( 0x0001, 0x0001, "Coin Meter" ) PORT_DIPLOCATION("DS1:8") + PORT_DIPSETTING( 0x0001, "Shared" ) + PORT_DIPSETTING( 0x0000, "Independent" ) + + PORT_DIPNAME( 0x8000, 0x8000, "Test Switch" ) PORT_DIPLOCATION("DS2:1") + PORT_DIPSETTING( 0x8000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x7800, 0x7800, DEF_STR( Coin_A )) PORT_DIPLOCATION("DS2:5,4,3,2") PORT_DIPSETTING( 0x3000, DEF_STR( 5C_1C )) PORT_DIPSETTING( 0x3800, DEF_STR( 4C_1C )) PORT_DIPSETTING( 0x4000, DEF_STR( 3C_1C )) @@ -696,101 +703,15 @@ static INPUT_PORTS_START( strkforc ) PORT_DIPSETTING( 0x1000, "1 Coin/1 Credit - 5 Coins/6 Credits" ) PORT_DIPSETTING( 0x0800, "3 Coin/1 Credit - 5 Coins/2 Credits" ) PORT_DIPSETTING( 0x0000, "1 Coin/2 Credits - 2 Coins/5 Credits" ) - PORT_DIPNAME( 0x8000, 0x8000, "Test Switch" ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - - PORT_START("UNK0") - PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START("UNK1") - PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - - -static INPUT_PORTS_START( mkla2 ) - PORT_START("IN0") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 High Punch") PORT_PLAYER(1) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Block") PORT_PLAYER(1) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 High Kick") PORT_PLAYER(1) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 High Punch") PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Block") PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 High Kick") PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START("IN1") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) /* Slam Switch */ - PORT_SERVICE( 0x0010, IP_ACTIVE_LOW ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BILL1 ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("P2 Low Punch") PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("P2 Low Kick") PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("P2 Block 2") PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("P1 Low Punch") PORT_PLAYER(1) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("P1 Low Kick") PORT_PLAYER(1) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(midyunit_state, adpcm_irq_state_r) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("P1 Block 2") PORT_PLAYER(1) - - PORT_START("IN2") - PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START("DSW") - PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x0010, 0x0010, "Attract Sound" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0010, DEF_STR( On )) - PORT_DIPNAME( 0x0020, 0x0020, "Low Blows" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0020, DEF_STR( On )) - PORT_DIPNAME( 0x0040, 0x0040, "Blood" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0040, DEF_STR( On )) - PORT_DIPNAME( 0x0080, 0x0080, "Violence" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0080, DEF_STR( On )) - PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0200, 0x0000, "Counters" ) - PORT_DIPSETTING( 0x0200, "One" ) - PORT_DIPSETTING( 0x0000, "Two" ) - PORT_DIPNAME( 0x7c00, 0x7c00, DEF_STR( Coinage )) - PORT_DIPSETTING( 0x7c00, "USA-1" ) - PORT_DIPSETTING( 0x3c00, "USA-2" ) - PORT_DIPSETTING( 0x5c00, "USA-3" ) - PORT_DIPSETTING( 0x1c00, "USA-4" ) - PORT_DIPSETTING( 0x6c00, "USA-ECA" ) - PORT_DIPSETTING( 0x0c00, "USA-Free Play" ) - PORT_DIPSETTING( 0x7400, "German-1" ) - PORT_DIPSETTING( 0x3400, "German-2" ) - PORT_DIPSETTING( 0x5400, "German-3" ) - PORT_DIPSETTING( 0x1400, "German-4" ) - PORT_DIPSETTING( 0x6400, "German-5" ) - PORT_DIPSETTING( 0x2400, "German-ECA" ) - PORT_DIPSETTING( 0x0400, "German-Free Play" ) - PORT_DIPSETTING( 0x7800, "French-1" ) - PORT_DIPSETTING( 0x3800, "French-2" ) - PORT_DIPSETTING( 0x5800, "French-3" ) - PORT_DIPSETTING( 0x1800, "French-4" ) - PORT_DIPSETTING( 0x6800, "French-ECA" ) - PORT_DIPSETTING( 0x0800, "French-Free Play" ) - PORT_DIPNAME( 0x8000, 0x0000, "Coinage Source" ) - PORT_DIPSETTING( 0x8000, "Dipswitch" ) - PORT_DIPSETTING( 0x0000, "CMOS" ) + PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coin_B )) PORT_DIPLOCATION("DS2:8,7,6") + PORT_DIPSETTING( 0x0700, DEF_STR( 1C_1C )) + PORT_DIPSETTING( 0x0600, DEF_STR( 1C_2C )) + PORT_DIPSETTING( 0x0500, DEF_STR( 1C_3C )) + PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C )) + PORT_DIPSETTING( 0x0300, DEF_STR( 1C_5C )) + PORT_DIPSETTING( 0x0200, DEF_STR( 1C_6C )) + PORT_DIPSETTING( 0x0100, "U.K. Elect." ) + PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play )) PORT_START("UNK0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -841,32 +762,38 @@ static INPUT_PORTS_START( mkla4 ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x0008, 0x0008, "Comic Book Offer" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0008, DEF_STR( On )) - PORT_DIPNAME( 0x0010, 0x0010, "Attract Sound" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0010, DEF_STR( On )) - PORT_DIPNAME( 0x0020, 0x0020, "Low Blows" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0020, DEF_STR( On )) - PORT_DIPNAME( 0x0040, 0x0040, "Blood" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0040, DEF_STR( On )) - PORT_DIPNAME( 0x0080, 0x0080, "Violence" ) + PORT_DIPNAME( 0x0080, 0x0080, "Violence" ) PORT_DIPLOCATION("DS1:1") PORT_DIPSETTING( 0x0000, DEF_STR( Off )) PORT_DIPSETTING( 0x0080, DEF_STR( On )) - PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPNAME( 0x0040, 0x0040, "Blood" ) PORT_DIPLOCATION("DS1:2") + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0040, DEF_STR( On )) + PORT_DIPNAME( 0x0020, 0x0020, "Low Blows" ) PORT_DIPLOCATION("DS1:3") + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0020, DEF_STR( On )) + PORT_DIPNAME( 0x0010, 0x0010, "Attract Sound" ) PORT_DIPLOCATION("DS1:4") + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0010, DEF_STR( On )) + PORT_DIPNAME( 0x0008, 0x0008, "Comic Book Offer" ) PORT_DIPLOCATION("DS1:5") + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0008, DEF_STR( On )) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:6") + PORT_DIPSETTING( 0x0004, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0200, 0x0000, "Counters" ) - PORT_DIPSETTING( 0x0200, "One" ) - PORT_DIPSETTING( 0x0000, "Two" ) - PORT_DIPNAME( 0x7c00, 0x7c00, DEF_STR( Coinage )) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:7") + PORT_DIPSETTING( 0x0002, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:8") + PORT_DIPSETTING( 0x0001, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + + PORT_DIPNAME( 0x8000, 0x8000, "Coinage Source" ) PORT_DIPLOCATION("DS2:1") + PORT_DIPSETTING( 0x8000, "Dipswitch" ) + PORT_DIPSETTING( 0x0000, "CMOS" ) + PORT_DIPNAME( 0x7c00, 0x5c00, DEF_STR( Coinage )) PORT_DIPLOCATION("DS2:6,5,4,3,2") // ignored when DS2:1 set to CMOS PORT_DIPSETTING( 0x7c00, "USA-1" ) PORT_DIPSETTING( 0x3c00, "USA-2" ) - PORT_DIPSETTING( 0x5c00, "USA-3" ) + PORT_DIPSETTING( 0x5c00, "USA-3" ) // 1 Coin 1 Credit PORT_DIPSETTING( 0x1c00, "USA-4" ) PORT_DIPSETTING( 0x6c00, "USA-ECA" ) PORT_DIPSETTING( 0x0c00, "USA-Free Play" ) @@ -883,9 +810,12 @@ static INPUT_PORTS_START( mkla4 ) PORT_DIPSETTING( 0x1800, "French-4" ) PORT_DIPSETTING( 0x6800, "French-ECA" ) PORT_DIPSETTING( 0x0800, "French-Free Play" ) - PORT_DIPNAME( 0x8000, 0x0000, "Coinage Source" ) - PORT_DIPSETTING( 0x8000, "Dipswitch" ) - PORT_DIPSETTING( 0x0000, "CMOS" ) + PORT_DIPNAME( 0x0200, 0x0200, "Counters" ) PORT_DIPLOCATION("DS2:7") + PORT_DIPSETTING( 0x0200, "One" ) + PORT_DIPSETTING( 0x0000, "Two" ) + PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) PORT_DIPLOCATION("DS2:8") + PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) PORT_START("UNK0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -894,6 +824,15 @@ static INPUT_PORTS_START( mkla4 ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END +static INPUT_PORTS_START( mkla2 ) + PORT_INCLUDE( mkla4 ) + PORT_MODIFY("DSW") + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unused )) PORT_DIPLOCATION("DS1:5") + PORT_DIPSETTING( 0x0008, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) +INPUT_PORTS_END + + static INPUT_PORTS_START( mkyawdim ) PORT_INCLUDE( mkla4 ) @@ -930,7 +869,20 @@ static INPUT_PORTS_START( term2 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW") - PORT_DIPNAME( 0x0007, 0x0003, "Credits" ) + PORT_DIPNAME( 0x0080, 0x0080, "Display" ) PORT_DIPLOCATION("DS1:1") + PORT_DIPSETTING( 0x0080, "Normal" ) + PORT_DIPSETTING( 0x0000, "Mirrored" ) + PORT_DIPNAME( 0x0040, 0x0040, "Coinage Source" ) PORT_DIPLOCATION("DS1:2") + PORT_DIPSETTING( 0x0000, "CMOS" ) + PORT_DIPSETTING( 0x0040, "Dipswitch" ) + PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coinage )) PORT_DIPLOCATION("DS1:5,4,3") + PORT_DIPSETTING( 0x0038, "1" ) + PORT_DIPSETTING( 0x0018, "2" ) + PORT_DIPSETTING( 0x0028, "3" ) + PORT_DIPSETTING( 0x0008, "4" ) + PORT_DIPSETTING( 0x0030, "ECA" ) + PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play )) + PORT_DIPNAME( 0x0007, 0x0003, "Credits" ) PORT_DIPLOCATION("DS1:8,7,6") PORT_DIPSETTING( 0x0007, "2 Start/1 Continue" ) PORT_DIPSETTING( 0x0006, "4 Start/1 Continue" ) PORT_DIPSETTING( 0x0005, "2 Start/2 Continue" ) @@ -939,42 +891,30 @@ static INPUT_PORTS_START( term2 ) PORT_DIPSETTING( 0x0002, "3 Start/2 Continue" ) PORT_DIPSETTING( 0x0001, "3 Start/1 Continue" ) PORT_DIPSETTING( 0x0000, "3 Start/3 Continue" ) - PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coinage )) - PORT_DIPSETTING( 0x0038, "1" ) - PORT_DIPSETTING( 0x0018, "2" ) - PORT_DIPSETTING( 0x0028, "3" ) - PORT_DIPSETTING( 0x0008, "4" ) - PORT_DIPSETTING( 0x0030, "ECA" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play )) - PORT_DIPNAME( 0x0040, 0x0040, "Dipswitch Coinage" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0040, DEF_STR( On )) - PORT_DIPNAME( 0x0080, 0x0080, "Normal Display" ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0200, 0x0200, "Video Freeze" ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unused )) - PORT_DIPSETTING( 0x0400, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Players ) ) - PORT_DIPSETTING( 0x0800, "2 Players" ) - PORT_DIPSETTING( 0x0000, "1 Player" ) - PORT_DIPNAME( 0x1000, 0x0000, "Two Counters" ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x2000, 0x0000, "Powerup Test" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off )) - PORT_DIPSETTING( 0x2000, DEF_STR( On )) - PORT_DIPNAME( 0xc000, 0xc000, "Country" ) + + PORT_DIPNAME( 0xc000, 0xc000, "Country" ) PORT_DIPLOCATION("DS2:2,1") PORT_DIPSETTING( 0xc000, DEF_STR( USA ) ) PORT_DIPSETTING( 0x8000, DEF_STR( French ) ) PORT_DIPSETTING( 0x4000, DEF_STR( German ) ) -// PORT_DIPSETTING( 0x0000, DEF_STR( Unused )) + PORT_DIPSETTING( 0x0000, DEF_STR( Unused )) + PORT_DIPNAME( 0x2000, 0x0000, "Power-Up Test" ) PORT_DIPLOCATION("DS2:3") + PORT_DIPSETTING( 0x0000, DEF_STR( Off )) + PORT_DIPSETTING( 0x2000, DEF_STR( On )) + PORT_DIPNAME( 0x1000, 0x1000, "Counters" ) PORT_DIPLOCATION("DS2:4") + PORT_DIPSETTING( 0x1000, "One" ) + PORT_DIPSETTING( 0x0000, "Two" ) + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Players ) ) PORT_DIPLOCATION("DS2:5") + PORT_DIPSETTING( 0x0800, "2 Players" ) + PORT_DIPSETTING( 0x0000, "1 Player" ) + PORT_DIPNAME( 0x0400, 0x0400, "Cabinet?" ) PORT_DIPLOCATION("DS2:6") // Manual says Dedicated / Kit. Does this do anything? + PORT_DIPSETTING( 0x0400, "Dedicated" ) + PORT_DIPSETTING( 0x0000, "Kit" ) + PORT_DIPNAME( 0x0200, 0x0200, "Video Freeze" ) PORT_DIPLOCATION("DS2:7") + PORT_DIPSETTING( 0x0200, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) PORT_DIPLOCATION("DS2:8") + PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) PORT_START("UNK0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1034,71 +974,65 @@ static INPUT_PORTS_START( totcarn ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage )) - PORT_DIPSETTING( 0x001f, "USA 1" ) - PORT_DIPSETTING( 0x001e, "USA 2" ) - PORT_DIPSETTING( 0x001d, "USA 3" ) - PORT_DIPSETTING( 0x001c, "German 1" ) - PORT_DIPSETTING( 0x001b, "German 2" ) - PORT_DIPSETTING( 0x001a, "German 3" ) - PORT_DIPSETTING( 0x0019, "France 2" ) - PORT_DIPSETTING( 0x0018, "France 3" ) - PORT_DIPSETTING( 0x0017, "France 4" ) - PORT_DIPSETTING( 0x0016, "Swiss 1" ) - PORT_DIPSETTING( 0x0015, "Italy" ) - PORT_DIPSETTING( 0x0014, "U.K. 1" ) - PORT_DIPSETTING( 0x0013, "U.K. 2" ) - PORT_DIPSETTING( 0x0012, "U.K. ECA" ) - PORT_DIPSETTING( 0x0011, "Spain 1" ) - PORT_DIPSETTING( 0x0010, "Australia 1" ) - PORT_DIPSETTING( 0x000f, "Japan 1" ) - PORT_DIPSETTING( 0x000e, "Japan 2" ) - PORT_DIPSETTING( 0x000d, "Austria 1" ) - PORT_DIPSETTING( 0x000c, "Belgium 1" ) - PORT_DIPSETTING( 0x000b, "Belgium 2" ) - PORT_DIPSETTING( 0x000a, "Sweden" ) - PORT_DIPSETTING( 0x0009, "New Zealand 1" ) - PORT_DIPSETTING( 0x0008, "Netherlands" ) - PORT_DIPSETTING( 0x0007, "Finland" ) - PORT_DIPSETTING( 0x0006, "Norway" ) - PORT_DIPSETTING( 0x0005, "Denmark" ) -// PORT_DIPSETTING( 0x0004, DEF_STR( Unused )) -// PORT_DIPSETTING( 0x0003, DEF_STR( Unused )) -// PORT_DIPSETTING( 0x0002, DEF_STR( Unused )) -// PORT_DIPSETTING( 0x0001, DEF_STR( Unused )) -// PORT_DIPSETTING( 0x0000, DEF_STR( Unused )) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0020, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0040, 0x0040, "Dipswitch Coinage" ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0080, 0x0080, "Keys for Pleasure Dome" ) + PORT_DIPNAME( 0x0080, 0x0080, "Keys for Pleasure Dome" ) PORT_DIPLOCATION("DS1:1") PORT_DIPSETTING( 0x0080, "220" ) PORT_DIPSETTING( 0x0000, "200" ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Service_Mode )) - PORT_DIPSETTING( 0x0100, DEF_STR( Off )) + PORT_DIPNAME( 0x0040, 0x0000, "Coinage Source" ) PORT_DIPLOCATION("DS1:2") + PORT_DIPSETTING( 0x0040, "CMOS" ) + PORT_DIPSETTING( 0x0000, "Dipswitch" ) + PORT_DIPNAME( 0x003f, 0x003f, DEF_STR( Coinage )) PORT_DIPLOCATION("DS1:8,7,6,5,4,3") // To activate any coinage changes go to Test / Utilities + PORT_DIPSETTING( 0x003f, "USA 1" ) // 1 Coin 1 Credit and select 'FULL FACTORY RESTORE' + PORT_DIPSETTING( 0x003e, "USA 2" ) // Then exit test mode and the new coinage will be active. + PORT_DIPSETTING( 0x003d, "USA 3" ) // This actually checks the dipswitch and puts the coin/credit value + PORT_DIPSETTING( 0x003c, "German 1" ) // into CMOS. But it only checks when doing a full factory restore. + PORT_DIPSETTING( 0x003b, "German 2" ) + PORT_DIPSETTING( 0x003a, "German 3" ) + PORT_DIPSETTING( 0x0039, "France 2" ) + PORT_DIPSETTING( 0x0038, "France 3" ) + PORT_DIPSETTING( 0x0037, "France 4" ) + PORT_DIPSETTING( 0x0036, "Swiss 1" ) + PORT_DIPSETTING( 0x0035, "Italy" ) + PORT_DIPSETTING( 0x0034, "U.K. 1" ) + PORT_DIPSETTING( 0x0033, "U.K. 2" ) + PORT_DIPSETTING( 0x0032, "U.K. ECA" ) + PORT_DIPSETTING( 0x0031, "Spain 1" ) + PORT_DIPSETTING( 0x0030, "Australia 1" ) + PORT_DIPSETTING( 0x002f, "Japan 1" ) + PORT_DIPSETTING( 0x002e, "Japan 2" ) + PORT_DIPSETTING( 0x002d, "Austria 1" ) + PORT_DIPSETTING( 0x002c, "Belgium 1" ) + PORT_DIPSETTING( 0x002b, "Belgium 2" ) + PORT_DIPSETTING( 0x002a, "Sweden" ) + PORT_DIPSETTING( 0x0029, "New Zealand 1" ) + PORT_DIPSETTING( 0x0028, "Netherlands" ) + PORT_DIPSETTING( 0x0027, "Finland" ) + PORT_DIPSETTING( 0x0026, "Norway" ) + PORT_DIPSETTING( 0x0025, "Denmark 1" ) + PORT_DIPSETTING( 0x0000, "Denmark 2" ) + + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:1") + PORT_DIPSETTING( 0x8000, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0200, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0400, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x0800, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x1000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x2000, DEF_STR( Off )) - PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown )) + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:2") PORT_DIPSETTING( 0x4000, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown )) - PORT_DIPSETTING( 0x8000, DEF_STR( Off )) + PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:3") + PORT_DIPSETTING( 0x2000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:4") + PORT_DIPSETTING( 0x1000, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:5") + PORT_DIPSETTING( 0x0800, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:6") + PORT_DIPSETTING( 0x0400, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown )) PORT_DIPLOCATION("DS2:7") + PORT_DIPSETTING( 0x0200, DEF_STR( Off )) + PORT_DIPSETTING( 0x0000, DEF_STR( On )) + PORT_DIPNAME( 0x0100, 0x0100, "Test Switch" ) PORT_DIPLOCATION("DS2:8") + PORT_DIPSETTING( 0x0100, DEF_STR( Off )) PORT_DIPSETTING( 0x0000, DEF_STR( On )) PORT_START("UNK0") diff --git a/src/mame/misc/goldnpkr.cpp b/src/mame/misc/goldnpkr.cpp index 4b84d8dc979..d50de3d367e 100644 --- a/src/mame/misc/goldnpkr.cpp +++ b/src/mame/misc/goldnpkr.cpp @@ -11819,7 +11819,7 @@ ROM_END Since we currently haven't a R6511 core, and due to the encrypted program ROMs, I decided to hook the games here till can get some improvements. GFX decode seems OK. - Will see if it's neccessary to move these games to a different driver later... + Will see if it's necessary to move these games to a different driver later... There are tiles for "Wild Card" title. Both sets use the same GFX ROMs. @@ -11850,7 +11850,7 @@ ROM_END Bipolar PROMs: 1x 74S288 (U10) 1x 74S472 (U45) - PLDs: 2x PAL16L8 (U4, U5) + PLDs: 2x PAL16L8 (U4, U5) 2x PAL10L8 (U7, U8) Xtal 10 MHz. @@ -12236,7 +12236,7 @@ void goldnpkr_state::init_icp1db() F2EE: 76 69 64 65 6F 20 6B 6C 65 69 6E 20 74 65 73 74 64 61 74 61 00 | video klein testdata. - So nasty... and unneccessary. + So nasty... and unnecessary. ***********************************************/ diff --git a/src/mame/misc/jackhouse.cpp b/src/mame/misc/jackhouse.cpp index 2d920a52339..1f04ebded66 100644 --- a/src/mame/misc/jackhouse.cpp +++ b/src/mame/misc/jackhouse.cpp @@ -73,24 +73,24 @@ private: void bgvideoram_w(u16 dst, u16 tile_code, u8 tile_color); // Video processor - void vp_reg_0x00(offs_t offs, u8 data); - void vp_reg_0x01(offs_t offs, u8 data); - void vp_reg_0x02(offs_t offs, u8 data); - void vp_reg_0x04(offs_t offs, u8 data); - void vp_reg_0x05(offs_t offs, u8 data); - void vp_reg_0x07(offs_t offs, u8 data); - void vp_reg_0x08(offs_t offs, u8 data); - void vp_reg_0x0f(offs_t offs, u8 data); - void vp_reg_0x10(offs_t offs, u8 data); - void vp_reg_0x12(offs_t offs, u8 data); - void vp_reg_0x13(offs_t offs, u8 data); - void vp_reg_0x14(offs_t offs, u8 data); - void vp_reg_0x15(offs_t offs, u8 data); - void vp_reg_0x16(offs_t offs, u8 data); - void vp_reg_0x17(offs_t offs, u8 data); - void vp_reg_0x18(offs_t offs, u8 data); - void vp_reg_0x1a(offs_t offs, u8 data); - void vp_reg_0x1b(offs_t offs, u8 data); + void vp_reg_0x00(u8 data); + void vp_reg_0x01(u8 data); + void vp_reg_0x02(offs_t offset, u8 data); + void vp_reg_0x04(u8 data); + void vp_reg_0x05(offs_t offset, u8 data); + void vp_reg_0x07(u8 data); + void vp_reg_0x08(u8 data); + void vp_reg_0x0f(u8 data); + void vp_reg_0x10(u8 data); + void vp_reg_0x12(u8 data); + void vp_reg_0x13(u8 data); + void vp_reg_0x14(u8 data); + void vp_reg_0x15(u8 data); + void vp_reg_0x16(u8 data); + void vp_reg_0x17(u8 data); + void vp_reg_0x18(u8 data); + void vp_reg_0x1a(u8 data); + void vp_reg_0x1b(u8 data); void vp_exec(u8 data); void vp_playfield(u8 data); @@ -236,7 +236,7 @@ void jackhouse_state::vp_playfield(u8 data) // Video Processor handlers -void jackhouse_state::vp_reg_0x00(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x00(u8 data) { m_fgt_addr = data; // fg tiles address register m_bgt_addr = data; // bg tiles address register @@ -245,7 +245,7 @@ void jackhouse_state::vp_reg_0x00(offs_t offs, u8 data) } -void jackhouse_state::vp_reg_0x01(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x01(u8 data) { m_fgt_addr |= data << 6; // fg tiles address register m_bgt_addr |= data << 6; // bg tiles address register @@ -255,16 +255,16 @@ void jackhouse_state::vp_reg_0x01(offs_t offs, u8 data) // fg tiles -void jackhouse_state::vp_reg_0x02(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x02(offs_t offset, u8 data) { - m_fgvideoram[offs][m_fgt_addr] = data; + m_fgvideoram[offset][m_fgt_addr] = data; m_fg_tilemap->mark_tile_dirty(m_fgt_addr); - if (offs == 1) + if (offset == 1) m_fgt_addr += 1; } // fg color -void jackhouse_state::vp_reg_0x04(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x04(u8 data) { m_fgvideoram[2][m_fgc_addr] = data; m_fg_tilemap->mark_tile_dirty(m_fgc_addr); @@ -272,81 +272,81 @@ void jackhouse_state::vp_reg_0x04(offs_t offs, u8 data) } // bg tiles -void jackhouse_state::vp_reg_0x05(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x05(offs_t offset, u8 data) { - m_bgvideoram[offs][m_fgt_addr] = data; + m_bgvideoram[offset][m_fgt_addr] = data; m_bg_tilemap->mark_tile_dirty(m_fgt_addr); - if (offs == 1) + if (offset == 1) m_bgt_addr++; } // bg color -void jackhouse_state::vp_reg_0x07(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x07(u8 data) { m_bgvideoram[2][m_bgc_addr] = data; m_bg_tilemap->mark_tile_dirty(m_bgc_addr); m_bgc_addr++; } -void jackhouse_state::vp_reg_0x08(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x08(u8 data) { m_cont++; if (m_cont == 0x3f) vp_playfield(m_color_dst); } -void jackhouse_state::vp_reg_0x0f(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x0f(u8 data) { m_gfxA_src_low = data; } -void jackhouse_state::vp_reg_0x10(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x10(u8 data) { m_gfxA_src_high = data; } -void jackhouse_state::vp_reg_0x12(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x12(u8 data) { m_color_dst = data; } -void jackhouse_state::vp_reg_0x13(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x13(u8 data) { m_gfxB_src_low = data; } -void jackhouse_state::vp_reg_0x14(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x14(u8 data) { m_gfxB_src_high = data; } -void jackhouse_state::vp_reg_0x15(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x15(u8 data) { m_vram_dest_col = data; } -void jackhouse_state::vp_reg_0x16(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x16(u8 data) { m_vram_dest_row = data; } -void jackhouse_state::vp_reg_0x17(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x17(u8 data) { m_col_end = data; } -void jackhouse_state::vp_reg_0x18(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x18(u8 data) { m_row_end = data; vp_exec(data); } -void jackhouse_state::vp_reg_0x1a(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x1a(u8 data) { m_cont = 0; } -void jackhouse_state::vp_reg_0x1b(offs_t offs, u8 data) +void jackhouse_state::vp_reg_0x1b(u8 data) { m_cmd_mode = data; }