summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/royalmah.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/royalmah.c')
-rw-r--r--src/mame/drivers/royalmah.c1471
1 files changed, 186 insertions, 1285 deletions
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 1a9f2314e52..d22552fa0e6 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -225,26 +225,26 @@ static WRITE8_HANDLER( input_port_select_w )
static READ8_HANDLER( royalmah_player_1_port_r )
{
- int ret = (input_port_read_indexed(machine,0) & 0xc0) | 0x3f;
+ int ret = (input_port_read(machine, "KEY0") & 0xc0) | 0x3f;
- if ((input_port_select & 0x01) == 0) ret &= input_port_read_indexed(machine,0);
- if ((input_port_select & 0x02) == 0) ret &= input_port_read_indexed(machine,1);
- if ((input_port_select & 0x04) == 0) ret &= input_port_read_indexed(machine,2);
- if ((input_port_select & 0x08) == 0) ret &= input_port_read_indexed(machine,3);
- if ((input_port_select & 0x10) == 0) ret &= input_port_read_indexed(machine,4);
+ if ((input_port_select & 0x01) == 0) ret &= input_port_read(machine, "KEY0");
+ if ((input_port_select & 0x02) == 0) ret &= input_port_read(machine, "KEY1");
+ if ((input_port_select & 0x04) == 0) ret &= input_port_read(machine, "KEY2");
+ if ((input_port_select & 0x08) == 0) ret &= input_port_read(machine, "KEY3");
+ if ((input_port_select & 0x10) == 0) ret &= input_port_read(machine, "KEY4");
return ret;
}
static READ8_HANDLER( royalmah_player_2_port_r )
{
- int ret = (input_port_read_indexed(machine,5) & 0xc0) | 0x3f;
+ int ret = (input_port_read(machine, "KEY5") & 0xc0) | 0x3f;
- if ((input_port_select & 0x01) == 0) ret &= input_port_read_indexed(machine,5);
- if ((input_port_select & 0x02) == 0) ret &= input_port_read_indexed(machine,6);
- if ((input_port_select & 0x04) == 0) ret &= input_port_read_indexed(machine,7);
- if ((input_port_select & 0x08) == 0) ret &= input_port_read_indexed(machine,8);
- if ((input_port_select & 0x10) == 0) ret &= input_port_read_indexed(machine,9);
+ if ((input_port_select & 0x01) == 0) ret &= input_port_read(machine, "KEY5");
+ if ((input_port_select & 0x02) == 0) ret &= input_port_read(machine, "KEY6");
+ if ((input_port_select & 0x04) == 0) ret &= input_port_read(machine, "KEY7");
+ if ((input_port_select & 0x08) == 0) ret &= input_port_read(machine, "KEY8");
+ if ((input_port_select & 0x10) == 0) ret &= input_port_read(machine, "KEY9");
return ret;
}
@@ -255,9 +255,9 @@ static READ8_HANDLER ( majs101b_dsw_r )
{
switch (dsw_select)
{
- case 0x00: return input_port_read_indexed(machine, 13); /* DSW3 */
- case 0x20: return input_port_read_indexed(machine, 14); /* DSW4 */
- case 0x40: return input_port_read_indexed(machine, 12); /* DSW2 */
+ case 0x00: return input_port_read(machine, "DSW3"); /* DSW3 */
+ case 0x20: return input_port_read(machine, "DSW4"); /* DSW4 */
+ case 0x40: return input_port_read(machine, "DSW2"); /* DSW2 */
}
return 0;
}
@@ -275,9 +275,9 @@ static READ8_HANDLER ( suzume_dsw_r )
{
switch (suzume_bank)
{
- case 0x08: return input_port_read_indexed(machine, 14); /* DSW4 */
- case 0x10: return input_port_read_indexed(machine, 13); /* DSW3 */
- case 0x18: return input_port_read_indexed(machine, 12); /* DSW2 */
+ case 0x08: return input_port_read(machine, "DSW4"); /* DSW4 */
+ case 0x10: return input_port_read(machine, "DSW3"); /* DSW3 */
+ case 0x18: return input_port_read(machine, "DSW2"); /* DSW2 */
}
return 0;
}
@@ -383,8 +383,8 @@ static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
ADDRESS_MAP_END
static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
@@ -392,10 +392,10 @@ static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
- AM_RANGE( 0x12, 0x12 ) AM_READ( input_port_12_r )
- AM_RANGE( 0x13, 0x13 ) AM_READ( input_port_13_r )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
+ AM_RANGE( 0x12, 0x12 ) AM_READ_PORT("DSW2")
+ AM_RANGE( 0x13, 0x13 ) AM_READ_PORT("DSW3")
ADDRESS_MAP_END
static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
@@ -403,8 +403,8 @@ static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x80, 0x80 ) AM_READ( suzume_dsw_r )
AM_RANGE( 0x81, 0x81 ) AM_WRITE( suzume_bank_w )
ADDRESS_MAP_END
@@ -414,10 +414,10 @@ static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE(AY8910_control_port_0_w)
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
- AM_RANGE( 0x85, 0x85 ) AM_READ( input_port_12_r ) // DSW2
- AM_RANGE( 0x86, 0x86 ) AM_READ( input_port_13_r ) // DSW3
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
+ AM_RANGE( 0x85, 0x85 ) AM_READ_PORT("DSW2") // DSW2
+ AM_RANGE( 0x86, 0x86 ) AM_READ_PORT("DSW3") // DSW3
AM_RANGE( 0x87, 0x87 ) AM_WRITE( dynax_bank_w )
ADDRESS_MAP_END
@@ -426,11 +426,11 @@ static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x61, 0x61 ) AM_WRITE(tontonb_bank_w)
- AM_RANGE( 0x62, 0x62 ) AM_READ( input_port_12_r ) // DSW2
- AM_RANGE( 0x63, 0x63 ) AM_READ( input_port_13_r ) // DSW3
+ AM_RANGE( 0x62, 0x62 ) AM_READ_PORT("DSW2") // DSW2
+ AM_RANGE( 0x63, 0x63 ) AM_READ_PORT("DSW3") // DSW3
ADDRESS_MAP_END
static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
@@ -438,11 +438,11 @@ static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x44, 0x44 ) AM_WRITE( tontonb_bank_w )
- AM_RANGE( 0x46, 0x46 ) AM_READ( input_port_13_r ) // DSW2
- AM_RANGE( 0x47, 0x47 ) AM_READ( input_port_12_r ) // DSW3
+ AM_RANGE( 0x46, 0x46 ) AM_READ_PORT("DSW2") // DSW2
+ AM_RANGE( 0x47, 0x47 ) AM_READ_PORT("DSW3") // DSW3
ADDRESS_MAP_END
static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
@@ -450,8 +450,8 @@ static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x00, 0x00 ) AM_READWRITE( majs101b_dsw_r, dynax_bank_w )
ADDRESS_MAP_END
@@ -460,12 +460,12 @@ static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
-// AM_RANGE( 0x10, 0x10 ) AM_READ( input_port_11_r )
+// AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1")
AM_RANGE( 0x10, 0x10 ) AM_WRITE( mjderngr_coin_w ) // palette bank is set separately
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x20, 0x20 ) AM_WRITE( dynax_bank_w )
- AM_RANGE( 0x40, 0x40 ) AM_READ( input_port_13_r ) // DSW2
- AM_RANGE( 0x4c, 0x4c ) AM_READ( input_port_12_r ) // DSW3
+ AM_RANGE( 0x40, 0x40 ) AM_READ_PORT("DSW3")
+ AM_RANGE( 0x4c, 0x4c ) AM_READ_PORT("DSW2")
AM_RANGE( 0x60, 0x60 ) AM_WRITE( mjderngr_palbank_w )
ADDRESS_MAP_END
@@ -475,9 +475,9 @@ static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x04, 0x04 ) AM_READ( input_port_12_r )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, mjapinky_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x04, 0x04 ) AM_READ_PORT("DSW2")
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( mjapinky_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
ADDRESS_MAP_END
/****************************************************************************
@@ -551,7 +551,7 @@ static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x83, 0x83 ) AM_WRITE( AY8910_control_port_0_w )
AM_RANGE( 0x93, 0x93 ) AM_WRITE( input_port_select_w )
AM_RANGE( 0xd8, 0xd8 ) AM_WRITE( janptr96_coin_counter_w )
- AM_RANGE( 0xd9, 0xd9 ) AM_READ( input_port_10_r )
+ AM_RANGE( 0xd9, 0xd9 ) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
/****************************************************************************
@@ -576,10 +576,10 @@ static READ8_HANDLER( mjifb_rom_io_r )
switch(offset)
{
- case 0x8000: return input_port_read_indexed(machine, 14); // dsw 4
- case 0x8200: return input_port_read_indexed(machine, 13); // dsw 3
- case 0x9001: return AY8910_read_port_0_r(machine,0); // inputs
- case 0x9011: return input_port_read_indexed(machine, 10);
+ case 0x8000: return input_port_read(machine, "DSW4"); // dsw 4
+ case 0x8200: return input_port_read(machine, "DSW3"); // dsw 3
+ case 0x9001: return AY8910_read_port_0_r(machine, 0); // inputs
+ case 0x9011: return input_port_read(machine, "SYSTEM");
}
logerror("%04X: unmapped input read at %04X\n", activecpu_get_pc(), offset);
@@ -628,19 +628,19 @@ ADDRESS_MAP_END
static READ8_HANDLER( mjifb_p3_r )
{
- return input_port_read_indexed(machine, 11) >> 6;
+ return input_port_read(machine, "PORT3_5") >> 6;
}
static READ8_HANDLER( mjifb_p5_r )
{
- return input_port_read_indexed(machine, 11);
+ return input_port_read(machine, "PORT3_5");
}
static READ8_HANDLER( mjifb_p6_r )
{
- return input_port_read_indexed(machine, 12);
+ return input_port_read(machine, "PORT6_7");
}
static READ8_HANDLER( mjifb_p7_r )
{
- return input_port_read_indexed(machine, 12) >> 4;
+ return input_port_read(machine, "PORT6_7") >> 4;
}
static READ8_HANDLER( mjifb_p8_r )
{
@@ -683,10 +683,10 @@ static READ8_HANDLER( mjdejavu_rom_io_r )
switch(offset)
{
- case 0x8000: return input_port_read_indexed(machine, 14); // dsw 2
- case 0x8001: return input_port_read_indexed(machine, 13); // dsw 1
- case 0x9001: return AY8910_read_port_0_r(machine,0); // inputs
- case 0x9011: return input_port_read_indexed(machine, 10);
+ case 0x8000: return input_port_read(machine, "DSW2"); // dsw 2
+ case 0x8001: return input_port_read(machine, "DSW1"); // dsw 1
+ case 0x9001: return AY8910_read_port_0_r(machine, 0); // inputs
+ case 0x9011: return input_port_read(machine, "SYSTEM");
}
logerror("%04X: unmapped input read at %04X\n", activecpu_get_pc(), offset);
@@ -756,7 +756,7 @@ static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x6fc2, 0x6fc2 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x6fc3, 0x6fc3 ) AM_WRITE( AY8910_control_port_0_w )
AM_RANGE( 0x6fd0, 0x6fd0 ) AM_WRITE( janptr96_coin_counter_w )
- AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x6fe0, 0x6fef ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w)
AM_RANGE( 0x6ff0, 0x6ff0 ) AM_READWRITE( janptr96_dsw_r, janptr96_dswsel_w )
AM_RANGE( 0x6ff1, 0x6ff1 ) AM_WRITE( mjderngr_palbank_w )
@@ -825,7 +825,7 @@ static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x7fc2, 0x7fc2 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x7fc3, 0x7fc3 ) AM_WRITE( AY8910_control_port_0_w )
AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w )
- AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READWRITE( input_port_10_r, SMH_NOP )
+ AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READ_PORT("SYSTEM") AM_WRITENOP
AM_RANGE( 0x7fd3, 0x7fd3 ) AM_WRITE( input_port_select_w )
AM_RANGE( 0x7fe0, 0x7fe0 ) AM_READ( cafetime_dsw_r )
AM_RANGE( 0x7fe1, 0x7fe1 ) AM_WRITE( cafetime_dsw_w )
@@ -844,226 +844,119 @@ static ADDRESS_MAP_START( cafetime_iomap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static INPUT_PORTS_START( royalmah )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+
+static INPUT_PORTS_START( mjctrl1 )
+ PORT_START_TAG("KEY0") /* P1 IN0 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
+
+ PORT_START_TAG("KEY1") /* P1 IN1 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ PORT_START_TAG("KEY2") /* P1 IN2 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ PORT_START_TAG("KEY3") /* P1 IN3 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
+ PORT_START_TAG("KEY4") /* P1 IN4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
+ PORT_START_TAG("KEY5") /* P2 IN0 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY6") /* P2 IN1 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
+ PORT_START_TAG("KEY7") /* P2 IN2 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
+ PORT_START_TAG("KEY8") /* P2 IN3 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
+ PORT_START_TAG("KEY9") /* P2 IN4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN10 */
+ PORT_START_TAG("SYSTEM") /* IN10 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW (inport $10) */
- PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
- PORT_DIPSETTING( 0x0f, "96%" )
- PORT_DIPSETTING( 0x0e, "93%" )
- PORT_DIPSETTING( 0x0d, "90%" )
- PORT_DIPSETTING( 0x0c, "87%" )
- PORT_DIPSETTING( 0x0b, "84%" )
- PORT_DIPSETTING( 0x0a, "81%" )
- PORT_DIPSETTING( 0x09, "78%" )
- PORT_DIPSETTING( 0x08, "75%" )
- PORT_DIPSETTING( 0x07, "71%" )
- PORT_DIPSETTING( 0x06, "68%" )
- PORT_DIPSETTING( 0x05, "65%" )
- PORT_DIPSETTING( 0x04, "62%" )
- PORT_DIPSETTING( 0x03, "59%" )
- PORT_DIPSETTING( 0x02, "56%" )
- PORT_DIPSETTING( 0x01, "53%" )
- PORT_DIPSETTING( 0x00, "50%" )
- PORT_DIPNAME( 0x30, 0x30, "Maximum Bet" )
- PORT_DIPSETTING( 0x00, "1" )
- PORT_DIPSETTING( 0x10, "5" )
- PORT_DIPSETTING( 0x20, "10" )
- PORT_DIPSETTING( 0x30, "20" )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x80, DEF_STR( On ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( janyoup2 )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
+static INPUT_PORTS_START( mjctrl2 )
+ PORT_INCLUDE( mjctrl1 )
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_MODIFY("KEY0")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+INPUT_PORTS_END
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+static INPUT_PORTS_START( royalmah )
+ PORT_INCLUDE( mjctrl1 )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_MODIFY("KEY5")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW (inport $10) */
+ PORT_START_TAG("DSW1") /* DSW (inport $10) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1092,8 +985,12 @@ static INPUT_PORTS_START( janyoup2 )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
+INPUT_PORTS_END
- PORT_START /* DSW (inport $12) */
+static INPUT_PORTS_START( janyoup2 )
+ PORT_INCLUDE( royalmah )
+
+ PORT_START_TAG("DSW2") /* DSW (inport $12) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1119,7 +1016,7 @@ static INPUT_PORTS_START( janyoup2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW (inport $13) */
+ PORT_START_TAG("DSW3") /* DSW (inport $13) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1147,100 +1044,9 @@ static INPUT_PORTS_START( janyoup2 )
INPUT_PORTS_END
static INPUT_PORTS_START( suzume )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50%" )
PORT_DIPSETTING( 0x01, "53%" )
@@ -1270,7 +1076,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 */
+ PORT_START_TAG("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" )
PORT_DIPSETTING( 0x00, "50 30 20 15 8 6 3 2" )
@@ -1295,7 +1101,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW3 */
+ PORT_START_TAG("DSW3") /* DSW3 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1320,7 +1126,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW4 */
+ PORT_START_TAG("DSW4") /* DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1345,100 +1151,9 @@ static INPUT_PORTS_START( suzume )
INPUT_PORTS_END
static INPUT_PORTS_START( tontonb )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW1 (inport $10 -> 0x73b0) */
+ PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x73b0) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1468,7 +1183,7 @@ static INPUT_PORTS_START( tontonb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW3 (inport $47 -> 0x73b1) */
+ PORT_START_TAG("DSW3") /* DSW3 (inport $47 -> 0x73b1) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x0e6d
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x4e7d
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x4e4d
@@ -1492,7 +1207,7 @@ static INPUT_PORTS_START( tontonb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW2 (inport $46 -> 0x73b2) */
+ PORT_START_TAG("DSW2") /* DSW2 (inport $46 -> 0x73b2) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1520,100 +1235,9 @@ static INPUT_PORTS_START( tontonb )
INPUT_PORTS_END
static INPUT_PORTS_START( mjdiplob )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW1 (inport $10 -> 0x76fa) */
+ PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x76fa) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1643,7 +1267,7 @@ static INPUT_PORTS_START( mjdiplob )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 (inport $62 -> 0x76fb) */
+ PORT_START_TAG("DSW2") /* DSW2 (inport $62 -> 0x76fb) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x09cd
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x4b82
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x4b52
@@ -1667,7 +1291,7 @@ static INPUT_PORTS_START( mjdiplob )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW3 (inport $63 -> 0x76fc) */
+ PORT_START_TAG("DSW3") /* DSW3 (inport $63 -> 0x76fc) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1695,100 +1319,9 @@ static INPUT_PORTS_START( mjdiplob )
INPUT_PORTS_END
static INPUT_PORTS_START( majs101b )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW1 (inport $10 -> 0x76fd) */
+ PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x76fd) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1818,7 +1351,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 (inport $00 (after out 0,$40) -> 0x76fa) */
+ PORT_START_TAG("DSW2") /* DSW2 (inport $00 (after out 0,$40) -> 0x76fa) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x14e4
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x1539
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x1509
@@ -1843,7 +1376,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x00, "Black" )
PORT_DIPSETTING( 0x80, "Gray" )
- PORT_START /* DSW3 (inport $00 (after out 0,$00) -> 0x76fc) */
+ PORT_START_TAG("DSW3") /* DSW3 (inport $00 (after out 0,$00) -> 0x76fc) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1869,7 +1402,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW4 (inport $00 (after out 0,$20) -> 0x76fb) */
+ PORT_START_TAG("DSW4") /* DSW4 (inport $00 (after out 0,$20) -> 0x76fb) */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Unknown ) ) // stored at 0x702f - check code at 0x1713,
PORT_DIPSETTING( 0x00, "0" ) // 0x33d1, 0x3408, 0x3415, 0x347c, 0x3492, 0x350d,
PORT_DIPSETTING( 0x01, "1" ) // 0x4af9, 0x4b1f and 0x61f6
@@ -1894,98 +1427,7 @@ static INPUT_PORTS_START( majs101b )
INPUT_PORTS_END
static INPUT_PORTS_START( mjapinky )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
PORT_START_TAG("DSW1") /* IN11 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
@@ -2063,98 +1505,7 @@ static INPUT_PORTS_START( mjapinky )
INPUT_PORTS_END
static INPUT_PORTS_START( janptr96 )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl1 )
PORT_START_TAG("DSW4") /* IN11 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
@@ -2287,100 +1638,9 @@ static INPUT_PORTS_START( janptr96 )
INPUT_PORTS_END
static INPUT_PORTS_START( mjifb )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START // IN10 - DSW1 (P3 & P5)
+ PORT_START_TAG("PORT3_5") // IN10 - DSW1 (P3 & P5)
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -2409,7 +1669,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START // IN11 - DSW2 (P6 & P7)
+ PORT_START_TAG("PORT6_7") // IN11 - DSW2 (P6 & P7)
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x00, "50 30 15 8 5 3 2 1" )
@@ -2434,7 +1694,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x00, "1/4" )
PORT_DIPSETTING( 0x80, "2/4" )
- PORT_START // IN13 - DSW3 ($8200)
+ PORT_START_TAG("DSW3") // IN13 - DSW3 ($8200)
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2460,7 +1720,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x80, "Black" )
PORT_DIPSETTING( 0x00, "Blue" )
- PORT_START // IN14 - DSW4 ($8000)
+ PORT_START_TAG("DSW4") // IN14 - DSW4 ($8000)
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2488,98 +1748,7 @@ static INPUT_PORTS_START( mjifb )
INPUT_PORTS_END
static INPUT_PORTS_START( mjtensin )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl1 )
PORT_START_TAG("DSW4") /* IN11 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
@@ -2710,98 +1879,7 @@ static INPUT_PORTS_START( mjtensin )
INPUT_PORTS_END
static INPUT_PORTS_START( cafetime )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
PORT_START_TAG("DSW1") /* IN11 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
@@ -2935,100 +2013,14 @@ static INPUT_PORTS_START( cafetime )
INPUT_PORTS_END
static INPUT_PORTS_START( ippatsu )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl1 )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_MODIFY("KEY5")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW (inport $10) */
+ PORT_START_TAG("DSW1") /* DSW (inport $10) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -3058,7 +2050,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START /* DSW (inport $12) */
+ PORT_START_TAG("DSW2") /* DSW (inport $12) */
PORT_DIPNAME( 0x03, 0x03, "Cut" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x02, "2 Bai" )
@@ -3081,7 +2073,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW (inport $13) */
+ PORT_START_TAG("DSW3") /* DSW (inport $13) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0*" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -3108,100 +2100,9 @@ static INPUT_PORTS_START( ippatsu )
INPUT_PORTS_END
static INPUT_PORTS_START( mjdejavu )
- PORT_START /* P1 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START // IN11 - DSW3 (P3 & P5)
+ PORT_START_TAG("PORT3_5") // IN11 - DSW3 (P3 & P5)
PORT_DIPNAME( 0x03, 0x03, "Unknown 3-0&1*" )
PORT_DIPSETTING( 0x00, "1 1" )
PORT_DIPSETTING( 0x02, "3 4" )
@@ -3226,7 +2127,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN12 - DSW4 (P6 & P7)
+ PORT_START_TAG("PORT6_7") // IN12 - DSW4 (P6 & P7)
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3252,7 +2153,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN13 - DSW1 ($8001)
+ PORT_START_TAG("DSW1") // IN13 - DSW1 ($8001)
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -3282,7 +2183,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, "Gray" )
PORT_DIPSETTING( 0x00, "Black" )
- PORT_START // IN14 - DSW2 ($8000)
+ PORT_START_TAG("DSW2") // IN14 - DSW2 ($8000)
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" )