From 8cc6459f4c52f2620d813607027fd7275194fe4a Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 6 Feb 2022 13:23:59 +0100 Subject: mrdo: universal set protection is not same as taito's --- src/mame/drivers/mrdo.cpp | 300 ++++++++++++++++++++++++++-------------------- src/mame/includes/mrdo.h | 56 ++++++--- src/mame/video/mrdo.cpp | 75 ++---------- 3 files changed, 225 insertions(+), 206 deletions(-) diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index 642e88e821d..ba9552a6d48 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -31,30 +31,85 @@ is also 8106 and has the same sound chips. #include "speaker.h" -namespace { +void mrdo_state::machine_start() +{ + save_item(NAME(m_pal_u001)); +} + +void mrdo_state::machine_reset() +{ + // initial outputs are high on power-up + m_pal_u001 = 0xff; +} -constexpr XTAL MAIN_CLOCK = 8.2_MHz_XTAL; -constexpr XTAL VIDEO_CLOCK = 19.6_MHz_XTAL; +void mrdot_state::protection_w(uint8_t data) +{ + // protection, each write latches a new value on IC U001 (PAL16R6) + const uint8_t i9 = BIT(data,0); + const uint8_t i8 = BIT(data,1); +// const uint8_t i7 = BIT(data,2); pin 7 not used in equations + const uint8_t i6 = BIT(data,3); + const uint8_t i5 = BIT(data,4); + const uint8_t i4 = BIT(data,5); + const uint8_t i3 = BIT(data,6); + const uint8_t i2 = BIT(data,7); + + // equations extracted from dump using jedutil + const uint8_t t1 = i2 & (1^i3) & i4 & (1^i5) & (1^i6) & (1^i8) & i9; + const uint8_t t2 = (1^i2) & (1^i3) & i4 & i5 & (1^i6) & i8 & (1^i9); + const uint8_t t3 = i2 & i3 & (1^i4) & (1^i5) & i6 & (1^i8) & i9; + const uint8_t t4 = (1^i2) & i3 & i4 & (1^i5) & i6 & i8 & i9; + + const uint8_t r12 = 0; + const uint8_t r13 = ( t1 ) << 1; + const uint8_t r14 = ( t1 | t2 ) << 2; + const uint8_t r15 = ( t1 | t3 ) << 3; + const uint8_t r16 = ( t1 ) << 4; + const uint8_t r17 = ( t1 | t3 ) << 5; + const uint8_t r18 = ( t3 | t4 ) << 6; + const uint8_t r19 = 0; + + m_pal_u001 = ~(r19 | r18 | r17 | r16 | r15 | r14 | r13 | r12); +} + +uint8_t mrdot_state::protection_r() +{ + return m_pal_u001; +} + +void mrdo_state::protection_w(uint8_t data) +{ + // protection via U001 (PAL16R6), but not as simple as the Taito version, + // it appears that m_pal_u001 outputs are fed back to inputs. The game + // won't work properly after the EXTRA reward when using the Taito protection. + // Notably, the Taito version NOPped out the EXTRA protection check. +} + +uint8_t mrdo_state::protection_r() +{ + // HACK: workaround until accurate PAL emulation + uint8_t *ROM = memregion("maincpu")->base(); + return ROM[m_maincpu->state_int(Z80_HL)]; +} -} // anonymous namespace void mrdo_state::main_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().w(FUNC(mrdo_state::mrdo_bgvideoram_w)).share("bgvideoram"); - map(0x8800, 0x8fff).ram().w(FUNC(mrdo_state::mrdo_fgvideoram_w)).share("fgvideoram"); + map(0x8000, 0x87ff).ram().w(FUNC(mrdo_state::bgvideoram_w)).share("bgvideoram"); + map(0x8800, 0x8fff).ram().w(FUNC(mrdo_state::fgvideoram_w)).share("fgvideoram"); map(0x9000, 0x90ff).writeonly().share("spriteram"); - map(0x9800, 0x9800).w(FUNC(mrdo_state::mrdo_flipscreen_w)); // screen flip + playfield priority + map(0x9800, 0x9800).w(FUNC(mrdo_state::flipscreen_w)); // screen flip + playfield priority map(0x9801, 0x9801).w("sn1", FUNC(sn76489_device::write)); map(0x9802, 0x9802).w("sn2", FUNC(sn76489_device::write)); - map(0x9803, 0x9803).r(FUNC(mrdo_state::mrdo_secre_r)); + map(0x9803, 0x9803).r(FUNC(mrdo_state::protection_r)); map(0xa000, 0xa000).portr("P1"); map(0xa001, 0xa001).portr("P2"); map(0xa002, 0xa002).portr("DSW1"); map(0xa003, 0xa003).portr("DSW2"); map(0xe000, 0xefff).ram(); - map(0xf000, 0xf7ff).w(FUNC(mrdo_state::mrdo_scrollx_w)); - map(0xf800, 0xffff).w(FUNC(mrdo_state::mrdo_scrolly_w)); + map(0xf000, 0xf7ff).w(FUNC(mrdo_state::scrollx_w)); + map(0xf800, 0xffff).w(FUNC(mrdo_state::scrolly_w)); } @@ -166,46 +221,29 @@ GFXDECODE_END void mrdo_state::mrdo(machine_config &config) { // Basic machine hardware - Z80(config, m_maincpu, MAIN_CLOCK/2); // Verified + Z80(config, m_maincpu, 8.2_MHz_XTAL/2); // Verified m_maincpu->set_addrmap(AS_PROGRAM, &mrdo_state::main_map); m_maincpu->set_vblank_int("screen", FUNC(mrdo_state::irq0_line_hold)); // Video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(VIDEO_CLOCK/4, 312, 8, 248, 262, 32, 224); + screen.set_raw(19.6_MHz_XTAL/4, 312, 8, 248, 262, 32, 224); screen.set_screen_update(FUNC(mrdo_state::screen_update_mrdo)); screen.set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_mrdo); - PALETTE(config, m_palette, FUNC(mrdo_state::mrdo_palette), 64*4 + 16*4, 256); + PALETTE(config, m_palette, FUNC(mrdo_state::palette_init), 64*4 + 16*4, 256); // Sound hardware SPEAKER(config, "mono").front_center(); - SN76489(config, "sn1", MAIN_CLOCK/2).add_route(ALL_OUTPUTS, "mono", 0.50); // Verified - SN76489(config, "sn2", MAIN_CLOCK/2).add_route(ALL_OUTPUTS, "mono", 0.50); // Verified + SN76489(config, "sn1", 8.2_MHz_XTAL/2).add_route(ALL_OUTPUTS, "mono", 0.50); // Verified + SN76489(config, "sn2", 8.2_MHz_XTAL/2).add_route(ALL_OUTPUTS, "mono", 0.50); // Verified } -void mrdo_state::machine_start() -{ - save_item(NAME(m_pal_u001)); -} - -void mrdo_state::machine_reset() -{ - // initial outputs are high on power-up - m_pal_u001 = 0xff; -} - -void mrdo_state::mrlo(machine_config &config) -{ - mrdo(config); - //config.device_remove("pal16r6"); -} - -// Main Clock: XTAL = 8.000 MHz, Video clock: XTAL = 19.908 MHz void mrdo_state::mrdobl(machine_config &config) { + // Main Clock: XTAL = 8.000 MHz, Video clock: XTAL = 19.908 MHz mrdo(config); m_maincpu->set_clock(8_MHz_XTAL/2); } @@ -244,27 +282,27 @@ ROM_START( mrdo ) ROM_LOAD( "j10--4.bin", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) ROM_REGION( 0x0200, "pal16r6", 0 ) - ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8 + ROM_LOAD( "u001_pal16r6cn.j2", 0x0000, 0x0104, CRC(84dbe498) SHA1(5863342b2db85ffef31b5e9ce26bfd8fca9923b0) ) ROM_END -ROM_START( mrdot ) +ROM_START( mrdoy ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "d1", 0x0000, 0x2000, CRC(3dcd9359) SHA1(bfe00450ee8822f437d87514f051ad1be6de9463) ) - ROM_LOAD( "d2", 0x2000, 0x2000, CRC(710058d8) SHA1(168cc179f2266bbf9437445bef9ff7d3358a8e6b) ) - ROM_LOAD( "d3", 0x4000, 0x2000, CRC(467d12d8) SHA1(7bb85e6a780de1c0c224229ee571cab39098f78d) ) - ROM_LOAD( "d4", 0x6000, 0x2000, CRC(fce9afeb) SHA1(26236a42c1c620975d4480c4315d0c6f112429b6) ) + ROM_LOAD( "dosnow.1", 0x0000, 0x2000, CRC(d3454e2c) SHA1(f8ecb9eec414badbcb65b7188d4a4d06739534cc) ) + ROM_LOAD( "dosnow.2", 0x2000, 0x2000, CRC(5120a6b2) SHA1(1db6dc3a91ac024e763179f425ad46d9d0aff8f9) ) + ROM_LOAD( "dosnow.3", 0x4000, 0x2000, CRC(96416dbe) SHA1(55f5262448b65899309f3e9e16c62b0c1e0b86c3) ) + ROM_LOAD( "dosnow.4", 0x6000, 0x2000, CRC(c05051b6) SHA1(6f528370dc097bf1550f4fa4b5f740214bc18f0b) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "d9", 0x0000, 0x1000, CRC(de4cfe66) SHA1(c217dcc24305f3b4badfb778a1cf4e57c178d168) ) - ROM_LOAD( "d10", 0x1000, 0x1000, CRC(a6c2f38b) SHA1(7c132771bf385c8ed28d8c8bdfc3dbf0b4aa75e8) ) + ROM_LOAD( "dosnow.9", 0x0000, 0x1000, CRC(85d16217) SHA1(35cb4e4a9e55f42f7818aeaa3f72892d2ddc99aa) ) + ROM_LOAD( "dosnow.10", 0x1000, 0x1000, CRC(61a7f54b) SHA1(19b0074f098955d61e5dfab060873ac96fdb30b4) ) ROM_REGION( 0x2000, "gfx2", 0 ) - ROM_LOAD( "r8-08.bin", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) - ROM_LOAD( "n8-07.bin", 0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) ) + ROM_LOAD( "dosnow.8", 0x0000, 0x1000, CRC(2bd1239a) SHA1(43a36afbf7374578e9735956f54412823486b3ff) ) + ROM_LOAD( "dosnow.7", 0x1000, 0x1000, CRC(ac8ffddf) SHA1(9911524de6b4e9056944b92a53ac93de110d52bd) ) ROM_REGION( 0x2000, "gfx3", 0 ) - ROM_LOAD( "h5-05.bin", 0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) ) - ROM_LOAD( "k5-06.bin", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) ) + ROM_LOAD( "dosnow.5", 0x0000, 0x1000, CRC(7662d828) SHA1(559150326e3edc7ee062bfd962fe8d39f9423b45) ) + ROM_LOAD( "dosnow.6", 0x1000, 0x1000, CRC(413f88d1) SHA1(830df0def7289536e2d08e0517cdb6edbc947400) ) ROM_REGION( 0x0080, "proms", 0 ) ROM_LOAD( "u02--2.bin", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits) @@ -273,27 +311,56 @@ ROM_START( mrdot ) ROM_LOAD( "j10--4.bin", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) ROM_REGION( 0x0200, "pal16r6", 0 ) - ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8 + ROM_LOAD( "u001_pal16r6cn.j2", 0x0000, 0x0104, CRC(84dbe498) SHA1(5863342b2db85ffef31b5e9ce26bfd8fca9923b0) ) ROM_END -ROM_START( mrdofix ) +ROM_START( mrdobl ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "d1", 0x0000, 0x2000, CRC(3dcd9359) SHA1(bfe00450ee8822f437d87514f051ad1be6de9463) ) - ROM_LOAD( "d2", 0x2000, 0x2000, CRC(710058d8) SHA1(168cc179f2266bbf9437445bef9ff7d3358a8e6b) ) - ROM_LOAD( "dofix.d3", 0x4000, 0x2000, CRC(3a7d039b) SHA1(ac87a3c9fa6433d1700e858914a995dce35113fa) ) - ROM_LOAD( "dofix.d4", 0x6000, 0x2000, CRC(32db845f) SHA1(5c58532ae2cfab9bd81383824d970b20015c960e) ) + ROM_LOAD( "d1.a4", 0x0000, 0x2000, CRC(03dcfba2) SHA1(c15e3d0c4225e0ca120bcd28aca39632575f8e11) ) + ROM_LOAD( "d2.c4", 0x2000, 0x2000, CRC(0ecdd39c) SHA1(c64b3363593911a676c647bf3dba8fe063fcb0de) ) + ROM_LOAD( "d3.e4", 0x4000, 0x2000, CRC(afc518e3) SHA1(abfb874e22ce375a2badecafaf95a3cd8c6179b1) ) + ROM_LOAD( "d4.f4", 0x6000, 0x2000, CRC(f4190cfc) SHA1(24f5125d900f944294d4eda068b710c8f1c6d39f) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "d9", 0x0000, 0x1000, CRC(de4cfe66) SHA1(c217dcc24305f3b4badfb778a1cf4e57c178d168) ) - ROM_LOAD( "d10", 0x1000, 0x1000, CRC(a6c2f38b) SHA1(7c132771bf385c8ed28d8c8bdfc3dbf0b4aa75e8) ) + ROM_LOAD( "d9.s8", 0x0000, 0x1000, CRC(aa80c5b6) SHA1(76f9f90deb74598470e7ed565237da38dd07e4e9) ) + ROM_LOAD( "d10.u8", 0x1000, 0x1000, CRC(d20ec85b) SHA1(9762bbe34d3fa209ea719807c723f57cb6bf4e01) ) + + ROM_REGION( 0x2000, "gfx2", 0 ) + ROM_LOAD( "d8.r8", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) + ROM_LOAD( "d7.n8", 0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) ) + + ROM_REGION( 0x2000, "gfx3", 0 ) + ROM_LOAD( "d5.h5", 0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) ) + ROM_LOAD( "d6.k5", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) ) + + ROM_REGION( 0x0080, "proms", 0 ) + ROM_LOAD( "2_18s030.u2", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits) + ROM_LOAD( "1_18s030.t2", 0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits) + ROM_LOAD( "7603-5.e10", 0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table + ROM_LOAD( "82s123.j10", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) + + ROM_REGION( 0x0104, "pal16r6", 0 ) + ROM_LOAD( "u001_pal16r6cn.j2", 0x0000, 0x0104, CRC(84dbe498) SHA1(5863342b2db85ffef31b5e9ce26bfd8fca9923b0) ) +ROM_END + +ROM_START( yankeedo ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "a4-01.bin", 0x0000, 0x2000, CRC(03dcfba2) SHA1(c15e3d0c4225e0ca120bcd28aca39632575f8e11) ) + ROM_LOAD( "yd_d2.c4", 0x2000, 0x2000, CRC(7c9d7ce0) SHA1(37889575c7c83cb647008b038e4efdc87355bd3e) ) + ROM_LOAD( "e4-03.bin", 0x4000, 0x2000, CRC(358f5dc2) SHA1(9fed1f5d1d04935d1b77687c8b2f3bfce970dc08) ) + ROM_LOAD( "f4-04.bin", 0x6000, 0x2000, CRC(f4190cfc) SHA1(24f5125d900f944294d4eda068b710c8f1c6d39f) ) + + ROM_REGION( 0x2000, "gfx1", 0 ) + ROM_LOAD( "s8-09.bin", 0x0000, 0x1000, CRC(aa80c5b6) SHA1(76f9f90deb74598470e7ed565237da38dd07e4e9) ) + ROM_LOAD( "u8-10.bin", 0x1000, 0x1000, CRC(d20ec85b) SHA1(9762bbe34d3fa209ea719807c723f57cb6bf4e01) ) ROM_REGION( 0x2000, "gfx2", 0 ) ROM_LOAD( "r8-08.bin", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) ROM_LOAD( "n8-07.bin", 0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) ) ROM_REGION( 0x2000, "gfx3", 0 ) - ROM_LOAD( "h5-05.bin", 0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) ) - ROM_LOAD( "k5-06.bin", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) ) + ROM_LOAD( "yd_d5.h5", 0x0000, 0x1000, CRC(f530b79b) SHA1(bffc4ddf8aa26933c8a15ed40bfa0b4cee85b408) ) + ROM_LOAD( "yd_d6.k5", 0x1000, 0x1000, CRC(790579aa) SHA1(89d8a77d2046cf8cfc393e0f08d361d1886bfec1) ) ROM_REGION( 0x0080, "proms", 0 ) ROM_LOAD( "u02--2.bin", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits) @@ -302,19 +369,20 @@ ROM_START( mrdofix ) ROM_LOAD( "j10--4.bin", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) ROM_REGION( 0x0200, "pal16r6", 0 ) - ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8 + ROM_LOAD( "u001_pal16r6cn.j2", 0x0000, 0x0104, CRC(84dbe498) SHA1(5863342b2db85ffef31b5e9ce26bfd8fca9923b0) ) ROM_END -ROM_START( mrlo ) + +ROM_START( mrdot ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "mrlo01.bin", 0x0000, 0x2000, CRC(6f455e7d) SHA1(82fbe05229f19fb849c90b41e3365be74f4f448f) ) + ROM_LOAD( "d1", 0x0000, 0x2000, CRC(3dcd9359) SHA1(bfe00450ee8822f437d87514f051ad1be6de9463) ) ROM_LOAD( "d2", 0x2000, 0x2000, CRC(710058d8) SHA1(168cc179f2266bbf9437445bef9ff7d3358a8e6b) ) - ROM_LOAD( "dofix.d3", 0x4000, 0x2000, CRC(3a7d039b) SHA1(ac87a3c9fa6433d1700e858914a995dce35113fa) ) - ROM_LOAD( "mrlo04.bin", 0x6000, 0x2000, CRC(49c10274) SHA1(e94b638f9888ebdff114f80e2c5906bbc81d9c6b) ) + ROM_LOAD( "d3", 0x4000, 0x2000, CRC(467d12d8) SHA1(7bb85e6a780de1c0c224229ee571cab39098f78d) ) + ROM_LOAD( "d4", 0x6000, 0x2000, CRC(fce9afeb) SHA1(26236a42c1c620975d4480c4315d0c6f112429b6) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "mrlo09.bin", 0x0000, 0x1000, CRC(fdb60d0d) SHA1(fe3502058a68247e5a55b930136f8d0cb80f894f) ) - ROM_LOAD( "mrlo10.bin", 0x1000, 0x1000, CRC(0492c10e) SHA1(782e541539537ab3f3a590770ca48bdc0fabdc10) ) + ROM_LOAD( "d9", 0x0000, 0x1000, CRC(de4cfe66) SHA1(c217dcc24305f3b4badfb778a1cf4e57c178d168) ) + ROM_LOAD( "d10", 0x1000, 0x1000, CRC(a6c2f38b) SHA1(7c132771bf385c8ed28d8c8bdfc3dbf0b4aa75e8) ) ROM_REGION( 0x2000, "gfx2", 0 ) ROM_LOAD( "r8-08.bin", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) @@ -329,18 +397,21 @@ ROM_START( mrlo ) ROM_LOAD( "t02--3.bin", 0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits) ROM_LOAD( "f10--1.bin", 0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table ROM_LOAD( "j10--4.bin", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) + + ROM_REGION( 0x0200, "pal16r6", 0 ) + ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8 ROM_END -ROM_START( mrdu ) +ROM_START( mrdofix ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "d1", 0x0000, 0x2000, CRC(3dcd9359) SHA1(bfe00450ee8822f437d87514f051ad1be6de9463) ) ROM_LOAD( "d2", 0x2000, 0x2000, CRC(710058d8) SHA1(168cc179f2266bbf9437445bef9ff7d3358a8e6b) ) - ROM_LOAD( "d3", 0x4000, 0x2000, CRC(467d12d8) SHA1(7bb85e6a780de1c0c224229ee571cab39098f78d) ) - ROM_LOAD( "du4.bin", 0x6000, 0x2000, CRC(893bc218) SHA1(2b546989c4eef9f94594c50a48458c91e3f4983f) ) + ROM_LOAD( "dofix.d3", 0x4000, 0x2000, CRC(3a7d039b) SHA1(ac87a3c9fa6433d1700e858914a995dce35113fa) ) + ROM_LOAD( "dofix.d4", 0x6000, 0x2000, CRC(32db845f) SHA1(5c58532ae2cfab9bd81383824d970b20015c960e) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "du9.bin", 0x0000, 0x1000, CRC(4090dcdc) SHA1(7f481f2e966d6a98fd7d82404afefc1483658ffa) ) - ROM_LOAD( "du10.bin", 0x1000, 0x1000, CRC(1e63ab69) SHA1(f0a4a12f818bc21c2bf0fe755c2e378b968b977b) ) + ROM_LOAD( "d9", 0x0000, 0x1000, CRC(de4cfe66) SHA1(c217dcc24305f3b4badfb778a1cf4e57c178d168) ) + ROM_LOAD( "d10", 0x1000, 0x1000, CRC(a6c2f38b) SHA1(7c132771bf385c8ed28d8c8bdfc3dbf0b4aa75e8) ) ROM_REGION( 0x2000, "gfx2", 0 ) ROM_LOAD( "r8-08.bin", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) @@ -357,27 +428,27 @@ ROM_START( mrdu ) ROM_LOAD( "j10--4.bin", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) ROM_REGION( 0x0200, "pal16r6", 0 ) - ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) + ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8 ROM_END -ROM_START( mrdoy ) +ROM_START( mrdu ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "dosnow.1", 0x0000, 0x2000, CRC(d3454e2c) SHA1(f8ecb9eec414badbcb65b7188d4a4d06739534cc) ) - ROM_LOAD( "dosnow.2", 0x2000, 0x2000, CRC(5120a6b2) SHA1(1db6dc3a91ac024e763179f425ad46d9d0aff8f9) ) - ROM_LOAD( "dosnow.3", 0x4000, 0x2000, CRC(96416dbe) SHA1(55f5262448b65899309f3e9e16c62b0c1e0b86c3) ) - ROM_LOAD( "dosnow.4", 0x6000, 0x2000, CRC(c05051b6) SHA1(6f528370dc097bf1550f4fa4b5f740214bc18f0b) ) + ROM_LOAD( "d1", 0x0000, 0x2000, CRC(3dcd9359) SHA1(bfe00450ee8822f437d87514f051ad1be6de9463) ) + ROM_LOAD( "d2", 0x2000, 0x2000, CRC(710058d8) SHA1(168cc179f2266bbf9437445bef9ff7d3358a8e6b) ) + ROM_LOAD( "d3", 0x4000, 0x2000, CRC(467d12d8) SHA1(7bb85e6a780de1c0c224229ee571cab39098f78d) ) + ROM_LOAD( "du4.bin", 0x6000, 0x2000, CRC(893bc218) SHA1(2b546989c4eef9f94594c50a48458c91e3f4983f) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "dosnow.9", 0x0000, 0x1000, CRC(85d16217) SHA1(35cb4e4a9e55f42f7818aeaa3f72892d2ddc99aa) ) - ROM_LOAD( "dosnow.10", 0x1000, 0x1000, CRC(61a7f54b) SHA1(19b0074f098955d61e5dfab060873ac96fdb30b4) ) + ROM_LOAD( "du9.bin", 0x0000, 0x1000, CRC(4090dcdc) SHA1(7f481f2e966d6a98fd7d82404afefc1483658ffa) ) + ROM_LOAD( "du10.bin", 0x1000, 0x1000, CRC(1e63ab69) SHA1(f0a4a12f818bc21c2bf0fe755c2e378b968b977b) ) ROM_REGION( 0x2000, "gfx2", 0 ) - ROM_LOAD( "dosnow.8", 0x0000, 0x1000, CRC(2bd1239a) SHA1(43a36afbf7374578e9735956f54412823486b3ff) ) - ROM_LOAD( "dosnow.7", 0x1000, 0x1000, CRC(ac8ffddf) SHA1(9911524de6b4e9056944b92a53ac93de110d52bd) ) + ROM_LOAD( "r8-08.bin", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) + ROM_LOAD( "n8-07.bin", 0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) ) ROM_REGION( 0x2000, "gfx3", 0 ) - ROM_LOAD( "dosnow.5", 0x0000, 0x1000, CRC(7662d828) SHA1(559150326e3edc7ee062bfd962fe8d39f9423b45) ) - ROM_LOAD( "dosnow.6", 0x1000, 0x1000, CRC(413f88d1) SHA1(830df0def7289536e2d08e0517cdb6edbc947400) ) + ROM_LOAD( "h5-05.bin", 0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) ) + ROM_LOAD( "k5-06.bin", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) ) ROM_REGION( 0x0080, "proms", 0 ) ROM_LOAD( "u02--2.bin", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits) @@ -418,74 +489,45 @@ ROM_START( mrdofabr ) ROM_LOAD( "82s123.j10", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) ROM_REGION( 0x0200, "pal16r6", 0 ) - ROM_LOAD( "pal16r6.j2", 0x0000, 0x0117, BAD_DUMP CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // From parent, protected on this set + ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // From mrdot, protected on this set ROM_END -ROM_START( mrdobl ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "d1.a4", 0x0000, 0x2000, CRC(03dcfba2) SHA1(c15e3d0c4225e0ca120bcd28aca39632575f8e11) ) - ROM_LOAD( "d2.c4", 0x2000, 0x2000, CRC(0ecdd39c) SHA1(c64b3363593911a676c647bf3dba8fe063fcb0de) ) - ROM_LOAD( "d3.e4", 0x4000, 0x2000, CRC(afc518e3) SHA1(abfb874e22ce375a2badecafaf95a3cd8c6179b1) ) - ROM_LOAD( "d4.f4", 0x6000, 0x2000, CRC(f4190cfc) SHA1(24f5125d900f944294d4eda068b710c8f1c6d39f) ) - - ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "d9.s8", 0x0000, 0x1000, CRC(aa80c5b6) SHA1(76f9f90deb74598470e7ed565237da38dd07e4e9) ) - ROM_LOAD( "d10.u8", 0x1000, 0x1000, CRC(d20ec85b) SHA1(9762bbe34d3fa209ea719807c723f57cb6bf4e01) ) - - ROM_REGION( 0x2000, "gfx2", 0 ) - ROM_LOAD( "d8.r8", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) - ROM_LOAD( "d7.n8", 0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) ) - - ROM_REGION( 0x2000, "gfx3", 0 ) - ROM_LOAD( "d5.h5", 0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) ) - ROM_LOAD( "d6.k5", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) ) - - ROM_REGION( 0x0080, "proms", 0 ) - ROM_LOAD( "2_18s030.u2", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits) - ROM_LOAD( "1_18s030.t2", 0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits) - ROM_LOAD( "7603-5.e10", 0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table - ROM_LOAD( "82s123.j10", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) - - ROM_REGION( 0x0104, "pal16r6", 0 ) - ROM_LOAD( "u001_pal16r6cn.j2", 0x0000, 0x0104, CRC(84dbe498) SHA1(5863342b2db85ffef31b5e9ce26bfd8fca9923b0) ) -ROM_END -ROM_START( yankeedo ) +ROM_START( mrlo ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "a4-01.bin", 0x0000, 0x2000, CRC(03dcfba2) SHA1(c15e3d0c4225e0ca120bcd28aca39632575f8e11) ) - ROM_LOAD( "yd_d2.c4", 0x2000, 0x2000, CRC(7c9d7ce0) SHA1(37889575c7c83cb647008b038e4efdc87355bd3e) ) - ROM_LOAD( "e4-03.bin", 0x4000, 0x2000, CRC(358f5dc2) SHA1(9fed1f5d1d04935d1b77687c8b2f3bfce970dc08) ) - ROM_LOAD( "f4-04.bin", 0x6000, 0x2000, CRC(f4190cfc) SHA1(24f5125d900f944294d4eda068b710c8f1c6d39f) ) + ROM_LOAD( "mrlo01.bin", 0x0000, 0x2000, CRC(6f455e7d) SHA1(82fbe05229f19fb849c90b41e3365be74f4f448f) ) + ROM_LOAD( "d2", 0x2000, 0x2000, CRC(710058d8) SHA1(168cc179f2266bbf9437445bef9ff7d3358a8e6b) ) + ROM_LOAD( "dofix.d3", 0x4000, 0x2000, CRC(3a7d039b) SHA1(ac87a3c9fa6433d1700e858914a995dce35113fa) ) + ROM_LOAD( "mrlo04.bin", 0x6000, 0x2000, CRC(49c10274) SHA1(e94b638f9888ebdff114f80e2c5906bbc81d9c6b) ) ROM_REGION( 0x2000, "gfx1", 0 ) - ROM_LOAD( "s8-09.bin", 0x0000, 0x1000, CRC(aa80c5b6) SHA1(76f9f90deb74598470e7ed565237da38dd07e4e9) ) - ROM_LOAD( "u8-10.bin", 0x1000, 0x1000, CRC(d20ec85b) SHA1(9762bbe34d3fa209ea719807c723f57cb6bf4e01) ) + ROM_LOAD( "mrlo09.bin", 0x0000, 0x1000, CRC(fdb60d0d) SHA1(fe3502058a68247e5a55b930136f8d0cb80f894f) ) + ROM_LOAD( "mrlo10.bin", 0x1000, 0x1000, CRC(0492c10e) SHA1(782e541539537ab3f3a590770ca48bdc0fabdc10) ) ROM_REGION( 0x2000, "gfx2", 0 ) ROM_LOAD( "r8-08.bin", 0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) ) ROM_LOAD( "n8-07.bin", 0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) ) ROM_REGION( 0x2000, "gfx3", 0 ) - ROM_LOAD( "yd_d5.h5", 0x0000, 0x1000, CRC(f530b79b) SHA1(bffc4ddf8aa26933c8a15ed40bfa0b4cee85b408) ) - ROM_LOAD( "yd_d6.k5", 0x1000, 0x1000, CRC(790579aa) SHA1(89d8a77d2046cf8cfc393e0f08d361d1886bfec1) ) + ROM_LOAD( "h5-05.bin", 0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) ) + ROM_LOAD( "k5-06.bin", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) ) ROM_REGION( 0x0080, "proms", 0 ) ROM_LOAD( "u02--2.bin", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits) ROM_LOAD( "t02--3.bin", 0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits) ROM_LOAD( "f10--1.bin", 0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table ROM_LOAD( "j10--4.bin", 0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used) - - ROM_REGION( 0x0200, "pal16r6", 0 ) - ROM_LOAD( "j2-u001.bin", 0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8 ROM_END -GAME( 1982, mrdo, 0, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal", "Mr. Do!", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, mrdoy, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal", "Mr. Do! (prototype)", MACHINE_SUPPORTS_SAVE ) /* aka "Yukidaruma" */ -GAME( 1982, mrdot, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (Taito)", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, mrdofix, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (bugfixed)", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, mrlo, mrdo, mrlo, mrdo, mrdo_state, empty_init, ROT270, "bootleg", "Mr. Lo!", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, mrdu, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "bootleg", "Mr. Du!", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, mrdofabr, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "bootleg (Fabremar)", "Mr. Do! (Fabremar bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, mrdobl, mrdo, mrdobl, mrdo, mrdo_state, empty_init, ROT270, "bootleg", "Mr. Do! (bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, yankeedo, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "hack", "Yankee DO!", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, mrdo, 0, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal", "Mr. Do!", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, mrdoy, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal", "Mr. Do! (prototype)", MACHINE_SUPPORTS_SAVE ) /* aka "Yukidaruma" */ +GAME( 1982, mrdobl, mrdo, mrdobl, mrdo, mrdo_state, empty_init, ROT270, "bootleg", "Mr. Do! (bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, yankeedo, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "hack", "Yankee DO!", MACHINE_SUPPORTS_SAVE ) + +GAME( 1982, mrdot, mrdo, mrdo, mrdo, mrdot_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (Taito)", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, mrdofix, mrdo, mrdo, mrdo, mrdot_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (bugfixed)", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, mrdu, mrdo, mrdo, mrdo, mrdot_state, empty_init, ROT270, "bootleg", "Mr. Du!", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, mrdofabr, mrdo, mrdo, mrdo, mrdot_state, empty_init, ROT270, "bootleg (Fabremar)", "Mr. Do! (Fabremar bootleg)", MACHINE_SUPPORTS_SAVE ) + +GAME( 1982, mrlo, mrdo, mrdo, mrdo, mrlo_state, empty_init, ROT270, "bootleg", "Mr. Lo!", MACHINE_SUPPORTS_SAVE ) // no protection diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index fdab799f466..2de6579be85 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -27,14 +27,17 @@ public: { } void mrdo(machine_config &config); - void mrlo(machine_config &config); void mrdobl(machine_config &config); protected: - virtual void video_start() override; - virtual void machine_start() override; virtual void machine_reset() override; + virtual void video_start() override; + + virtual void protection_w(uint8_t data); + virtual uint8_t protection_r(); + + uint8_t m_pal_u001; private: // memory pointers @@ -46,25 +49,48 @@ private: required_device m_gfxdecode; required_device m_palette; + void main_map(address_map &map); + // video-related tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; - int m_flipscreen; - uint8_t m_pal_u001; - - uint8_t mrdo_secre_r(); + int m_flipscreen; - void mrdo_bgvideoram_w(offs_t offset, uint8_t data); - void mrdo_fgvideoram_w(offs_t offset, uint8_t data); - void mrdo_scrollx_w(uint8_t data); - void mrdo_scrolly_w(uint8_t data); - void mrdo_flipscreen_w(uint8_t data); + void bgvideoram_w(offs_t offset, uint8_t data); + void fgvideoram_w(offs_t offset, uint8_t data); + void scrollx_w(uint8_t data); + void scrolly_w(uint8_t data); + void flipscreen_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - void mrdo_palette(palette_device &palette) const; + void palette_init(palette_device &palette) const; uint32_t screen_update_mrdo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); - void main_map(address_map &map); + void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); +}; + +class mrdot_state : public mrdo_state +{ +public: + mrdot_state(const machine_config &mconfig, device_type type, const char *tag) : + mrdo_state(mconfig, type, tag) + { } + +protected: + virtual void protection_w(uint8_t data) override; + virtual uint8_t protection_r() override; +}; + +class mrlo_state : public mrdo_state +{ +public: + mrlo_state(const machine_config &mconfig, device_type type, const char *tag) : + mrdo_state(mconfig, type, tag) + { } + +protected: + // no PAL protection + virtual void protection_w(uint8_t data) override { } + virtual uint8_t protection_r() override { return 0; } }; #endif // MAME_INCLUDES_MRDO_H diff --git a/src/mame/video/mrdo.cpp b/src/mame/video/mrdo.cpp index fa73ef171ab..53ac33eb6ec 100644 --- a/src/mame/video/mrdo.cpp +++ b/src/mame/video/mrdo.cpp @@ -44,7 +44,7 @@ ***************************************************************************/ -void mrdo_state::mrdo_palette(palette_device &palette) const +void mrdo_state::palette_init(palette_device &palette) const { constexpr int R1 = 150; constexpr int R2 = 120; @@ -179,71 +179,26 @@ void mrdo_state::video_start() ***************************************************************************/ -void mrdo_state::mrdo_bgvideoram_w(offs_t offset, uint8_t data) +void mrdo_state::bgvideoram_w(offs_t offset, uint8_t data) { m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } -/* PAL16R6CN used for protection. The game doesn't clear the screen - if a read from this address doesn't return the value it expects. */ -uint8_t mrdo_state::mrdo_secre_r() -{ - return m_pal_u001; -} - -void mrdo_state::mrdo_fgvideoram_w(offs_t offset, uint8_t data) +void mrdo_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); - // protection. each write latches a new value on IC u001 (PAL16R6) - const uint8_t i9 = BIT(data,0); - const uint8_t i8 = BIT(data,1); -// const uint8_t i7 = BIT(data,2); pin 7 not used in equations - const uint8_t i6 = BIT(data,3); - const uint8_t i5 = BIT(data,4); - const uint8_t i4 = BIT(data,5); - const uint8_t i3 = BIT(data,6); - const uint8_t i2 = BIT(data,7); - - // equations extracted from dump using jedutil - const uint8_t t1 = i2 & (1^i3) & i4 & (1^i5) & (1^i6) & (1^i8) & i9; - const uint8_t t2 = (1^i2) & (1^i3) & i4 & i5 & (1^i6) & i8 & (1^i9); - const uint8_t t3 = i2 & i3 & (1^i4) & (1^i5) & i6 & (1^i8) & i9; - const uint8_t t4 = (1^i2) & i3 & i4 & (1^i5) & i6 & i8 & i9; - - const uint8_t r12 = 0; - const uint8_t r13 = (1^( t1 )) << 1 ; - const uint8_t r14 = (1^( t1 | t2 )) << 2 ; - const uint8_t r15 = (1^( t1 | t3 )) << 3 ; - const uint8_t r16 = (1^( t1 )) << 4 ; - const uint8_t r17 = (1^( t1 | t3 )) << 5 ; - const uint8_t r18 = (1^( t3 | t4 )) << 6 ; - const uint8_t r19 = 0; - - m_pal_u001 = r19 | r18 | r17 | r16 | r15 | r14 | r13 | r12 ; + protection_w(data); } -/* -/rf13 := i2 & /i3 & i4 & /i5 & /i6 & /i8 & i9 t1 - -/rf14 := /i2 & /i3 & i4 & i5 & /i6 & i8 & /i9 + i2 & /i3 & i4 & /i5 & /i6 & /i8 & i9 t2 | t1 - -/rf15 := i2 & i3 & /i4 & /i5 & i6 & /i8 & i9 + i2 & /i3 & i4 & /i5 & /i6 & /i8 & i9 t3 | t1 - -/rf16 := i2 & /i3 & i4 & /i5 & /i6 & /i8 & i9 t1 - -/rf17 := i2 & i3 & /i4 & /i5 & i6 & /i8 & i9 + i2 & /i3 & i4 & /i5 & /i6 & /i8 & i9 t3 | t1 - -/rf18 := /i2 & i3 & i4 & /i5 & i6 & i8 & i9 + i2 & i3 & /i4 & /i5 & i6 & /i8 & i9 t4 | t2 -*/ -void mrdo_state::mrdo_scrollx_w(uint8_t data) +void mrdo_state::scrollx_w(uint8_t data) { m_bg_tilemap->set_scrollx(0, data); } -void mrdo_state::mrdo_scrolly_w(uint8_t data) +void mrdo_state::scrolly_w(uint8_t data) { /* This is NOT affected by flipscreen (so stop it happening) */ if (m_flipscreen) @@ -253,11 +208,10 @@ void mrdo_state::mrdo_scrolly_w(uint8_t data) } -void mrdo_state::mrdo_flipscreen_w(uint8_t data) +void mrdo_state::flipscreen_w(uint8_t data) { /* bits 1-3 control the playfield priority, but they are not used by */ /* Mr. Do! so we don't emulate them */ - m_flipscreen = data & 0x01; machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } @@ -270,19 +224,16 @@ void mrdo_state::mrdo_flipscreen_w(uint8_t data) ***************************************************************************/ -void mrdo_state::draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ) +void mrdo_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) { - uint8_t *spriteram = m_spriteram; - int offs; - - for (offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4) + for (int offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4) { - if (spriteram[offs + 1] != 0) + if (m_spriteram[offs + 1] != 0) { m_gfxdecode->gfx(2)->transpen(bitmap,cliprect, - spriteram[offs], spriteram[offs + 2] & 0x0f, - spriteram[offs + 2] & 0x10, spriteram[offs + 2] & 0x20, - spriteram[offs + 3], 256 - spriteram[offs + 1], 0); + m_spriteram[offs], m_spriteram[offs + 2] & 0x0f, + m_spriteram[offs + 2] & 0x10, m_spriteram[offs + 2] & 0x20, + m_spriteram[offs + 3], 256 - m_spriteram[offs + 1], 0); } } } -- cgit v1.2.3