diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index f4dedb3ea87..c388117f336 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -5,7 +5,7 @@ and many other Dyna/Dynax games running in similar bare-bones hardware driver by Zsolt Vasvari, Nicola Salmoria, Luca Elia -CPU: Z80 / TLCS-90 +CPU: Z80 or TLCS-90 Video: Framebuffer Sound: AY-3-8910 OSC: 18.432MHz and 8MHz @@ -1205,7 +1205,7 @@ static INPUT_PORTS_START( mjctrl1 ) 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( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_O) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8) PORT_START("KEY1") /* P1 IN1 */ @@ -1247,7 +1247,7 @@ static INPUT_PORTS_START( mjctrl1 ) 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_CODE(KEYCODE_3) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1257,7 +1257,7 @@ static INPUT_PORTS_START( mjctrl1 ) 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( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("KEY7") /* P2 IN2 */ @@ -1285,9 +1285,9 @@ static INPUT_PORTS_START( mjctrl1 ) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("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_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) /* "Note" ("Paper Money") = 10 Credits */ + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Memory Reset */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Analizer (Statistics) */ PORT_SERVICE( 0x08, IP_ACTIVE_HIGH ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END @@ -1297,7 +1297,7 @@ static INPUT_PORTS_START( mjctrl2 ) PORT_INCLUDE( mjctrl1 ) PORT_MODIFY("KEY0") - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_O) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -1306,7 +1306,7 @@ static INPUT_PORTS_START( royalmah ) 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_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) // "COIN1", but not working PORT_START("DSW1") /* DSW (inport $10) */ PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" ) @@ -2266,10 +2266,10 @@ static INPUT_PORTS_START( janptr96 ) PORT_DIPSETTING( 0x20, "2 3 6 8 12 15 30 50" ) PORT_DIPSETTING( 0x10, "1 2 3 5 10 25 50 100" ) PORT_DIPNAME( 0xc0, 0xc0, "Maximum Bet" ) - PORT_DIPSETTING( 0x00, "20" ) - PORT_DIPSETTING( 0x40, "10" ) - PORT_DIPSETTING( 0x80, "5" ) PORT_DIPSETTING( 0xc0, "1" ) + PORT_DIPSETTING( 0x80, "5" ) + PORT_DIPSETTING( 0x40, "10" ) + PORT_DIPSETTING( 0x00, "20" ) PORT_START("DSWTOP") /* IN15 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) @@ -2678,7 +2678,7 @@ static INPUT_PORTS_START( ippatsu ) 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_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) // "COIN1", but not working PORT_START("DSW1") /* DSW (inport $10) */ @@ -2971,10 +2971,10 @@ static INPUT_PORTS_START( mjvegasa ) PORT_DIPSETTING( 0x01, "53%" ) PORT_DIPSETTING( 0x00, "50%" ) PORT_DIPNAME( 0x30, 0x30, "Odds Rate" ) - PORT_DIPSETTING( 0x30, "32 24 16 12 8 4 2 1" ) - PORT_DIPSETTING( 0x00, "50 30 15 8 5 3 2 1" ) - PORT_DIPSETTING( 0x10, "100 50 25 10 5 3 2 1" ) - PORT_DIPSETTING( 0x20, "200 100 50 10 5 3 2 1" ) + PORT_DIPSETTING( 0x30, "1 2 4 8 12 16 24 32" ) + PORT_DIPSETTING( 0x00, "1 2 3 5 8 15 30 50" ) + PORT_DIPSETTING( 0x10, "1 2 3 5 10 25 50 100" ) + PORT_DIPSETTING( 0x20, "1 2 3 5 10 50 100 200" ) PORT_DIPNAME( 0xc0, 0xc0, "Max Bet" ) PORT_DIPSETTING( 0xc0, "1" ) PORT_DIPSETTING( 0x80, "5" ) @@ -2994,13 +2994,13 @@ static INPUT_PORTS_START( mjvegasa ) PORT_DIPSETTING( 0x00, "5" ) PORT_DIPNAME( 0x70, 0x70, "YAKUMAN Bonus" ) PORT_DIPSETTING( 0x70, "Cut" ) - PORT_DIPSETTING( 0x60, "300" ) - PORT_DIPSETTING( 0x50, "500" ) - PORT_DIPSETTING( 0x40, "700" ) - PORT_DIPSETTING( 0x30, "1000" ) - PORT_DIPSETTING( 0x20, "1000?" ) - PORT_DIPSETTING( 0x10, "1000?" ) - PORT_DIPSETTING( 0x00, "1000?" ) + PORT_DIPSETTING( 0x60, "100?" ) + PORT_DIPSETTING( 0x50, "300" ) + PORT_DIPSETTING( 0x40, "500" ) + PORT_DIPSETTING( 0x30, "700" ) + PORT_DIPSETTING( 0x20, "1000" ) +// PORT_DIPSETTING( 0x10, "1000" ) +// PORT_DIPSETTING( 0x00, "1000" ) PORT_DIPNAME( 0x80, 0x80, "Unknown 2-7" ) PORT_DIPSETTING( 0x00, "1" ) PORT_DIPSETTING( 0x80, "2" ) @@ -3071,11 +3071,11 @@ static INPUT_PORTS_START( mjvegasa ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x10, 0x10, "Flip-Flop Key" ) - PORT_DIPSETTING( 0x10, "Flip-Flop" ) - PORT_DIPSETTING( 0x00, "Start" ) + PORT_DIPSETTING( 0x00, "Flip-Flop" ) + PORT_DIPSETTING( 0x10, "Start" ) PORT_DIPNAME( 0x20, 0x20, "Don Den Times" ) - PORT_DIPSETTING( 0x20, "5" ) - PORT_DIPSETTING( 0x00, "8" ) + PORT_DIPSETTING( 0x00, "5" ) + PORT_DIPSETTING( 0x20, "8" ) PORT_DIPNAME( 0x40, 0x40, "Unknown 4-8" ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) )