From 09cc947708cd03f363c6643a23917b5b5b051f87 Mon Sep 17 00:00:00 2001 From: cam900 Date: Mon, 29 Apr 2019 08:20:46 +0900 Subject: k054156_k054157_k056832.cpp : Updates Simplify handlers, Reduce unnecessary handlers, unnecessary tags, unnecessary lines, Fix notes Reduce deprecated AM_* macro comments --- src/mame/drivers/asterix.cpp | 12 +- src/mame/drivers/bishi.cpp | 16 +-- src/mame/drivers/dbz.cpp | 8 +- src/mame/drivers/djmain.cpp | 60 ++++----- src/mame/drivers/giclassic.cpp | 12 +- src/mame/drivers/gijoe.cpp | 12 +- src/mame/drivers/konamigx.cpp | 118 ++++++++--------- src/mame/drivers/konmedal.cpp | 23 ++-- src/mame/drivers/konmedal68k.cpp | 6 +- src/mame/drivers/lethal.cpp | 22 ++-- src/mame/drivers/moo.cpp | 26 ++-- src/mame/drivers/mystwarr.cpp | 60 ++++----- src/mame/drivers/piratesh.cpp | 6 +- src/mame/drivers/qdrmfgp.cpp | 28 ++-- src/mame/drivers/tasman.cpp | 40 +++--- src/mame/drivers/xexex.cpp | 10 +- src/mame/drivers/zr107.cpp | 22 ++-- src/mame/video/k054156_k054157_k056832.cpp | 200 ++++++++--------------------- src/mame/video/k054156_k054157_k056832.h | 71 +++++----- 19 files changed, 325 insertions(+), 427 deletions(-) diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp index 3c1bb313420..86da1c61685 100644 --- a/src/mame/drivers/asterix.cpp +++ b/src/mame/drivers/asterix.cpp @@ -285,7 +285,7 @@ void asterix_state::asterix(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(asterix_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 1); + m_k056832->set_config(K056832_BPP_4, 1, 1); m_k056832->set_palette("palette"); K053244(config, m_k053244, 0); @@ -317,7 +317,7 @@ ROM_START( asterix ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "068_a05.5f", 0x000000, 0x010000, CRC(d3d0d77b) SHA1(bfa77a8bf651dc27f481e96a2d63242084cc214c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "k056832", 0 ) ROM_LOAD32_WORD( "068a12.16k", 0x000000, 0x080000, CRC(b9da8e9c) SHA1(a46878916833923e421da0667e37620ae0b77744) ) ROM_LOAD32_WORD( "068a11.12k", 0x000002, 0x080000, CRC(7eb07a81) SHA1(672c0c60834df7816d33d88643e4575b8ca9bcc1) ) @@ -342,7 +342,7 @@ ROM_START( asterixeac ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "068_a05.5f", 0x000000, 0x010000, CRC(d3d0d77b) SHA1(bfa77a8bf651dc27f481e96a2d63242084cc214c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "k056832", 0 ) ROM_LOAD32_WORD( "068a12.16k", 0x000000, 0x080000, CRC(b9da8e9c) SHA1(a46878916833923e421da0667e37620ae0b77744) ) ROM_LOAD32_WORD( "068a11.12k", 0x000002, 0x080000, CRC(7eb07a81) SHA1(672c0c60834df7816d33d88643e4575b8ca9bcc1) ) @@ -367,7 +367,7 @@ ROM_START( asterixeaa ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "068_a05.5f", 0x000000, 0x010000, CRC(d3d0d77b) SHA1(bfa77a8bf651dc27f481e96a2d63242084cc214c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "k056832", 0 ) ROM_LOAD32_WORD( "068a12.16k", 0x000000, 0x080000, CRC(b9da8e9c) SHA1(a46878916833923e421da0667e37620ae0b77744) ) ROM_LOAD32_WORD( "068a11.12k", 0x000002, 0x080000, CRC(7eb07a81) SHA1(672c0c60834df7816d33d88643e4575b8ca9bcc1) ) @@ -392,7 +392,7 @@ ROM_START( asterixaad ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "068_a05.5f", 0x000000, 0x010000, CRC(d3d0d77b) SHA1(bfa77a8bf651dc27f481e96a2d63242084cc214c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "k056832", 0 ) ROM_LOAD32_WORD( "068a12.16k", 0x000000, 0x080000, CRC(b9da8e9c) SHA1(a46878916833923e421da0667e37620ae0b77744) ) ROM_LOAD32_WORD( "068a11.12k", 0x000002, 0x080000, CRC(7eb07a81) SHA1(672c0c60834df7816d33d88643e4575b8ca9bcc1) ) @@ -417,7 +417,7 @@ ROM_START( asterixj ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "068_a05.5f", 0x000000, 0x010000, CRC(d3d0d77b) SHA1(bfa77a8bf651dc27f481e96a2d63242084cc214c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "k056832", 0 ) ROM_LOAD32_WORD( "068a12.16k", 0x000000, 0x080000, CRC(b9da8e9c) SHA1(a46878916833923e421da0667e37620ae0b77744) ) ROM_LOAD32_WORD( "068a11.12k", 0x000002, 0x080000, CRC(7eb07a81) SHA1(672c0c60834df7816d33d88643e4575b8ca9bcc1) ) diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp index 6a54c78bfcb..c4759292227 100644 --- a/src/mame/drivers/bishi.cpp +++ b/src/mame/drivers/bishi.cpp @@ -141,7 +141,7 @@ READ16_MEMBER(bishi_state::bishi_K056832_rom_r) if (m_cur_control2 & 0x1000) ouroffs += 4; - return m_k056832->bishi_rom_word_r(space, ouroffs, mem_mask); + return m_k056832->bishi_rom_word_r(ouroffs); } void bishi_state::main_map(address_map &map) @@ -467,7 +467,7 @@ void bishi_state::bishi(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(bishi_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_8, 1, 0); + m_k056832->set_config(K056832_BPP_8, 1, 0); m_k056832->set_palette(m_palette); K054338(config, m_k054338, 0); @@ -490,7 +490,7 @@ void bishi_state::dobouchn(machine_config &config) bishi(config); // TODO: change accordingly (ASCII charset definitely not 8bpp, 5bpp perhaps?) // m_k056832->set_tile_callback(FUNC(bishi_state::dobouchn_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_8, 1, 0); + m_k056832->set_config(K056832_BPP_8, 1, 0); } // ROM definitions @@ -501,7 +501,7 @@ ROM_START( bishi ) ROM_LOAD16_WORD_SWAP( "575jaa05.12e", 0x000000, 0x80000, CRC(7d354567) SHA1(7fc11585693c91c0ef7a8e00df4f2f01b356210f) ) ROM_LOAD16_WORD_SWAP( "575jaa06.15e", 0x080000, 0x80000, CRC(9b2f7fbb) SHA1(26c828085c44a9c4d4e713e8fcc0bc8fc973d107) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD16_BYTE( "575jaa07.14n", 0x000000, 0x080000, CRC(37bbf387) SHA1(dcf7b151b865d251f3122611b6339dd84eb1f990) ) ROM_LOAD16_BYTE( "575jaa08.17n", 0x000001, 0x080000, CRC(47ecd559) SHA1(7baac23557d40cccc21b93f181606563924244b0) ) ROM_LOAD16_BYTE( "575jaa09.19n", 0x100000, 0x080000, CRC(c1db6e68) SHA1(e951661e3b39a83db21aed484764e032adcf3c2a) ) @@ -522,7 +522,7 @@ ROM_START( sbishi ) ROM_LOAD16_WORD_SWAP( "675jaa05.12e", 0x000000, 0x80000, CRC(28a09c01) SHA1(627f6c9b9e88434ff3198c778ae5c57d9cda82c5) ) ROM_LOAD16_WORD_SWAP( "675jaa06.15e", 0x080000, 0x80000, CRC(e4998b33) SHA1(3012f7661542b38b1a113c5c10e2729c6a37e709) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD16_BYTE( "675jaa07.14n", 0x000000, 0x080000, CRC(6fe7c658) SHA1(a786a417053a5fc62f967bdd564e8d3bdc89f958) ) ROM_LOAD16_BYTE( "675jaa08.17n", 0x000001, 0x080000, CRC(c230afc9) SHA1(f23c64ed08e77960beb0f8db2605622a3887e5f8) ) ROM_LOAD16_BYTE( "675jaa09.19n", 0x100000, 0x080000, CRC(63fe85a5) SHA1(e5ef1f3fc634264260d5fc3a669646abf1601b23) ) @@ -543,7 +543,7 @@ ROM_START( sbishik ) ROM_LOAD16_WORD_SWAP( "kab05.12e", 0x000000, 0x80000, CRC(749063ca) SHA1(ef551132410248ef0b858fb8bcf6f8dd1115ad71) ) ROM_LOAD16_WORD_SWAP( "kab06.15e", 0x080000, 0x80000, CRC(089e0f37) SHA1(9cd64ebfab716bbaf0ba420ad8168a33601699a9) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD16_BYTE( "675kaa07.14n", 0x000000, 0x080000, CRC(1177c1f8) SHA1(42c6f3c3a6bd0adb7d927386fd99f1497e5df30c) ) ROM_LOAD16_BYTE( "675kaa08.17n", 0x000001, 0x080000, CRC(7117e9cd) SHA1(5a9b4b7427edcc10725d5936869927874fef6463) ) ROM_LOAD16_BYTE( "675kaa09.19n", 0x100000, 0x080000, CRC(8d49c765) SHA1(7921f8f3671fbbc3d5ea529234268a1e23ea622c) ) @@ -565,7 +565,7 @@ ROM_START( sbishika ) ROM_LOAD16_WORD_SWAP( "675kaa05.12e", 0x000000, 0x80000, CRC(23600e1d) SHA1(b3224c84e41e3077425a60232bb91775107f37a8) ) ROM_LOAD16_WORD_SWAP( "675kaa06.15e", 0x080000, 0x80000, CRC(bd1091f5) SHA1(29872abc49fe8209d0f414ca40a34fc494ff9b96) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD16_BYTE( "675kaa07.14n", 0x000000, 0x080000, CRC(1177c1f8) SHA1(42c6f3c3a6bd0adb7d927386fd99f1497e5df30c) ) ROM_LOAD16_BYTE( "675kaa08.17n", 0x000001, 0x080000, CRC(7117e9cd) SHA1(5a9b4b7427edcc10725d5936869927874fef6463) ) ROM_LOAD16_BYTE( "675kaa09.19n", 0x100000, 0x080000, CRC(8d49c765) SHA1(7921f8f3671fbbc3d5ea529234268a1e23ea622c) ) @@ -585,7 +585,7 @@ ROM_START( dobouchn ) ROM_REGION( 0x100000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "640-a05-2n.bin", 0x000000, 0x080000, CRC(7643dbc6) SHA1(3b55a782f04a741088b93954279b35c1c90af622) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) // makes GFX ROM test to pass // must return 0xf0c3 and 0xee9e, check snippets at 0x2e1c and 0x2e42 // TODO: might require a different K056832_rom_r callback instead diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index aba4c725577..96bee932d11 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -350,7 +350,7 @@ void dbz_state::dbz(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(dbz_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 1); + m_k056832->set_config(K056832_BPP_4, 1, 1); m_k056832->set_palette("palette"); K053246(config, m_k053246, 0); @@ -400,7 +400,7 @@ ROM_START( dbz ) ROM_LOAD("222a10.5e", 0x000000, 0x08000, CRC(1c93e30a) SHA1(8545a0ac5126b3c855e1901b186f57820699895d) ) /* tiles */ - ROM_REGION( 0x400000, "gfx1", 0) + ROM_REGION( 0x400000, "k056832", 0) ROM_LOAD32_WORD( "222a01.27c", 0x000000, 0x200000, CRC(9fce4ed4) SHA1(81e19375b351ee247f066434dd595149333d73c5) ) ROM_LOAD32_WORD( "222a02.27e", 0x000002, 0x200000, CRC(651acaa5) SHA1(33942a90fb294b5da6a48e5bfb741b31babca188) ) @@ -435,7 +435,7 @@ ROM_START( dbza ) ROM_LOAD("222a10.5e", 0x000000, 0x08000, CRC(1c93e30a) SHA1(8545a0ac5126b3c855e1901b186f57820699895d) ) /* tiles */ - ROM_REGION( 0x400000, "gfx1", 0) + ROM_REGION( 0x400000, "k056832", 0) ROM_LOAD32_WORD( "222a01.27c", 0x000000, 0x200000, CRC(9fce4ed4) SHA1(81e19375b351ee247f066434dd595149333d73c5) ) ROM_LOAD32_WORD( "222a02.27e", 0x000002, 0x200000, CRC(651acaa5) SHA1(33942a90fb294b5da6a48e5bfb741b31babca188) ) @@ -470,7 +470,7 @@ ROM_START( dbz2 ) ROM_LOAD("s-001.5e", 0x000000, 0x08000, CRC(154e6d03) SHA1(db15c20982692271f40a733dfc3f2486221cd604) ) /* tiles */ - ROM_REGION( 0x400000, "gfx1", 0) + ROM_REGION( 0x400000, "k056832", 0) ROM_LOAD32_WORD( "ds-b01.27c", 0x000000, 0x200000, CRC(8dc39972) SHA1(c6e3d4e0ff069e08bdb68e2b0ad24cc7314e4e93) ) ROM_LOAD32_WORD( "ds-b02.27e", 0x000002, 0x200000, CRC(7552f8cd) SHA1(1f3beffe9733b1a18d44b5e8880ff1cc97e7a8ab) ) diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp index 11354990fbc..cde246b9f6d 100644 --- a/src/mame/drivers/djmain.cpp +++ b/src/mame/drivers/djmain.cpp @@ -188,8 +188,8 @@ WRITE32_MEMBER(djmain_state::v_ctrl_w) READ32_MEMBER(djmain_state::v_rom_r) { - uint8_t *mem8 = memregion("gfx2")->base(); - int bank = m_k056832->word_r(space, 0x34/2, 0xffff); + uint8_t *mem8 = memregion("k056832")->base(); + int bank = m_k056832->word_r(0x34/2); offset *= 2; @@ -379,7 +379,7 @@ void djmain_state::maincpu_djmain(address_map &map) map(0x400000, 0x40ffff).ram(); // WORK RAM map(0x480000, 0x48443f).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // COLOR RAM map(0x500000, 0x57ffff).rw(FUNC(djmain_state::sndram_r), FUNC(djmain_state::sndram_w)); // SOUND RAM - map(0x580000, 0x58003f).rw(m_k056832, FUNC(k056832_device::long_r), FUNC(k056832_device::long_w)); // VIDEO REG (tilemap) + map(0x580000, 0x58003f).rw(m_k056832, FUNC(k056832_device::word_r), FUNC(k056832_device::word_w)); // VIDEO REG (tilemap) map(0x590000, 0x590007).w(FUNC(djmain_state::unknown590000_w)); // ?? map(0x5a0000, 0x5a005f).w(m_k055555, FUNC(k055555_device::K055555_long_w)); // 055555: priority encoder map(0x5b0000, 0x5b04ff).rw("k054539_1", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0xff00ff00); @@ -402,7 +402,7 @@ void djmain_state::maincpu_djmainj(address_map &map) { maincpu_djmain(map); - map(0xc00000, 0xc01fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); // VIDEO RAM (tilemap) (beatmania) + map(0xc00000, 0xc01fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // VIDEO RAM (tilemap) (beatmania) map(0xc02000, 0xc02047).w(FUNC(djmain_state::unknownc02000_w)); // ?? map(0xf00000, 0xf0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs (beatmania) map(0xf40000, 0xf4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg (beatmania) @@ -414,7 +414,7 @@ void djmain_state::maincpu_djmainu(address_map &map) map(0xd00000, 0xd0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs (hiphopmania) map(0xd40000, 0xd4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg (hiphopmania) - map(0xe00000, 0xe01fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); // VIDEO RAM (tilemap) (hiphopmania) + map(0xe00000, 0xe01fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // VIDEO RAM (tilemap) (hiphopmania) } void djmain_state::maincpu_djmaina(address_map &map) @@ -423,7 +423,7 @@ void djmain_state::maincpu_djmaina(address_map &map) map(0xc00000, 0xc0000f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)); // IDE control regs map(0xc40000, 0xc4000f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)); // IDE status control reg - map(0xf00000, 0xf01fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); // VIDEO RAM (tilemap) + map(0xf00000, 0xf01fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // VIDEO RAM (tilemap) } void djmain_state::k054539_map(address_map &map) @@ -1404,7 +1404,7 @@ void djmain_state::djmainj(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(djmain_state::tile_callback), this); - m_k056832->set_config("gfx2", K056832_BPP_4dj, 1, 1); + m_k056832->set_config(K056832_BPP_4dj, 1, 1); m_k056832->set_palette(m_palette); K055555(config, m_k055555, 0); @@ -1455,7 +1455,7 @@ ROM_START( bm1stmix ) ROM_LOAD16_BYTE( "753jaa05.22a", 0x100000, 0x80000, CRC(749b1e87) SHA1(1c771c19f152ae95171e4fd51da561ba4ec5ea87) ) ROM_LOAD16_BYTE( "753jaa06.24a", 0x100001, 0x80000, CRC(6d86b0fd) SHA1(74a255dbb1c83131717ea1fe335f12aef81d9fcc) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "753jaa07.22d", 0x000000, 0x80000, CRC(f03ab5d8) SHA1(2ad902547908208714855aa0f2b7ed493452ee5f) ) ROM_LOAD16_BYTE( "753jaa08.23d", 0x000001, 0x80000, CRC(6559f0c8) SHA1(0d6ec4bdc22c02cb9fb8de36b0a8f7a6c983440e) ) ROM_LOAD16_BYTE( "753jaa09.25d", 0x100000, 0x80000, CRC(b50c3dbb) SHA1(6022ea249aad0793b2279699e68087b4bc9b4ef1) ) @@ -1478,7 +1478,7 @@ ROM_START( bm2ndmix ) ROM_LOAD16_BYTE( "853jaa05.22a", 0x100000, 0x80000, CRC(0da3fef9) SHA1(f9ef24144c00c054ecc4650bb79e74c57c6d6b3c) ) ROM_LOAD16_BYTE( "853jaa06.24a", 0x100001, 0x80000, CRC(6a66978c) SHA1(460178a6f35e554a157742d77ed5ea6989fbcee1) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "853jaa07.22d", 0x000000, 0x80000, CRC(728c0010) SHA1(18888b402e0b7ccf63c7b3cb644673df1746dba7) ) ROM_LOAD16_BYTE( "853jaa08.23d", 0x000001, 0x80000, CRC(926fc37c) SHA1(f251cba56ca201f0e748112462116cff218b66da) ) ROM_LOAD16_BYTE( "853jaa09.25d", 0x100000, 0x80000, CRC(8584e21e) SHA1(3d1ca6de00f9ac07bbe7cd1e67093cca7bf484bb) ) @@ -1499,7 +1499,7 @@ ROM_START( bm2ndmxa ) ROM_LOAD16_BYTE( "853jaa05.22a", 0x100000, 0x80000, CRC(0da3fef9) SHA1(f9ef24144c00c054ecc4650bb79e74c57c6d6b3c) ) ROM_LOAD16_BYTE( "853jaa06.24a", 0x100001, 0x80000, CRC(6a66978c) SHA1(460178a6f35e554a157742d77ed5ea6989fbcee1) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "853jaa07.22d", 0x000000, 0x80000, CRC(728c0010) SHA1(18888b402e0b7ccf63c7b3cb644673df1746dba7) ) ROM_LOAD16_BYTE( "853jaa08.23d", 0x000001, 0x80000, CRC(926fc37c) SHA1(f251cba56ca201f0e748112462116cff218b66da) ) ROM_LOAD16_BYTE( "853jaa09.25d", 0x100000, 0x80000, CRC(8584e21e) SHA1(3d1ca6de00f9ac07bbe7cd1e67093cca7bf484bb) ) @@ -1520,7 +1520,7 @@ ROM_START( bm3rdmix ) ROM_LOAD16_BYTE( "825jaa05.22a", 0x100000, 0x80000, CRC(9f9a3369) SHA1(d8b20127336af89b9e886289fb4f5a2e0db65f9b) ) ROM_LOAD16_BYTE( "825jaa06.24a", 0x100001, 0x80000, CRC(e7a3991a) SHA1(6c8cb481e721428e1365f784e97bb6f6d421ed5a) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "825jaa07.22d", 0x000000, 0x80000, CRC(a96cf46c) SHA1(c8540b452dcb15f5873ca629fa62657a5a3bb02c) ) ROM_LOAD16_BYTE( "825jaa08.23d", 0x000001, 0x80000, CRC(06d56c3b) SHA1(19cd15ab0869773e6a16b1cad48c53bec2f60b0b) ) ROM_LOAD16_BYTE( "825jaa09.25d", 0x100000, 0x80000, CRC(d3e65669) SHA1(51abf452da60794fa47c05d11c08b203dde563ff) ) @@ -1541,7 +1541,7 @@ ROM_START( bmcompmx ) ROM_LOAD16_BYTE( "858jaa05.22a", 0x100000, 0x80000, CRC(9ce769da) SHA1(1fe2999f786effdd5e3e74475e8431393eb9403d) ) ROM_LOAD16_BYTE( "858jaa06.24a", 0x100001, 0x80000, CRC(0cde6584) SHA1(fb58d2b4f58144b71703431740c0381bb583f581) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "858jaa07.22d", 0x000000, 0x80000, CRC(7d183f46) SHA1(7a1b0ccb0407b787af709bdf038d886727199e4e) ) ROM_LOAD16_BYTE( "858jaa08.23d", 0x000001, 0x80000, CRC(c731dc8f) SHA1(1a937d76c02711b7f73743c9999456d4408ad284) ) ROM_LOAD16_BYTE( "858jaa09.25d", 0x100000, 0x80000, CRC(0b4ad843) SHA1(c01e15053dd1975dc68db9f4e6da47062d8f9b54) ) @@ -1562,7 +1562,7 @@ ROM_START( hmcompmx ) ROM_LOAD16_BYTE( "858uaa05.22a", 0x100000, 0x80000, CRC(2e14cf83) SHA1(799b2162f7b11678d1d260f7e1eb841abda55a60) ) ROM_LOAD16_BYTE( "858uaa06.24a", 0x100001, 0x80000, CRC(2be07788) SHA1(5cc2408f907ca6156efdcbb2c10a30e9b81797f8) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "858uaa07.22d", 0x000000, 0x80000, CRC(9d7c8ea0) SHA1(5ef773ade7ab12a5dc10484e8b7711c9d76fe2a1) ) ROM_LOAD16_BYTE( "858uaa08.23d", 0x000001, 0x80000, CRC(f21c3f45) SHA1(1d7ff2c4161605b382d07900142093192aa93a48) ) ROM_LOAD16_BYTE( "858uaa09.25d", 0x100000, 0x80000, CRC(99519886) SHA1(664f6bd953201a6e2fc123cb8b3facf72766107d) ) @@ -1583,7 +1583,7 @@ ROM_START( bm4thmix ) ROM_LOAD16_BYTE( "847jaa05.22a", 0x100000, 0x80000, CRC(da165b5e) SHA1(e46110590e6ab89b55f6abfbf6c53c99d28a75a9) ) ROM_LOAD16_BYTE( "847jaa06.24a", 0x100001, 0x80000, CRC(8bfc2f28) SHA1(f8869867945d63d9f34b6228d95c5a61b193eed2) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "847jab07.22d", 0x000000, 0x80000, CRC(c159e7c4) SHA1(96af0c29b2f1fef494b2223179862d16f26bb33f) ) ROM_LOAD16_BYTE( "847jab08.23d", 0x000001, 0x80000, CRC(8ff084d6) SHA1(50cff8c701e33f2630925c1a9ae4351076912acd) ) ROM_LOAD16_BYTE( "847jab09.25d", 0x100000, 0x80000, CRC(2e4ac9fe) SHA1(bbd4c6e0c82fc0be88f851e901e5853b6bcf775f) ) @@ -1604,7 +1604,7 @@ ROM_START( bm5thmix ) ROM_LOAD16_BYTE( "981jaa05.22a", 0x100000, 0x80000, CRC(f370fdb9) SHA1(3a2bbdda984f2630e8ae505a8db259d9162e07a3) ) ROM_LOAD16_BYTE( "981jaa06.24a", 0x100001, 0x80000, CRC(da6e3813) SHA1(9163bd2cfb0a32798e797c7b4eea21e28772a206) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "981jaa07.22d", 0x000000, 0x80000, CRC(f6c72998) SHA1(e78af5b515b224c534f47abd6477dd97dc521b0d) ) ROM_LOAD16_BYTE( "981jaa08.23d", 0x000001, 0x80000, CRC(aa4ff682) SHA1(3750e1e81b7c1a4fb419076171f20e4c36b1c544) ) ROM_LOAD16_BYTE( "981jaa09.25d", 0x100000, 0x80000, CRC(d96d4e1c) SHA1(379aa4e82cd06490645f54dab1724c827108735d) ) @@ -1625,7 +1625,7 @@ ROM_START( bmclubmx ) ROM_LOAD16_BYTE( "993jaa05.22a", 0x100000, 0x80000, CRC(4e340947) SHA1(a0a7f3b222a292b07bc5c7acd61547ea2bdbad43) ) ROM_LOAD16_BYTE( "993jaa06.24a", 0x100001, 0x80000, CRC(c0a711d6) SHA1(ab581c5215c4db6dbf58b47f54834fe81e8a569b) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "993jaa07.22d", 0x000000, 0x80000, CRC(4fc588cf) SHA1(00fb73002b6b5ae414eef320169e379b94ee33a1) ) ROM_LOAD16_BYTE( "993jaa08.23d", 0x000001, 0x80000, CRC(b6c88e9e) SHA1(e3b76e782b9507dad2bdb9de1a34d125f6100cc8) ) ROM_LOAD16_BYTE( "993jaa09.25d", 0x100000, 0x80000, CRC(e1a172dd) SHA1(42e850c055dc5bfccf6b6989f9f3a945fce13006) ) @@ -1648,7 +1648,7 @@ ROM_START( bmcompm2 ) ROM_LOAD16_BYTE( "988jaa05.22a", 0x100000, 0x80000, CRC(0ddf7d6d) SHA1(aa110ab64c2fbf427796dff3a817b57cf6a9440d) ) ROM_LOAD16_BYTE( "988jaa06.24a", 0x100001, 0x80000, CRC(2a87f69e) SHA1(fe84bb50864467a83d06d34a18123ab11fb55781) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "988jaa07.22d", 0x000000, 0x80000, CRC(9e57fe24) SHA1(40bd0428227e46ebe365f2f6821b08182a0ce698) ) ROM_LOAD16_BYTE( "988jaa08.23d", 0x000001, 0x80000, CRC(bf604ca4) SHA1(6abc81d5d9084fcf59f70a6bd57e1b36041a1072) ) ROM_LOAD16_BYTE( "988jaa09.25d", 0x100000, 0x80000, CRC(8f3bae7f) SHA1(c4dac14f6c7f75a2b19153e05bfe969e9eb4aca0) ) @@ -1669,7 +1669,7 @@ ROM_START( hmcompm2 ) ROM_LOAD16_BYTE( "988uaa05.22a", 0x100000, 0x80000, CRC(6b9321cb) SHA1(449e5f85288a8c6724658050fa9521c7454a1e46) ) ROM_LOAD16_BYTE( "988uaa06.24a", 0x100001, 0x80000, CRC(da6e0c1e) SHA1(4ef37db6c872bccff8c27fc53cccc0b269c7aee4) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "988uaa07.22d", 0x000000, 0x80000, CRC(9217870d) SHA1(d0536a8a929c41b49cdd053205165bfb8150e0c5) ) ROM_LOAD16_BYTE( "988uaa08.23d", 0x000001, 0x80000, CRC(77777e59) SHA1(33b5508b961a04b82c9967a3326af6bbd838b85e) ) ROM_LOAD16_BYTE( "988uaa09.25d", 0x100000, 0x80000, CRC(c2ad6810) SHA1(706388c5acf6718297fd90e10f8a673463a0893b) ) @@ -1690,7 +1690,7 @@ ROM_START( bmdct ) ROM_LOAD16_BYTE( "995jaa05.22a", 0x100000, 0x80000, CRC(1493fd98) SHA1(4cae2ebccc79b21d7e21b984dc6fe10ab3013a2d) ) ROM_LOAD16_BYTE( "995jaa06.24a", 0x100001, 0x80000, CRC(86bff0bb) SHA1(658280f78987eaee31b60a7826db6df105601f0a) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "995jaa07.22d", 0x000000, 0x80000, CRC(ce030edf) SHA1(1e2594a6a04559d70b09750bb665d8cd3d0288ea) ) ROM_LOAD16_BYTE( "995jaa08.23d", 0x000001, 0x80000, CRC(375d3d17) SHA1(180cb5ad4497b3745aa9317764f237b30a678b31) ) ROM_LOAD16_BYTE( "995jaa09.25d", 0x100000, 0x80000, CRC(1510a9c2) SHA1(daf1ab26b7b6b0fe0123b3fbee68684157c2ce51) ) @@ -1711,7 +1711,7 @@ ROM_START( bmcorerm ) ROM_LOAD16_BYTE( "a05jaa05.22a", 0x100000, 0x80000, CRC(e241b22b) SHA1(941a76f6ac821e0984057ec7df7862b12fa657b8) ) ROM_LOAD16_BYTE( "a05jaa06.24a", 0x100001, 0x80000, CRC(77eb08a3) SHA1(fd339aaec06916abfc928e850e33480707b5450d) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "a05jaa07.22d", 0x000000, 0x80000, CRC(4d79646d) SHA1(5f1237bbd3cb09b27babf1c5359ef6c0d80ae3a9) ) ROM_LOAD16_BYTE( "a05jaa08.23d", 0x000001, 0x80000, CRC(f067494f) SHA1(ef031b5501556c1aa047a51604a44551b35a8b99) ) ROM_LOAD16_BYTE( "a05jaa09.25d", 0x100000, 0x80000, CRC(1504d62c) SHA1(3c31c6625bc089235a96fe21021239f2d0c0f6e1) ) @@ -1732,7 +1732,7 @@ ROM_START( bm6thmix ) ROM_LOAD16_BYTE( "a21jaa05.22a", 0x100000, 0x80000, CRC(818e34e6) SHA1(8a9093b92392a065d0cf94d56195a6f3ca611044) ) ROM_LOAD16_BYTE( "a21jaa06.24a", 0x100001, 0x80000, CRC(36f2043b) SHA1(d2846cc10173662029da7c5d686cf89299be2be5) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "a21jaa07.22d", 0x000000, 0x80000, CRC(841d83e1) SHA1(c85962abcc955e8f11138e03002b16afd3791f0a) ) ROM_LOAD16_BYTE( "a21jaa08.23d", 0x000001, 0x80000, CRC(4e561919) SHA1(4b91560d9ba367c848d784db760f042d5d76e003) ) ROM_LOAD16_BYTE( "a21jaa09.25d", 0x100000, 0x80000, CRC(181e6f70) SHA1(82c7ca3068ace9a66b614ead4b90ea6fe4017d51) ) @@ -1753,7 +1753,7 @@ ROM_START( bm7thmix ) ROM_LOAD16_BYTE( "b07jaa05.22a", 0x100000, 0x80000, CRC(415a6363) SHA1(b3edbcd293006c3738a10680ecfa66e105028786) ) ROM_LOAD16_BYTE( "b07jaa06.24a", 0x100001, 0x80000, CRC(46c59a43) SHA1(ba58432bf7df394b5c633e63bcf2321bc320f023) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "b07jaa07.22d", 0x000000, 0x80000, CRC(b2908dc7) SHA1(22e36afef9a03681928d37a8ffe50078d04525ce) ) ROM_LOAD16_BYTE( "b07jaa08.23d", 0x000001, 0x80000, CRC(cbbefecf) SHA1(ed1347d1a8fd59677e4290b8cd568ddf505a7265) ) ROM_LOAD16_BYTE( "b07jaa09.25d", 0x100000, 0x80000, CRC(2530cedb) SHA1(94b38b4fe198b26a2ff4d99d2cb28a0f935fe940) ) @@ -1776,7 +1776,7 @@ ROM_START( bmfinal ) ROM_LOAD16_BYTE( "c01jaa05.22a", 0x100000, 0x80000, CRC(37dab217) SHA1(66b07c36e7749a4c9d9dfaca633958a4922c4562) ) ROM_LOAD16_BYTE( "c01jaa06.24a", 0x100001, 0x80000, CRC(d35c6818) SHA1(ce608603ea3662f8cda5cf958a676d64a0f74645) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "c01jaa07.22d", 0x000000, 0x80000, CRC(3e70f506) SHA1(d3cd0b48383bf2514b7f47fade8549ea8e3c5555) ) ROM_LOAD16_BYTE( "c01jaa08.23d", 0x000001, 0x80000, CRC(535e6065) SHA1(131f7eec4179145781bbd23474202f4eaf9cefd0) ) ROM_LOAD16_BYTE( "c01jaa09.25d", 0x100000, 0x80000, CRC(45cf93b1) SHA1(7c5082bcd1fe15761a0a965e25dda121904ff1bd) ) @@ -1799,7 +1799,7 @@ ROM_START( popn1 ) ROM_LOAD16_BYTE( "803aaa05.22a", 0x100000, 0x80000, CRC(8a23c18d) SHA1(714b68a3112dff52feba6a50ae15c02d041b1def) ) ROM_LOAD16_BYTE( "803aaa06.24a", 0x100001, 0x80000, CRC(bd6450ff) SHA1(bb89c65d1b0e38c0a26ec4cccd35103583efff45) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "803aaa07.22d", 0x000000, 0x80000, CRC(4c97dbf0) SHA1(c33f84e2c1a59294413163a5546cb2fe092e42d1) ) ROM_LOAD16_BYTE( "803aaa08.23d", 0x000001, 0x80000, CRC(cc6b21d3) SHA1(eac3b92bc392265df08b0311320c4e23f257c58b) ) ROM_LOAD16_BYTE( "803aaa09.25d", 0x100000, 0x80000, CRC(45ab3978) SHA1(c34b800dfb14affcb705dffa566d046a6d1e7c7c) ) @@ -1820,7 +1820,7 @@ ROM_START( popn2 ) ROM_LOAD16_BYTE( "831jaa05.22a", 0x100000, 0x80000, CRC(f3b63033) SHA1(c3c6de0d8c749ddf4926040637f03b11c2a21b99) ) ROM_LOAD16_BYTE( "831jaa06.24a", 0x100001, 0x80000, CRC(43564e9c) SHA1(54b792b8aaf22876f9eb806e31b86af4b354bcf6) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "831jaa07.22d", 0x000000, 0x80000, CRC(25af75f5) SHA1(c150514a3bc6f3f88a5b98ef0db5440e2c5fec2d) ) ROM_LOAD16_BYTE( "831jaa08.23d", 0x000001, 0x80000, CRC(3b1b5629) SHA1(95b6bed5c5218a3bfb10996cd9af31bd7e08c1c4) ) ROM_LOAD16_BYTE( "831jaa09.25d", 0x100000, 0x80000, CRC(ae7838d2) SHA1(4f8a6793065c6c1eb08161f65b1d6246987bf47e) ) @@ -1841,7 +1841,7 @@ ROM_START( popn3 ) ROM_LOAD16_BYTE( "980a05.22a", 0x100000, 0x080000, CRC(d31072e4) SHA1(c23c0e21fb22fe82b9a76d28bf2896dfec6bdc9b) ) ROM_LOAD16_BYTE( "980a06.24a", 0x100001, 0x080000, CRC(d2bbcf36) SHA1(4f44c5d8df5dabf2956bdf33739a97b0645b5a5d) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "980a07.22d", 0x000000, 0x080000, CRC(770732d0) SHA1(f4330952d1e54658077e315ebd3cfd35e267219c) ) ROM_LOAD16_BYTE( "980a08.23d", 0x000001, 0x080000, CRC(64ba3895) SHA1(3e4654c970d6fffe46b4e1097c1a6cda196ec92a) ) ROM_LOAD16_BYTE( "980a09.25d", 0x100000, 0x080000, CRC(1cb4d84e) SHA1(9669585c6a2825aeae6e47dd03458624b4c44721) ) @@ -1862,7 +1862,7 @@ ROM_START( popnstage ) ROM_LOAD16_BYTE( "970jba05.22a", 0x100000, 0x80000, NO_DUMP ) ROM_LOAD16_BYTE( "970jba06.24a", 0x100001, 0x80000, NO_DUMP ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "970jba07.22d", 0x000000, 0x80000, NO_DUMP ) ROM_LOAD16_BYTE( "970jba08.23d", 0x000001, 0x80000, NO_DUMP ) ROM_LOAD16_BYTE( "970jba09.25d", 0x100000, 0x80000, NO_DUMP ) @@ -1885,7 +1885,7 @@ ROM_START( bm3rdmxb ) ROM_LOAD16_BYTE( "825jaa05.22a", 0x100000, 0x80000, CRC(9f9a3369) SHA1(d8b20127336af89b9e886289fb4f5a2e0db65f9b) ) ROM_LOAD16_BYTE( "825jaa06.24a", 0x100001, 0x80000, CRC(e7a3991a) SHA1(6c8cb481e721428e1365f784e97bb6f6d421ed5a) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "825jab07.22d", 0x000000, 0x80000, CRC(1a515c82) SHA1(a0c908d449aa45cb3a90a42c97429f10873e884b) ) ROM_LOAD16_BYTE( "825jab08.23d", 0x000001, 0x80000, CRC(82731b07) SHA1(c0d391fcd94c6b2225fca338c0c5db5d35e2d8bc) ) ROM_LOAD16_BYTE( "825jab09.25d", 0x100000, 0x80000, CRC(1407ba5d) SHA1(e7a0d190326589f4d94e83cb7c85dd4e91f4efad) ) @@ -1906,7 +1906,7 @@ ROM_START( popn1j ) ROM_LOAD16_BYTE( "803jaa05.22a", 0x100000, 0x80000, CRC(2902f6df) SHA1(658ccae9a67196a310bd69870c350058d2911feb) ) ROM_LOAD16_BYTE( "803jaa06.24a", 0x100001, 0x80000, CRC(508f326a) SHA1(a55c17f88b5856a754f00a6e32b6f60685a88bec) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "803jaa07.22d", 0x000000, 0x80000, CRC(b9c12071) SHA1(8f67965d5c8e7c9bfac528a77a9e7c8e0d8b17c8) ) ROM_LOAD16_BYTE( "803jaa08.23d", 0x000001, 0x80000, CRC(a263f819) SHA1(b479a215282212e9253e4085640c0638a4036e31) ) ROM_LOAD16_BYTE( "803jaa09.25d", 0x100000, 0x80000, CRC(204d53eb) SHA1(349de147246b0ed08fb7e473d63e073b71fa30c9) ) @@ -1927,7 +1927,7 @@ ROM_START( popnstex ) ROM_LOAD16_BYTE( "970jba05.22a", 0x100000, 0x80000, CRC(3bedc09c) SHA1(d0806bb54a3e620a987d61c6a5f04a2e1fc613a8) ) ROM_LOAD16_BYTE( "970jba06.24a", 0x100001, 0x80000, CRC(1673a771) SHA1(2768434f1c94543f69d40165e68d325ae5d553cd) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* TILEMAP */ + ROM_REGION( 0x200000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD16_BYTE( "970jba07.22d", 0x000000, 0x80000, CRC(6fd06bdb) SHA1(1dc621923e0871d2d5171753f5ddb97786ab12bd) ) ROM_LOAD16_BYTE( "970jba08.23d", 0x000001, 0x80000, CRC(28256891) SHA1(2069f52d596acbf355f205bb8d69cefc4cce3542) ) ROM_LOAD16_BYTE( "970jba09.25d", 0x100000, 0x80000, CRC(5d2bda52) SHA1(d03c135ac04437b54e4d267ae168fe7ebb9e5b65) ) diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp index 7e0c2a7377e..856b5c30824 100644 --- a/src/mame/drivers/giclassic.cpp +++ b/src/mame/drivers/giclassic.cpp @@ -138,10 +138,10 @@ READ16_MEMBER(giclassic_state::vrom_r) { if (m_control & 8) { - return m_k056832->piratesh_rom_r(space, offset + 0x1000); + return m_k056832->piratesh_rom_r(offset + 0x1000); } - return m_k056832->piratesh_rom_r(space, offset); + return m_k056832->piratesh_rom_r(offset); } void giclassic_state::satellite_main(address_map &map) @@ -316,7 +316,7 @@ void giclassic_state::giclassic(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(giclassic_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4PIRATESH, 1, 0); + m_k056832->set_config(K056832_BPP_4PIRATESH, 1, 0); m_k056832->set_palette(m_palette); } @@ -340,7 +340,7 @@ void giclassicsvr_state::giclassvr(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(giclassicsvr_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4PIRATESH, 0, 0); + m_k056832->set_config(K056832_BPP_4PIRATESH, 0, 0); m_k056832->set_palette(m_palette); K055673(config, m_k055673, 0); @@ -356,7 +356,7 @@ ROM_START( giclasex ) ROM_REGION( 0x80000, "maincpu", 0 ) /* main program */ ROM_LOAD16_WORD_SWAP( "gsgu760ae01.12t", 0x000000, 0x080000, CRC(f0f9c118) SHA1(1753d53946bc0703d329e4a09c452713b260da75) ) - ROM_REGION( 0x100000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x100000, "k056832", 0 ) /* tilemaps */ ROM_LOAD( "gsgu760ae03.14c", 0x000000, 0x080000, CRC(1663d327) SHA1(98c1a9653d38f4918f78b3a11af0c29c658201f5) ) ROM_LOAD( "gsgu760ae02.14e", 0x080000, 0x080000, CRC(2b9fe163) SHA1(f60190a9689a70d6c5bb14fb46b7ac2267cf0969) ) ROM_END @@ -365,7 +365,7 @@ ROM_START( giclassvr ) ROM_REGION( 0x80000, "maincpu", 0 ) /* main program */ ROM_LOAD16_WORD_SWAP( "gsgu_760_fd01.34e.bin", 0x000000, 0x080000, CRC(da89c1d7) SHA1(551d050a9b6e54fbf98e966eb37924b644037893) ) - ROM_REGION( 0x100000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x100000, "k056832", 0 ) /* tilemaps */ ROM_LOAD( "gsgu_760_ad04.25q", 0x080000, 0x080000, CRC(71a45742) SHA1(fbddd54f5fb236662f7cc7e9b350723bc5404f72) ) ROM_LOAD( "gsgu_760_ad05.25r", 0x000000, 0x080000, CRC(44221eec) SHA1(966452e606e828b536ed11cbdd626a2fe3165199) ) diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp index 70ae9c16b9e..87f71786986 100644 --- a/src/mame/drivers/gijoe.cpp +++ b/src/mame/drivers/gijoe.cpp @@ -317,7 +317,7 @@ void gijoe_state::gijoe(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(gijoe_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 0); + m_k056832->set_config(K056832_BPP_4, 1, 0); m_k056832->set_palette(m_palette); K053246(config, m_k053246, 0); @@ -350,7 +350,7 @@ ROM_START( gijoe ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "069a01.7c", 0x000000, 0x010000, CRC(74172b99) SHA1(f5e0e0d43317454fdacd3df7cd3035fcae4aef68) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) ) ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) ) @@ -383,7 +383,7 @@ ROM_START( gijoeea ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "069a01.7c", 0x000000, 0x010000, CRC(74172b99) SHA1(f5e0e0d43317454fdacd3df7cd3035fcae4aef68) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) ) ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) ) @@ -410,7 +410,7 @@ ROM_START( gijoeu ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "069a01.7c", 0x000000, 0x010000, CRC(74172b99) SHA1(f5e0e0d43317454fdacd3df7cd3035fcae4aef68) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) ) ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) ) @@ -437,7 +437,7 @@ ROM_START( gijoej ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "069a01.7c", 0x000000, 0x010000, CRC(74172b99) SHA1(f5e0e0d43317454fdacd3df7cd3035fcae4aef68) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) ) ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) ) @@ -464,7 +464,7 @@ ROM_START( gijoea ) ROM_REGION( 0x010000, "audiocpu", 0 ) ROM_LOAD( "069a01.7c", 0x000000, 0x010000, CRC(74172b99) SHA1(f5e0e0d43317454fdacd3df7cd3035fcae4aef68) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) ) ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) ) diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index e21c69d77bf..316ba030c47 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -997,7 +997,7 @@ void konamigx_state::gx_base_memmap(address_map &map) map(0xd20000, 0xd20fff).rw(m_k055673, FUNC(k055673_device::k053247_word_r), FUNC(k055673_device::k053247_word_w)); map(0xd21000, 0xd21fff).ram(); // second bank of sprite RAM, accessed thru ESC map(0xd22000, 0xd23fff).ram(); // extra bank checked at least by sexyparo, pending further investigation. - map(0xd40000, 0xd4003f).w(m_k056832, FUNC(k056832_device::long_w)); + map(0xd40000, 0xd4003f).w(m_k056832, FUNC(k056832_device::word_w)); map(0xd44000, 0xd4400f).w(FUNC(konamigx_state::konamigx_tilebank_w)); map(0xd48000, 0xd48007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); map(0xd4a000, 0xd4a00f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); @@ -1012,8 +1012,8 @@ void konamigx_state::gx_base_memmap(address_map &map) map(0xd5c000, 0xd5c003).portr("INPUTS"); map(0xd5e000, 0xd5e003).portr("SERVICE"); map(0xd80000, 0xd8001f).w(m_k054338, FUNC(k054338_device::long_w)); - map(0xda0000, 0xda1fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); - map(0xda2000, 0xda3fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); + map(0xda0000, 0xda1fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); + map(0xda2000, 0xda3fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); } void konamigx_state::gx_type1_map(address_map &map) @@ -1047,15 +1047,15 @@ void konamigx_state::gx_type3_map(address_map &map) { gx_base_memmap(map); map(0xd90000, 0xd97fff).ram(); - //AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w) + //map(0xcc0000, 0xcc0007).w(FUNC(konamigx_state::type4_prot_w)); map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); - //AM_RANGE(0xe20000, 0xe20003) AM_WRITENOP + //map(0xe20000, 0xe20003).nopw(); map(0xe40000, 0xe40003).w(FUNC(konamigx_state::konamigx_type3_psac2_bank_w)).share("psac2_bank"); map(0xe60000, 0xe60fff).ram().share("k053936_0_line"); map(0xe80000, 0xe83fff).ram().share("paletteram"); // main monitor palette map(0xea0000, 0xea3fff).ram().share("subpaletteram"); map(0xec0000, 0xec0003).r(FUNC(konamigx_state::type3_sync_r)); - //AM_RANGE(0xf00000, 0xf07fff) AM_RAM + //map(0xf00000, 0xf07fff).ram(); } void konamigx_state::gx_type4_map(address_map &map) @@ -1071,7 +1071,7 @@ void konamigx_state::gx_type4_map(address_map &map) map(0xea0000, 0xea7fff).ram().share("subpaletteram"); // 5G/7G/9G (sub screen palette RAM) map(0xec0000, 0xec0003).r(FUNC(konamigx_state::type3_sync_r)); // type 4 polls this too map(0xf00000, 0xf07fff).ram().w(FUNC(konamigx_state::konamigx_t4_psacmap_w)).share("psacram"); // PSAC2 tilemap -// AM_RANGE(0xf00000, 0xf07fff) AM_RAM +// map(0xf00000, 0xf07fff).ram(); } /**********************************************************************************/ @@ -1646,7 +1646,7 @@ void konamigx_state::konamigx(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(konamigx_state::type2_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_5, 0, 0); + m_k056832->set_config(K056832_BPP_5, 0, 0); m_k056832->set_palette(m_palette); K055555(config, m_k055555, 0); @@ -1695,7 +1695,7 @@ void konamigx_state::konamigx_bios(machine_config &config) { konamigx(config); - m_k056832->set_config("gfx1", K056832_BPP_4, 0, 0); + m_k056832->set_config(K056832_BPP_4, 0, 0); } void konamigx_state::gokuparo(machine_config &config) @@ -1717,7 +1717,7 @@ void konamigx_state::tbyahhoo(machine_config &config) { konamigx(config); - m_k056832->set_config("gfx1", K056832_BPP_5, 0, 0); + m_k056832->set_config(K056832_BPP_5, 0, 0); } void konamigx_state::dragoonj(machine_config &config) @@ -1727,7 +1727,7 @@ void konamigx_state::dragoonj(machine_config &config) m_k053252->set_offsets(24+16, 16); - m_k056832->set_config("gfx1", K056832_BPP_5, 1, 0); + m_k056832->set_config(K056832_BPP_5, 1, 0); m_k055673->set_sprite_callback(FUNC(konamigx_state::dragoonj_sprite_callback), this); m_k055673->set_config("gfx2", K055673_LAYOUT_RNG, -53, -23); @@ -1740,7 +1740,7 @@ void konamigx_state::le2(machine_config &config) TIMER(config, "scantimer").configure_scanline(FUNC(konamigx_state::konamigx_type2_scanline), "screen", 0, 1); - m_k056832->set_config("gfx1", K056832_BPP_8, 1, 0); + m_k056832->set_config(K056832_BPP_8, 1, 0); m_k055673->set_sprite_callback(FUNC(konamigx_state::le2_sprite_callback), this); m_k055673->set_config("gfx2", K055673_LAYOUT_LE2, -46, -23); @@ -1751,7 +1751,7 @@ void konamigx_state::konamigx_6bpp(machine_config &config) konamigx(config); MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_6bpp) - m_k056832->set_config("gfx1", K056832_BPP_6, 0, 0); + m_k056832->set_config(K056832_BPP_6, 0, 0); m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -46, -23); } @@ -1759,7 +1759,7 @@ void konamigx_state::konamigx_6bpp(machine_config &config) void konamigx_state::salmndr2(machine_config &config) { konamigx(config); - m_k056832->set_config("gfx1", K056832_BPP_6, 1, 0); + m_k056832->set_config(K056832_BPP_6, 1, 0); m_k055673->set_sprite_callback(FUNC(konamigx_state::salmndr2_sprite_callback), this); m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -48, -23); @@ -1796,7 +1796,7 @@ void konamigx_state::racinfrc(machine_config &config) m_k053252->set_offsets(24-8+16, 0); - m_k056832->set_config("gfx1", K056832_BPP_6, 0, 0); + m_k056832->set_config(K056832_BPP_6, 0, 0); m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -53, -23); @@ -1822,7 +1822,7 @@ void konamigx_state::gxtype3(machine_config &config) m_k053252->set_offsets(0, 16); m_k053252->set_slave_screen("screen2"); - m_k056832->set_config("gfx1", K056832_BPP_6, 0, 2); + m_k056832->set_config(K056832_BPP_6, 0, 2); m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -132, -23); @@ -1874,7 +1874,7 @@ void konamigx_state::gxtype4(machine_config &config) m_k053252->set_offsets(0, 16); m_k053252->set_slave_screen("screen2"); - m_k056832->set_config("gfx1", K056832_BPP_8, 0, 0); + m_k056832->set_config(K056832_BPP_8, 0, 0); m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -79, -24); // -23 looks better in intro } @@ -1894,7 +1894,7 @@ void konamigx_state::gxtype4_vsn(machine_config &config) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4_vsn) - m_k056832->set_config("gfx1", K056832_BPP_8, 0, 2); // set djmain_hack to 2 to kill layer association or half the tilemaps vanish on screen 0 + m_k056832->set_config(K056832_BPP_8, 0, 2); // set djmain_hack to 2 to kill layer association or half the tilemaps vanish on screen 0 m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -132, -23); } @@ -1915,7 +1915,7 @@ void konamigx_state::winspike(machine_config &config) m_k053252->set_offsets(24+15, 16); m_k056832->set_tile_callback(FUNC(konamigx_state::alpha_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_8, 0, 2); + m_k056832->set_config(K056832_BPP_8, 0, 2); m_k055673->set_config("gfx2", K055673_LAYOUT_LE2, -53, -23); } @@ -1941,7 +1941,7 @@ ROM_START(konamigx) ROM_FILL( 0x101, 1, 0xfe ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASEFF ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASEFF ) /* sprites */ ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASEFF ) /* sound samples */ @@ -1977,7 +1977,7 @@ ROM_START( gokuparo ) ROM_LOAD16_BYTE("321b07.7c", 0x000001, 128*1024, CRC(c47634c0) SHA1(20e4105df5bbc33edd01894e78f74ed5f173576e) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "321b14.17h", 0x000000, 2*1024*1024, CRC(437d0057) SHA1(30c449200e0510dc664289b527bade6e10dbe57a) ) TILE_BYTE_ROM_LOAD( "321b12.13g", 0x000004, 512*1024, CRC(5f9edfa0) SHA1(36d54c5fe498a4d0fa64757cef11c56c67518258) ) @@ -2010,7 +2010,7 @@ ROM_START( fantjour ) ROM_LOAD16_BYTE("321b07.7c", 0x000001, 128*1024, CRC(c47634c0) SHA1(20e4105df5bbc33edd01894e78f74ed5f173576e) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "321b14.17h", 0x000000, 2*1024*1024, CRC(437d0057) SHA1(30c449200e0510dc664289b527bade6e10dbe57a) ) TILE_BYTE_ROM_LOAD( "321b12.13g", 0x000004, 512*1024, CRC(5f9edfa0) SHA1(36d54c5fe498a4d0fa64757cef11c56c67518258) ) @@ -2043,7 +2043,7 @@ ROM_START( fantjoura ) ROM_LOAD16_BYTE("321b07.7c", 0x000001, 128*1024, CRC(c47634c0) SHA1(20e4105df5bbc33edd01894e78f74ed5f173576e) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "321b14.17h", 0x000000, 2*1024*1024, CRC(437d0057) SHA1(30c449200e0510dc664289b527bade6e10dbe57a) ) TILE_BYTE_ROM_LOAD( "321b12.13g", 0x000004, 512*1024, CRC(5f9edfa0) SHA1(36d54c5fe498a4d0fa64757cef11c56c67518258) ) @@ -2076,7 +2076,7 @@ ROM_START( salmndr2 ) ROM_LOAD16_BYTE("521-a05.7c", 0x000001, 64*1024, CRC(51a3af2c) SHA1(94d220ae619d53747bd3e762000ed59cf1b4d305) ) /* tiles */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD("521-a09.17h", 0x000000, 2*1024*1024, CRC(fb9e2f5e) SHA1(acb41616625d6976ad50e184787ab74e29f86039) ) TILE_WORDS2_ROM_LOAD("521-a11.15h", 0x300000, 1*1024*1024, CRC(25e0a6e5) SHA1(592e9f183f077e9272a4f0ead441b5bfd8029816) ) TILE_BYTES2_ROM_LOAD("521-a13.13c", 0x000004, 2*1024*1024, CRC(3ed7441b) SHA1(57e3e8035c056cf46a383d228c76a7da7def134f) ) @@ -2110,7 +2110,7 @@ ROM_START( salmndr2a ) ROM_LOAD16_BYTE("521-a05.7c", 0x000001, 64*1024, CRC(51a3af2c) SHA1(94d220ae619d53747bd3e762000ed59cf1b4d305) ) /* tiles */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD("521-a09.17h", 0x000000, 2*1024*1024, CRC(fb9e2f5e) SHA1(acb41616625d6976ad50e184787ab74e29f86039) ) TILE_WORDS2_ROM_LOAD("521-a11.15h", 0x300000, 1*1024*1024, CRC(25e0a6e5) SHA1(592e9f183f077e9272a4f0ead441b5bfd8029816) ) TILE_BYTES2_ROM_LOAD("521-a13.13c", 0x000004, 2*1024*1024, CRC(3ed7441b) SHA1(57e3e8035c056cf46a383d228c76a7da7def134f) ) @@ -2144,7 +2144,7 @@ ROM_START( tbyahhoo ) ROM_LOAD16_BYTE("424a07.7c", 0x000001, 128*1024, CRC(fa90d7e2) SHA1(6b6dee29643309005834416bdfdb18d74f34cb1b) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "424a14.17h", 0x000000, 2*1024*1024, CRC(b1d9fce8) SHA1(143ed2f03ac10a0f18d878c0ee0509a5714e4664) ) TILE_BYTE_ROM_LOAD( "424a12.13g", 0x000004, 512*1024, CRC(7f9cb8b1) SHA1(f5e18d70fcb572bb85f9b064995fc0ab0bb581e8) ) @@ -2177,7 +2177,7 @@ ROM_START( daiskiss ) ROM_LOAD16_BYTE("535a09.7c", 0x000001, 128*1024, CRC(8ec57ab4) SHA1(bd8e12c796d42d2cb27c1e47dc6253bfb74a2887) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "535a19.17h", 0x000000, 2*1024*1024, CRC(fa1c59d1) SHA1(7344afab2b8101f979c35ff9ec8d9c18475bb821) ) TILE_BYTE_ROM_LOAD( "535a18.13g", 0x000004, 512*1024, CRC(d02e5103) SHA1(43c63a718a034636bad29d2def054d8b48f071e3) ) @@ -2206,7 +2206,7 @@ ROM_START( sexyparo ) ROM_LOAD16_BYTE("533a09.7c", 0x000001, 128*1024, CRC(a93c6f0b) SHA1(bee1abab985c7163212cad1a4bc0a427804dfed3) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "533a19.17h", 0x000000, 2*1024*1024, CRC(3ec1843e) SHA1(5d2c37f1eb299c846daa63f35ccd5334a516a1f5) ) TILE_BYTE_ROM_LOAD( "533a18.13g", 0x000004, 512*1024, CRC(d3e0d058) SHA1(c50bdb3493501bfbbe092d01f5d4c38bfa3412f8) ) @@ -2236,7 +2236,7 @@ ROM_START( sexyparoa ) ROM_LOAD16_BYTE("533aaa09.7c", 0x000001, 128*1024, CRC(49086451) SHA1(8fdbeb5889e476dfd3f31619d5b5280a0494de69) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "533a19.17h", 0x000000, 2*1024*1024, CRC(3ec1843e) SHA1(5d2c37f1eb299c846daa63f35ccd5334a516a1f5) ) TILE_BYTE_ROM_LOAD( "533a18.13g", 0x000004, 512*1024, CRC(d3e0d058) SHA1(c50bdb3493501bfbbe092d01f5d4c38bfa3412f8) ) @@ -2269,7 +2269,7 @@ ROM_START( rungun2 ) ROM_LOAD16_BYTE("505a07.7m", 0x000001, 128*1024, CRC(5641c603) SHA1(1af1f92032e7f870e1668e8d720742fb53c4d0e2) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "505a21.11r", 0x000000, 1024*1024, CRC(03fda175) SHA1(4fdf7cfaa0d4024a2c40bba1f229c41e0627b8c8) ) ROM_LOAD16_BYTE( "505a20.11m", 0x000001, 1024*1024, CRC(a6a300fb) SHA1(290d97c6ec36e3cab8e6fcd5310030e00fb0ce07) ) @@ -2316,7 +2316,7 @@ ROM_START( slamdnk2 ) ROM_LOAD16_BYTE("505a07.7m", 0x000001, 128*1024, CRC(5641c603) SHA1(1af1f92032e7f870e1668e8d720742fb53c4d0e2) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "505a21.11r", 0x000000, 1024*1024, CRC(03fda175) SHA1(4fdf7cfaa0d4024a2c40bba1f229c41e0627b8c8) ) ROM_LOAD16_BYTE( "505a20.11m", 0x000001, 1024*1024, CRC(a6a300fb) SHA1(290d97c6ec36e3cab8e6fcd5310030e00fb0ce07) ) @@ -2364,7 +2364,7 @@ ROM_START( rushhero ) ROM_LOAD16_BYTE("605a07.7m", 0x000001, 128*1024, CRC(3116a8b0) SHA1(f0899d7027464d9aad45ffa6a464288a51a80dc1) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "605a21.11r", 0x000000, 1024*1024, CRC(0e5add29) SHA1(f80d81ff8110825ba19ebc3cf50480b8cf275571) ) ROM_LOAD16_BYTE( "605a20.11m", 0x000001, 1024*1024, CRC(a8fb4288) SHA1(b0ee6c2add5a8063f771ac8bbdfd78c0382a5036) ) @@ -2406,7 +2406,7 @@ ROM_START( tokkae ) ROM_LOAD16_BYTE("615a09.7c", 0x000001, 128*1024, CRC(c61f954c) SHA1(5242a2872db1db9ab4edd9951c2ac2d872f06dc7) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "615a19.17h", 0x000000, 1*1024*1024, CRC(07749e1e) SHA1(79a5f979b1dc7fa92ae37af03447edf4885ecdf8) ) TILE_BYTES2_ROM_LOAD( "615a20.13c", 0x000004, 512*1024, CRC(9911b5a1) SHA1(7dc9348fd23331ca7614db27dc5f280610f87a20) ) @@ -2442,7 +2442,7 @@ ROM_START( tkmmpzdm ) ROM_LOAD16_BYTE("515a05.7c", 0x000001, 128*1024, CRC(dea4ca2f) SHA1(5d11469a93293381228233baad6896e098994d9b) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "515a11.17h", 0x000000, 1024*1024, CRC(8689852d) SHA1(42ba16a9dfba47132fe07c6b1d044c5b32753220) ) TILE_BYTES2_ROM_LOAD( "515a12.13c", 0x000004, 512*1024, CRC(6936f94a) SHA1(e2c7fc327638ee39eef6109c4f164eaf98972f00) ) @@ -2478,7 +2478,7 @@ ROM_START( winspike ) /* tiles: length of 1 meg each is TRUSTED by the internal checksum code */ /* do NOT change these to the 4 meg dumps again, those are WRONG!!!!!!! */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "705a19.17h", 0x000000, 0x100000, CRC(bab84b30) SHA1(8522a0dc5e37524f51d632e9d975e949a14c0dc3) ) ROM_LOAD16_BYTE( "705a18.22h", 0x000001, 0x100000, CRC(eb97fb5f) SHA1(13de0ad060fd6f1312fa10edde1fef6481e8df64) ) @@ -2537,7 +2537,7 @@ ROM_START( winspikej ) /* tiles: length of 1 meg each is TRUSTED by the internal checksum code */ /* do NOT change these to the 4 meg dumps again, those are WRONG!!!!!!! */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "705a19.17h", 0x000000, 0x100000, CRC(bab84b30) SHA1(8522a0dc5e37524f51d632e9d975e949a14c0dc3) ) ROM_LOAD16_BYTE( "705a18.22h", 0x000001, 0x100000, CRC(eb97fb5f) SHA1(13de0ad060fd6f1312fa10edde1fef6481e8df64) ) @@ -2567,7 +2567,7 @@ ROM_START( crzcross ) ROM_LOAD16_BYTE("315a07.7c", 0x000001, 128*1024, CRC(431c58f3) SHA1(4888e305875d56cca5e1d792bdf27e57b3e42b03) ) /* tiles */ - ROM_REGION( 0xa00000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0xa00000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "315a14.17h", 0x000000, 512*1024, CRC(0ab731e0) SHA1(1f7d6ce40e689e1dddfee656bb46bd044012c2d6) ) TILE_BYTE_ROM_LOAD( "315a12.13g", 0x000004, 2*1024*1024, CRC(3047b8d2) SHA1(99fa4d20ee5aae89b9093ceb581f187bc9acc0ae) ) @@ -2600,7 +2600,7 @@ ROM_START( puzldama ) ROM_LOAD16_BYTE("315a07.7c", 0x000001, 128*1024, CRC(431c58f3) SHA1(4888e305875d56cca5e1d792bdf27e57b3e42b03) ) /* tiles */ - ROM_REGION( 0xa00000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0xa00000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "315a14.17h", 0x000000, 512*1024, CRC(0ab731e0) SHA1(1f7d6ce40e689e1dddfee656bb46bd044012c2d6) ) TILE_BYTE_ROM_LOAD( "315a12.13g", 0x000004, 2*1024*1024, CRC(3047b8d2) SHA1(99fa4d20ee5aae89b9093ceb581f187bc9acc0ae) ) @@ -2637,7 +2637,7 @@ ROM_START( dragoonj ) ROM_LOAD16_BYTE("417a07.7c", 0x000001, 128*1024, CRC(c1fd7584) SHA1(1b204165ef07b6b53f47adc16eed69d11dab53b2) ) /* tiles */ - ROM_REGION( 0x400000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x400000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "417a16.17h", 0x000000, 2*1024*1024, CRC(88b2213b) SHA1(ac4ac57618cf98d7486b147f5494e6943bff1a4d) ) /* sprites */ @@ -2677,7 +2677,7 @@ ROM_START( dragoona ) ROM_LOAD16_BYTE("417a07.7c", 0x000001, 128*1024, CRC(c1fd7584) SHA1(1b204165ef07b6b53f47adc16eed69d11dab53b2) ) /* tiles */ - ROM_REGION( 0x400000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x400000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "417a16.17h", 0x000000, 2*1024*1024, CRC(88b2213b) SHA1(ac4ac57618cf98d7486b147f5494e6943bff1a4d) ) /* sprites */ @@ -2717,7 +2717,7 @@ ROM_START( soccerss ) ROM_LOAD16_BYTE("427a06.9m", 0x000001, 128*1024, CRC(979df65d) SHA1(7499e9a27aa562692bd3a296789696492a6254bc) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "427a15.11r", 0x000000, 0x100000, CRC(33ce2b8e) SHA1(b0936386cdc7c41f33b1d7b4f5ce25fe618d1286) ) TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) ) @@ -2776,7 +2776,7 @@ ROM_START( soccerssu ) ROM_LOAD16_BYTE("427a06.9m", 0x000001, 128*1024, CRC(979df65d) SHA1(7499e9a27aa562692bd3a296789696492a6254bc) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "427a15.11r", 0x000000, 0x100000, CRC(33ce2b8e) SHA1(b0936386cdc7c41f33b1d7b4f5ce25fe618d1286) ) TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) ) @@ -2835,7 +2835,7 @@ ROM_START( soccerssj ) ROM_LOAD16_BYTE("427a06.9m", 0x000001, 128*1024, CRC(979df65d) SHA1(7499e9a27aa562692bd3a296789696492a6254bc) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "427a15.11r", 0x000000, 0x100000, CRC(33ce2b8e) SHA1(b0936386cdc7c41f33b1d7b4f5ce25fe618d1286) ) TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) ) @@ -2882,7 +2882,7 @@ ROM_START( soccerssja ) ROM_LOAD16_BYTE("427a06.9m", 0x000001, 128*1024, CRC(979df65d) SHA1(7499e9a27aa562692bd3a296789696492a6254bc) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "427a15.11r", 0x000000, 0x100000, CRC(33ce2b8e) SHA1(b0936386cdc7c41f33b1d7b4f5ce25fe618d1286) ) TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) ) @@ -2929,7 +2929,7 @@ ROM_START( soccerssa ) ROM_LOAD16_BYTE("427a06.9m", 0x000001, 128*1024, CRC(979df65d) SHA1(7499e9a27aa562692bd3a296789696492a6254bc) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "427a15.11r", 0x000000, 0x100000, CRC(33ce2b8e) SHA1(b0936386cdc7c41f33b1d7b4f5ce25fe618d1286) ) TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) ) @@ -2977,7 +2977,7 @@ ROM_START( vsnetscr ) ROM_LOAD16_BYTE("627b07.7m", 0x000001, 128*1024, CRC(d7d92579) SHA1(929b8e90cfef2ef14d84173267b637e4efdb6867) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) ) ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) ) @@ -3015,7 +3015,7 @@ ROM_START( vsnetscreb ) ROM_LOAD16_BYTE("627b07.7m", 0x000001, 128*1024, CRC(d7d92579) SHA1(929b8e90cfef2ef14d84173267b637e4efdb6867) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) ) ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) ) @@ -3053,7 +3053,7 @@ ROM_START( vsnetscru ) ROM_LOAD16_BYTE("627b07.7m", 0x000001, 128*1024, CRC(d7d92579) SHA1(929b8e90cfef2ef14d84173267b637e4efdb6867) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) ) ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) ) @@ -3217,7 +3217,7 @@ ROM_START( vsnetscrj ) ROM_LOAD16_BYTE("627b07.7m", 0x000001, 128*1024, CRC(d7d92579) SHA1(929b8e90cfef2ef14d84173267b637e4efdb6867) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) ) ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) ) @@ -3255,7 +3255,7 @@ ROM_START( vsnetscra ) ROM_LOAD16_BYTE("627b07.7m", 0x000001, 128*1024, CRC(d7d92579) SHA1(929b8e90cfef2ef14d84173267b637e4efdb6867) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) ) ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) ) @@ -3292,7 +3292,7 @@ ROM_START( le2 ) ROM_LOAD16_BYTE("312b07.7c", 0x000001, 128*1024, CRC(1aa19c41) SHA1(5b879fb17ac514f266e63db6af50f2f4af7da32c) ) /* tiles */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "312a14.17h", 0x000000, 2*1024*1024, CRC(dc862f19) SHA1(8ec9f8715b622462fb8c79a48162c161eb9fe13b) ) ROM_LOAD16_BYTE( "312a12.22h", 0x000001, 2*1024*1024, CRC(98c04ddd) SHA1(7bc7af21625466e75003da9fd950437249e75b78) ) ROM_LOAD16_BYTE( "312a15.15h", 0x400000, 2*1024*1024, CRC(516f2941) SHA1(07415fec2d96fe6b707f801a9e9e963186d83d6a) ) @@ -3330,7 +3330,7 @@ ROM_START( le2u ) ROM_LOAD16_BYTE("312a07.7c", 0x000001, 128*1024, CRC(3d31e989) SHA1(1fdf205b0f9c21093bc6147aaacdf178aa628508) ) /* tiles */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "312a14.17h", 0x000000, 2*1024*1024, CRC(dc862f19) SHA1(8ec9f8715b622462fb8c79a48162c161eb9fe13b) ) ROM_LOAD16_BYTE( "312a12.22h", 0x000001, 2*1024*1024, CRC(98c04ddd) SHA1(7bc7af21625466e75003da9fd950437249e75b78) ) ROM_LOAD16_BYTE( "312a15.15h", 0x400000, 2*1024*1024, CRC(516f2941) SHA1(07415fec2d96fe6b707f801a9e9e963186d83d6a) ) @@ -3369,7 +3369,7 @@ ROM_START( le2j ) ROM_LOAD16_BYTE("312b07.7c", 0x000001, 128*1024, CRC(1aa19c41) SHA1(5b879fb17ac514f266e63db6af50f2f4af7da32c) ) /* tiles */ - ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "k056832", ROMREGION_ERASE00 ) ROM_LOAD16_BYTE( "312a14.17h", 0x000000, 2*1024*1024, CRC(dc862f19) SHA1(8ec9f8715b622462fb8c79a48162c161eb9fe13b) ) ROM_LOAD16_BYTE( "312a12.22h", 0x000001, 2*1024*1024, CRC(98c04ddd) SHA1(7bc7af21625466e75003da9fd950437249e75b78) ) ROM_LOAD16_BYTE( "312a15.15h", 0x400000, 2*1024*1024, CRC(516f2941) SHA1(07415fec2d96fe6b707f801a9e9e963186d83d6a) ) @@ -3409,7 +3409,7 @@ ROM_START( racinfrc ) ROM_LOAD16_BYTE("250a07.6p", 0x000001, 128*1024, CRC(612b670a) SHA1(255515fa5096fcc4681b32defa0ae855286d8ed1) ) /* tiles */ - ROM_REGION( 0x300000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x300000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "250a15.19y", 0x000000, 0x100000, CRC(60abc472) SHA1(ff360d81222e2d8cd55b907ca5a9947f958aaaab) ) TILE_BYTES2_ROM_LOAD( "250a14.21y", 0x000004, 0x080000, CRC(d14abf98) SHA1(14827a01deb659c96fd38a5c76f1c9cead5f83c7) ) @@ -3461,7 +3461,7 @@ ROM_START( racinfrcu ) ROM_LOAD16_BYTE("250a07.6p", 0x000001, 128*1024, CRC(612b670a) SHA1(255515fa5096fcc4681b32defa0ae855286d8ed1) ) /* tiles */ - ROM_REGION( 0x300000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x300000, "k056832", ROMREGION_ERASE00 ) TILE_WORDS2_ROM_LOAD( "250a15.19y", 0x000000, 0x100000, CRC(60abc472) SHA1(ff360d81222e2d8cd55b907ca5a9947f958aaaab) ) TILE_BYTES2_ROM_LOAD( "250a14.21y", 0x000004, 0x080000, CRC(d14abf98) SHA1(14827a01deb659c96fd38a5c76f1c9cead5f83c7) ) @@ -3545,7 +3545,7 @@ ROM_START( opengolf ) ROM_LOAD16_BYTE("218a07.6p", 0x000001, 128*1024, CRC(221e5293) SHA1(44b0b4fa37da4c19c29d4d2e5b93b94fbec03633) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "218a15.19y", 0x000000, 2*1024*1024, CRC(78ddc8af) SHA1(24313881dbf7e1b06da008080b0143c3ca5e15b1) ) TILE_WORD_ROM_LOAD( "218a16.16y", 0x280000, 512*1024, CRC(a41a3ec8) SHA1(dfef4c3e4d6d4e453a4958f2bd52788497c64093) ) TILE_BYTE_ROM_LOAD( "218a14.22y", 0x000004, 1*1024*1024, CRC(508cd75e) SHA1(adfaac92bc55f60b178a5817c48774a664d8980d) ) @@ -3600,7 +3600,7 @@ ROM_START( opengolf2 ) ROM_LOAD16_BYTE("218a07.6p", 0x000001, 128*1024, CRC(221e5293) SHA1(44b0b4fa37da4c19c29d4d2e5b93b94fbec03633) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "218a15.19y", 0x000000, 2*1024*1024, CRC(78ddc8af) SHA1(24313881dbf7e1b06da008080b0143c3ca5e15b1) ) TILE_WORD_ROM_LOAD( "218a16.16y", 0x280000, 512*1024, CRC(a41a3ec8) SHA1(dfef4c3e4d6d4e453a4958f2bd52788497c64093) ) TILE_BYTE_ROM_LOAD( "218a14.22y", 0x000004, 1*1024*1024, CRC(508cd75e) SHA1(adfaac92bc55f60b178a5817c48774a664d8980d) ) @@ -3654,7 +3654,7 @@ ROM_START( ggreats2 ) ROM_LOAD16_BYTE("218a07.6p", 0x000001, 128*1024, CRC(221e5293) SHA1(44b0b4fa37da4c19c29d4d2e5b93b94fbec03633) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) TILE_WORD_ROM_LOAD( "218a15.19y", 0x000000, 2*1024*1024, CRC(78ddc8af) SHA1(24313881dbf7e1b06da008080b0143c3ca5e15b1) ) TILE_WORD_ROM_LOAD( "218a16.16y", 0x280000, 512*1024, CRC(a41a3ec8) SHA1(dfef4c3e4d6d4e453a4958f2bd52788497c64093) ) TILE_BYTE_ROM_LOAD( "218a14.22y", 0x000004, 1*1024*1024, CRC(508cd75e) SHA1(adfaac92bc55f60b178a5817c48774a664d8980d) ) @@ -3825,7 +3825,7 @@ static const GXGameInfoT gameDefs[] = READ32_MEMBER( konamigx_state::k_6bpp_rom_long_r ) { - return m_k056832->k_6bpp_rom_long_r(space,offset,mem_mask); + return m_k056832->k_6bpp_rom_long_r(offset, mem_mask); } void konamigx_state::init_konamigx() diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index bb24bc21f71..7e45d16fee4 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -122,16 +122,16 @@ READ8_MEMBER(konmedal_state::vram_r) { if (offset & 1) { - return m_k056832->ram_code_hi_r(space, offset>>1); + return m_k056832->ram_code_hi_r(offset>>1); } else { - return m_k056832->ram_code_lo_r(space, offset>>1); + return m_k056832->ram_code_lo_r(offset>>1); } } else if (m_control == 0) // ROM readback { - return m_k056832->konmedal_rom_r(space, offset); + return m_k056832->konmedal_rom_r(offset); } return 0; @@ -144,11 +144,11 @@ WRITE8_MEMBER(konmedal_state::vram_w) if (offset & 1) { - m_k056832->ram_code_hi_w(space, offset>>1, data); + m_k056832->ram_code_hi_w(offset>>1, data); return; } - m_k056832->ram_code_lo_w(space, offset>>1, data); + m_k056832->ram_code_lo_w(offset>>1, data); } READ8_MEMBER(konmedal_state::magic_r) @@ -401,7 +401,7 @@ void konmedal_state::tsukande(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(konmedal_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 0); + m_k056832->set_config(K056832_BPP_4, 1, 0); m_k056832->set_palette(m_palette); /* sound hardware */ @@ -434,14 +434,13 @@ void konmedal_state::ddboy(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(konmedal_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 0); + m_k056832->set_config(K056832_BPP_4, 1, 0); m_k056832->set_palette(m_palette); /* sound hardware */ SPEAKER(config, "mono").front_center(); OKIM6295(config, m_oki, XTAL(14'318'181)/14, okim6295_device::PIN7_HIGH); - m_oki->add_route(0, "mono", 1.0); - m_oki->add_route(1, "mono", 1.0); + m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); K051649(config, "k051649", XTAL(14'318'181)/8).add_route(ALL_OUTPUTS, "mono", 0.45); } @@ -576,7 +575,7 @@ ROM_START( tsukande ) ROM_REGION( 0x20000, "maincpu", 0 ) /* main program */ ROM_LOAD( "441-d02.4g", 0x000000, 0x020000, CRC(6ed17227) SHA1(4e3f5219cbf6f42c60df38a99f3009fe49f78fc1) ) - ROM_REGION( 0x80000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x80000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_BYTE( "441-a03.4l", 0x000002, 0x020000, CRC(8adf3304) SHA1(1c8312c76cd626978ff5b3896fb5a5b34be72988) ) ROM_LOAD32_BYTE( "441-a04.4m", 0x000003, 0x020000, CRC(038e0c67) SHA1(2b8640bfad7026a2d86fb6498aff4d7a9cb0b700) ) ROM_LOAD32_BYTE( "441-a05.4p", 0x000000, 0x020000, CRC(937c4740) SHA1(155c869b9321d62df115435d7c855f9be4278e45) ) @@ -601,7 +600,7 @@ ROM_START( ddboy ) ROM_REGION( 0x20000, "maincpu", 0 ) /* main program */ ROM_LOAD( "342_c02.27c010.4d", 0x000000, 0x020000, CRC(dc33af9f) SHA1(db22f3b28e3aba69f70fd2581c77755373b582d0) ) - ROM_REGION( 0x80000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x80000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_BYTE( "342_a03.27c010.4f", 0x000002, 0x020000, CRC(424f80dd) SHA1(fb7648960ce0951aebcf5cf4465a9acb3ab49cd8) ) ROM_LOAD32_BYTE( "342_a04.27c010.4g", 0x000003, 0x020000, CRC(a4d4e15e) SHA1(809afab3f2adc58ca5d18e2413b40a6f33bd0cfa) ) ROM_LOAD32_BYTE( "342_a05.27c010.4h", 0x000000, 0x020000, CRC(e7e50901) SHA1(5e01377a3ad8ccb2a2b56610e8225b9b6bf15122) ) @@ -626,7 +625,7 @@ ROM_START( ddboya ) ROM_REGION( 0x20000, "maincpu", 0 ) /* main program */ ROM_LOAD( "342-f02-4g-=p=.bin", 0x000000, 0x020000, CRC(563dfd4f) SHA1(a50544735a9d6f448b969b9fd84e6cdca303d7a0) ) - ROM_REGION( 0x80000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x80000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_BYTE( "342_a03.27c010.4f", 0x000002, 0x020000, CRC(424f80dd) SHA1(fb7648960ce0951aebcf5cf4465a9acb3ab49cd8) ) ROM_LOAD32_BYTE( "342_a04.27c010.4g", 0x000003, 0x020000, CRC(a4d4e15e) SHA1(809afab3f2adc58ca5d18e2413b40a6f33bd0cfa) ) ROM_LOAD32_BYTE( "342_a05.27c010.4h", 0x000000, 0x020000, CRC(e7e50901) SHA1(5e01377a3ad8ccb2a2b56610e8225b9b6bf15122) ) diff --git a/src/mame/drivers/konmedal68k.cpp b/src/mame/drivers/konmedal68k.cpp index 7b562fa8655..676755c2c30 100644 --- a/src/mame/drivers/konmedal68k.cpp +++ b/src/mame/drivers/konmedal68k.cpp @@ -78,7 +78,7 @@ private: offset |= 0x1000; } - return m_k056832->piratesh_rom_r(space, offset, mem_mask); + return m_k056832->piratesh_rom_r(offset); } void kzaurus_main(address_map &map); @@ -314,7 +314,7 @@ void konmedal68k_state::kzaurus(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(konmedal68k_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4dj, 1, 0); + m_k056832->set_config(K056832_BPP_4dj, 1, 0); m_k056832->set_palette(m_palette); K055555(config, m_k055555, 0); @@ -332,7 +332,7 @@ ROM_START( kzaurus ) ROM_REGION( 0x80000, "maincpu", 0 ) /* main program */ ROM_LOAD16_WORD_SWAP( "540-b05-2n.bin", 0x000000, 0x080000, CRC(110d4ecb) SHA1(8903783f62ad5a983242a0fe8d835857964abc43) ) - ROM_REGION( 0x100000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x100000, "k056832", 0 ) /* tilemaps */ ROM_LOAD( "540-a06-14n.bin", 0x000000, 0x080000, CRC(260ad79e) SHA1(fb56bf6e59e78b2bd1f8df17c9c8fd0d1700dced) ) ROM_LOAD( "540-a07-17n.bin", 0x080000, 0x080000, CRC(442bcec2) SHA1(3100de8c146a28284ae3ab8763e5b1c6fb1755c2) ) diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp index b4d39607c8e..16fb28cf0be 100644 --- a/src/mame/drivers/lethal.cpp +++ b/src/mame/drivers/lethal.cpp @@ -376,7 +376,7 @@ void lethal_state::bank4000_map(address_map &map) map(0x3800, 0x3fff).rw(m_k056832, FUNC(k056832_device::ram_attr_hi_r), FUNC(k056832_device::ram_attr_hi_w)); // VRD = 1, CBNK = 0 or 1 - map(0xa000, 0xbfff).mirror(0x4000).unmaprw(); // AM_DEVREAD("k056832", k056832_device, rom_byte_r) + map(0xa000, 0xbfff).mirror(0x4000).unmaprw(); // .r(m_k056832, FUNC(k056832_device::rom_byte_r)); // CBNK = 1; partially overlaid when VRD = 1 map(0x4000, 0x7fff).mirror(0x8000).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); @@ -517,7 +517,7 @@ void lethal_state::lethalen(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(lethal_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_8LE, 1, 0); + m_k056832->set_config(K056832_BPP_8LE, 1, 0); m_k056832->set_palette(m_palette); K053244(config, m_k053244, 0); @@ -556,7 +556,7 @@ ROM_START( lethalen ) // US version UAE ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -581,7 +581,7 @@ ROM_START( lethalenub ) // US version UAB ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -606,7 +606,7 @@ ROM_START( lethalenua ) // US version UAA ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -631,7 +631,7 @@ ROM_START( lethalenux ) // US version ?, proto / hack?, very different to other ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -656,7 +656,7 @@ ROM_START( lethaleneab ) // Euro ver. EAB ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -681,7 +681,7 @@ ROM_START( lethalenead ) // Euro ver. EAD ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -706,7 +706,7 @@ ROM_START( lethaleneae ) // Euro ver. EAE ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -731,7 +731,7 @@ ROM_START( lethalenj ) // Japan version JAD ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) @@ -756,7 +756,7 @@ ROM_START( lethaleneaa ) // Euro ver. EAA ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 sound program */ ROM_LOAD( "191a02.f4", 0x00000, 0x10000, CRC(72b843cc) SHA1(b44b2f039358c26fa792d740639b66a5c8bf78e7) ) - ROM_REGION( 0x400000, "gfx1", 0 ) /* tilemaps */ + ROM_REGION( 0x400000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "191a08", 0x000002, 0x100000, CRC(555bd4db) SHA1(d2e55796b4ab2306ae549fa9e7288e41eaa8f3de) ) ROM_LOAD32_WORD( "191a10", 0x000000, 0x100000, CRC(2fa9bf51) SHA1(1e4ec56b41dfd8744347a7b5799e3ebce0939adc) ) ROM_LOAD32_WORD( "191a07", 0x200002, 0x100000, CRC(1dad184c) SHA1(b2c4a8e48084005056aef2c8eaccb3d2eca71b73) ) diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp index e01c2c4d483..d46fff6d98d 100644 --- a/src/mame/drivers/moo.cpp +++ b/src/mame/drivers/moo.cpp @@ -534,7 +534,7 @@ void moo_state::moo(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(moo_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 0); + m_k056832->set_config(K056832_BPP_4, 1, 0); m_k056832->set_palette("palette"); K053251(config, m_k053251, 0); @@ -588,7 +588,7 @@ void moo_state::moobl(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(moo_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 0); + m_k056832->set_config(K056832_BPP_4, 1, 0); m_k056832->set_palette("palette"); K053251(config, m_k053251, 0); @@ -636,7 +636,7 @@ ROM_START( moomesa ) /* Version EA */ ROM_LOAD( "151a07.f5", 0x000000, 0x040000, CRC(cde247fc) SHA1(cdee0228db55d53ae43d7cd2d9001dadd20c2c61) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) ) ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) ) @@ -671,7 +671,7 @@ ROM_START( moomesauac ) /* Version UA */ ROM_LOAD( "151a07.f5", 0x000000, 0x040000, CRC(cde247fc) SHA1(cdee0228db55d53ae43d7cd2d9001dadd20c2c61) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) ) ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) ) @@ -706,7 +706,7 @@ ROM_START( moomesauab ) /* Version UA */ ROM_LOAD( "151a07.f5", 0x000000, 0x040000, CRC(cde247fc) SHA1(cdee0228db55d53ae43d7cd2d9001dadd20c2c61) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) ) ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) ) @@ -741,7 +741,7 @@ ROM_START( moomesaaab ) /* Version AA */ ROM_LOAD( "151a07.f5", 0x000000, 0x040000, CRC(cde247fc) SHA1(cdee0228db55d53ae43d7cd2d9001dadd20c2c61) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) ) ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) ) @@ -776,7 +776,7 @@ ROM_START( bucky ) /* Version EA */ ROM_LOAD( "173a07.f5", 0x000000, 0x040000, CRC(4cdaee71) SHA1(bdc05d4475415f6fac65d7cdbc48df398e57845e) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) ) ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) ) @@ -812,7 +812,7 @@ ROM_START( buckyea ) /* Version EA */ ROM_LOAD( "173a07.f5", 0x000000, 0x040000, CRC(4cdaee71) SHA1(bdc05d4475415f6fac65d7cdbc48df398e57845e) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) ) ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) ) @@ -848,7 +848,7 @@ ROM_START( buckyjaa ) /* Version JA */ ROM_LOAD( "173a07.f5", 0x000000, 0x040000, CRC(4cdaee71) SHA1(bdc05d4475415f6fac65d7cdbc48df398e57845e) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) ) ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) ) @@ -884,7 +884,7 @@ ROM_START( buckyuab ) /* Version UA */ ROM_LOAD( "173a07.f5", 0x000000, 0x040000, CRC(4cdaee71) SHA1(bdc05d4475415f6fac65d7cdbc48df398e57845e) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) ) ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) ) @@ -920,7 +920,7 @@ ROM_START( buckyaab ) /* Version AA */ ROM_LOAD( "173a07.f5", 0x000000, 0x040000, CRC(4cdaee71) SHA1(bdc05d4475415f6fac65d7cdbc48df398e57845e) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) ) ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) ) @@ -956,7 +956,7 @@ ROM_START( buckyaa ) /* Version AA */ ROM_LOAD( "173a07.f5", 0x000000, 0x040000, CRC(4cdaee71) SHA1(bdc05d4475415f6fac65d7cdbc48df398e57845e) ) ROM_RELOAD( 0x010000, 0x040000 ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) /* tilemaps */ ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) ) ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) ) @@ -987,7 +987,7 @@ ROM_START( moomesabl ) ROM_LOAD16_WORD_SWAP( "moo03.rom", 0x000000, 0x80000, CRC(fed6a1cb) SHA1(be58e266973930d643b5e15dcc974a82e1a3ae35) ) ROM_LOAD16_WORD_SWAP( "moo04.rom", 0x080000, 0x80000, CRC(ec45892a) SHA1(594330cbbfbca87e61ddf519e565018b6eaf5a20) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "moo05.rom", 0x000000, 0x080000, CRC(8c045f9c) SHA1(cde81a722a4bc2efac09a26d7e300664059ec7bb) ) ROM_LOAD32_WORD( "moo07.rom", 0x000002, 0x080000, CRC(b9e29f50) SHA1(c2af095df0af45064d49210085370425b319b82b) ) ROM_LOAD32_WORD( "moo06.rom", 0x100000, 0x080000, CRC(1261aa89) SHA1(b600916911bc0d8b6348e2ad4a16ed1a1c528261) ) diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index a9229f5adbf..99f21b28c92 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -251,7 +251,7 @@ WRITE16_MEMBER(mystwarr_state::sound_irq_w) WRITE16_MEMBER(mystwarr_state::irq_ack_w) { - m_k056832->b_word_w(space, offset, data, mem_mask); + m_k056832->b_word_w(offset, data, mem_mask); if (offset == 3 && ACCESSING_BITS_0_7) { @@ -958,7 +958,7 @@ void mystwarr_state::mystwarr(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(mystwarr_state::mystwarr_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_5, 0, 0); + m_k056832->set_config(K056832_BPP_5, 0, 0); m_k056832->set_palette(m_palette); K055555(config, m_k055555, 0); @@ -1156,7 +1156,7 @@ ROM_START( mystwarr ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "128a08.1h", 0x000000, 1*1024*1024, CRC(63d6cfa0) SHA1(324bf25cf79aa030d2dcc94a53c1984eb8abec3a) ) ROM_LOADTILE_WORD( "128a09.1k", 0x000002, 1*1024*1024, CRC(573a7725) SHA1(f2fef32053ed2a65c6c3ddd3e1657a866aa80b3e) ) ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) ) @@ -1196,7 +1196,7 @@ ROM_START( mystwarru ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "128a08.1h", 0x000000, 1*1024*1024, CRC(63d6cfa0) SHA1(324bf25cf79aa030d2dcc94a53c1984eb8abec3a) ) ROM_LOADTILE_WORD( "128a09.1k", 0x000002, 1*1024*1024, CRC(573a7725) SHA1(f2fef32053ed2a65c6c3ddd3e1657a866aa80b3e) ) ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) ) @@ -1236,7 +1236,7 @@ ROM_START( mystwarrj ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "128a08.1h", 0x000000, 1*1024*1024, CRC(63d6cfa0) SHA1(324bf25cf79aa030d2dcc94a53c1984eb8abec3a) ) ROM_LOADTILE_WORD( "128a09.1k", 0x000002, 1*1024*1024, CRC(573a7725) SHA1(f2fef32053ed2a65c6c3ddd3e1657a866aa80b3e) ) ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) ) @@ -1276,7 +1276,7 @@ ROM_START( mystwarra ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "128a08.1h", 0x000000, 1*1024*1024, CRC(63d6cfa0) SHA1(324bf25cf79aa030d2dcc94a53c1984eb8abec3a) ) ROM_LOADTILE_WORD( "128a09.1k", 0x000002, 1*1024*1024, CRC(573a7725) SHA1(f2fef32053ed2a65c6c3ddd3e1657a866aa80b3e) ) ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) ) @@ -1316,7 +1316,7 @@ ROM_START( mystwarraa ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "128a08.1h", 0x000000, 1*1024*1024, CRC(63d6cfa0) SHA1(324bf25cf79aa030d2dcc94a53c1984eb8abec3a) ) ROM_LOADTILE_WORD( "128a09.1k", 0x000002, 1*1024*1024, CRC(573a7725) SHA1(f2fef32053ed2a65c6c3ddd3e1657a866aa80b3e) ) ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) ) @@ -1354,7 +1354,7 @@ ROM_START( viostorm ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1389,7 +1389,7 @@ ROM_START( viostormeb ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1424,7 +1424,7 @@ ROM_START( viostormu ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1459,7 +1459,7 @@ ROM_START( viostormub ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1494,7 +1494,7 @@ ROM_START( viostorma ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1529,7 +1529,7 @@ ROM_START( viostormab ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1565,7 +1565,7 @@ ROM_START( viostormj ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "168a09.1h", 0x000000, 2*1024*1024, CRC(1b34a881) SHA1(5de20f7ee7f90d4f6dea349ca5000bfcf74253b1) ) ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) ) @@ -1601,7 +1601,7 @@ ROM_START( metamrph ) ROM_LOAD("224a05", 0x000000, 0x40000, CRC(4b4c985c) SHA1(c83cce05355023be9cd55b4aa595c61f8236269c) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "224a09", 0x000000, 1*1024*1024, CRC(1931afce) SHA1(78838c0fd2a9c80f130db1fcf6c88b14f7363639) ) ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) ) @@ -1638,7 +1638,7 @@ ROM_START( metamrphe ) /* alternate set - possibly a bugfix version. Only 2 adju ROM_LOAD("224a05", 0x000000, 0x40000, CRC(4b4c985c) SHA1(c83cce05355023be9cd55b4aa595c61f8236269c) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "224a09", 0x000000, 1*1024*1024, CRC(1931afce) SHA1(78838c0fd2a9c80f130db1fcf6c88b14f7363639) ) ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) ) @@ -1675,7 +1675,7 @@ ROM_START( metamrpha ) ROM_LOAD("224a05", 0x000000, 0x40000, CRC(4b4c985c) SHA1(c83cce05355023be9cd55b4aa595c61f8236269c) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "224a09", 0x000000, 1*1024*1024, CRC(1931afce) SHA1(78838c0fd2a9c80f130db1fcf6c88b14f7363639) ) ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) ) @@ -1712,7 +1712,7 @@ ROM_START( metamrphu ) ROM_LOAD("224a05", 0x000000, 0x40000, CRC(4b4c985c) SHA1(c83cce05355023be9cd55b4aa595c61f8236269c) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "224a09", 0x000000, 1*1024*1024, CRC(1931afce) SHA1(78838c0fd2a9c80f130db1fcf6c88b14f7363639) ) ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) ) @@ -1749,7 +1749,7 @@ ROM_START( metamrphj ) ROM_LOAD("224a05", 0x000000, 0x40000, CRC(4b4c985c) SHA1(c83cce05355023be9cd55b4aa595c61f8236269c) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "224a09", 0x000000, 1*1024*1024, CRC(1931afce) SHA1(78838c0fd2a9c80f130db1fcf6c88b14f7363639) ) ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) ) @@ -1787,7 +1787,7 @@ ROM_START( mtlchamp ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "234a08.1h", 0x000000, 1*1024*1024, CRC(27e94288) SHA1(a92b03adf7beea6a1ceb74f659c87c628a7ab8e4) ) ROM_LOADTILE_WORD( "234a09.1k", 0x000002, 1*1024*1024, CRC(03aad28f) SHA1(e7d9d788822ac9666e089b58288e3fcdba1b89da) ) ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) ) @@ -1824,7 +1824,7 @@ ROM_START( mtlchamp1 ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "234a08.1h", 0x000000, 1*1024*1024, CRC(27e94288) SHA1(a92b03adf7beea6a1ceb74f659c87c628a7ab8e4) ) ROM_LOADTILE_WORD( "234a09.1k", 0x000002, 1*1024*1024, CRC(03aad28f) SHA1(e7d9d788822ac9666e089b58288e3fcdba1b89da) ) ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) ) @@ -1861,7 +1861,7 @@ ROM_START( mtlchampa ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "234a08.1h", 0x000000, 1*1024*1024, CRC(27e94288) SHA1(a92b03adf7beea6a1ceb74f659c87c628a7ab8e4) ) ROM_LOADTILE_WORD( "234a09.1k", 0x000002, 1*1024*1024, CRC(03aad28f) SHA1(e7d9d788822ac9666e089b58288e3fcdba1b89da) ) ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) ) @@ -1898,7 +1898,7 @@ ROM_START( mtlchampj ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "234a08.1h", 0x000000, 1*1024*1024, CRC(27e94288) SHA1(a92b03adf7beea6a1ceb74f659c87c628a7ab8e4) ) ROM_LOADTILE_WORD( "234a09.1k", 0x000002, 1*1024*1024, CRC(03aad28f) SHA1(e7d9d788822ac9666e089b58288e3fcdba1b89da) ) ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) ) @@ -1935,7 +1935,7 @@ ROM_START( mtlchampu ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "234a08.1h", 0x000000, 1*1024*1024, CRC(27e94288) SHA1(a92b03adf7beea6a1ceb74f659c87c628a7ab8e4) ) ROM_LOADTILE_WORD( "234a09.1k", 0x000002, 1*1024*1024, CRC(03aad28f) SHA1(e7d9d788822ac9666e089b58288e3fcdba1b89da) ) ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) ) @@ -1972,7 +1972,7 @@ ROM_START( mtlchampu1 ) ROM_RELOAD( 0x20000, 0x20000 ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "234a08.1h", 0x000000, 1*1024*1024, CRC(27e94288) SHA1(a92b03adf7beea6a1ceb74f659c87c628a7ab8e4) ) ROM_LOADTILE_WORD( "234a09.1k", 0x000002, 1*1024*1024, CRC(03aad28f) SHA1(e7d9d788822ac9666e089b58288e3fcdba1b89da) ) ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) ) @@ -2010,7 +2010,7 @@ ROM_START( gaiapols ) ROM_LOAD("123e13.9c", 0x00000, 0x40000, CRC(e772f822) SHA1(2a5cdfc0aacad56cbef8bdbe8319e7ff4ab71eee) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "123e16.2t", 0x000000, 1*1024*1024, CRC(a3238200) SHA1(9ea073f7611b5c0b328c707c97ef174634c303bc) ) ROM_LOADTILE_WORD( "123e17.2x", 0x000002, 1*1024*1024, CRC(bd0b9fb9) SHA1(1714c19d2123b8fd4cfedb66d13bdcee6fc77576) ) @@ -2057,7 +2057,7 @@ ROM_START( gaiapolsu ) ROM_LOAD("123e13.9c", 0x00000, 0x40000, CRC(e772f822) SHA1(2a5cdfc0aacad56cbef8bdbe8319e7ff4ab71eee) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "123e16.2t", 0x000000, 1*1024*1024, CRC(a3238200) SHA1(9ea073f7611b5c0b328c707c97ef174634c303bc) ) ROM_LOADTILE_WORD( "123e17.2x", 0x000002, 1*1024*1024, CRC(bd0b9fb9) SHA1(1714c19d2123b8fd4cfedb66d13bdcee6fc77576) ) @@ -2104,7 +2104,7 @@ ROM_START( gaiapolsj ) ROM_LOAD("123e13.9c", 0x00000, 0x40000, CRC(e772f822) SHA1(2a5cdfc0aacad56cbef8bdbe8319e7ff4ab71eee) ) /* tiles */ - ROM_REGION( 0x500000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "123e16.2t", 0x000000, 1*1024*1024, CRC(a3238200) SHA1(9ea073f7611b5c0b328c707c97ef174634c303bc) ) ROM_LOADTILE_WORD( "123e17.2x", 0x000002, 1*1024*1024, CRC(bd0b9fb9) SHA1(1714c19d2123b8fd4cfedb66d13bdcee6fc77576) ) @@ -2149,7 +2149,7 @@ ROM_START( mmaulers ) ROM_LOAD("170a13.9c", 0x00000, 0x40000, CRC(2ebf4d1c) SHA1(33a3f4153dfdc46cc223d216a17ef9428c09129d) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "170a16.2t", 0x000000, 1*1024*1024, CRC(41fee912) SHA1(73cf167ac9fc42cb8048a87b6c6d1c3c0ae3c2e2) ) ROM_LOADTILE_WORD( "170a17.2x", 0x000002, 1*1024*1024, CRC(96957c91) SHA1(b12d356f8a015ec0984bdb86da9c569eb0c67880) ) ROM_LOADTILE_BYTE( "170a24.5r", 0x000004, 512*1024, CRC(562ad4bd) SHA1(f55b29142ea39f090244f0945a56760bab25c7a7) ) @@ -2196,7 +2196,7 @@ ROM_START( dadandrn ) ROM_LOAD("170a13.9c", 0x00000, 0x40000, CRC(2ebf4d1c) SHA1(33a3f4153dfdc46cc223d216a17ef9428c09129d) ) /* tiles */ - ROM_REGION( 0x600000, "gfx1", ROMREGION_ERASE00 ) + ROM_REGION( 0x600000, "k056832", ROMREGION_ERASE00 ) ROM_LOADTILE_WORD( "170a16.2t", 0x000000, 1*1024*1024, CRC(41fee912) SHA1(73cf167ac9fc42cb8048a87b6c6d1c3c0ae3c2e2) ) ROM_LOADTILE_WORD( "170a17.2x", 0x000002, 1*1024*1024, CRC(96957c91) SHA1(b12d356f8a015ec0984bdb86da9c569eb0c67880) ) ROM_LOADTILE_BYTE( "170a24.5r", 0x000004, 512*1024, CRC(562ad4bd) SHA1(f55b29142ea39f090244f0945a56760bab25c7a7) ) diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp index 5933f7d580c..25a2f5e62c1 100644 --- a/src/mame/drivers/piratesh.cpp +++ b/src/mame/drivers/piratesh.cpp @@ -342,7 +342,7 @@ READ16_MEMBER(piratesh_state::K056832_rom_r) uint16_t offs; offs = (m_control & 2 ? 0x1000 : 0) + offset; - return m_k056832->piratesh_rom_r(space, offs, mem_mask); + return m_k056832->piratesh_rom_r(offs); } @@ -627,7 +627,7 @@ void piratesh_state::piratesh(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(piratesh_state::piratesh_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4PIRATESH, 1, 0); + m_k056832->set_config(K056832_BPP_4PIRATESH, 1, 0); m_k056832->set_palette("palette"); K055555(config, m_k055555, 0); @@ -664,7 +664,7 @@ ROM_START( piratesh ) ROM_LOAD16_WORD_SWAP( "360ua-c04.4p", 0x000000, 0x80000, CRC(6d69dd90) SHA1(ccbdbfea406d9cbc3f242211290ba82ccbbe3795) ) /* tiles */ - ROM_REGION( 0x80000, "gfx1", ROMREGION_ERASE00 ) // 27C4096 + ROM_REGION( 0x80000, "k056832", ROMREGION_ERASE00 ) // 27C4096 ROM_LOAD( "360ua-a01.17g", 0x000000, 0x80000, CRC(e39153f5) SHA1(5da9132a2c24a15b55c3f65c26e2ad0467411a88) ) /* sprites */ diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp index 30b914bc6ba..86f36d4686a 100644 --- a/src/mame/drivers/qdrmfgp.cpp +++ b/src/mame/drivers/qdrmfgp.cpp @@ -132,8 +132,8 @@ WRITE16_MEMBER(qdrmfgp_state::gp2_control_w) READ16_MEMBER(qdrmfgp_state::v_rom_r) { - uint8_t *mem8 = memregion("gfx1")->base(); - int bank = m_k056832->word_r(space, 0x34/2, 0xffff); + uint8_t *mem8 = memregion("k056832")->base(); + int bank = m_k056832->word_r(0x34/2); offset += bank * 0x800 * 4; @@ -147,33 +147,33 @@ READ16_MEMBER(qdrmfgp_state::v_rom_r) READ16_MEMBER(qdrmfgp_state::gp2_vram_r) { if (offset < 0x1000 / 2) - return m_k056832->ram_word_r(space, offset * 2 + 1, mem_mask); + return m_k056832->ram_word_r(offset * 2 + 1); else - return m_k056832->ram_word_r(space, (offset - 0x1000 / 2) * 2, mem_mask); + return m_k056832->ram_word_r((offset - 0x1000 / 2) * 2); } READ16_MEMBER(qdrmfgp_state::gp2_vram_mirror_r) { if (offset < 0x1000 / 2) - return m_k056832->ram_word_r(space, offset * 2, mem_mask); + return m_k056832->ram_word_r(offset * 2); else - return m_k056832->ram_word_r(space, (offset - 0x1000 / 2) * 2 + 1, mem_mask); + return m_k056832->ram_word_r((offset - 0x1000 / 2) * 2 + 1); } WRITE16_MEMBER(qdrmfgp_state::gp2_vram_w) { if (offset < 0x1000 / 2) - m_k056832->ram_word_w(space, offset * 2 + 1, data, mem_mask); + m_k056832->ram_word_w(offset * 2 + 1, data, mem_mask); else - m_k056832->ram_word_w(space, (offset - 0x1000 / 2) * 2, data, mem_mask); + m_k056832->ram_word_w((offset - 0x1000 / 2) * 2, data, mem_mask); } WRITE16_MEMBER(qdrmfgp_state::gp2_vram_mirror_w) { if (offset < 0x1000 / 2) - m_k056832->ram_word_w(space, offset * 2, data, mem_mask); + m_k056832->ram_word_w(offset * 2, data, mem_mask); else - m_k056832->ram_word_w(space, (offset - 0x1000 / 2) * 2 + 1, data, mem_mask); + m_k056832->ram_word_w((offset - 0x1000 / 2) * 2 + 1, data, mem_mask); } @@ -553,7 +553,7 @@ void qdrmfgp_state::qdrmfgp(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(qdrmfgp_state::qdrmfgp_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4dj, 1, 0); + m_k056832->set_config(K056832_BPP_4dj, 1, 0); m_k056832->set_palette(m_palette); K053252(config, m_k053252, XTAL(32'000'000)/4); @@ -598,7 +598,7 @@ void qdrmfgp_state::qdrmfgp2(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(qdrmfgp_state::qdrmfgp2_tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4dj, 1, 0); + m_k056832->set_config(K056832_BPP_4dj, 1, 0); m_k056832->set_palette(m_palette); K053252(config, m_k053252, XTAL(32'000'000)/4); @@ -626,7 +626,7 @@ ROM_START( qdrmfgp ) ROM_LOAD16_WORD_SWAP( "gq_460_b04.20e", 0x000000, 0x80000, CRC(293d8174) SHA1(cf507d0b29dab161190f0160c05c640f16306bae) ) ROM_LOAD16_WORD_SWAP( "gq_460_a05.22e", 0x080000, 0x80000, CRC(4128cb3c) SHA1(4a16d85a66934a20afd074546de362c40a1ea785) ) - ROM_REGION( 0x100000, "gfx1", 0 ) /* TILEMAP */ + ROM_REGION( 0x100000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD( "gq_460_a01.15e", 0x000000, 0x80000, CRC(6536b700) SHA1(47ffe0cfbf80810179560150b23d825fe1a5c5ca) ) ROM_LOAD( "gq_460_a02.17e", 0x080000, 0x80000, CRC(ac01d675) SHA1(bf66433ace95f4ef14699d03add7cbc2e5d90eea) ) @@ -643,7 +643,7 @@ ROM_START( qdrmfgp2 ) ROM_LOAD16_WORD_SWAP( "ge_557_c05.20e", 0x000000, 0x80000, CRC(336df99f) SHA1(46fb36d40371761be0cfa17b34f28cc893a44a22) ) ROM_LOAD16_WORD_SWAP( "ge_557_a06.22e", 0x080000, 0x80000, CRC(ad77e10f) SHA1(4a762a59fe3096d48e3cbf0da3bb0d75c5087e78) ) - ROM_REGION( 0x100000, "gfx1", 0 ) /* TILEMAP */ + ROM_REGION( 0x100000, "k056832", 0 ) /* TILEMAP */ ROM_LOAD( "ge_557_a01.13e", 0x000000, 0x80000, CRC(c301d406) SHA1(5fad8cc611edd83380972abf37ec80561b9317a6) ) ROM_LOAD( "ge_557_a02.15e", 0x080000, 0x80000, CRC(3bfe1e56) SHA1(9e4df512a804a96fcb545d4e0eb58b5421d65ea4) ) diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index 3e8efe41fbd..de123902fc7 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -224,15 +224,15 @@ void kongambl_state::kongambl_map(address_map &map) map(0x300000, 0x307fff).ram(); // backup RAM 24H // override konami chips with custom areas until that code is removed - map(0x400000, 0x401fff).rom().region("gfx1", 0); + map(0x400000, 0x401fff).rom().region("k056832", 0); map(0x420000, 0x43ffff).ram().share("vram"); - //AM_RANGE(0x480000, 0x48003f) AM_RAM // vregs + //map(0x480000, 0x48003f).ram(); // vregs //0x400000 0x400001 "13M" even addresses //0x400002,0x400003 "13J" odd addresses -// AM_RANGE(0x400000, 0x401fff) AM_DEVREAD("k056832", k056832_device, rom_long_r) -// AM_RANGE(0x420000, 0x43ffff) AM_DEVREADWRITE("k056832", k056832_device, unpaged_ram_long_r, unpaged_ram_long_w) - map(0x480000, 0x48003f).w(m_k056832, FUNC(k056832_device::long_w)); +// map(0x400000, 0x401fff).r(m_k056832, FUNC(k056832_device::rom_word_r)); +// map(0x420000, 0x43ffff).rw(m_k056832, FUNC(k056832_device::unpaged_ram_word_r), FUNC(k056832_device::unpaged_ram_word_w)); + map(0x480000, 0x48003f).w(m_k056832, FUNC(k056832_device::word_w)); @@ -243,10 +243,10 @@ void kongambl_state::kongambl_map(address_map &map) map(0x4b0000, 0x4b001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask32(0xff00ff00); map(0x4c0000, 0x4c0007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); - //AM_RANGE(0x4c4000, 0x4c4003) AM_WRITENOP - //AM_RANGE(0x4c4004, 0x4c4007) AM_WRITENOP - //AM_RANGE(0x4c801c, 0x4c801f) AM_WRITENOP - //AM_RANGE(0x4cc01c, 0x4cc01f) AM_WRITENOP + //map(0x4c4000, 0x4c4003).nopw(); + //map(0x4c4004, 0x4c4007).nopw(); + //map(0x4c801c, 0x4c801f).nopw(); + //map(0x4cc01c, 0x4cc01f).nopw(); map(0x4cc000, 0x4cc00f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); @@ -254,9 +254,9 @@ void kongambl_state::kongambl_map(address_map &map) map(0x500000, 0x5007ff).ram(); map(0x500380, 0x500383).r(FUNC(kongambl_state::test_r)); -// AM_RANGE(0x500400, 0x500403) AM_NOP //dual port? -// AM_RANGE(0x500420, 0x500423) AM_NOP //dual port? -// AM_RANGE(0x500500, 0x500503) AM_NOP // reads sound ROM in here, polled from m68k? +// map(0x500400, 0x500403).noprw(); //dual port? +// map(0x500420, 0x500423).noprw(); //dual port? +// map(0x500500, 0x500503).noprw(); // reads sound ROM in here, polled from m68k? map(0x580000, 0x580007).r(FUNC(kongambl_state::test_r)); map(0x600000, 0x60000f).r(FUNC(kongambl_state::test_r)); @@ -265,7 +265,7 @@ void kongambl_state::kongambl_map(address_map &map) map(0x700004, 0x700007).portr("IN1"); map(0x700008, 0x70000b).portr("IN3"); map(0x780000, 0x780003).w(FUNC(kongambl_state::eeprom_w)); - //AM_RANGE(0x780004, 0x780007) AM_WRITENOP + //map(0x780004, 0x780007).nopw(); } void kongambl_state::kongamaud_map(address_map &map) @@ -612,7 +612,7 @@ static const gfx_layout charlayout8_tasman = }; static GFXDECODE_START( gfx_tasman ) - GFXDECODE_ENTRY( "gfx1", 0, charlayout8_tasman, 0, 0x8000/(1 << 8) ) + GFXDECODE_ENTRY( "k056832", 0, charlayout8_tasman, 0, 0x8000/(1 << 8) ) GFXDECODE_END @@ -685,7 +685,7 @@ void kongambl_state::kongambl(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(kongambl_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_8TASMAN, 0, 0); + m_k056832->set_config(K056832_BPP_8TASMAN, 0, 0); m_k056832->set_palette(m_palette); SPEAKER(config, "lspeaker").front_left(); @@ -703,7 +703,7 @@ ROM_START( kingtut ) ROM_REGION( 0x80000, "sndcpu", 0 ) /* 68000 sound program */ ROM_LOAD16_WORD_SWAP( "n12prog_ifu.41", 0x00000, 0x08000, CRC(dbb8a7e8) SHA1(9662b34e9332385d20e17ee1c92fd91935d4c3b2) ) - ROM_REGION( 0x100000, "gfx1", 0 ) // 8x8x8 tiles + ROM_REGION( 0x100000, "k056832", 0 ) // 8x8x8 tiles ROM_LOAD16_BYTE( "kit11_l1_vrm.21", 0x000000, 0x80000, CRC(431eb89f) SHA1(377c96f615b4b76314aeecad4e868edb66c72f33) ) ROM_LOAD16_BYTE( "kit11_h1_vrm.23", 0x000001, 0x80000, CRC(7aa2f1bc) SHA1(d8aead9dedcc83d3dc574122103aaa2074011197) ) @@ -728,7 +728,7 @@ ROM_START( moneybnk ) ROM_REGION( 0x80000, "sndcpu", 0 ) /* 68000 sound program */ ROM_LOAD16_WORD_SWAP( "n12prog_ifu.41", 0x00000, 0x08000, CRC(dbb8a7e8) SHA1(9662b34e9332385d20e17ee1c92fd91935d4c3b2) ) // some kind of bios? same on both games - ROM_REGION( 0x100000, "gfx1", 0 ) // 8x8x8 tiles + ROM_REGION( 0x100000, "k056832", 0 ) // 8x8x8 tiles ROM_LOAD16_BYTE( "mob11_l1_vrm.21", 0x000000, 0x80000, CRC(926fbd3b) SHA1(4f85ea63faff1508d5abf0ca0ebd16e802f8f45c) ) ROM_LOAD16_BYTE( "mob11_h1_vrm.23", 0x000001, 0x80000, CRC(a119feaa) SHA1(567e319dfddb9ec04b9302af782e9baccab4f5a6) ) @@ -753,7 +753,7 @@ ROM_START( dragsphr ) ROM_REGION( 0x80000, "sndcpu", 0 ) /* 68000 sound program */ ROM_LOAD16_WORD_SWAP( "u41_c06chex", 0x0000, 0x020000, CRC(adac17b1) SHA1(8e92dfd112f15ee0dbca215e265f479fb19d4be4) ) - ROM_REGION( 0x100000, "gfx1", 0 ) // 8x8x8 tiles + ROM_REGION( 0x100000, "k056832", 0 ) // 8x8x8 tiles ROM_LOAD16_BYTE( "u21.bin", 0x00000, 0x080000, CRC(83fc3afe) SHA1(09cc89567b985685ed206b273915157fc46212f9) ) ROM_LOAD16_BYTE( "u23.bin", 0x00001, 0x080000, CRC(a29a777f) SHA1(1ca37e468f31246cbcbd2e1799e5a0137d19d0b9) ) @@ -778,7 +778,7 @@ ROM_START( ivorytsk ) ROM_REGION( 0x80000, "sndcpu", 0 ) /* 68000 sound program */ ROM_LOAD16_WORD_SWAP( "u41_c06chex", 0x0000, 0x020000, CRC(adac17b1) SHA1(8e92dfd112f15ee0dbca215e265f479fb19d4be4) ) - ROM_REGION( 0x100000, "gfx1", 0 ) // 8x8x8 tiles + ROM_REGION( 0x100000, "k056832", 0 ) // 8x8x8 tiles ROM_LOAD16_BYTE( "u21_ba6dhex", 0x00000, 0x080000, CRC(d14efb82) SHA1(420bf5d807d59e6d17ee113125046b979e1d12f4) ) ROM_LOAD16_BYTE( "u23_9297hex", 0x00001, 0x080000, CRC(5e36ff5f) SHA1(9be65015217affc1e28d9ce855cd22f9cb147258) ) @@ -803,7 +803,7 @@ ROM_START( vikingt ) ROM_REGION( 0x80000, "sndcpu", 0 ) /* 68000 sound program */ ROM_LOAD16_WORD_SWAP( "u41.bin", 0x0000, 0x020000, CRC(adac17b1) SHA1(8e92dfd112f15ee0dbca215e265f479fb19d4be4) ) - ROM_REGION( 0x100000, "gfx1", 0 ) // 8x8x8 tiles + ROM_REGION( 0x100000, "k056832", 0 ) // 8x8x8 tiles ROM_LOAD16_BYTE( "u21.bin", 0x00000, 0x080000, CRC(789d7c41) SHA1(a04b7e8c894e08e9210c630fabd878b8389ee82c) ) ROM_LOAD16_BYTE( "u23.bin", 0x00001, 0x080000, CRC(56ba968e) SHA1(100edc40748067683172480fc2b7d48f4dc89da7) ) diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 82762a0711e..3802b2e7f29 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -499,7 +499,7 @@ void xexex_state::xexex(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(xexex_state::tile_callback), this); - m_k056832->set_config("gfx1", K056832_BPP_4, 1, 0); + m_k056832->set_config(K056832_BPP_4, 1, 0); m_k056832->set_palette(m_palette); K053246(config, m_k053246, 0); @@ -551,7 +551,7 @@ ROM_START( xexex ) /* Europe, Version AA */ ROM_REGION( 0x020000, "audiocpu", 0 ) ROM_LOAD( "067eaa05.4e", 0x000000, 0x020000, CRC(0e33d6ec) SHA1(4dd68cb78c779e2d035e43fec35a7672ed1c259b) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) ) ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) ) @@ -582,7 +582,7 @@ ROM_START( orius ) /* USA, Version AA */ ROM_REGION( 0x020000, "audiocpu", 0 ) ROM_LOAD( "067uaa05.4e", 0x000000, 0x020000, CRC(0e33d6ec) SHA1(4dd68cb78c779e2d035e43fec35a7672ed1c259b) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) ) ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) ) @@ -613,7 +613,7 @@ ROM_START( xexexa ) /* Asia, Version AA */ ROM_REGION( 0x020000, "audiocpu", 0 ) ROM_LOAD( "067eaa05.4e", 0x000000, 0x020000, CRC(0e33d6ec) SHA1(4dd68cb78c779e2d035e43fec35a7672ed1c259b) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) ) ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) ) @@ -644,7 +644,7 @@ ROM_START( xexexj ) /* Japan, Version AA */ ROM_REGION( 0x020000, "audiocpu", 0 ) ROM_LOAD( "067jaa05.4e", 0x000000, 0x020000, CRC(2f4dd0a8) SHA1(bfa76c9c968f1beba648a2911510e3d666a8fe3a) ) - ROM_REGION( 0x200000, "gfx1", 0 ) + ROM_REGION( 0x200000, "k056832", 0 ) ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) ) ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) ) diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 14ebfa5ec1e..4f3828fddef 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -497,11 +497,11 @@ void zr107_state::machine_start() void midnrun_state::main_memmap(address_map &map) { map(0x00000000, 0x000fffff).ram().share("workram"); /* Work RAM */ - map(0x74000000, 0x74003fff).rw(m_k056832, FUNC(k056832_device::ram_long_r), FUNC(k056832_device::ram_long_w)); - map(0x74020000, 0x7402003f).rw(m_k056832, FUNC(k056832_device::long_r), FUNC(k056832_device::long_w)); + map(0x74000000, 0x74003fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); + map(0x74020000, 0x7402003f).rw(m_k056832, FUNC(k056832_device::word_r), FUNC(k056832_device::word_w)); map(0x74060000, 0x7406003f).rw(FUNC(midnrun_state::ccu_r), FUNC(midnrun_state::ccu_w)); map(0x74080000, 0x74081fff).ram().w(FUNC(midnrun_state::paletteram32_w)).share("paletteram"); - map(0x740a0000, 0x740a3fff).r(m_k056832, FUNC(k056832_device::rom_long_r)); + map(0x740a0000, 0x740a3fff).r(m_k056832, FUNC(k056832_device::rom_word_r)); map(0x78000000, 0x7800ffff).rw(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_r_ppc), FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); /* 21N 21K 23N 23K */ map(0x78010000, 0x7801ffff).w(m_konppc, FUNC(konppc_device::cgboard_dsp_shared_w_ppc)); map(0x78040000, 0x7804000f).rw(m_k001006_1, FUNC(k001006_device::read), FUNC(k001006_device::write)); @@ -851,7 +851,7 @@ void midnrun_state::midnrun(machine_config &config) K056832(config, m_k056832, 0); m_k056832->set_tile_callback(FUNC(midnrun_state::tile_callback), this); - m_k056832->set_config("gfx2", K056832_BPP_8, 1, 0); + m_k056832->set_config(K056832_BPP_8, 1, 0); m_k056832->set_palette(m_palette); } @@ -904,7 +904,7 @@ ROM_START( midnrun ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "477a07.19l", 0x000000, 0x20000, CRC(a82c0ba1) SHA1(dad69f2e5e75009d70cc2748477248ec47627c30) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "477a11.35b", 0x000000, 0x80000, CRC(85eef04b) SHA1(02e26d2d4a8b29894370f28d2a49fdf5c7d23f95) ) ROM_LOAD16_BYTE( "477a12.35a", 0x000001, 0x80000, CRC(451d7777) SHA1(0bf280ca475100778bbfd3f023547bf0413fc8b7) ) @@ -930,7 +930,7 @@ ROM_START( midnrunj ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "477a07.19l", 0x000000, 0x20000, CRC(a82c0ba1) SHA1(dad69f2e5e75009d70cc2748477248ec47627c30) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "477a11.35b", 0x000000, 0x80000, CRC(85eef04b) SHA1(02e26d2d4a8b29894370f28d2a49fdf5c7d23f95) ) ROM_LOAD16_BYTE( "477a12.35a", 0x000001, 0x80000, CRC(451d7777) SHA1(0bf280ca475100778bbfd3f023547bf0413fc8b7) ) @@ -956,7 +956,7 @@ ROM_START( midnruna ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "477a07.19l", 0x000000, 0x20000, CRC(a82c0ba1) SHA1(dad69f2e5e75009d70cc2748477248ec47627c30) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "477a11.35b", 0x000000, 0x80000, CRC(85eef04b) SHA1(02e26d2d4a8b29894370f28d2a49fdf5c7d23f95) ) ROM_LOAD16_BYTE( "477a12.35a", 0x000001, 0x80000, CRC(451d7777) SHA1(0bf280ca475100778bbfd3f023547bf0413fc8b7) ) @@ -982,7 +982,7 @@ ROM_START( windheat ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "677a07.19l", 0x000000, 0x020000, CRC(05b14f2d) SHA1(3753f71173594ee741980e08eed0f7c3fc3588c9) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "677a11.35b", 0x000000, 0x080000, CRC(bf34f00f) SHA1(ca0d390c8b30d0cfdad4cfe5a601cc1f6e8c263d) ) ROM_LOAD16_BYTE( "677a12.35a", 0x000001, 0x080000, CRC(458f0b1d) SHA1(8e11023c75c80b496dfc62b6645cfedcf2a80db4) ) @@ -1008,7 +1008,7 @@ ROM_START( windheatu ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "677a07.19l", 0x000000, 0x020000, CRC(05b14f2d) SHA1(3753f71173594ee741980e08eed0f7c3fc3588c9) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "677a11.35b", 0x000000, 0x080000, CRC(bf34f00f) SHA1(ca0d390c8b30d0cfdad4cfe5a601cc1f6e8c263d) ) ROM_LOAD16_BYTE( "677a12.35a", 0x000001, 0x080000, CRC(458f0b1d) SHA1(8e11023c75c80b496dfc62b6645cfedcf2a80db4) ) @@ -1034,7 +1034,7 @@ ROM_START( windheatj ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "677a07.19l", 0x000000, 0x020000, CRC(05b14f2d) SHA1(3753f71173594ee741980e08eed0f7c3fc3588c9) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "677a11.35b", 0x000000, 0x080000, CRC(bf34f00f) SHA1(ca0d390c8b30d0cfdad4cfe5a601cc1f6e8c263d) ) ROM_LOAD16_BYTE( "677a12.35a", 0x000001, 0x080000, CRC(458f0b1d) SHA1(8e11023c75c80b496dfc62b6645cfedcf2a80db4) ) @@ -1060,7 +1060,7 @@ ROM_START( windheata ) ROM_REGION(0x20000, "audiocpu", 0) /* M68K program */ ROM_LOAD16_WORD_SWAP( "677a07.19l", 0x000000, 0x020000, CRC(05b14f2d) SHA1(3753f71173594ee741980e08eed0f7c3fc3588c9) ) - ROM_REGION(0x100000, "gfx2", 0) /* Tilemap */ + ROM_REGION(0x100000, "k056832", 0) /* Tilemap */ ROM_LOAD16_BYTE( "677a11.35b", 0x000000, 0x080000, CRC(bf34f00f) SHA1(ca0d390c8b30d0cfdad4cfe5a601cc1f6e8c263d) ) ROM_LOAD16_BYTE( "677a12.35a", 0x000001, 0x080000, CRC(458f0b1d) SHA1(8e11023c75c80b496dfc62b6645cfedcf2a80db4) ) diff --git a/src/mame/video/k054156_k054157_k056832.cpp b/src/mame/video/k054156_k054157_k056832.cpp index 32d39132ab7..56476fc99ca 100644 --- a/src/mame/video/k054156_k054157_k056832.cpp +++ b/src/mame/video/k054156_k054157_k056832.cpp @@ -1,6 +1,6 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -/* this should probably be k054156.c and k054156_device (the base management device) */ +/* this should probably be k054156.cpp and k054156_device (the base management device) */ /***************************************************************************/ /* */ @@ -191,7 +191,7 @@ k056832_device::k056832_device(const machine_config &mconfig, const char *tag, d //*m_pixmap[K056832_PAGE_COUNT], //m_regs[0x20], //m_regsb[4], - m_rombase(*this, finder_base::DUMMY_TAG), + m_rombase(*this, DEVICE_SELF), m_num_gfx_banks(0), m_cur_gfx_banks(0), m_gfx_num(0), @@ -632,7 +632,7 @@ int k056832_device::rom_read_b( int offset, int blksize, int blksize2, int zeros } -READ16_MEMBER( k056832_device::k_5bpp_rom_word_r ) +u16 k056832_device::k_5bpp_rom_word_r(offs_t offset, u16 mem_mask) { if (mem_mask == 0xff00) return rom_read_b(offset * 2, 4, 5, 0)<<8; @@ -643,7 +643,7 @@ READ16_MEMBER( k056832_device::k_5bpp_rom_word_r ) return 0; } -READ32_MEMBER( k056832_device::k_5bpp_rom_long_r ) +u32 k056832_device::k_5bpp_rom_long_r(offs_t offset, u32 mem_mask) { if (mem_mask == 0xff000000) return rom_read_b(offset * 4, 4, 5, 0) << 24; @@ -658,7 +658,7 @@ READ32_MEMBER( k056832_device::k_5bpp_rom_long_r ) return 0; } -READ32_MEMBER( k056832_device::k_6bpp_rom_long_r ) +u32 k056832_device::k_6bpp_rom_long_r(offs_t offset, u32 mem_mask) { if (mem_mask == 0xff000000) return rom_read_b(offset * 4, 4, 6, 0) << 24; @@ -673,7 +673,7 @@ READ32_MEMBER( k056832_device::k_6bpp_rom_long_r ) return 0; } -READ8_MEMBER( k056832_device::konmedal_rom_r ) +u8 k056832_device::konmedal_rom_r(offs_t offset) { uint32_t addr = ((m_regs[0x1b] << 7) | ((m_regs[0x1a] & 0xc) * 0x800)) + offset; @@ -681,7 +681,7 @@ READ8_MEMBER( k056832_device::konmedal_rom_r ) } -READ16_MEMBER( k056832_device::piratesh_rom_r ) +u16 k056832_device::piratesh_rom_r(offs_t offset) { uint32_t addr = 0x2000 * m_cur_gfx_banks + offset; @@ -689,7 +689,7 @@ READ16_MEMBER( k056832_device::piratesh_rom_r ) } -READ16_MEMBER( k056832_device::rom_word_r ) +u16 k056832_device::rom_word_r(offs_t offset) { int addr = 0x2000 * m_cur_gfx_banks + 2 * offset; @@ -698,7 +698,7 @@ READ16_MEMBER( k056832_device::rom_word_r ) // data is arranged like this: // 0000 1111 22 0000 1111 22 -READ16_MEMBER( k056832_device::mw_rom_word_r ) +u16 k056832_device::mw_rom_word_r(offs_t offset) { int bank = 10240 * m_cur_gfx_banks; int addr; @@ -758,35 +758,29 @@ READ16_MEMBER( k056832_device::mw_rom_word_r ) } -READ16_MEMBER( k056832_device::bishi_rom_word_r ) +u16 k056832_device::bishi_rom_word_r(offs_t offset) { int addr = 0x4000 * m_cur_gfx_banks + offset; return m_rombase[addr + 2] | (m_rombase[addr] << 8); } -READ16_MEMBER( k056832_device::rom_word_8000_r ) +u16 k056832_device::rom_word_8000_r(offs_t offset) { int addr = 0x8000 * m_cur_gfx_banks + 2 * offset; return m_rombase[addr + 2] | (m_rombase[addr] << 8); } -READ16_MEMBER( k056832_device::old_rom_word_r ) +u16 k056832_device::old_rom_word_r(offs_t offset) { int addr = 0x2000 * m_cur_gfx_banks + 2 * offset; return m_rombase[addr + 1] | (m_rombase[addr] << 8); } -READ32_MEMBER( k056832_device::rom_long_r ) -{ - offset <<= 1; - return (rom_word_r(space, offset + 1, 0xffff) | (rom_word_r(space, offset, 0xffff) << 16)); -} - /* only one page is mapped to videoram at a time through a window */ -READ16_MEMBER( k056832_device::ram_word_r ) +u16 k056832_device::ram_word_r(offs_t offset) { // reading from tile RAM resets the ROM readback "half" offset m_rom_half = 0; @@ -794,65 +788,41 @@ READ16_MEMBER( k056832_device::ram_word_r ) return m_videoram[m_selected_page_x4096 + offset]; } -READ16_MEMBER( k056832_device::ram_half_word_r ) +u16 k056832_device::ram_half_word_r(offs_t offset) { return m_videoram[m_selected_page_x4096 + (((offset << 1) & 0xffe) | ((offset >> 11) ^ 1))]; } - - - - -READ32_MEMBER( k056832_device::ram_long_r ) +u16 k056832_device::unpaged_ram_word_r(offs_t offset) { - uint16_t *pMem = &m_videoram[m_selected_page_x4096 + offset * 2]; - - // reading from tile RAM resets the ROM readback "half" offset - m_rom_half = 0; - - return (pMem[0]<<16 | pMem[1]); -} - -READ32_MEMBER( k056832_device::unpaged_ram_long_r ) -{ - uint16_t *pMem = &m_videoram[offset * 2]; - // reading from tile RAM resets the ROM readback "half" offset m_rom_half = 0; - return (pMem[0]<<16 | pMem[1]); + return m_videoram[offset]; } /* special 8-bit handlers for Lethal Enforcers */ -READ8_MEMBER( k056832_device::ram_code_lo_r ) +u8 k056832_device::ram_code_lo_r(offs_t offset) { - uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2) + 1]; - - return *adr & 0xff; + return m_videoram[m_selected_page_x4096 + (offset * 2) + 1] & 0xff; } -READ8_MEMBER( k056832_device::ram_code_hi_r ) +u8 k056832_device::ram_code_hi_r(offs_t offset) { - uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2) + 1]; - - return *adr >> 8; + return m_videoram[m_selected_page_x4096 + (offset * 2) + 1] >> 8; } -READ8_MEMBER( k056832_device::ram_attr_lo_r ) +u8 k056832_device::ram_attr_lo_r(offs_t offset) { - uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2)]; - - return *adr & 0xff; + return m_videoram[m_selected_page_x4096 + (offset * 2)] & 0xff; } -READ8_MEMBER( k056832_device::ram_attr_hi_r ) +u8 k056832_device::ram_attr_hi_r(offs_t offset) { - uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2)]; - - return *adr >> 8; + return m_videoram[m_selected_page_x4096 + (offset * 2)] >> 8; } -WRITE8_MEMBER( k056832_device::ram_code_lo_w ) +void k056832_device::ram_code_lo_w(offs_t offset, u8 data) { uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2) + 1]; @@ -868,7 +838,7 @@ WRITE8_MEMBER( k056832_device::ram_code_lo_w ) } } -WRITE8_MEMBER( k056832_device::ram_code_hi_w ) +void k056832_device::ram_code_hi_w(offs_t offset, u8 data) { uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2) + 1]; @@ -884,7 +854,7 @@ WRITE8_MEMBER( k056832_device::ram_code_hi_w ) } } -WRITE8_MEMBER( k056832_device::ram_attr_lo_w ) +void k056832_device::ram_attr_lo_w(offs_t offset, u8 data) { uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2)]; @@ -900,7 +870,7 @@ WRITE8_MEMBER( k056832_device::ram_attr_lo_w ) } } -WRITE8_MEMBER( k056832_device::ram_attr_hi_w ) +void k056832_device::ram_attr_hi_w(offs_t offset, u8 data) { uint16_t *adr = &m_videoram[m_selected_page_x4096 + (offset * 2)]; @@ -916,14 +886,11 @@ WRITE8_MEMBER( k056832_device::ram_attr_hi_w ) } } -WRITE16_MEMBER( k056832_device::ram_word_w ) +void k056832_device::ram_word_w(offs_t offset, u16 data, u16 mem_mask) { - uint16_t *tile_ptr; - uint16_t old_mask, old_data; - - tile_ptr = &m_videoram[m_selected_page_x4096 + offset]; - old_mask = ~mem_mask; - old_data = *tile_ptr; + uint16_t *tile_ptr = &m_videoram[m_selected_page_x4096 + offset]; + const uint16_t old_mask = ~mem_mask; + const uint16_t old_data = *tile_ptr; data = (data & mem_mask) | (old_data & old_mask); if(data != old_data) @@ -938,12 +905,10 @@ WRITE16_MEMBER( k056832_device::ram_word_w ) } } - - -WRITE16_MEMBER( k056832_device::ram_half_word_w ) +void k056832_device::ram_half_word_w(offs_t offset, u16 data, u16 mem_mask) { uint16_t *adr = &m_videoram[m_selected_page_x4096 + (((offset << 1) & 0xffe) | 1)]; - uint16_t old = *adr; + const uint16_t old = *adr; COMBINE_DATA(adr); if(*adr != old) @@ -959,45 +924,18 @@ WRITE16_MEMBER( k056832_device::ram_half_word_w ) } } -WRITE32_MEMBER( k056832_device::ram_long_w ) -{ - uint16_t *tile_ptr; - uint32_t old_mask, old_data; - tile_ptr = &m_videoram[m_selected_page_x4096 + offset * 2]; - old_mask = ~mem_mask; - old_data = (uint32_t)tile_ptr[0] << 16 | (uint32_t)tile_ptr[1]; - data = (data & mem_mask) | (old_data & old_mask); - - if (data != old_data) - { - tile_ptr[0] = data >> 16; - tile_ptr[1] = data; - - if (m_page_tile_mode[m_selected_page]) - m_tilemap[m_selected_page]->mark_tile_dirty(offset); - else - mark_line_dirty(m_selected_page, offset); - } -} - - - - -WRITE32_MEMBER( k056832_device::unpaged_ram_long_w ) +void k056832_device::unpaged_ram_word_w(offs_t offset, u16 data, u16 mem_mask) { - uint16_t *tile_ptr; - uint32_t old_mask, old_data; - - tile_ptr = &m_videoram[offset * 2]; - old_mask = ~mem_mask; - old_data = (uint32_t)tile_ptr[0] << 16 | (uint32_t)tile_ptr[1]; + uint16_t *tile_ptr = &m_videoram[offset]; + const uint16_t old_mask = ~mem_mask; + const uint16_t old_data = *tile_ptr; data = (data & mem_mask) | (old_data & old_mask); if (data != old_data) { - tile_ptr[0] = data >> 16; - tile_ptr[1] = data; + offset >>= 1; + *tile_ptr = data; if (m_page_tile_mode[offset/0x800]) m_tilemap[offset/0x800]->mark_tile_dirty(offset&0x7ff); @@ -1006,14 +944,13 @@ WRITE32_MEMBER( k056832_device::unpaged_ram_long_w ) } } -WRITE16_MEMBER( k056832_device::word_w ) +void k056832_device::word_w(offs_t offset, u16 data, u16 mem_mask) { int layer, flip, mask, i; - uint32_t old_data, new_data; - old_data = m_regs[offset]; + const uint16_t old_data = m_regs[offset]; COMBINE_DATA(&m_regs[offset]); - new_data = m_regs[offset]; + const uint16_t new_data = m_regs[offset]; if (new_data != old_data) { @@ -1127,18 +1064,7 @@ WRITE16_MEMBER( k056832_device::word_w ) } -WRITE32_MEMBER( k056832_device::long_w ) -{ - // GX does access of all 3 widths (8/16/32) so we can't do the - // if (ACCESSING_xxx) trick. in particular, 8-bit writes - // are used to the tilemap bank register. - offset <<= 1; - word_w(space, offset, data >> 16, mem_mask >> 16); - word_w(space, offset + 1, data, mem_mask); -} - - -WRITE16_MEMBER( k056832_device::b_word_w ) +void k056832_device::b_word_w(offs_t offset, u16 data, u16 mem_mask) { assert(offset < ARRAY_LENGTH(m_regsb)); COMBINE_DATA(&m_regsb[offset]); @@ -1147,39 +1073,27 @@ WRITE16_MEMBER( k056832_device::b_word_w ) -WRITE8_MEMBER( k056832_device::write ) +void k056832_device::write(offs_t offset, u8 data) { if (offset & 1) { - word_w(space, (offset >> 1), data, 0x00ff); + word_w((offset >> 1), data, 0x00ff); } else { - word_w(space, (offset >> 1), data << 8, 0xff00); + word_w((offset >> 1), data << 8, 0xff00); } } -WRITE8_MEMBER( k056832_device::b_w ) +void k056832_device::b_w(offs_t offset, u8 data) { if (offset & 1) { - b_word_w(space, (offset >> 1), data, 0x00ff); + b_word_w((offset >> 1), data, 0x00ff); } else { - b_word_w(space, (offset >> 1), data<<8, 0xff00); - } -} - -WRITE32_MEMBER( k056832_device::b_long_w ) -{ - if (ACCESSING_BITS_16_31) - { - b_word_w(space, offset << 1, data >> 16, mem_mask >> 16); - } - if (ACCESSING_BITS_0_15) - { - b_word_w(space, (offset << 1) + 1, data, mem_mask); + b_word_w((offset >> 1), data<<8, 0xff00); } } @@ -1211,7 +1125,7 @@ int k056832_device::update_linemap( screen_device &screen, _BitmapClass &bitmap, m_all_lines_dirty[page] = 0; // force tilemap into a clean, static state - // *really ugly but it minimizes alteration to tilemap.c + // *really ugly but it minimizes alteration to tilemap.cpp memset(&zerorect, 0, sizeof(rectangle)); // zero dimension tmap->draw(screen, bitmap, zerorect, 0, 0); // dummy call to reset tile_dirty_map xprmap.fill(0); // reset pixel transparency_bitmap; @@ -1948,18 +1862,12 @@ void k056832_device::device_post_load() //misc debug handlers -READ32_MEMBER( k056832_device::long_r ) -{ - offset <<= 1; - return (word_r(space, offset + 1, 0xffff) | word_r(space, offset, 0xffff) << 16); -} - -READ16_MEMBER( k056832_device::word_r ) +u16 k056832_device::word_r(offs_t offset) { return (m_regs[offset]); } // VACSET -READ16_MEMBER( k056832_device::b_word_r ) +u16 k056832_device::b_word_r(offs_t offset) { return (m_regsb[offset]); } // VSCCS (board dependent) @@ -2149,7 +2057,7 @@ int k056832_device::altK056832_update_linemap(screen_device &screen, bitmap_rgb3 m_all_lines_dirty[page] = 0; // force tilemap into a clean, static state - // *really ugly but it minimizes alteration to tilemap.c + // *really ugly but it minimizes alteration to tilemap.cpp memset (&zerorect, 0, sizeof(rectangle)); // zero dimension tmap->draw(screen, bitmap, zerorect, 0, 0); // dummy call to reset tile_dirty_map xprmap.fill(0); // reset pixel transparency_bitmap; diff --git a/src/mame/video/k054156_k054157_k056832.h b/src/mame/video/k054156_k054157_k056832.h index 982bcd4a7db..846b09093ec 100644 --- a/src/mame/video/k054156_k054157_k056832.h +++ b/src/mame/video/k054156_k054157_k056832.h @@ -41,10 +41,8 @@ public: template void set_tile_callback(T &&... args) { m_k056832_cb = k056832_cb_delegate(std::forward(args)...); } - template - void set_config(T &&gfx_reg, int bpp, int big, int djmain_hack) + void set_config(int bpp, int big, int djmain_hack) { - m_rombase.set_tag(std::forward(gfx_reg)); m_bpp = bpp; m_big = big; m_djmain_hack = djmain_hack; @@ -52,32 +50,34 @@ public: void SetExtLinescroll(); /* Lethal Enforcers */ - DECLARE_READ16_MEMBER( ram_word_r ); - DECLARE_WRITE16_MEMBER( ram_word_w ); - DECLARE_READ16_MEMBER( ram_half_word_r ); - DECLARE_WRITE16_MEMBER( ram_half_word_w ); - DECLARE_READ16_MEMBER( k_5bpp_rom_word_r ); - DECLARE_READ32_MEMBER( k_5bpp_rom_long_r ); - DECLARE_READ32_MEMBER( k_6bpp_rom_long_r ); - DECLARE_READ16_MEMBER( rom_word_r ); - DECLARE_READ8_MEMBER( konmedal_rom_r ); - DECLARE_READ16_MEMBER( piratesh_rom_r ); - DECLARE_READ16_MEMBER( mw_rom_word_r ); - DECLARE_READ16_MEMBER( bishi_rom_word_r ); - DECLARE_READ16_MEMBER( old_rom_word_r ); - DECLARE_READ16_MEMBER( rom_word_8000_r ); - DECLARE_WRITE16_MEMBER( word_w ); // "VRAM" registers - DECLARE_WRITE16_MEMBER( b_word_w ); - DECLARE_READ8_MEMBER( ram_code_lo_r ); - DECLARE_READ8_MEMBER( ram_code_hi_r ); - DECLARE_READ8_MEMBER( ram_attr_lo_r ); - DECLARE_READ8_MEMBER( ram_attr_hi_r ); - DECLARE_WRITE8_MEMBER( ram_code_lo_w ); - DECLARE_WRITE8_MEMBER( ram_code_hi_w ); - DECLARE_WRITE8_MEMBER( ram_attr_lo_w ); - DECLARE_WRITE8_MEMBER( ram_attr_hi_w ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_WRITE8_MEMBER( b_w ); + u16 ram_word_r(offs_t offset); + void ram_word_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 ram_half_word_r(offs_t offset); + void ram_half_word_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 unpaged_ram_word_r(offs_t offset); + void unpaged_ram_word_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 k_5bpp_rom_word_r(offs_t offset, u16 mem_mask = ~0); + u32 k_5bpp_rom_long_r(offs_t offset, u32 mem_mask = ~0); + u32 k_6bpp_rom_long_r(offs_t offset, u32 mem_mask = ~0); + u16 rom_word_r(offs_t offset); + u8 konmedal_rom_r(offs_t offset); + u16 piratesh_rom_r(offs_t offset); + u16 mw_rom_word_r(offs_t offset); + u16 bishi_rom_word_r(offs_t offset); + u16 old_rom_word_r(offs_t offset); + u16 rom_word_8000_r(offs_t offset); + void word_w(offs_t offset, u16 data, u16 mem_mask = ~0); // "VRAM" registers + void b_word_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u8 ram_code_lo_r(offs_t offset); + u8 ram_code_hi_r(offs_t offset); + u8 ram_attr_lo_r(offs_t offset); + u8 ram_attr_hi_r(offs_t offset); + void ram_code_lo_w(offs_t offset, u8 data); + void ram_code_hi_w(offs_t offset, u8 data); + void ram_attr_lo_w(offs_t offset, u8 data); + void ram_attr_hi_w(offs_t offset, u8 data); + void write(offs_t offset, u8 data); + void b_w(offs_t offset, u8 data); void mark_plane_dirty(int num); void mark_all_tilemaps_dirty(); void tilemap_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int num, uint32_t flags, uint32_t priority); @@ -97,17 +97,8 @@ public: int get_gfx_num() const { return m_gfx_num; } - DECLARE_READ32_MEMBER( ram_long_r ); - DECLARE_READ32_MEMBER( rom_long_r ); - DECLARE_WRITE32_MEMBER( ram_long_w ); - DECLARE_READ32_MEMBER( unpaged_ram_long_r ); - DECLARE_WRITE32_MEMBER( unpaged_ram_long_w ); - DECLARE_WRITE32_MEMBER( long_w ); - DECLARE_WRITE32_MEMBER( b_long_w ); - - DECLARE_READ16_MEMBER( word_r ); // VACSET - DECLARE_READ16_MEMBER( b_word_r ); // VSCCS (board dependent) - DECLARE_READ32_MEMBER( long_r ); // VACSET + u16 word_r(offs_t offset); // VACSET + u16 b_word_r(offs_t offset); // VSCCS (board dependent) protected: -- cgit v1.2.3