diff options
Diffstat (limited to 'src/mame/drivers/nbmj8688.c')
-rw-r--r-- | src/mame/drivers/nbmj8688.c | 602 |
1 files changed, 136 insertions, 466 deletions
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index a0b8288f0ba..42e6c03c2da 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -551,7 +551,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( mjsikaku ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -577,7 +577,7 @@ static INPUT_PORTS_START( mjsikaku ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -603,7 +603,7 @@ static INPUT_PORTS_START( mjsikaku ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -613,22 +613,12 @@ static INPUT_PORTS_START( mjsikaku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( mmsikaku ) #if 1 - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -654,7 +644,7 @@ static INPUT_PORTS_START( mmsikaku ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -681,7 +671,7 @@ static INPUT_PORTS_START( mmsikaku ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) #else - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x00, "Game Out" ) PORT_DIPSETTING( 0x07, "60% (Hard)" ) PORT_DIPSETTING( 0x06, "65%" ) @@ -705,7 +695,7 @@ static INPUT_PORTS_START( mmsikaku ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x00, "Rate Up" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -718,7 +708,7 @@ static INPUT_PORTS_START( mmsikaku ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) #endif - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -728,21 +718,11 @@ static INPUT_PORTS_START( mmsikaku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( otonano ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -768,7 +748,7 @@ static INPUT_PORTS_START( otonano ) PORT_DIPSETTING( 0x80, "100 Yen" ) PORT_DIPSETTING( 0x00, "50 Yen" ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "Character Display Test" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -794,7 +774,7 @@ static INPUT_PORTS_START( otonano ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -804,21 +784,11 @@ static INPUT_PORTS_START( otonano ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( mjcamera ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -844,7 +814,7 @@ static INPUT_PORTS_START( mjcamera ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -870,7 +840,7 @@ static INPUT_PORTS_START( mjcamera ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -880,21 +850,11 @@ static INPUT_PORTS_START( mjcamera ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( kaguya ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) @@ -919,7 +879,7 @@ static INPUT_PORTS_START( kaguya ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x00, "Nudity graphic on bet" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -943,7 +903,7 @@ static INPUT_PORTS_START( kaguya ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) // @@ -954,21 +914,11 @@ static INPUT_PORTS_START( kaguya ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( kaguya2 ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -994,7 +944,7 @@ static INPUT_PORTS_START( kaguya2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1020,7 +970,7 @@ static INPUT_PORTS_START( kaguya2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1031,21 +981,11 @@ static INPUT_PORTS_START( kaguya2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( kanatuen ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1071,7 +1011,7 @@ static INPUT_PORTS_START( kanatuen ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1097,7 +1037,7 @@ static INPUT_PORTS_START( kanatuen ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) // @@ -1108,21 +1048,11 @@ static INPUT_PORTS_START( kanatuen ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( kyuhito ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1148,7 +1078,7 @@ static INPUT_PORTS_START( kyuhito ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1174,7 +1104,7 @@ static INPUT_PORTS_START( kyuhito ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) // @@ -1185,21 +1115,11 @@ static INPUT_PORTS_START( kyuhito ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( idhimitu ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1225,7 +1145,7 @@ static INPUT_PORTS_START( idhimitu ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1251,7 +1171,7 @@ static INPUT_PORTS_START( idhimitu ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) // @@ -1262,21 +1182,11 @@ static INPUT_PORTS_START( idhimitu ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( secolove ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -1302,7 +1212,7 @@ static INPUT_PORTS_START( secolove ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x00, "Number of last chance" ) PORT_DIPSETTING( 0x03, "0" ) PORT_DIPSETTING( 0x02, "3" ) @@ -1327,7 +1237,7 @@ static INPUT_PORTS_START( secolove ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1337,21 +1247,11 @@ static INPUT_PORTS_START( secolove ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( citylove ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x0f, "1 (Easy)" ) PORT_DIPSETTING( 0x0e, "2" ) @@ -1381,7 +1281,7 @@ static INPUT_PORTS_START( citylove ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x00, "Number of last chance" ) PORT_DIPSETTING( 0x03, "0" ) PORT_DIPSETTING( 0x02, "3" ) @@ -1405,7 +1305,7 @@ static INPUT_PORTS_START( citylove ) PORT_DIPSETTING( 0x40, "TSUMO 7" ) PORT_DIPSETTING( 0x00, "HAIPAI" ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1415,22 +1315,12 @@ static INPUT_PORTS_START( citylove ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( mcitylov ) #if 1 - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1456,7 +1346,7 @@ static INPUT_PORTS_START( mcitylov ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1483,7 +1373,7 @@ static INPUT_PORTS_START( mcitylov ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) #else - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x00, "Game Out" ) PORT_DIPSETTING( 0x07, "60% (Hard)" ) PORT_DIPSETTING( 0x06, "65%" ) @@ -1507,7 +1397,7 @@ static INPUT_PORTS_START( mcitylov ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x00, "Rate Up" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1520,7 +1410,7 @@ static INPUT_PORTS_START( mcitylov ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) #endif - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1530,21 +1420,11 @@ static INPUT_PORTS_START( mcitylov ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( seiha ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Hard)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -1570,7 +1450,7 @@ static INPUT_PORTS_START( seiha ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1596,7 +1476,7 @@ static INPUT_PORTS_START( seiha ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1606,21 +1486,11 @@ static INPUT_PORTS_START( seiha ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( seiham ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x00, "Game Out" ) PORT_DIPSETTING( 0x07, "60% (Hard)" ) PORT_DIPSETTING( 0x06, "65%" ) @@ -1644,7 +1514,7 @@ static INPUT_PORTS_START( seiham ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x00, "Rate Up" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1670,7 +1540,7 @@ static INPUT_PORTS_START( seiham ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1680,21 +1550,11 @@ static INPUT_PORTS_START( seiham ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( iemoto ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Hard)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -1720,7 +1580,7 @@ static INPUT_PORTS_START( iemoto ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1746,7 +1606,7 @@ static INPUT_PORTS_START( iemoto ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1756,21 +1616,11 @@ static INPUT_PORTS_START( iemoto ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( iemotom ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1796,7 +1646,7 @@ static INPUT_PORTS_START( iemotom ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1822,7 +1672,7 @@ static INPUT_PORTS_START( iemotom ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1832,21 +1682,11 @@ static INPUT_PORTS_START( iemotom ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( ryuuha ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1872,7 +1712,7 @@ static INPUT_PORTS_START( ryuuha ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "Character Display Test" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1898,7 +1738,7 @@ static INPUT_PORTS_START( ryuuha ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1908,21 +1748,11 @@ static INPUT_PORTS_START( ryuuha ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( bijokkoy ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -1948,7 +1778,7 @@ static INPUT_PORTS_START( bijokkoy ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x00, "Number of last chance" ) PORT_DIPSETTING( 0x03, "0" ) PORT_DIPSETTING( 0x02, "2" ) @@ -1973,7 +1803,7 @@ static INPUT_PORTS_START( bijokkoy ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -1983,21 +1813,11 @@ static INPUT_PORTS_START( bijokkoy ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( bijokkog ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -2023,7 +1843,7 @@ static INPUT_PORTS_START( bijokkog ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x00, "Number of last chance" ) PORT_DIPSETTING( 0x03, "0" ) PORT_DIPSETTING( 0x02, "2" ) @@ -2047,7 +1867,7 @@ static INPUT_PORTS_START( bijokkog ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2057,21 +1877,11 @@ static INPUT_PORTS_START( bijokkog ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( housemnq ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -2097,7 +1907,7 @@ static INPUT_PORTS_START( housemnq ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x03, "Time" ) PORT_DIPSETTING( 0x03, "120" ) PORT_DIPSETTING( 0x02, "100" ) @@ -2121,7 +1931,7 @@ static INPUT_PORTS_START( housemnq ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2131,21 +1941,11 @@ static INPUT_PORTS_START( housemnq ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( housemn2 ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -2171,7 +1971,7 @@ static INPUT_PORTS_START( housemn2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x03, "Time" ) PORT_DIPSETTING( 0x03, "120" ) PORT_DIPSETTING( 0x02, "100" ) @@ -2194,7 +1994,7 @@ static INPUT_PORTS_START( housemn2 ) // PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2204,21 +2004,11 @@ static INPUT_PORTS_START( housemn2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( orangec ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2244,7 +2034,7 @@ static INPUT_PORTS_START( orangec ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2270,7 +2060,7 @@ static INPUT_PORTS_START( orangec ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2280,21 +2070,11 @@ static INPUT_PORTS_START( orangec ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( orangeci ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2320,7 +2100,7 @@ static INPUT_PORTS_START( orangeci ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2346,7 +2126,7 @@ static INPUT_PORTS_START( orangeci ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2356,21 +2136,11 @@ static INPUT_PORTS_START( orangeci ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( vipclub ) - PORT_START /* (1) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2396,7 +2166,7 @@ static INPUT_PORTS_START( vipclub ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2422,7 +2192,7 @@ static INPUT_PORTS_START( vipclub ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2432,21 +2202,11 @@ static INPUT_PORTS_START( vipclub ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( livegal ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2472,7 +2232,7 @@ static INPUT_PORTS_START( livegal ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2498,7 +2258,7 @@ static INPUT_PORTS_START( livegal ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2508,21 +2268,11 @@ static INPUT_PORTS_START( livegal ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( ojousan ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) PORT_DIPSETTING( 0x06, "2" ) @@ -2548,7 +2298,7 @@ static INPUT_PORTS_START( ojousan ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2574,7 +2324,7 @@ static INPUT_PORTS_START( ojousan ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2584,21 +2334,11 @@ static INPUT_PORTS_START( ojousan ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( ojousanm ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2624,7 +2364,7 @@ static INPUT_PORTS_START( ojousanm ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2650,7 +2390,7 @@ static INPUT_PORTS_START( ojousanm ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2660,21 +2400,11 @@ static INPUT_PORTS_START( ojousanm ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( korinai ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2700,7 +2430,7 @@ static INPUT_PORTS_START( korinai ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2726,7 +2456,7 @@ static INPUT_PORTS_START( korinai ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2736,21 +2466,11 @@ static INPUT_PORTS_START( korinai ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( korinaim ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2776,7 +2496,7 @@ static INPUT_PORTS_START( korinaim ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2802,7 +2522,7 @@ static INPUT_PORTS_START( korinaim ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2812,21 +2532,11 @@ static INPUT_PORTS_START( korinaim ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( crystalg ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2852,7 +2562,7 @@ static INPUT_PORTS_START( crystalg ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2878,7 +2588,7 @@ static INPUT_PORTS_START( crystalg ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2888,21 +2598,11 @@ static INPUT_PORTS_START( crystalg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // OPTION (?) - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( crystal2 ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x0f, 0x0d, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x0d, "1 (Easy)" ) PORT_DIPSETTING( 0x0a, "2" ) @@ -2926,7 +2626,7 @@ static INPUT_PORTS_START( crystal2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x03, 0x00, "Number of last chance" ) PORT_DIPSETTING( 0x03, "0" ) PORT_DIPSETTING( 0x02, "1" ) @@ -2950,7 +2650,7 @@ static INPUT_PORTS_START( crystal2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -2960,21 +2660,11 @@ static INPUT_PORTS_START( crystal2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // OPTION (?) - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( apparel ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3000,7 +2690,7 @@ static INPUT_PORTS_START( apparel ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3026,7 +2716,7 @@ static INPUT_PORTS_START( apparel ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -3036,21 +2726,11 @@ static INPUT_PORTS_START( apparel ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END static INPUT_PORTS_START( nightlov ) - PORT_START /* (0) DIPSW-A */ + PORT_START_TAG("DSWA") /* (0) DIPSW-A */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3076,7 +2756,7 @@ static INPUT_PORTS_START( nightlov ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (1) DIPSW-B */ + PORT_START_TAG("DSWB") /* (1) DIPSW-B */ PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3102,7 +2782,7 @@ static INPUT_PORTS_START( nightlov ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* (2) PORT 0 */ + PORT_START_TAG("SYSTEM") /* (2) PORT 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET @@ -3112,17 +2792,7 @@ static INPUT_PORTS_START( nightlov ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE - NBMJCTRL_PORT1 /* (3) PORT 1-1 */ - NBMJCTRL_PORT2 /* (4) PORT 1-2 */ - NBMJCTRL_PORT3 /* (5) PORT 1-3 */ - NBMJCTRL_PORT4 /* (6) PORT 1-4 */ - NBMJCTRL_PORT5 /* (7) PORT 1-5 */ - - NBMJCTRL_PORT6 /* (8) PORT 2-1 */ - NBMJCTRL_PORT7 /* (9) PORT 2-2 */ - NBMJCTRL_PORT8 /* (10) PORT 2-3 */ - NBMJCTRL_PORT9 /* (11) PORT 2-4 */ - NBMJCTRL_PORT10 /* (12) PORT 2-5 */ + PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END |