diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 8ccfb61eef7..4611a846d2f 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -3727,13 +3727,10 @@ ROM_END ROM_START( m4tbreel ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "dtr12.bin", 0x0000, 0x010000, CRC(cdb63ef5) SHA1(748cc06e6a274b125d189dd66f2adad8bd2fb166) ) + ROM_LOAD( "dtr12.bin", 0x0000, 0x010000, CRC(cdb63ef5) SHA1(748cc06e6a274b125d189dd66f2adad8bd2fb166) ) // aka dtr31.dat ROM_END -ROM_START( m4tbreela ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "dtr31.dat", 0x0000, 0x010000, CRC(cdb63ef5) SHA1(748cc06e6a274b125d189dd66f2adad8bd2fb166) ) -ROM_END + ROM_START( m4tbrldx ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -9258,7 +9255,6 @@ GAME(199?, m4randr ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Bar GAME(199?, m4samu ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Samurai (Barcrest) (Dutch) (MPU4)", GAME_FLAGS|GAME_NO_SOUND ) GAME(199?, m4stards ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Stardust (Barcrest) (Dutch) (MPU4)", GAME_FLAGS|GAME_NO_SOUND ) GAME(199?, m4tbreel ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Turbo Reel (Barcrest) (Dutch) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND ) -GAME(199?, m4tbreela,m4tbreel ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Turbo Reel (Barcrest) (Dutch) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND ) GAME(199?, m4tbrldx ,m4tbreel ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Turbo Reel (Barcrest) (Dutch) (MPU4) (set 3, Deluxe?)", GAME_FLAGS|GAME_NO_SOUND ) GAME(199?, m4taj ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Taj Mahal (Barcrest) (Dutch) (MPU4)", GAME_FLAGS|GAME_NO_SOUND ) GAME(199?, m4topdk ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Top Deck (Barcrest) (Dutch) (MPU4)", GAME_FLAGS|GAME_NO_SOUND ) diff --git a/src/mame/drivers/mpu4sw.c b/src/mame/drivers/mpu4sw.c index 4720f57dfa5..f3ac38c3143 100644 --- a/src/mame/drivers/mpu4sw.c +++ b/src/mame/drivers/mpu4sw.c @@ -994,7 +994,6 @@ M4EAW_SET( 199?, m4eaw__bu, m4eaw, "eun01k.p1", 0x0000, 0x010000, CRC(9fca43f M4EAW_SET( 199?, m4eaw__bv, m4eaw, "eun01r.p1", 0x0000, 0x010000, CRC(15b8eb9e) SHA1(e4babaf526e6dd45bb4b7f7441a08cfbec12c661), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 95)" ) M4EAW_SET( 199?, m4eaw__bw, m4eaw, "eun01s.p1", 0x0000, 0x010000, CRC(d0b49fc6) SHA1(4062d9763010d42666660e383e52818d572b61b9), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 96)" ) M4EAW_SET( 199?, m4eaw__bx, m4eaw, "eun01y.p1", 0x0000, 0x010000, CRC(88d3c370) SHA1(6c3839a9c89ae67f80ab932ec70ebaf1240de9bb), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 97)" ) -M4EAW_SET( 199?, m4eaw__by, m4eaw, "every1.hex", 0x0000, 0x010000, CRC(406843a2) SHA1(7d4bf6cd3c5be0f6df687b0ba97b3b88fd377170), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 98)" ) M4EAW_SET( 199?, m4eaw__bz, m4eaw, "everyones a winner v2-5p", 0x0000, 0x008000, CRC(eb8f2fc5) SHA1(0d3614bd5ff561d17bef0d1e620f2f812b8fed5b), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 99)" ) @@ -1017,7 +1016,6 @@ M4EAW_SET( 199?, m4eaw__bz, m4eaw, "everyones a winner v2-5p", 0x0000, 0x008000, M4WTA_SET( 199?, m4wta, 0, "wta55", 0x0000, 0x010000, CRC(df3e66cd) SHA1(68e769816cb1a71dea8a3ccf4636414c45c01646), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 1)" ) M4WTA_SET( 199?, m4wta__a, m4wta, "pwnk.p1", 0x0000, 0x020000, CRC(7c6e21e3) SHA1(d6aeb5948e0800050193575a3b5c06c11f46eed8), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 2)" ) M4WTA_SET( 199?, m4wta__b, m4wta, "windy.p1", 0x0000, 0x010000, CRC(d8b78c2d) SHA1(d8c2a2ac30a9b876acfbe99e3c540ba0e82cde33), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 3)" ) -M4WTA_SET( 199?, m4wta__c, m4wta, "winner takes all wn80.1c 20p 8 idm.bin", 0x0000, 0x010000, CRC(471ba65a) SHA1(6ede860bcf323ee75dd7f75a51e5d1166ee72abc), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 4)" ) M4WTA_SET( 199?, m4wta__d, m4wta, "wins.p1", 0x0000, 0x010000, CRC(d79d1e5b) SHA1(722657423a605d6d272d61e4e00b4055ed05f98d), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 5)" ) M4WTA_SET( 199?, m4wta__e, m4wta, "winy.p1", 0x0000, 0x010000, CRC(5ff8ed08) SHA1(9567db64e8ebf25ecb22236598cc88a3106f0e36), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 6)" ) M4WTA_SET( 199?, m4wta__f, m4wta, "wn5ad.p1", 0x0000, 0x010000, CRC(0eb0845d) SHA1(57a2ca27672119e71af3b990cedcf52dd89e24cc), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 7)" ) @@ -2221,7 +2219,6 @@ M4TUTFRT_SET( 199?, m4tutfrt__ad, m4tutfrt, "tf4dy.p1", 0x0000, 0x010000, CRC M4TUTFRT_SET( 199?, m4tutfrt__ae, m4tutfrt, "tf4k.p1", 0x0000, 0x010000, CRC(1a4eb247) SHA1(f6b4c85dd8b155b672bd96ea7ee6630df773c6ca), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 42)" ) M4TUTFRT_SET( 199?, m4tutfrt__af, m4tutfrt, "tf4s.p1", 0x0000, 0x010000, CRC(2d298c58) SHA1(568c2babdb002da871df7a36d16e4f7810cac265), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 43)" ) M4TUTFRT_SET( 199?, m4tutfrt__ag, m4tutfrt, "tf4y.p1", 0x0000, 0x010000, CRC(06cd8b06) SHA1(92205e9edd42f80de67d5d6652de8ea80bc60af7), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 44)" ) -M4TUTFRT_SET( 199?, m4tutfrt__ah, m4tutfrt, "tfruity.hex", 0x0000, 0x010000, CRC(dce2e5be) SHA1(3c218cdb939d5b7cc650c820737ae3ac653435ce), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 45)" ) M4TUTFRT_SET( 199?, m4tutfrt__ai, m4tutfrt, "tft04ad.p1", 0x0000, 0x010000, CRC(2994aa14) SHA1(af0e618f24cdedd14e3a347701313360d9fc73d1), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 46)" ) M4TUTFRT_SET( 199?, m4tutfrt__aj, m4tutfrt, "tft04b.p1", 0x0000, 0x010000, CRC(e95eab06) SHA1(70e85e38493ac1fd30a79582bab45af5227d835a), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 47)" ) M4TUTFRT_SET( 199?, m4tutfrt__ak, m4tutfrt, "tft04bd.p1", 0x0000, 0x010000, CRC(060d3572) SHA1(e78b6248d3aef6cd08f4b30e0b00bd4cf254e630), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 48)" ) diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index f9bae435fd4..355c03ce4e1 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -447,7 +447,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( tokib, toki_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */ + MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */ MCFG_CPU_PROGRAM_MAP(tokib_map) MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL (could be level1, same vector) */ @@ -635,7 +635,7 @@ ROM_START( juju ) ROM_LOAD( "tokijp.009", 0x00000, 0x20000, CRC(ae7a6b8b) SHA1(1d410f91354ffd1774896b2e64f20a2043607805) ) ROM_END -ROM_START( jujub ) +ROM_START( jujuba ) ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */ ROM_LOAD16_BYTE( "8.19g", 0x20000, 0x10000, CRC(208fb08a) SHA1(113d3924d738705cb73d137712a23fa25cd4c78c) ) ROM_LOAD16_BYTE( "5.19e", 0x20001, 0x10000, CRC(722e5183) SHA1(87b813e818670bad45043db7f692619052987ce8) ) @@ -705,7 +705,56 @@ ROM_START( tokib ) ROM_LOAD( "toki.e22", 0x010000, 0x08000, CRC(04dcdc21) SHA1(3b74019d764a13ffc155f154522c6fe60cf1c5ea) ) ROM_LOAD( "toki.e7", 0x018000, 0x08000, CRC(70729106) SHA1(e343c02d139d20a54e837e65b6a964e202f5811e) ) - ROM_REGION( 0x100000, "gfx2", 0 ) + ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_LOAD( "toki.e26", 0x000000, 0x20000, CRC(a8ba71fc) SHA1(331d7396b6e862e32bb6a0d62c25fc201203b951) ) /* sprites */ + ROM_LOAD( "toki.e28", 0x020000, 0x20000, CRC(29784948) SHA1(9e17e57e2cb65a0aff61385c6d3a97b52474b6e7) ) + ROM_LOAD( "toki.e34", 0x040000, 0x20000, CRC(e5f6e19b) SHA1(77dc5cf961c8062b86ebeb896ad2075c3bfa2205) ) + ROM_LOAD( "toki.e36", 0x060000, 0x20000, CRC(96e8db8b) SHA1(9a0421fc57af27a8886e35b7a1a873aa06a112af) ) + ROM_LOAD( "toki.e30", 0x080000, 0x20000, CRC(770d2b1b) SHA1(27e57f21b462e36a10ffa2d4384955047b84190c) ) + ROM_LOAD( "toki.e32", 0x0a0000, 0x20000, CRC(c289d246) SHA1(596eda73b073e8fc3053734c780e7e2604fb5ca3) ) + ROM_LOAD( "toki.e38", 0x0c0000, 0x20000, CRC(87f4e7fb) SHA1(07d6bf00b1145a11f3d3f0af4425a3c5baeca3db) ) + ROM_LOAD( "toki.e40", 0x0e0000, 0x20000, CRC(96e87350) SHA1(754947f71261d8358e158fa9c8fcfd242cd58bc3) ) + + ROM_REGION( 0x080000, "gfx3", 0 ) + ROM_LOAD( "toki.e23", 0x000000, 0x10000, CRC(feb13d35) SHA1(1b78ce1e48d16e58ad0721b30ab87765ded7d24e) ) /* tiles 1 */ + ROM_LOAD( "toki.e24", 0x010000, 0x10000, CRC(5b365637) SHA1(434775b0614d904beaf40d7e00c1eaf59b704cb1) ) + ROM_LOAD( "toki.e15", 0x020000, 0x10000, CRC(617c32e6) SHA1(a80f93c83a06acf836e638e4ad2453692622015d) ) + ROM_LOAD( "toki.e16", 0x030000, 0x10000, CRC(2a11c0f0) SHA1(f9b1910c4932f5b95e5a9a8e8d5376c7210bcde7) ) + ROM_LOAD( "toki.e17", 0x040000, 0x10000, CRC(fbc3d456) SHA1(dd10455f2e6c415fb5e39fb239904c499b38ca3e) ) + ROM_LOAD( "toki.e18", 0x050000, 0x10000, CRC(4c2a72e1) SHA1(52a31f88e02e1689c2fffbbd86cbccd0bdab7dcc) ) + ROM_LOAD( "toki.e8", 0x060000, 0x10000, CRC(46a1b821) SHA1(74d9762aef3891463dc100d1bc2d4fdc3c1d163f) ) + ROM_LOAD( "toki.e9", 0x070000, 0x10000, CRC(82ce27f6) SHA1(db29396a336098664f48e3c04930b973a6ffe969) ) + + ROM_REGION( 0x080000, "gfx4", 0 ) + ROM_LOAD( "toki.e25", 0x000000, 0x10000, CRC(63026cad) SHA1(c8f3898985d99f2a61d4e17eba66b5989a23d0d7) ) /* tiles 2 */ + ROM_LOAD( "toki.e20", 0x010000, 0x10000, CRC(a7f2ce26) SHA1(6b12b3bd872112b42d91ce3c0d5bc95c0fc0f5b5) ) + ROM_LOAD( "toki.e11", 0x020000, 0x10000, CRC(48989aa0) SHA1(109c68c9f0966862194226cecc8b269d9307dd25) ) + ROM_LOAD( "toki.e12", 0x030000, 0x10000, CRC(c2ad9342) SHA1(7c9b5c14c8061e1a57797b79677741b1b98e64fa) ) + ROM_LOAD( "toki.e19", 0x040000, 0x10000, CRC(6cd22b18) SHA1(8281cfd46738448b6890c50c64fb72941e169bee) ) + ROM_LOAD( "toki.e14", 0x050000, 0x10000, CRC(859e313a) SHA1(18ac471a72b3ed42ba74456789adbe323f723660) ) + ROM_LOAD( "toki.e10", 0x060000, 0x10000, CRC(e15c1d0f) SHA1(d0d571dd1055d7307379850313216da86b0704e6) ) + ROM_LOAD( "toki.e6", 0x070000, 0x10000, CRC(6f4b878a) SHA1(4560b1e705a0eb9fad7fdc11fadf952ff67eb264) ) +ROM_END + +/* This had Playmark stickers on all the roms */ +ROM_START( jujub ) + ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */ + ROM_LOAD16_BYTE( "jujub_playmark.e3", 0x00000, 0x20000, CRC(b50c73ec) SHA1(64855e3f5ceab39abf45035eeee80ae6dc39a421) ) + ROM_LOAD16_BYTE( "jujub_playmark.e5", 0x00001, 0x20000, CRC(b2812942) SHA1(aec7e08770935cc59a8246544d99b283583e9601) ) + ROM_LOAD16_BYTE( "tokijp.005", 0x40000, 0x10000, CRC(d6a82808) SHA1(9fcd3e97f7eaada5374347383dc8a6cea2378f7f) ) + ROM_LOAD16_BYTE( "tokijp.003", 0x40001, 0x10000, CRC(a01a5b10) SHA1(76d6da114105402aab9dd5167c0c00a0bddc3bba) ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for code + 32k for banked data */ + ROM_LOAD( "toki.e1", 0x00000, 0x8000, CRC(2832ef75) SHA1(c15dc67a1251230fe79625b582c255678f3714d8) ) + ROM_CONTINUE( 0x10000, 0x8000 ) /* banked at 8000-bfff */ + + ROM_REGION( 0x020000, "gfx1", 0 ) + ROM_LOAD( "toki.e21", 0x000000, 0x08000, CRC(bb8cacbd) SHA1(05cdd2efe63de30dec2e5d2948567cee22e82a63) ) /* chars */ + ROM_LOAD( "toki.e13", 0x008000, 0x08000, CRC(052ad275) SHA1(0f4a9c752348cf5fb43d706bacbcd3e5937441e7) ) + ROM_LOAD( "toki.e22", 0x010000, 0x08000, CRC(04dcdc21) SHA1(3b74019d764a13ffc155f154522c6fe60cf1c5ea) ) + ROM_LOAD( "toki.e7", 0x018000, 0x08000, CRC(70729106) SHA1(e343c02d139d20a54e837e65b6a964e202f5811e) ) + + ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) ROM_LOAD( "toki.e26", 0x000000, 0x20000, CRC(a8ba71fc) SHA1(331d7396b6e862e32bb6a0d62c25fc201203b951) ) /* sprites */ ROM_LOAD( "toki.e28", 0x020000, 0x20000, CRC(29784948) SHA1(9e17e57e2cb65a0aff61385c6d3a97b52474b6e7) ) ROM_LOAD( "toki.e34", 0x040000, 0x20000, CRC(e5f6e19b) SHA1(77dc5cf961c8062b86ebeb896ad2075c3bfa2205) ) @@ -737,6 +786,7 @@ ROM_START( tokib ) ROM_END + static DRIVER_INIT( toki ) { UINT8 *ROM = machine.root_device().memregion("oki")->base(); @@ -761,12 +811,6 @@ static DRIVER_INIT( tokib ) int i, offs, len; UINT8 *rom; - /* invert the sprite data in the ROMs */ - len = machine.root_device().memregion("gfx2")->bytes(); - rom = machine.root_device().memregion("gfx2")->base(); - for (i = 0; i < len; i++) - rom[i] ^= 0xff; - /* merge background tile graphics together */ len = machine.root_device().memregion("gfx3")->bytes(); rom = machine.root_device().memregion("gfx3")->base(); @@ -800,7 +844,7 @@ static DRIVER_INIT( tokib ) auto_free (machine, temp); } -static DRIVER_INIT(jujub) +static DRIVER_INIT(jujuba) { /* Program ROMs are bitswapped */ { @@ -859,6 +903,7 @@ GAME( 1989, tokia, toki, toki, toki, toki_state, toki, ROT0, "TAD Corporation GAME( 1989, tokiua,toki, toki, toki, toki_state, toki, ROT0, "TAD Corporation (Fabtek license)", "Toki (US, set 2)", 0 ) GAME( 1989, juju, toki, toki, toki, toki_state, toki, ROT0, "TAD Corporation", "JuJu Densetsu (Japan)", 0 ) -GAME( 1990, tokib, toki, tokib, tokib, toki_state, tokib, ROT0, "bootleg (Datsu)", "Toki (Datsu bootleg)", 0 ) +GAME( 1990, tokib, toki, tokib, tokib, toki_state, tokib, ROT0, "bootleg (Datsu)", "Toki (Datsu bootleg)", 0 ) +GAME( 1990, jujub, toki, tokib, tokib, toki_state, tokib, ROT0, "bootleg (Playmark)", "JuJu Densetsu (Playmark bootleg)", 0 ) /* Sound hardware seems to have been slightly modified, the coins are handled ok, but there is no music and bad sfx. Program roms have a slight bitswap, Flipscreen also seems to be ignored */ -GAME( 1989, jujub, toki, toki, toki, toki_state, jujub, ROT180, "bootleg", "JuJu Densetsu (Japan, bootleg)", GAME_IMPERFECT_SOUND ) // bootleg of tokia/juju revison +GAME( 1989, jujuba, toki, toki, toki, toki_state, jujuba, ROT180, "bootleg", "JuJu Densetsu (Japan, bootleg)", GAME_IMPERFECT_SOUND ) // bootleg of tokia/juju revison diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 3c577eee0e6..9be14c4aa99 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -7848,8 +7848,9 @@ tokia // (c) 1989 Tad (World) tokiu // (c) 1989 Tad + Fabtek license (US) tokiua // (c) 1989 Tad + Fabtek license (US) tokib // bootleg +jujub // bootleg juju // (c) 1989 Tad (Japan) -jujub // (c) 1989 Tad (Japan) +jujuba // bootleg bloodbro // (c) 1990 Tad bloodbroa // (c) 1990 Tad bloodbrob // (c) 1990 Tad @@ -19335,7 +19336,6 @@ m4eaw__bu // m4eaw__bv // m4eaw__bw // m4eaw__bx // -m4eaw__by // m4eaw__bz // m4exprs // Express (Barcrest) m4exgam // Extra Game (Fairplay - Barcrest) @@ -19609,6 +19609,9 @@ m4jolgem__aj // m4jolgem__ak // m4jolgem__al // m4jolgem__am // +m4jolgem__an // +m4jolgem__ao // +m4jolgem__ap // m4joljokd // m4joljokh // m4joljok // Jolly Joker (Barcrest) @@ -20440,7 +20443,6 @@ m4tropcl // Tropicana Club (Barcrest) m4tupen // Tuppenny Cracker (Barcrest - Bootleg) m4tbplay // Turbo Play (Barcrest) m4tbreel // Turbo Reel (Barcrest) -m4tbreela // m4tbrldx // Turbo Reel Deluxe (Barcrest) m4tutfrt // Tutti Fruity (Barcrest) m4tutfrt__a // @@ -20486,7 +20488,6 @@ m4tutfrt__ad // m4tutfrt__ae // m4tutfrt__af // m4tutfrt__ag // -m4tutfrt__ah // m4tutfrt__ai // m4tutfrt__aj // m4tutfrt__ak // @@ -20586,7 +20587,6 @@ m4wildtm // Wild Timer (Barcrest) m4wta // Winner Takes All (Barcrest) m4wta__a // m4wta__b // -m4wta__c // m4wta__d // m4wta__e // m4wta__f //