summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar cam900 <dbtlrchl@naver.com>2019-05-05 12:16:20 +0900
committerGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2019-05-04 23:16:20 -0400
commit5fb1517227809c32a5e7e11929499754aa4540d9 (patch) (github)
treea2422db317652c90ad13f65299bfae8b41207189 /src
parent9d05df2a57e3a0c019575be6d351adf567f29216 (diff)
downloadmame-5fb1517227809c32a5e7e11929499754aa4540d9.tar.bz2
mame-5fb1517227809c32a5e7e11929499754aa4540d9.zip
k053246_k053247_k055673.cpp : Updates (#4955)
Simplify handlers, Reduce duplicates, Unnecessary lines, Remove unnecessary tags, Use shorter type values, Fix spacing vendetta.cpp : Remove outdated comments overdriv.cpp : Fix objdma behavior, Remove unnecessary address map vendetta.cpp, rungun.cpp, konamigx.cpp, moo.cpp, gijoe.cpp : Fix notes xmen.cpp : Remove deprecated handler in comment Remove deprecated AM_* macro in comments
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/dbz.cpp18
-rw-r--r--src/mame/drivers/giclassic.cpp6
-rw-r--r--src/mame/drivers/gijoe.cpp26
-rw-r--r--src/mame/drivers/konamigx.cpp110
-rw-r--r--src/mame/drivers/moo.cpp46
-rw-r--r--src/mame/drivers/mystwarr.cpp88
-rw-r--r--src/mame/drivers/overdriv.cpp33
-rw-r--r--src/mame/drivers/piratesh.cpp8
-rw-r--r--src/mame/drivers/rungun.cpp34
-rw-r--r--src/mame/drivers/simpsons.cpp18
-rw-r--r--src/mame/drivers/tasman.cpp14
-rw-r--r--src/mame/drivers/vendetta.cpp35
-rw-r--r--src/mame/drivers/xexex.cpp16
-rw-r--r--src/mame/drivers/xmen.cpp38
-rw-r--r--src/mame/includes/konamigx.h2
-rw-r--r--src/mame/includes/overdriv.h3
-rw-r--r--src/mame/machine/konamigx.cpp2
-rw-r--r--src/mame/video/k053246_k053247_k055673.cpp179
-rw-r--r--src/mame/video/k053246_k053247_k055673.h99
-rw-r--r--src/mame/video/konamigx.cpp2
-rw-r--r--src/mame/video/rungun.cpp3
21 files changed, 366 insertions, 414 deletions
diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp
index a2046945915..160c23da091 100644
--- a/src/mame/drivers/dbz.cpp
+++ b/src/mame/drivers/dbz.cpp
@@ -116,9 +116,9 @@ void dbz_state::dbz_map(address_map &map)
map(0x4a0000, 0x4a0fff).rw(m_k053246, FUNC(k053247_device::k053247_word_r), FUNC(k053247_device::k053247_word_w));
map(0x4a1000, 0x4a3fff).ram();
map(0x4a8000, 0x4abfff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); // palette
- map(0x4c0000, 0x4c0001).r(m_k053246, FUNC(k053247_device::k053246_word_r));
- map(0x4c0000, 0x4c0007).w(m_k053246, FUNC(k053247_device::k053246_word_w));
- map(0x4c4000, 0x4c4007).w(m_k053246, FUNC(k053247_device::k053246_word_w));
+ map(0x4c0000, 0x4c0001).r(m_k053246, FUNC(k053247_device::k053246_r));
+ map(0x4c0000, 0x4c0007).w(m_k053246, FUNC(k053247_device::k053246_w));
+ map(0x4c4000, 0x4c4007).w(m_k053246, FUNC(k053247_device::k053246_w));
map(0x4c8000, 0x4c8007).w(m_k056832, FUNC(k056832_device::b_word_w));
map(0x4cc000, 0x4cc03f).w(m_k056832, FUNC(k056832_device::word_w));
map(0x4d0000, 0x4d001f).w(m_k053936_1, FUNC(k053936_device::ctrl_w));
@@ -130,8 +130,8 @@ void dbz_state::dbz_map(address_map &map)
map(0x4ec000, 0x4ec001).w(FUNC(dbz_state::dbzcontrol_w));
map(0x4f0000, 0x4f0001).w(FUNC(dbz_state::dbz_sound_command_w));
map(0x4f4000, 0x4f4001).w(FUNC(dbz_state::dbz_sound_cause_nmi));
- map(0x4f8000, 0x4f801f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0xff00); // 251 #1
- map(0x4fc000, 0x4fc01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff); // 251 #2
+ map(0x4f8000, 0x4f801f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0xff00); // 252
+ map(0x4fc000, 0x4fc01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff); // 251
map(0x500000, 0x501fff).ram().w(FUNC(dbz_state::dbz_bg2_videoram_w)).share("bg2_videoram");
map(0x508000, 0x509fff).ram().w(FUNC(dbz_state::dbz_bg1_videoram_w)).share("bg1_videoram");
@@ -355,7 +355,7 @@ void dbz_state::dbz(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(dbz_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -87, 32); // or -52, 16?
+ m_k053246->set_config(NORMAL_PLANE_ORDER, -87, 32); // or -52, 16?
m_k053246->set_palette("palette");
K053251(config, m_k053251, 0);
@@ -405,7 +405,7 @@ ROM_START( dbz )
ROM_LOAD32_WORD( "222a02.27e", 0x000002, 0x200000, CRC(651acaa5) SHA1(33942a90fb294b5da6a48e5bfb741b31babca188) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k053246", 0)
ROM_LOAD64_WORD( "222a04.3j", 0x000000, 0x200000, CRC(2533b95a) SHA1(35910836b6030130d742eae6c4bf1cdf1ff43fa4) )
ROM_LOAD64_WORD( "222a05.1j", 0x000002, 0x200000, CRC(731b7f93) SHA1(b676fff2ede5aa72c49fe12736cd60766462fe0b) )
ROM_LOAD64_WORD( "222a06.3l", 0x000004, 0x200000, CRC(97b767d3) SHA1(3d879c431586da2f88c632ab1a531b4a5ec96939) )
@@ -440,7 +440,7 @@ ROM_START( dbza )
ROM_LOAD32_WORD( "222a02.27e", 0x000002, 0x200000, CRC(651acaa5) SHA1(33942a90fb294b5da6a48e5bfb741b31babca188) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k053246", 0)
ROM_LOAD64_WORD( "222a04.3j", 0x000000, 0x200000, CRC(2533b95a) SHA1(35910836b6030130d742eae6c4bf1cdf1ff43fa4) )
ROM_LOAD64_WORD( "222a05.1j", 0x000002, 0x200000, CRC(731b7f93) SHA1(b676fff2ede5aa72c49fe12736cd60766462fe0b) )
ROM_LOAD64_WORD( "222a06.3l", 0x000004, 0x200000, CRC(97b767d3) SHA1(3d879c431586da2f88c632ab1a531b4a5ec96939) )
@@ -475,7 +475,7 @@ ROM_START( dbz2 )
ROM_LOAD32_WORD( "ds-b02.27e", 0x000002, 0x200000, CRC(7552f8cd) SHA1(1f3beffe9733b1a18d44b5e8880ff1cc97e7a8ab) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k053246", 0)
ROM_LOAD64_WORD( "ds-o01.3j", 0x000000, 0x200000, CRC(d018531f) SHA1(d4082fe28e9f1f3f35aa75b4be650cadf1cef192) )
ROM_LOAD64_WORD( "ds-o02.1j", 0x000002, 0x200000, CRC(5a0f1ebe) SHA1(3bb9e1389299dc046a24740ef1a1c543e44b5c37) )
ROM_LOAD64_WORD( "ds-o03.3l", 0x000004, 0x200000, CRC(ddc3bef1) SHA1(69638ef53f627a238a12b6c206d57faadf894893) )
diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp
index 856b5c30824..8bc3c9928d9 100644
--- a/src/mame/drivers/giclassic.cpp
+++ b/src/mame/drivers/giclassic.cpp
@@ -274,7 +274,7 @@ void giclassicsvr_state::server_main(address_map &map)
map(0x100000, 0x107fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x180000, 0x183fff).ram();
map(0x280000, 0x281fff).ram().rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w));
- map(0x300000, 0x300007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); // SPRITES
+ map(0x300000, 0x300007).w(m_k055673, FUNC(k055673_device::k053246_w)); // SPRITES
map(0x300060, 0x30006f).r(m_k055673, FUNC(k055673_device::k055673_ps_rom_word_r)); // SPRITES
map(0x308000, 0x30803f).rw(m_k056832, FUNC(k056832_device::word_r), FUNC(k056832_device::word_w));
map(0x320000, 0x32001f).rw("k053252a", FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); // CRTC 1
@@ -345,7 +345,7 @@ void giclassicsvr_state::giclassvr(machine_config &config)
K055673(config, m_k055673, 0);
m_k055673->set_sprite_callback(FUNC(giclassicsvr_state::sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_PS, -60, 24);
+ m_k055673->set_config(K055673_LAYOUT_PS, -60, 24);
m_k055673->set_palette(m_palette);
K053252(config, "k053252a", XTAL(32'000'000)/4).set_offsets(40, 16); // TODO
@@ -369,7 +369,7 @@ ROM_START( giclassvr )
ROM_LOAD( "gsgu_760_ad04.25q", 0x080000, 0x080000, CRC(71a45742) SHA1(fbddd54f5fb236662f7cc7e9b350723bc5404f72) )
ROM_LOAD( "gsgu_760_ad05.25r", 0x000000, 0x080000, CRC(44221eec) SHA1(966452e606e828b536ed11cbdd626a2fe3165199) )
- ROM_REGION( 0x100000, "gfx2", 0 ) /* tilemaps */
+ ROM_REGION( 0x100000, "k055673", 0 ) /* tilemaps */
ROM_LOAD32_WORD( "gsgu_760_ad02.34j", 0x000000, 0x080000, CRC(6d33c720) SHA1(35da3e1f0133a76480d2078fae89ea87b841ffc7) )
ROM_LOAD32_WORD( "gsgu_760_ad02.34k", 0x000002, 0x080000, CRC(8057a417) SHA1(82d4a1d84729e9f0a8aff4c219a19601b89caf15) )
ROM_END
diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp
index cc7f25d5d45..0248a66ece8 100644
--- a/src/mame/drivers/gijoe.cpp
+++ b/src/mame/drivers/gijoe.cpp
@@ -79,17 +79,17 @@ Change Log
AT070403:
-tilemap.h,tilemap.c
+tilemap.h,tilemap.cpp
- added tilemap_get_transparency_data() for transparency cache manipulation
-video\konamiic.c
+video\konamiic.cpp
- added preliminary K056832 tilemap<->linemap switching and tileline code
-drivers\gijoe.c
+drivers\gijoe.cpp
- updated video settings, memory map and irq handler
- added object blitter
-video\gijoe.c
+video\gijoe.cpp
- completed K054157 to K056832 migration
- added ground scroll emulation
- fixed sprite and BG priority
@@ -201,7 +201,7 @@ void gijoe_state::gijoe_map(address_map &map)
{
map(0x000000, 0x0fffff).rom();
map(0x100000, 0x100fff).ram().share("spriteram"); // Sprites
- map(0x110000, 0x110007).w(m_k053246, FUNC(k053247_device::k053246_word_w));
+ map(0x110000, 0x110007).w(m_k053246, FUNC(k053247_device::k053246_w));
map(0x120000, 0x121fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // Graphic planes
map(0x122000, 0x123fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // Graphic planes mirror read
map(0x130000, 0x131fff).r(m_k056832, FUNC(k056832_device::rom_word_r)); // Passthrough to tile roms
@@ -218,9 +218,9 @@ void gijoe_state::gijoe_map(address_map &map)
map(0x1e4000, 0x1e4001).portr("SYSTEM");
map(0x1e4002, 0x1e4003).portr("START");
map(0x1e8000, 0x1e8001).rw(FUNC(gijoe_state::control2_r), FUNC(gijoe_state::control2_w));
- map(0x1f0000, 0x1f0001).r(m_k053246, FUNC(k053247_device::k053246_word_r));
+ map(0x1f0000, 0x1f0001).r(m_k053246, FUNC(k053247_device::k053246_r));
#if JOE_DEBUG
- map(0x110000, 0x110007).r(m_k053246, FUNC(k053247_device::k053246_reg_word_r));
+ map(0x110000, 0x110007).r(m_k053246, FUNC(k053247_device::k053246_read_register));
map(0x160000, 0x160007).r(m_k056832, FUNC(k056832_device::b_word_r));
map(0x1a0000, 0x1a001f).r(m_k053251, FUNC(k053251_device::read)).umask16(0x00ff);
map(0x1b0000, 0x1b003f).r(m_k056832, FUNC(k056832_device::word_r));
@@ -322,7 +322,7 @@ void gijoe_state::gijoe(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(gijoe_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -37, 20);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, -37, 20);
m_k053246->set_palette(m_palette);
K053251(config, m_k053251, 0);
@@ -354,7 +354,7 @@ ROM_START( gijoe )
ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) )
ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "069a08.6h", 0x000000, 0x100000, CRC(325477d4) SHA1(140c57b0ac9e5cf702d788f416408a5eeb5d6d3c) )
ROM_LOAD64_WORD( "069a05.1h", 0x000002, 0x100000, CRC(c4ab07ed) SHA1(dc806eff00937d9465b1726fae8fdc3022464a28) )
ROM_LOAD64_WORD( "069a07.4h", 0x000004, 0x100000, CRC(ccaa3971) SHA1(16989cbbd65fe1b41c4a85fea02ba1e9880818a9) )
@@ -387,7 +387,7 @@ ROM_START( gijoeea )
ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) )
ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "069a08.6h", 0x000000, 0x100000, CRC(325477d4) SHA1(140c57b0ac9e5cf702d788f416408a5eeb5d6d3c) )
ROM_LOAD64_WORD( "069a05.1h", 0x000002, 0x100000, CRC(c4ab07ed) SHA1(dc806eff00937d9465b1726fae8fdc3022464a28) )
ROM_LOAD64_WORD( "069a07.4h", 0x000004, 0x100000, CRC(ccaa3971) SHA1(16989cbbd65fe1b41c4a85fea02ba1e9880818a9) )
@@ -414,7 +414,7 @@ ROM_START( gijoeu )
ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) )
ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "069a08.6h", 0x000000, 0x100000, CRC(325477d4) SHA1(140c57b0ac9e5cf702d788f416408a5eeb5d6d3c) )
ROM_LOAD64_WORD( "069a05.1h", 0x000002, 0x100000, CRC(c4ab07ed) SHA1(dc806eff00937d9465b1726fae8fdc3022464a28) )
ROM_LOAD64_WORD( "069a07.4h", 0x000004, 0x100000, CRC(ccaa3971) SHA1(16989cbbd65fe1b41c4a85fea02ba1e9880818a9) )
@@ -441,7 +441,7 @@ ROM_START( gijoej )
ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) )
ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "069a08.6h", 0x000000, 0x100000, CRC(325477d4) SHA1(140c57b0ac9e5cf702d788f416408a5eeb5d6d3c) )
ROM_LOAD64_WORD( "069a05.1h", 0x000002, 0x100000, CRC(c4ab07ed) SHA1(dc806eff00937d9465b1726fae8fdc3022464a28) )
ROM_LOAD64_WORD( "069a07.4h", 0x000004, 0x100000, CRC(ccaa3971) SHA1(16989cbbd65fe1b41c4a85fea02ba1e9880818a9) )
@@ -468,7 +468,7 @@ ROM_START( gijoea )
ROM_LOAD32_WORD( "069a10.18j", 0x000000, 0x100000, CRC(4c6743ee) SHA1(fa94fbfb55955fdb40705e79b49103676961d919) )
ROM_LOAD32_WORD( "069a09.16j", 0x000002, 0x100000, CRC(e6e36b05) SHA1(fecad503f2c285b2b0312e888c06dd6e87f95a07) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "069a08.6h", 0x000000, 0x100000, CRC(325477d4) SHA1(140c57b0ac9e5cf702d788f416408a5eeb5d6d3c) )
ROM_LOAD64_WORD( "069a05.1h", 0x000002, 0x100000, CRC(c4ab07ed) SHA1(dc806eff00937d9465b1726fae8fdc3022464a28) )
ROM_LOAD64_WORD( "069a07.4h", 0x000004, 0x100000, CRC(ccaa3971) SHA1(16989cbbd65fe1b41c4a85fea02ba1e9880818a9) )
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index f99582389ec..cefc18565fb 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -2,7 +2,7 @@
// copyright-holders:R. Belmont, Acho A. Tang, Phil Stroffolino, Olivier Galibert
/**************************************************************************
*
- * konamigx.c - Konami System GX
+ * konamigx.cpp - Konami System GX
* Driver by R. Belmont, Acho A. Tang, and Phil Stroffolino.
* ESC protection emulation by Olivier Galibert.
*
@@ -999,7 +999,7 @@ void konamigx_state::gx_base_memmap(address_map &map)
map(0xd22000, 0xd23fff).ram(); // extra bank checked at least by sexyparo, pending further investigation.
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(0xd48000, 0xd48007).w(m_k055673, FUNC(k055673_device::k053246_w));
map(0xd4a000, 0xd4a00f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r));
map(0xd4a010, 0xd4a01f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
map(0xd4c000, 0xd4c01f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask32(0xff00ff00);
@@ -1657,7 +1657,7 @@ void konamigx_state::konamigx(machine_config &config)
K055673(config, m_k055673, 0);
m_k055673->set_sprite_callback(FUNC(konamigx_state::type2_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -26, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX, -26, -23);
m_k055673->set_screen(m_screen);
m_k055673->set_palette(m_palette);
@@ -1701,7 +1701,7 @@ void konamigx_state::konamigx_bios(machine_config &config)
void konamigx_state::gokuparo(machine_config &config)
{
konamigx(config);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -46, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX, -46, -23);
}
void konamigx_state::sexyparo(machine_config &config)
@@ -1710,7 +1710,7 @@ void konamigx_state::sexyparo(machine_config &config)
m_k056832->set_tile_callback(FUNC(konamigx_state::alpha_tile_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -42, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX, -42, -23);
}
void konamigx_state::tbyahhoo(machine_config &config)
@@ -1730,7 +1730,7 @@ void konamigx_state::dragoonj(machine_config &config)
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);
+ m_k055673->set_config(K055673_LAYOUT_RNG, -53, -23);
}
void konamigx_state::le2(machine_config &config)
@@ -1743,7 +1743,7 @@ void konamigx_state::le2(machine_config &config)
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);
+ m_k055673->set_config(K055673_LAYOUT_LE2, -46, -23);
}
void konamigx_state::konamigx_6bpp(machine_config &config)
@@ -1753,7 +1753,7 @@ void konamigx_state::konamigx_6bpp(machine_config &config)
m_k056832->set_config(K056832_BPP_6, 0, 0);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -46, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX, -46, -23);
}
void konamigx_state::salmndr2(machine_config &config)
@@ -1762,7 +1762,7 @@ void konamigx_state::salmndr2(machine_config &config)
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);
+ m_k055673->set_config(K055673_LAYOUT_GX6, -48, -23);
}
void konamigx_state::opengolf(machine_config &config)
@@ -1776,7 +1776,7 @@ void konamigx_state::opengolf(machine_config &config)
MCFG_VIDEO_START_OVERRIDE(konamigx_state, opengolf)
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -53, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX6, -53, -23);
m_maincpu->set_addrmap(AS_PROGRAM, &konamigx_state::gx_type1_map);
@@ -1798,7 +1798,7 @@ void konamigx_state::racinfrc(machine_config &config)
m_k056832->set_config(K056832_BPP_6, 0, 0);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -53, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX, -53, -23);
m_maincpu->set_addrmap(AS_PROGRAM, &konamigx_state::gx_type1_map);
@@ -1824,7 +1824,7 @@ void konamigx_state::gxtype3(machine_config &config)
m_k056832->set_config(K056832_BPP_6, 0, 2);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -132, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX6, -132, -23);
PALETTE(config.replace(), m_palette).set_entries(16384);
m_palette->enable_shadows();
@@ -1876,7 +1876,7 @@ void konamigx_state::gxtype4(machine_config &config)
m_k056832->set_config(K056832_BPP_8, 0, 0);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -79, -24); // -23 looks better in intro
+ m_k055673->set_config(K055673_LAYOUT_GX6, -79, -24); // -23 looks better in intro
}
void konamigx_state::gxtype4_vsn(machine_config &config)
@@ -1896,7 +1896,7 @@ void konamigx_state::gxtype4_vsn(machine_config &config)
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);
+ m_k055673->set_config(K055673_LAYOUT_GX6, -132, -23);
}
void konamigx_state::gxtype4sd2(machine_config &config)
@@ -1904,7 +1904,7 @@ void konamigx_state::gxtype4sd2(machine_config &config)
gxtype4(config);
MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4_sd2)
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -81, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX6, -81, -23);
}
void konamigx_state::winspike(machine_config &config)
@@ -1917,7 +1917,7 @@ void konamigx_state::winspike(machine_config &config)
m_k056832->set_tile_callback(FUNC(konamigx_state::alpha_tile_callback), this);
m_k056832->set_config(K056832_BPP_8, 0, 2);
- m_k055673->set_config("gfx2", K055673_LAYOUT_LE2, -53, -23);
+ m_k055673->set_config(K055673_LAYOUT_LE2, -53, -23);
}
@@ -1943,7 +1943,7 @@ ROM_START(konamigx)
/* tiles */
ROM_REGION( 0x600000, "k056832", ROMREGION_ERASEFF )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASEFF )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASEFF )
/* sound samples */
ROM_REGION( 0x400000, "k054539", ROMREGION_ERASE00 )
ROM_END
@@ -1982,7 +1982,7 @@ ROM_START( gokuparo )
TILE_BYTE_ROM_LOAD( "321b12.13g", 0x000004, 512*1024, CRC(5f9edfa0) SHA1(36d54c5fe498a4d0fa64757cef11c56c67518258) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "321b11.25g", 0x000000, 2*1024*1024, CRC(c6e2e74d) SHA1(3875a50923e46e2986dbe2573453af5c7fa726f7) )
ROM_LOAD32_WORD( "321b10.28g", 0x000002, 2*1024*1024, CRC(ea9f8c48) SHA1(b5e880015887308a5f1c1c623011d9b0903e848f) )
ROM_LOAD( "321b09.30g", 0x400000, 1*1024*1024, CRC(94add237) SHA1(9a6d0a9727e7fa02d91ece220b145074a6741a95) )
@@ -2015,7 +2015,7 @@ ROM_START( fantjour )
TILE_BYTE_ROM_LOAD( "321b12.13g", 0x000004, 512*1024, CRC(5f9edfa0) SHA1(36d54c5fe498a4d0fa64757cef11c56c67518258) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "321b11.25g", 0x000000, 2*1024*1024, CRC(c6e2e74d) SHA1(3875a50923e46e2986dbe2573453af5c7fa726f7) )
ROM_LOAD32_WORD( "321b10.28g", 0x000002, 2*1024*1024, CRC(ea9f8c48) SHA1(b5e880015887308a5f1c1c623011d9b0903e848f) )
ROM_LOAD( "321b09.30g", 0x400000, 1*1024*1024, CRC(94add237) SHA1(9a6d0a9727e7fa02d91ece220b145074a6741a95) )
@@ -2048,7 +2048,7 @@ ROM_START( fantjoura )
TILE_BYTE_ROM_LOAD( "321b12.13g", 0x000004, 512*1024, CRC(5f9edfa0) SHA1(36d54c5fe498a4d0fa64757cef11c56c67518258) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "321b11.25g", 0x000000, 2*1024*1024, CRC(c6e2e74d) SHA1(3875a50923e46e2986dbe2573453af5c7fa726f7) )
ROM_LOAD32_WORD( "321b10.28g", 0x000002, 2*1024*1024, CRC(ea9f8c48) SHA1(b5e880015887308a5f1c1c623011d9b0903e848f) )
ROM_LOAD( "321b09.30g", 0x400000, 1*1024*1024, CRC(94add237) SHA1(9a6d0a9727e7fa02d91ece220b145074a6741a95) )
@@ -2082,7 +2082,7 @@ ROM_START( salmndr2 )
TILE_BYTES2_ROM_LOAD("521-a13.13c", 0x000004, 2*1024*1024, CRC(3ed7441b) SHA1(57e3e8035c056cf46a383d228c76a7da7def134f) )
/* sprites */
- ROM_REGION( 0x600000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x600000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "521-a08.25g", 0x000000, 2*1024*1024, CRC(f24f76bd) SHA1(823f614d436901241743c923206cb61d8bbb5c58) )
_48_WORD_ROM_LOAD( "521-a07.28g", 0x000002, 2*1024*1024, CRC(50ef9b7a) SHA1(104eac2bce43e99d4adc208145afe7be9156628e) )
_48_WORD_ROM_LOAD( "521-a06.30g", 0x000004, 2*1024*1024, CRC(cba5db2c) SHA1(505efdf8571ae28d8788dcafbfffcfb67e3189ce) )
@@ -2116,7 +2116,7 @@ ROM_START( salmndr2a )
TILE_BYTES2_ROM_LOAD("521-a13.13c", 0x000004, 2*1024*1024, CRC(3ed7441b) SHA1(57e3e8035c056cf46a383d228c76a7da7def134f) )
/* sprites */
- ROM_REGION( 0x600000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x600000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "521-a08.25g", 0x000000, 2*1024*1024, CRC(f24f76bd) SHA1(823f614d436901241743c923206cb61d8bbb5c58) )
_48_WORD_ROM_LOAD( "521-a07.28g", 0x000002, 2*1024*1024, CRC(50ef9b7a) SHA1(104eac2bce43e99d4adc208145afe7be9156628e) )
_48_WORD_ROM_LOAD( "521-a06.30g", 0x000004, 2*1024*1024, CRC(cba5db2c) SHA1(505efdf8571ae28d8788dcafbfffcfb67e3189ce) )
@@ -2149,7 +2149,7 @@ ROM_START( tbyahhoo )
TILE_BYTE_ROM_LOAD( "424a12.13g", 0x000004, 512*1024, CRC(7f9cb8b1) SHA1(f5e18d70fcb572bb85f9b064995fc0ab0bb581e8) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "424a11.25g", 0x000000, 2*1024*1024, CRC(29592688) SHA1(a4b44e9153988a510915af83116e3c18dd15642f) )
ROM_LOAD32_WORD( "424a10.28g", 0x000002, 2*1024*1024, CRC(cf24e5e3) SHA1(095bf2ae4f47c6e4768515ae5e22c982fbc660a5) )
ROM_LOAD( "424a09.30g", 0x400000, 1*1024*1024, CRC(daa07224) SHA1(198cafa3d0ead2aa2593be066c6f372e66c11c44) )
@@ -2182,7 +2182,7 @@ ROM_START( daiskiss )
TILE_BYTE_ROM_LOAD( "535a18.13g", 0x000004, 512*1024, CRC(d02e5103) SHA1(43c63a718a034636bad29d2def054d8b48f071e3) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "535a17.25g", 0x000000, 1*1024*1024, CRC(b12070e2) SHA1(51a763bf0e2c1d5c2b9983fcd4304d74c7fe6dd1) )
ROM_LOAD32_WORD( "535a13.28g", 0x000002, 1*1024*1024, CRC(10cf9d05) SHA1(6c6e51082ce340643d381863fec9b220e3d0ac53) )
ROM_LOAD( "535a11.30g", 0x400000, 512*1024, CRC(2b176b0f) SHA1(ecf4114d95a308be8f96a5c602c0f5ed5ffc8f29) )
@@ -2211,7 +2211,7 @@ ROM_START( sexyparo )
TILE_BYTE_ROM_LOAD( "533a18.13g", 0x000004, 512*1024, CRC(d3e0d058) SHA1(c50bdb3493501bfbbe092d01f5d4c38bfa3412f8) )
/* sprites */
- ROM_REGION( 0x600000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x600000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "533a17.25g", 0x000000, 2*1024*1024, CRC(9947af57) SHA1(a8f67cb49cf55e8402de352bb530c7c90c643144) )
ROM_LOAD32_WORD( "533a13.28g", 0x000002, 2*1024*1024, CRC(58f1fc38) SHA1(9662b4fb036ffe90f294ee36fa52a0c1e1dbd116) )
ROM_LOAD( "533a11.30g", 0x400000, 2*1024*1024, CRC(983105e1) SHA1(c688f6f73fab16107f01523081558a2e02a5311c) )
@@ -2241,7 +2241,7 @@ ROM_START( sexyparoa )
TILE_BYTE_ROM_LOAD( "533a18.13g", 0x000004, 512*1024, CRC(d3e0d058) SHA1(c50bdb3493501bfbbe092d01f5d4c38bfa3412f8) )
/* sprites */
- ROM_REGION( 0x600000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x600000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "533a17.25g", 0x000000, 2*1024*1024, CRC(9947af57) SHA1(a8f67cb49cf55e8402de352bb530c7c90c643144) )
ROM_LOAD32_WORD( "533a13.28g", 0x000002, 2*1024*1024, CRC(58f1fc38) SHA1(9662b4fb036ffe90f294ee36fa52a0c1e1dbd116) )
ROM_LOAD( "533a11.30g", 0x400000, 2*1024*1024, CRC(983105e1) SHA1(c688f6f73fab16107f01523081558a2e02a5311c) )
@@ -2274,7 +2274,7 @@ ROM_START( rungun2 )
ROM_LOAD16_BYTE( "505a20.11m", 0x000001, 1024*1024, CRC(a6a300fb) SHA1(290d97c6ec36e3cab8e6fcd5310030e00fb0ce07) )
/* sprites */
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "505a19.14r", 0x0000000, 2*1024*1024, CRC(ffde4f17) SHA1(df93853f7bd3c775a15836b0ca9042f75eb65630) )
_48_WORD_ROM_LOAD( "505a15.18r", 0x0000002, 2*1024*1024, CRC(d9ab1e6c) SHA1(748a61d939bd335c1b50f440e819303552b3d5a1) )
_48_WORD_ROM_LOAD( "505a11.23r", 0x0000004, 2*1024*1024, CRC(75c13df0) SHA1(6680f75a67ca510fac29b65bce32fef64e844695) )
@@ -2321,7 +2321,7 @@ ROM_START( slamdnk2 )
ROM_LOAD16_BYTE( "505a20.11m", 0x000001, 1024*1024, CRC(a6a300fb) SHA1(290d97c6ec36e3cab8e6fcd5310030e00fb0ce07) )
/* sprites */
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "505a19.14r", 0x0000000, 2*1024*1024, CRC(ffde4f17) SHA1(df93853f7bd3c775a15836b0ca9042f75eb65630) )
_48_WORD_ROM_LOAD( "505a15.18r", 0x0000002, 2*1024*1024, CRC(d9ab1e6c) SHA1(748a61d939bd335c1b50f440e819303552b3d5a1) )
_48_WORD_ROM_LOAD( "505a11.23r", 0x0000004, 2*1024*1024, CRC(75c13df0) SHA1(6680f75a67ca510fac29b65bce32fef64e844695) )
@@ -2369,7 +2369,7 @@ ROM_START( rushhero )
ROM_LOAD16_BYTE( "605a20.11m", 0x000001, 1024*1024, CRC(a8fb4288) SHA1(b0ee6c2add5a8063f771ac8bbdfd78c0382a5036) )
/* sprites */
- ROM_REGION( 0x3000000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x3000000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "605a19.14r", 0x0000000, 4*1024*1024, CRC(293427d0) SHA1(c31f93797bda09ea7e990100a5556eb0fde64968) )
_48_WORD_ROM_LOAD( "605a15.18r", 0x0000002, 4*1024*1024, CRC(19e6e356) SHA1(b2568e14d6fb9a9792f95aafcf694dbf00c0d2c8) )
_48_WORD_ROM_LOAD( "605a11.23r", 0x0000004, 4*1024*1024, CRC(bc61339c) SHA1(77a5737501bf8ffd7ae4192a6e5924c479eb6655) )
@@ -2411,7 +2411,7 @@ ROM_START( tokkae )
TILE_BYTES2_ROM_LOAD( "615a20.13c", 0x000004, 512*1024, CRC(9911b5a1) SHA1(7dc9348fd23331ca7614db27dc5f280610f87a20) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "615a17.25g", 0x000000, 2*1024*1024, CRC(b864654b) SHA1(bbd74c992ba3c3c629520e68687d7c8f3c26d0b9) )
ROM_LOAD32_WORD( "615a13.28g", 0x000002, 2*1024*1024, CRC(4e8afa1a) SHA1(d980104ddf9670e689236f381db3345471aff6fd) )
ROM_LOAD32_WORD( "615a16.18h", 0x400000, 2*1024*1024, CRC(dfa0f0fe) SHA1(4f68767f8329f6348055a472d923557e7dec3154) )
@@ -2447,7 +2447,7 @@ ROM_START( tkmmpzdm )
TILE_BYTES2_ROM_LOAD( "515a12.13c", 0x000004, 512*1024, CRC(6936f94a) SHA1(e2c7fc327638ee39eef6109c4f164eaf98972f00) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "515a10.25g", 0x000000, 2*1024*1024, CRC(e6e7ab7e) SHA1(3f7ddab4b814673264b542d2a8761c56f82f2180) )
ROM_LOAD32_WORD( "515a08.28g", 0x000002, 2*1024*1024, CRC(5613daea) SHA1(43480c8104582cc27d8ab6920ec113e660de5ae7) )
ROM_LOAD32_WORD( "515a09.18h", 0x400000, 2*1024*1024, CRC(28ffdb48) SHA1(8511def7bb151f912755c2bbcb0cae1a2e52f405) )
@@ -2483,7 +2483,7 @@ ROM_START( winspike )
ROM_LOAD16_BYTE( "705a18.22h", 0x000001, 0x100000, CRC(eb97fb5f) SHA1(13de0ad060fd6f1312fa10edde1fef6481e8df64) )
/* sprites */
- ROM_REGION( 0x1000000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x1000000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "705a17.25g", 0x000000, 0x400000, CRC(971d2812) SHA1(ee0819faf6f6c8420d5d3742cb39dfb76b9ce7a4) )
ROM_LOAD64_WORD( "705a13.28g", 0x000002, 0x400000, CRC(3b62584b) SHA1(69718f47ff1e8d65a11972af1ed5068db175f625) )
ROM_LOAD64_WORD( "705a11.30g", 0x000004, 0x400000, CRC(68542ce9) SHA1(a4294da1d1026e3a9d070575e5855935389a705f) )
@@ -2542,7 +2542,7 @@ ROM_START( winspikej )
ROM_LOAD16_BYTE( "705a18.22h", 0x000001, 0x100000, CRC(eb97fb5f) SHA1(13de0ad060fd6f1312fa10edde1fef6481e8df64) )
/* sprites */
- ROM_REGION( 0x1000000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x1000000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "705a17.25g", 0x000000, 0x400000, CRC(971d2812) SHA1(ee0819faf6f6c8420d5d3742cb39dfb76b9ce7a4) )
ROM_LOAD64_WORD( "705a13.28g", 0x000002, 0x400000, CRC(3b62584b) SHA1(69718f47ff1e8d65a11972af1ed5068db175f625) )
ROM_LOAD64_WORD( "705a11.30g", 0x000004, 0x400000, CRC(68542ce9) SHA1(a4294da1d1026e3a9d070575e5855935389a705f) )
@@ -2572,7 +2572,7 @@ ROM_START( crzcross )
TILE_BYTE_ROM_LOAD( "315a12.13g", 0x000004, 2*1024*1024, CRC(3047b8d2) SHA1(99fa4d20ee5aae89b9093ceb581f187bc9acc0ae) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "315a11.25g", 0x000000, 2*1024*1024, CRC(b8a99c29) SHA1(60086f663aa6cbfc3fb378caeb2509c65637564e) )
ROM_LOAD32_WORD( "315a10.28g", 0x000002, 2*1024*1024, CRC(77d175dc) SHA1(73506df30db5ce38a9a21a1dce3e8b4cc1dfa7be) )
ROM_LOAD( "315a09.30g", 0x400000, 1*1024*1024, CRC(82580329) SHA1(99749a67f1843dfd0fe93cc6bbcbc126b7bb7fb4) )
@@ -2605,7 +2605,7 @@ ROM_START( puzldama )
TILE_BYTE_ROM_LOAD( "315a12.13g", 0x000004, 2*1024*1024, CRC(3047b8d2) SHA1(99fa4d20ee5aae89b9093ceb581f187bc9acc0ae) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "315a11.25g", 0x000000, 2*1024*1024, CRC(b8a99c29) SHA1(60086f663aa6cbfc3fb378caeb2509c65637564e) )
ROM_LOAD32_WORD( "315a10.28g", 0x000002, 2*1024*1024, CRC(77d175dc) SHA1(73506df30db5ce38a9a21a1dce3e8b4cc1dfa7be) )
ROM_LOAD( "315a09.30g", 0x400000, 1*1024*1024, CRC(82580329) SHA1(99749a67f1843dfd0fe93cc6bbcbc126b7bb7fb4) )
@@ -2641,7 +2641,7 @@ ROM_START( dragoonj )
TILE_WORD_ROM_LOAD( "417a16.17h", 0x000000, 2*1024*1024, CRC(88b2213b) SHA1(ac4ac57618cf98d7486b147f5494e6943bff1a4d) )
/* sprites */
- ROM_REGION( 0x1000000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x1000000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "417a15.25g", 0x000000, 2*1024*1024, CRC(83bccd01) SHA1(c0e65c43115164c3f64ac14a449c65c4e3e3c4cf) )
ROM_LOAD32_WORD( "417a11.28g", 0x000002, 2*1024*1024, CRC(624a7c4c) SHA1(5fda37cd02b4dcb328b80b29041214c685c77a78) )
ROM_LOAD32_WORD( "417a14.18h", 0x400000, 2*1024*1024, CRC(fbf551f1) SHA1(871c5804aba9845aa04596db51def3ba3b8bae30) )
@@ -2681,7 +2681,7 @@ ROM_START( dragoona )
TILE_WORD_ROM_LOAD( "417a16.17h", 0x000000, 2*1024*1024, CRC(88b2213b) SHA1(ac4ac57618cf98d7486b147f5494e6943bff1a4d) )
/* sprites */
- ROM_REGION( 0x1000000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x1000000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "417a15.25g", 0x000000, 2*1024*1024, CRC(83bccd01) SHA1(c0e65c43115164c3f64ac14a449c65c4e3e3c4cf) )
ROM_LOAD32_WORD( "417a11.28g", 0x000002, 2*1024*1024, CRC(624a7c4c) SHA1(5fda37cd02b4dcb328b80b29041214c685c77a78) )
ROM_LOAD32_WORD( "417a14.18h", 0x400000, 2*1024*1024, CRC(fbf551f1) SHA1(871c5804aba9845aa04596db51def3ba3b8bae30) )
@@ -2722,7 +2722,7 @@ ROM_START( soccerss )
TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) )
/* sprites */
- ROM_REGION( 0xc00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xc00000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "427a13.18r", 0x000000, 2*1024*1024, CRC(815a9b87) SHA1(7d9d5932fff7dd7aa4cbccf0c8d3784dc8042e70) )
_48_WORD_ROM_LOAD( "427a11.23r", 0x000002, 2*1024*1024, CRC(c1ca74c1) SHA1(b7286df8e59f8f1939ebf17aaf9345a857b0b100) )
_48_WORD_ROM_LOAD( "427a09.137", 0x000004, 2*1024*1024, CRC(56bdd480) SHA1(01d164aedc77f71f6310cfd739c00b33289a2e7e) )
@@ -2781,7 +2781,7 @@ ROM_START( soccerssu )
TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) )
/* sprites */
- ROM_REGION( 0xc00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xc00000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "427a13.18r", 0x000000, 2*1024*1024, CRC(815a9b87) SHA1(7d9d5932fff7dd7aa4cbccf0c8d3784dc8042e70) )
_48_WORD_ROM_LOAD( "427a11.23r", 0x000002, 2*1024*1024, CRC(c1ca74c1) SHA1(b7286df8e59f8f1939ebf17aaf9345a857b0b100) )
_48_WORD_ROM_LOAD( "427a09.137", 0x000004, 2*1024*1024, CRC(56bdd480) SHA1(01d164aedc77f71f6310cfd739c00b33289a2e7e) )
@@ -2840,7 +2840,7 @@ ROM_START( soccerssj )
TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) )
/* sprites */
- ROM_REGION( 0xc00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xc00000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "427a13.18r", 0x000000, 2*1024*1024, CRC(815a9b87) SHA1(7d9d5932fff7dd7aa4cbccf0c8d3784dc8042e70) )
_48_WORD_ROM_LOAD( "427a11.23r", 0x000002, 2*1024*1024, CRC(c1ca74c1) SHA1(b7286df8e59f8f1939ebf17aaf9345a857b0b100) )
_48_WORD_ROM_LOAD( "427a09.137", 0x000004, 2*1024*1024, CRC(56bdd480) SHA1(01d164aedc77f71f6310cfd739c00b33289a2e7e) )
@@ -2887,7 +2887,7 @@ ROM_START( soccerssja )
TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) )
/* sprites */
- ROM_REGION( 0xc00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xc00000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "427a13.18r", 0x000000, 2*1024*1024, CRC(815a9b87) SHA1(7d9d5932fff7dd7aa4cbccf0c8d3784dc8042e70) )
_48_WORD_ROM_LOAD( "427a11.23r", 0x000002, 2*1024*1024, CRC(c1ca74c1) SHA1(b7286df8e59f8f1939ebf17aaf9345a857b0b100) )
_48_WORD_ROM_LOAD( "427a09.137", 0x000004, 2*1024*1024, CRC(56bdd480) SHA1(01d164aedc77f71f6310cfd739c00b33289a2e7e) )
@@ -2934,7 +2934,7 @@ ROM_START( soccerssa )
TILE_BYTES2_ROM_LOAD( "427a14.143", 0x000004, 0x080000, CRC(7575a0ed) SHA1(92fda2747ac090f93e60cff8478af6721b949dc2) )
/* sprites */
- ROM_REGION( 0xc00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xc00000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "427a13.18r", 0x000000, 2*1024*1024, CRC(815a9b87) SHA1(7d9d5932fff7dd7aa4cbccf0c8d3784dc8042e70) )
_48_WORD_ROM_LOAD( "427a11.23r", 0x000002, 2*1024*1024, CRC(c1ca74c1) SHA1(b7286df8e59f8f1939ebf17aaf9345a857b0b100) )
_48_WORD_ROM_LOAD( "427a09.137", 0x000004, 2*1024*1024, CRC(56bdd480) SHA1(01d164aedc77f71f6310cfd739c00b33289a2e7e) )
@@ -2981,7 +2981,7 @@ ROM_START( vsnetscr )
ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) )
ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) )
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASEFF )
_48_WORD_ROM_LOAD( "627a19.14r", 0x0000000, 4*1024*1024, CRC(39989087) SHA1(9a1da422cc71c2e9512361511b8482a33ada6396) )
_48_WORD_ROM_LOAD( "627a15.18r", 0x0000002, 4*1024*1024, CRC(94c557e9) SHA1(3eb2b47d4143b1caeaaf529b5843d6cb0b517eb2) )
_48_WORD_ROM_LOAD( "627a11.23r", 0x0000004, 4*1024*1024, CRC(8185b19f) SHA1(4a8cc3613e743b2de786663f4f7097e7236a8b74) )
@@ -3019,7 +3019,7 @@ ROM_START( vsnetscreb )
ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) )
ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) )
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASEFF )
_48_WORD_ROM_LOAD( "627a19.14r", 0x0000000, 4*1024*1024, CRC(39989087) SHA1(9a1da422cc71c2e9512361511b8482a33ada6396) )
_48_WORD_ROM_LOAD( "627a15.18r", 0x0000002, 4*1024*1024, CRC(94c557e9) SHA1(3eb2b47d4143b1caeaaf529b5843d6cb0b517eb2) )
_48_WORD_ROM_LOAD( "627a11.23r", 0x0000004, 4*1024*1024, CRC(8185b19f) SHA1(4a8cc3613e743b2de786663f4f7097e7236a8b74) )
@@ -3057,7 +3057,7 @@ ROM_START( vsnetscru )
ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) )
ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) )
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASEFF )
_48_WORD_ROM_LOAD( "627a19.14r", 0x0000000, 4*1024*1024, CRC(39989087) SHA1(9a1da422cc71c2e9512361511b8482a33ada6396) )
_48_WORD_ROM_LOAD( "627a15.18r", 0x0000002, 4*1024*1024, CRC(94c557e9) SHA1(3eb2b47d4143b1caeaaf529b5843d6cb0b517eb2) )
_48_WORD_ROM_LOAD( "627a11.23r", 0x0000004, 4*1024*1024, CRC(8185b19f) SHA1(4a8cc3613e743b2de786663f4f7097e7236a8b74) )
@@ -3221,7 +3221,7 @@ ROM_START( vsnetscrj )
ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) )
ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) )
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASEFF )
_48_WORD_ROM_LOAD( "627a19.14r", 0x0000000, 4*1024*1024, CRC(39989087) SHA1(9a1da422cc71c2e9512361511b8482a33ada6396) )
_48_WORD_ROM_LOAD( "627a15.18r", 0x0000002, 4*1024*1024, CRC(94c557e9) SHA1(3eb2b47d4143b1caeaaf529b5843d6cb0b517eb2) )
_48_WORD_ROM_LOAD( "627a11.23r", 0x0000004, 4*1024*1024, CRC(8185b19f) SHA1(4a8cc3613e743b2de786663f4f7097e7236a8b74) )
@@ -3259,7 +3259,7 @@ ROM_START( vsnetscra )
ROM_LOAD16_BYTE( "627a21.11r", 0x000000, 1024*1024, CRC(d0755fb8) SHA1(de37ea2a7969a97b6f2abccb7dc2a58950482bf0) )
ROM_LOAD16_BYTE( "627a20.11m", 0x000001, 1024*1024, CRC(f68b28f2) SHA1(1463717ed581494fcab77a80dc6ffd3ab82ab1fa) )
- ROM_REGION( 0x1800000, "gfx2", ROMREGION_ERASEFF )
+ ROM_REGION( 0x1800000, "k055673", ROMREGION_ERASEFF )
_48_WORD_ROM_LOAD( "627a19.14r", 0x0000000, 4*1024*1024, CRC(39989087) SHA1(9a1da422cc71c2e9512361511b8482a33ada6396) )
_48_WORD_ROM_LOAD( "627a15.18r", 0x0000002, 4*1024*1024, CRC(94c557e9) SHA1(3eb2b47d4143b1caeaaf529b5843d6cb0b517eb2) )
_48_WORD_ROM_LOAD( "627a11.23r", 0x0000004, 4*1024*1024, CRC(8185b19f) SHA1(4a8cc3613e743b2de786663f4f7097e7236a8b74) )
@@ -3299,7 +3299,7 @@ ROM_START( le2 )
ROM_LOAD16_BYTE( "312a13.20h", 0x400001, 2*1024*1024, CRC(16e5fdaa) SHA1(f04e09ee4207eb2bd67533997d36f4b3cf42a439) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "312a11.25g", 0x000000, 2*1024*1024, CRC(5f474357) SHA1(1f6d99f1ea69e07a65731ea4eae5917452cfcab6) )
ROM_LOAD64_WORD( "312a10.28g", 0x000002, 2*1024*1024, CRC(3c570d04) SHA1(ebbf7d28726e98c8895c9bf901f8b2dd38018c77) )
ROM_LOAD64_WORD( "312a09.30g", 0x000004, 2*1024*1024, CRC(b2c5d6d5) SHA1(8248612275ca862c6688de5c6f24f37aeb3f9fe5) )
@@ -3337,7 +3337,7 @@ ROM_START( le2u )
ROM_LOAD16_BYTE( "312a13.20h", 0x400001, 2*1024*1024, CRC(16e5fdaa) SHA1(f04e09ee4207eb2bd67533997d36f4b3cf42a439) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "312a11.25g", 0x000000, 2*1024*1024, CRC(5f474357) SHA1(1f6d99f1ea69e07a65731ea4eae5917452cfcab6) )
ROM_LOAD64_WORD( "312a10.28g", 0x000002, 2*1024*1024, CRC(3c570d04) SHA1(ebbf7d28726e98c8895c9bf901f8b2dd38018c77) )
ROM_LOAD64_WORD( "312a09.30g", 0x000004, 2*1024*1024, CRC(b2c5d6d5) SHA1(8248612275ca862c6688de5c6f24f37aeb3f9fe5) )
@@ -3376,7 +3376,7 @@ ROM_START( le2j )
ROM_LOAD16_BYTE( "312a13.20h", 0x400001, 2*1024*1024, CRC(16e5fdaa) SHA1(f04e09ee4207eb2bd67533997d36f4b3cf42a439) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "312a11.25g", 0x000000, 2*1024*1024, CRC(5f474357) SHA1(1f6d99f1ea69e07a65731ea4eae5917452cfcab6) )
ROM_LOAD64_WORD( "312a10.28g", 0x000002, 2*1024*1024, CRC(3c570d04) SHA1(ebbf7d28726e98c8895c9bf901f8b2dd38018c77) )
ROM_LOAD64_WORD( "312a09.30g", 0x000004, 2*1024*1024, CRC(b2c5d6d5) SHA1(8248612275ca862c6688de5c6f24f37aeb3f9fe5) )
@@ -3414,7 +3414,7 @@ ROM_START( racinfrc )
TILE_BYTES2_ROM_LOAD( "250a14.21y", 0x000004, 0x080000, CRC(d14abf98) SHA1(14827a01deb659c96fd38a5c76f1c9cead5f83c7) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "250a12.26y", 0x000000, 0x200000, CRC(e4ca3cff) SHA1(5dfddda4b5257e98a53fb8669714004ae3aeb3a7) )
ROM_LOAD32_WORD( "250a10.31y", 0x000002, 0x200000, CRC(75c02d12) SHA1(3ca471d887b92261b1c3f50777903df13f07b1a9) )
ROM_LOAD32_WORD( "250a13.24y", 0x400000, 0x200000, CRC(7aeef929) SHA1(9f656e2ede27aea7d51f0f0a3a91a8f2c2d250c0) )
@@ -3466,7 +3466,7 @@ ROM_START( racinfrcu )
TILE_BYTES2_ROM_LOAD( "250a14.21y", 0x000004, 0x080000, CRC(d14abf98) SHA1(14827a01deb659c96fd38a5c76f1c9cead5f83c7) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD32_WORD( "250a12.26y", 0x000000, 0x200000, CRC(e4ca3cff) SHA1(5dfddda4b5257e98a53fb8669714004ae3aeb3a7) )
ROM_LOAD32_WORD( "250a10.31y", 0x000002, 0x200000, CRC(75c02d12) SHA1(3ca471d887b92261b1c3f50777903df13f07b1a9) )
ROM_LOAD32_WORD( "250a13.24y", 0x400000, 0x200000, CRC(7aeef929) SHA1(9f656e2ede27aea7d51f0f0a3a91a8f2c2d250c0) )
@@ -3551,7 +3551,7 @@ ROM_START( opengolf )
TILE_BYTE_ROM_LOAD( "218a14.22y", 0x000004, 1*1024*1024, CRC(508cd75e) SHA1(adfaac92bc55f60b178a5817c48774a664d8980d) )
/* sprites */
- ROM_REGION( 0x900000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x900000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "218a12.26y", 0x000000, 2*1024*1024, CRC(83158653) SHA1(b7e43d63f12a793b18ce9fc9cc2c38352d211905) )
_48_WORD_ROM_LOAD( "218a10.31y", 0x000002, 2*1024*1024, CRC(059bfee3) SHA1(e7f4621313b7f9a6cad81d455700172654bc7404) )
_48_WORD_ROM_LOAD( "218a08.35y", 0x000004, 2*1024*1024, CRC(5b7098f3) SHA1(91bedf731e94d1554f9a8f86f79425a2c58bbaf9) )
@@ -3606,7 +3606,7 @@ ROM_START( opengolf2 )
TILE_BYTE_ROM_LOAD( "218a14.22y", 0x000004, 1*1024*1024, CRC(508cd75e) SHA1(adfaac92bc55f60b178a5817c48774a664d8980d) )
/* sprites */
- ROM_REGION( 0x900000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x900000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "218a12.26y", 0x000000, 2*1024*1024, CRC(83158653) SHA1(b7e43d63f12a793b18ce9fc9cc2c38352d211905) )
_48_WORD_ROM_LOAD( "218a10.31y", 0x000002, 2*1024*1024, CRC(059bfee3) SHA1(e7f4621313b7f9a6cad81d455700172654bc7404) )
_48_WORD_ROM_LOAD( "218a08.35y", 0x000004, 2*1024*1024, CRC(5b7098f3) SHA1(91bedf731e94d1554f9a8f86f79425a2c58bbaf9) )
@@ -3660,7 +3660,7 @@ ROM_START( ggreats2 )
TILE_BYTE_ROM_LOAD( "218a14.22y", 0x000004, 1*1024*1024, CRC(508cd75e) SHA1(adfaac92bc55f60b178a5817c48774a664d8980d) )
/* sprites */
- ROM_REGION( 0x900000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x900000, "k055673", ROMREGION_ERASE00 )
_48_WORD_ROM_LOAD( "218a12.26y", 0x000000, 2*1024*1024, CRC(83158653) SHA1(b7e43d63f12a793b18ce9fc9cc2c38352d211905) )
_48_WORD_ROM_LOAD( "218a10.31y", 0x000002, 2*1024*1024, CRC(059bfee3) SHA1(e7f4621313b7f9a6cad81d455700172654bc7404) )
_48_WORD_ROM_LOAD( "218a08.35y", 0x000004, 2*1024*1024, CRC(5b7098f3) SHA1(91bedf731e94d1554f9a8f86f79425a2c58bbaf9) )
diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp
index 121c5d74924..a19bcf5611c 100644
--- a/src/mame/drivers/moo.cpp
+++ b/src/mame/drivers/moo.cpp
@@ -5,7 +5,7 @@
Wild West C.O.W.boys of Moo Mesa
Bucky O'Hare
(c) 1992 Konami
- Driver by R. Belmont and Acho A. Tang based on xexex.c by Olivier Galibert.
+ Driver by R. Belmont and Acho A. Tang based on xexex.cpp by Olivier Galibert.
Moo Mesa protection information thanks to ElSemi and OG.
These are the final Xexex hardware games before the pre-GX/Mystic Warriors
@@ -303,9 +303,9 @@ void moo_state::moo_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x0c0000, 0x0c003f).w(m_k056832, FUNC(k056832_device::word_w));
- map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_word_w));
+ map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_w));
- map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r));
+ map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_r));
map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); /* K054338 alpha blending engine */
map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff);
map(0x0ce000, 0x0ce01f).w(FUNC(moo_state::moo_prot_w));
@@ -327,7 +327,7 @@ void moo_state::moo_map(address_map &map)
map(0x1c0000, 0x1c1fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
#if MOO_DEBUG
map(0x0c0000, 0x0c003f).r(m_k056832, FUNC(k056832_device::word_r));
- map(0x0c2000, 0x0c2007).r(m_k053246, FUNC(k053247_device::k053246_reg_word_r));
+ map(0x0c2000, 0x0c2007).r(m_k053246, FUNC(k053247_device::k053246_read_register));
map(0x0ca000, 0x0ca01f).r(m_k054338, FUNC(k054338_device::register_r));
map(0x0cc000, 0x0cc01f).r(m_k053251, FUNC(k053251_device::read)).umask16(0x00ff);
map(0x0d8000, 0x0d8007).r(m_k056832, FUNC(k056832_device::b_word_r));
@@ -338,9 +338,9 @@ void moo_state::moobl_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x0c0000, 0x0c003f).w(m_k056832, FUNC(k056832_device::word_w));
- map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_word_w));
+ map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_w));
map(0x0c2f00, 0x0c2f01).nopr(); /* heck if I know, but it's polled constantly */
- map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r));
+ map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_r));
map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); /* K054338 alpha blending engine */
map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff);
map(0x0d0000, 0x0d001f).writeonly(); /* CCU regs (ignored) */
@@ -368,8 +368,8 @@ void moo_state::bucky_map(address_map &map)
map(0x090000, 0x09ffff).ram().share("spriteram"); /* Sprite RAM */
map(0x0a0000, 0x0affff).ram(); /* extra sprite RAM? */
map(0x0c0000, 0x0c003f).w(m_k056832, FUNC(k056832_device::word_w));
- map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_word_w));
- map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r));
+ map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_w));
+ map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_r));
map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); /* K054338 alpha blending engine */
map(0x0cc000, 0x0cc01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff);
map(0x0ce000, 0x0ce01f).w(FUNC(moo_state::moo_prot_w));
@@ -391,7 +391,7 @@ void moo_state::bucky_map(address_map &map)
map(0x200000, 0x23ffff).rom(); /* data */
#if MOO_DEBUG
map(0x0c0000, 0x0c003f).r(m_k056832, FUNC(k056832_device::word_r));
- map(0x0c2000, 0x0c2007).r(m_k053246, FUNC(k053247_device::k053246_reg_word_r));
+ map(0x0c2000, 0x0c2007).r(m_k053246, FUNC(k053247_device::k053246_read_register));
map(0x0ca000, 0x0ca01f).r(m_k054338, FUNC(k054338_device::register_r));
map(0x0cc000, 0x0cc01f).r(m_k053251, FUNC(k053251_device::read)).umask16(0x00ff);
map(0x0d8000, 0x0d8007).r(m_k056832, FUNC(k056832_device::b_word_r));
@@ -529,7 +529,7 @@ void moo_state::moo(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(moo_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -48+1, 23);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, -48+1, 23);
m_k053246->set_palette("palette");
K056832(config, m_k056832, 0);
@@ -583,7 +583,7 @@ void moo_state::moobl(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(moo_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -48+1, 23);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, -48+1, 23);
m_k053246->set_palette("palette");
K056832(config, m_k056832, 0);
@@ -612,7 +612,7 @@ void moo_state::bucky(machine_config &config)
K054000(config, "k054000", 0);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -48, 23);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, -48, 23);
/* video hardware */
m_palette->set_format(palette_device::xRGB_888, 4096);
@@ -641,7 +641,7 @@ ROM_START( moomesa ) /* Version EA */
ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) )
ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "151a10.b8", 0x000000, 0x200000, CRC(376c64f1) SHA1(eb69c5a27f9795e28f04a503955132f0a9e4de12) )
ROM_LOAD64_WORD( "151a11.a8", 0x000002, 0x200000, CRC(e7f49225) SHA1(1255b214f29b6507540dad5892c60a7ae2aafc5c) )
@@ -676,7 +676,7 @@ ROM_START( moomesauac ) /* Version UA */
ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) )
ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "151a10.b8", 0x000000, 0x200000, CRC(376c64f1) SHA1(eb69c5a27f9795e28f04a503955132f0a9e4de12) )
ROM_LOAD64_WORD( "151a11.a8", 0x000002, 0x200000, CRC(e7f49225) SHA1(1255b214f29b6507540dad5892c60a7ae2aafc5c) )
@@ -711,7 +711,7 @@ ROM_START( moomesauab ) /* Version UA */
ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) )
ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "151a10.b8", 0x000000, 0x200000, CRC(376c64f1) SHA1(eb69c5a27f9795e28f04a503955132f0a9e4de12) )
ROM_LOAD64_WORD( "151a11.a8", 0x000002, 0x200000, CRC(e7f49225) SHA1(1255b214f29b6507540dad5892c60a7ae2aafc5c) )
@@ -746,7 +746,7 @@ ROM_START( moomesaaab ) /* Version AA */
ROM_LOAD32_WORD( "151a05.t8", 0x000000, 0x100000, CRC(bc616249) SHA1(58c1f1a03ce9bead8f79d12ce4b2d342432b24b5) )
ROM_LOAD32_WORD( "151a06.t10", 0x000002, 0x100000, CRC(38dbcac1) SHA1(c357779733921695b20ac586db5b475f5b2b8f4c) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "151a10.b8", 0x000000, 0x200000, CRC(376c64f1) SHA1(eb69c5a27f9795e28f04a503955132f0a9e4de12) )
ROM_LOAD64_WORD( "151a11.a8", 0x000002, 0x200000, CRC(e7f49225) SHA1(1255b214f29b6507540dad5892c60a7ae2aafc5c) )
@@ -781,7 +781,7 @@ ROM_START( bucky ) /* Version EA */
ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) )
ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "173a10.b8", 0x000000, 0x200000, CRC(42fb0a0c) SHA1(d68c932cfabdec7896698b433525fe47ef4698d0) )
ROM_LOAD64_WORD( "173a11.a8", 0x000002, 0x200000, CRC(b0d747c4) SHA1(0cf1ee1b9a35ded31a81c321df2a076f7b588971) )
@@ -817,7 +817,7 @@ ROM_START( buckyea ) /* Version EA */
ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) )
ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "173a10.b8", 0x000000, 0x200000, CRC(42fb0a0c) SHA1(d68c932cfabdec7896698b433525fe47ef4698d0) )
ROM_LOAD64_WORD( "173a11.a8", 0x000002, 0x200000, CRC(b0d747c4) SHA1(0cf1ee1b9a35ded31a81c321df2a076f7b588971) )
@@ -853,7 +853,7 @@ ROM_START( buckyjaa ) /* Version JA */
ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) )
ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "173a10.b8", 0x000000, 0x200000, CRC(42fb0a0c) SHA1(d68c932cfabdec7896698b433525fe47ef4698d0) )
ROM_LOAD64_WORD( "173a11.a8", 0x000002, 0x200000, CRC(b0d747c4) SHA1(0cf1ee1b9a35ded31a81c321df2a076f7b588971) )
@@ -889,7 +889,7 @@ ROM_START( buckyuab ) /* Version UA */
ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) )
ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "173a10.b8", 0x000000, 0x200000, CRC(42fb0a0c) SHA1(d68c932cfabdec7896698b433525fe47ef4698d0) )
ROM_LOAD64_WORD( "173a11.a8", 0x000002, 0x200000, CRC(b0d747c4) SHA1(0cf1ee1b9a35ded31a81c321df2a076f7b588971) )
@@ -925,7 +925,7 @@ ROM_START( buckyaab ) /* Version AA */
ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) )
ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "173a10.b8", 0x000000, 0x200000, CRC(42fb0a0c) SHA1(d68c932cfabdec7896698b433525fe47ef4698d0) )
ROM_LOAD64_WORD( "173a11.a8", 0x000002, 0x200000, CRC(b0d747c4) SHA1(0cf1ee1b9a35ded31a81c321df2a076f7b588971) )
@@ -961,7 +961,7 @@ ROM_START( buckyaa ) /* Version AA */
ROM_LOAD32_WORD( "173a05.t8", 0x000000, 0x100000, CRC(d14333b4) SHA1(d1a15ead2d156e1fceca0bf202ab3962411caf11) )
ROM_LOAD32_WORD( "173a06.t10", 0x000002, 0x100000, CRC(6541a34f) SHA1(15cf481498e3b7e0b2f7bfe5434121cc3bd65662) )
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
/* sprites */
ROM_LOAD64_WORD( "173a10.b8", 0x000000, 0x200000, CRC(42fb0a0c) SHA1(d68c932cfabdec7896698b433525fe47ef4698d0) )
ROM_LOAD64_WORD( "173a11.a8", 0x000002, 0x200000, CRC(b0d747c4) SHA1(0cf1ee1b9a35ded31a81c321df2a076f7b588971) )
@@ -994,7 +994,7 @@ ROM_START( moomesabl )
ROM_LOAD32_WORD( "moo08.rom", 0x100002, 0x080000, CRC(e6937229) SHA1(089b3d4af33e8d8fbc1f3abb81e047a7a590567c) )
// sprites from bootleg not included in dump, taken from original game
- ROM_REGION( 0x800000, "gfx2", 0 )
+ ROM_REGION( 0x800000, "k053246", 0 )
ROM_LOAD64_WORD( "151a10", 0x000000, 0x200000, CRC(376c64f1) SHA1(eb69c5a27f9795e28f04a503955132f0a9e4de12) )
ROM_LOAD64_WORD( "151a11", 0x000002, 0x200000, CRC(e7f49225) SHA1(1255b214f29b6507540dad5892c60a7ae2aafc5c) )
ROM_LOAD64_WORD( "151a12", 0x000004, 0x200000, CRC(4978555f) SHA1(d9871f21d0c8a512b408e137e2e80e9392c2bf6f) )
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index 63a7805e4aa..b473b601e57 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -271,7 +271,7 @@ READ16_MEMBER(mystwarr_state::k053247_scattered_word_r)
else
{
offset = (offset & 0x0007) | ((offset & 0x7f80) >> 4);
- return m_k055673->k053247_word_r(space,offset,mem_mask);
+ return m_k055673->k053247_word_r(offset);
}
}
@@ -286,7 +286,7 @@ WRITE16_MEMBER(mystwarr_state::k053247_scattered_word_w)
{
offset = (offset & 0x0007) | ((offset & 0x7f80) >> 4);
- m_k055673->k053247_word_w(space,offset,data,mem_mask);
+ m_k055673->k053247_word_w(offset,data,mem_mask);
}
}
@@ -300,7 +300,7 @@ void mystwarr_state::mystwarr_map(address_map &map)
map(0x480000, 0x4800ff).w(m_k055555, FUNC(k055555_device::K055555_word_w));
map(0x482000, 0x48200f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r));
map(0x482010, 0x48201f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
- map(0x484000, 0x484007).w(m_k055673, FUNC(k055673_device::k053246_word_w));
+ map(0x484000, 0x484007).w(m_k055673, FUNC(k055673_device::k053246_w));
map(0x48a000, 0x48a01f).w(m_k054338, FUNC(k054338_device::word_w));
map(0x48c000, 0x48c03f).w(m_k056832, FUNC(k056832_device::word_w));
map(0x490000, 0x490001).w(FUNC(mystwarr_state::mweeprom_w));
@@ -326,7 +326,7 @@ void mystwarr_state::metamrph_map(address_map &map)
map(0x200000, 0x20ffff).ram().share("gx_workram");
map(0x210000, 0x210fff).rw(m_k055673, FUNC(k055673_device::k053247_word_r), FUNC(k055673_device::k053247_word_w));
map(0x211000, 0x21ffff).ram();
- map(0x240000, 0x240007).w(m_k055673, FUNC(k055673_device::k053246_word_w));
+ map(0x240000, 0x240007).w(m_k055673, FUNC(k055673_device::k053246_w));
map(0x244000, 0x24400f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r));
map(0x244010, 0x24401f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
map(0x24c000, 0x24ffff).rw("k053250_1", FUNC(k053250_device::ram_r), FUNC(k053250_device::ram_w));
@@ -358,7 +358,7 @@ void mystwarr_state::viostorm_map(address_map &map)
map(0x200000, 0x20ffff).ram().share("gx_workram");
map(0x210000, 0x210fff).rw(m_k055673, FUNC(k055673_device::k053247_word_r), FUNC(k055673_device::k053247_word_w));
map(0x211000, 0x21ffff).ram();
- map(0x240000, 0x240007).w(m_k055673, FUNC(k055673_device::k053246_word_w));
+ map(0x240000, 0x240007).w(m_k055673, FUNC(k055673_device::k053246_w));
map(0x244000, 0x24400f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r));
map(0x244010, 0x24401f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
map(0x24c000, 0x24ffff).ram(); // K053250 ram
@@ -392,7 +392,7 @@ READ16_MEMBER(mystwarr_state::k053247_martchmp_word_r)
else
{
offset = (offset & 0x0007) | ((offset & 0x1fe0) >> 2);
- return m_k055673->k053247_word_r(space,offset,mem_mask);
+ return m_k055673->k053247_word_r(offset);
}
}
@@ -406,7 +406,7 @@ WRITE16_MEMBER(mystwarr_state::k053247_martchmp_word_w)
{
offset = (offset & 0x0007) | ((offset & 0x1fe0) >> 2);
- m_k055673->k053247_word_w(space,offset,data,mem_mask);
+ m_k055673->k053247_word_w(offset,data,mem_mask);
}
}
@@ -455,7 +455,7 @@ void mystwarr_state::martchmp_map(address_map &map)
map(0x400000, 0x4000ff).w(m_k055555, FUNC(k055555_device::K055555_word_w)); // PCU2
map(0x402000, 0x40200f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); // sprite ROM readback
map(0x402010, 0x40201f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w)); // OBJSET2
- map(0x404000, 0x404007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); // OBJSET1
+ map(0x404000, 0x404007).w(m_k055673, FUNC(k055673_device::k053246_w)); // OBJSET1
map(0x40a000, 0x40a01f).w(m_k054338, FUNC(k054338_device::word_w)); // CLTC
map(0x40c000, 0x40c03f).w(m_k056832, FUNC(k056832_device::word_w)); // VACSET
map(0x40e000, 0x40e03f).w(FUNC(mystwarr_state::K053990_martchmp_word_w)); // protection
@@ -484,7 +484,7 @@ void mystwarr_state::dadandrn_map(address_map &map)
map(0x410000, 0x411fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM
map(0x412000, 0x413fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read/write (essential)
map(0x420000, 0x421fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
- map(0x430000, 0x430007).w(m_k055673, FUNC(k055673_device::k053246_word_w));
+ map(0x430000, 0x430007).w(m_k055673, FUNC(k055673_device::k053246_w));
map(0x440000, 0x443fff).r(m_k056832, FUNC(k056832_device::mw_rom_word_r));
map(0x450000, 0x45000f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r));
map(0x450010, 0x45001f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
@@ -521,7 +521,7 @@ void mystwarr_state::gaiapols_map(address_map &map)
map(0x410000, 0x411fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM
map(0x412000, 0x413fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read / write (essential)
map(0x420000, 0x421fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
- map(0x430000, 0x430007).w(m_k055673, FUNC(k055673_device::k053246_word_w));
+ map(0x430000, 0x430007).w(m_k055673, FUNC(k055673_device::k053246_w));
map(0x440000, 0x441fff).r(m_k056832, FUNC(k056832_device::mw_rom_word_r));
map(0x450000, 0x45000f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r));
map(0x450010, 0x45001f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
@@ -965,7 +965,7 @@ void mystwarr_state::mystwarr(machine_config &config)
K055673(config, m_k055673, 0);
m_k055673->set_sprite_callback(FUNC(mystwarr_state::mystwarr_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -48, -24);
+ m_k055673->set_config(K055673_LAYOUT_GX, -48, -24);
m_k055673->set_palette(m_palette);
K054338(config, m_k054338, 0, m_k055555);
@@ -1015,7 +1015,7 @@ void mystwarr_state::viostorm(machine_config &config)
m_k056832->set_tile_callback(FUNC(mystwarr_state::game4bpp_tile_callback), this);
m_k055673->set_sprite_callback(FUNC(mystwarr_state::metamrph_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_RNG, -62, -23);
+ m_k055673->set_config(K055673_LAYOUT_RNG, -62, -23);
}
void mystwarr_state::metamrph(machine_config &config)
@@ -1042,7 +1042,7 @@ void mystwarr_state::metamrph(machine_config &config)
m_k056832->set_tile_callback(FUNC(mystwarr_state::game4bpp_tile_callback), this);
m_k055673->set_sprite_callback(FUNC(mystwarr_state::metamrph_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_RNG, -51, -24);
+ m_k055673->set_config(K055673_LAYOUT_RNG, -51, -24);
}
void mystwarr_state::dadandrn(machine_config &config)
@@ -1071,7 +1071,7 @@ void mystwarr_state::dadandrn(machine_config &config)
m_k056832->set_tile_callback(FUNC(mystwarr_state::game5bpp_tile_callback), this);
m_k055673->set_sprite_callback(FUNC(mystwarr_state::gaiapols_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -42, -22);
+ m_k055673->set_config(K055673_LAYOUT_GX, -42, -22);
}
void mystwarr_state::gaiapols(machine_config &config)
@@ -1103,7 +1103,7 @@ void mystwarr_state::gaiapols(machine_config &config)
m_k056832->set_tile_callback(FUNC(mystwarr_state::game4bpp_tile_callback), this);
m_k055673->set_sprite_callback(FUNC(mystwarr_state::gaiapols_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_RNG, -61, -22); // stage2 brick walls
+ m_k055673->set_config(K055673_LAYOUT_RNG, -61, -22); // stage2 brick walls
}
void mystwarr_state::martchmp(machine_config &config)
@@ -1132,7 +1132,7 @@ void mystwarr_state::martchmp(machine_config &config)
m_k056832->set_tile_callback(FUNC(mystwarr_state::game5bpp_tile_callback), this);
m_k055673->set_sprite_callback(FUNC(mystwarr_state::martchmp_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -58, -23);
+ m_k055673->set_config(K055673_LAYOUT_GX, -58, -23);
config.device_remove("k054539_2");
}
@@ -1162,7 +1162,7 @@ ROM_START( mystwarr )
ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "128a16.22k", 0x000000, 1*1024*1024, CRC(459b6407) SHA1(e4dace4912f9558bee75a8e95ee2637f5e950b47) )
ROM_LOAD64_WORD( "128a15.20k", 0x000002, 1*1024*1024, CRC(6bbfedf4) SHA1(0b3acb2b34c722ddc60c0e64e12baa1f225e4fbb) )
ROM_LOAD64_WORD( "128a14.19k", 0x000004, 1*1024*1024, CRC(f7bd89dd) SHA1(c9b2ebd5a49840f8b260d53c25cfcc238d21c75c) )
@@ -1202,7 +1202,7 @@ ROM_START( mystwarru )
ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "128a16.22k", 0x000000, 1*1024*1024, CRC(459b6407) SHA1(e4dace4912f9558bee75a8e95ee2637f5e950b47) )
ROM_LOAD64_WORD( "128a15.20k", 0x000002, 1*1024*1024, CRC(6bbfedf4) SHA1(0b3acb2b34c722ddc60c0e64e12baa1f225e4fbb) )
ROM_LOAD64_WORD( "128a14.19k", 0x000004, 1*1024*1024, CRC(f7bd89dd) SHA1(c9b2ebd5a49840f8b260d53c25cfcc238d21c75c) )
@@ -1242,7 +1242,7 @@ ROM_START( mystwarrj )
ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "128a16.22k", 0x000000, 1*1024*1024, CRC(459b6407) SHA1(e4dace4912f9558bee75a8e95ee2637f5e950b47) )
ROM_LOAD64_WORD( "128a15.20k", 0x000002, 1*1024*1024, CRC(6bbfedf4) SHA1(0b3acb2b34c722ddc60c0e64e12baa1f225e4fbb) )
ROM_LOAD64_WORD( "128a14.19k", 0x000004, 1*1024*1024, CRC(f7bd89dd) SHA1(c9b2ebd5a49840f8b260d53c25cfcc238d21c75c) )
@@ -1282,7 +1282,7 @@ ROM_START( mystwarra )
ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "128a16.22k", 0x000000, 1*1024*1024, CRC(459b6407) SHA1(e4dace4912f9558bee75a8e95ee2637f5e950b47) )
ROM_LOAD64_WORD( "128a15.20k", 0x000002, 1*1024*1024, CRC(6bbfedf4) SHA1(0b3acb2b34c722ddc60c0e64e12baa1f225e4fbb) )
ROM_LOAD64_WORD( "128a14.19k", 0x000004, 1*1024*1024, CRC(f7bd89dd) SHA1(c9b2ebd5a49840f8b260d53c25cfcc238d21c75c) )
@@ -1322,7 +1322,7 @@ ROM_START( mystwarraa )
ROM_LOADTILE_BYTE( "128a10.3h", 0x000004, 512*1024, CRC(558e545a) SHA1(cac53e545f3f8980d431443f2c3b8b95e6077d1c) )
/* sprites */
- ROM_REGION( 0x500000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "128a16.22k", 0x000000, 1*1024*1024, CRC(459b6407) SHA1(e4dace4912f9558bee75a8e95ee2637f5e950b47) )
ROM_LOAD64_WORD( "128a15.20k", 0x000002, 1*1024*1024, CRC(6bbfedf4) SHA1(0b3acb2b34c722ddc60c0e64e12baa1f225e4fbb) )
ROM_LOAD64_WORD( "128a14.19k", 0x000004, 1*1024*1024, CRC(f7bd89dd) SHA1(c9b2ebd5a49840f8b260d53c25cfcc238d21c75c) )
@@ -1359,7 +1359,7 @@ ROM_START( viostorm )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00)
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00)
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1394,7 +1394,7 @@ ROM_START( viostormeb )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00)
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00)
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1429,7 +1429,7 @@ ROM_START( viostormu )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00)
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00)
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1464,7 +1464,7 @@ ROM_START( viostormub )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00)
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00)
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1499,7 +1499,7 @@ ROM_START( viostorma )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1534,7 +1534,7 @@ ROM_START( viostormab )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1570,7 +1570,7 @@ ROM_START( viostormj )
ROM_LOADTILE_WORD( "168a08.1k", 0x000002, 2*1024*1024, CRC(db0ce743) SHA1(dfe24a1e3e72da188a92668928e79afd6c5d22ee) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "168a10.22k", 0x000000, 2*1024*1024, CRC(bd2bbdea) SHA1(54faf2ded16e66d675bbbec4ebd42b4708edfaef) )
ROM_LOAD64_WORD( "168a11.19k", 0x000002, 2*1024*1024, CRC(7a57c9e7) SHA1(8763c310f7b515aef52d4e007bc949e8803690f4) )
ROM_LOAD64_WORD( "168a12.20k", 0x000004, 2*1024*1024, CRC(b6b1c4ef) SHA1(064ab4db884c8f98ab9e631b7034996d4b92ab7b) )
@@ -1606,7 +1606,7 @@ ROM_START( metamrph )
ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "224a10", 0x000000, 2*1024*1024, CRC(161287f0) SHA1(a13b197a98fa1cebb11fb87b54e277c72852c4ee) )
ROM_LOAD64_WORD( "224a11", 0x000002, 2*1024*1024, CRC(df5960e1) SHA1(ee7794dd119f5f2c52e7ba589d78067a89ff3cab) )
ROM_LOAD64_WORD( "224a12", 0x000004, 2*1024*1024, CRC(ca72a4b3) SHA1(a09deb6d7cb8be4edaeb78e0e676ea2d6055e9e0) )
@@ -1643,7 +1643,7 @@ ROM_START( metamrphe ) /* alternate set - possibly a bugfix version. Only 2 adju
ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "224a10", 0x000000, 2*1024*1024, CRC(161287f0) SHA1(a13b197a98fa1cebb11fb87b54e277c72852c4ee) )
ROM_LOAD64_WORD( "224a11", 0x000002, 2*1024*1024, CRC(df5960e1) SHA1(ee7794dd119f5f2c52e7ba589d78067a89ff3cab) )
ROM_LOAD64_WORD( "224a12", 0x000004, 2*1024*1024, CRC(ca72a4b3) SHA1(a09deb6d7cb8be4edaeb78e0e676ea2d6055e9e0) )
@@ -1680,7 +1680,7 @@ ROM_START( metamrpha )
ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "224a10", 0x000000, 2*1024*1024, CRC(161287f0) SHA1(a13b197a98fa1cebb11fb87b54e277c72852c4ee) )
ROM_LOAD64_WORD( "224a11", 0x000002, 2*1024*1024, CRC(df5960e1) SHA1(ee7794dd119f5f2c52e7ba589d78067a89ff3cab) )
ROM_LOAD64_WORD( "224a12", 0x000004, 2*1024*1024, CRC(ca72a4b3) SHA1(a09deb6d7cb8be4edaeb78e0e676ea2d6055e9e0) )
@@ -1717,7 +1717,7 @@ ROM_START( metamrphu )
ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "224a10", 0x000000, 2*1024*1024, CRC(161287f0) SHA1(a13b197a98fa1cebb11fb87b54e277c72852c4ee) )
ROM_LOAD64_WORD( "224a11", 0x000002, 2*1024*1024, CRC(df5960e1) SHA1(ee7794dd119f5f2c52e7ba589d78067a89ff3cab) )
ROM_LOAD64_WORD( "224a12", 0x000004, 2*1024*1024, CRC(ca72a4b3) SHA1(a09deb6d7cb8be4edaeb78e0e676ea2d6055e9e0) )
@@ -1754,7 +1754,7 @@ ROM_START( metamrphj )
ROM_LOADTILE_WORD( "224a08", 0x000002, 1*1024*1024, CRC(dc94d53a) SHA1(91e16371a335f078a81c06a1045759653080aba0) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "224a10", 0x000000, 2*1024*1024, CRC(161287f0) SHA1(a13b197a98fa1cebb11fb87b54e277c72852c4ee) )
ROM_LOAD64_WORD( "224a11", 0x000002, 2*1024*1024, CRC(df5960e1) SHA1(ee7794dd119f5f2c52e7ba589d78067a89ff3cab) )
ROM_LOAD64_WORD( "224a12", 0x000004, 2*1024*1024, CRC(ca72a4b3) SHA1(a09deb6d7cb8be4edaeb78e0e676ea2d6055e9e0) )
@@ -1793,7 +1793,7 @@ ROM_START( mtlchamp )
ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "234a16.22k", 0x000000, 2*1024*1024, CRC(14d909a5) SHA1(15da356852fc0c63ecd924ac37ebe24bf3ba0760) )
ROM_LOAD64_WORD( "234a15.20k", 0x000002, 2*1024*1024, CRC(a5028418) SHA1(ec6fc7b38fb1d27490a5a9310ecac2d1049e197c) )
ROM_LOAD64_WORD( "234a14.19k", 0x000004, 2*1024*1024, CRC(d7921f47) SHA1(3fc97b308ad2ca25a376373ddfe08c8a375c424e) )
@@ -1830,7 +1830,7 @@ ROM_START( mtlchamp1 )
ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "234a16.22k", 0x000000, 2*1024*1024, CRC(14d909a5) SHA1(15da356852fc0c63ecd924ac37ebe24bf3ba0760) )
ROM_LOAD64_WORD( "234a15.20k", 0x000002, 2*1024*1024, CRC(a5028418) SHA1(ec6fc7b38fb1d27490a5a9310ecac2d1049e197c) )
ROM_LOAD64_WORD( "234a14.19k", 0x000004, 2*1024*1024, CRC(d7921f47) SHA1(3fc97b308ad2ca25a376373ddfe08c8a375c424e) )
@@ -1867,7 +1867,7 @@ ROM_START( mtlchampa )
ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "234a16.22k", 0x000000, 2*1024*1024, CRC(14d909a5) SHA1(15da356852fc0c63ecd924ac37ebe24bf3ba0760) )
ROM_LOAD64_WORD( "234a15.20k", 0x000002, 2*1024*1024, CRC(a5028418) SHA1(ec6fc7b38fb1d27490a5a9310ecac2d1049e197c) )
ROM_LOAD64_WORD( "234a14.19k", 0x000004, 2*1024*1024, CRC(d7921f47) SHA1(3fc97b308ad2ca25a376373ddfe08c8a375c424e) )
@@ -1904,7 +1904,7 @@ ROM_START( mtlchampj )
ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "234a16.22k", 0x000000, 2*1024*1024, CRC(14d909a5) SHA1(15da356852fc0c63ecd924ac37ebe24bf3ba0760) )
ROM_LOAD64_WORD( "234a15.20k", 0x000002, 2*1024*1024, CRC(a5028418) SHA1(ec6fc7b38fb1d27490a5a9310ecac2d1049e197c) )
ROM_LOAD64_WORD( "234a14.19k", 0x000004, 2*1024*1024, CRC(d7921f47) SHA1(3fc97b308ad2ca25a376373ddfe08c8a375c424e) )
@@ -1941,7 +1941,7 @@ ROM_START( mtlchampu )
ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "234a16.22k", 0x000000, 2*1024*1024, CRC(14d909a5) SHA1(15da356852fc0c63ecd924ac37ebe24bf3ba0760) )
ROM_LOAD64_WORD( "234a15.20k", 0x000002, 2*1024*1024, CRC(a5028418) SHA1(ec6fc7b38fb1d27490a5a9310ecac2d1049e197c) )
ROM_LOAD64_WORD( "234a14.19k", 0x000004, 2*1024*1024, CRC(d7921f47) SHA1(3fc97b308ad2ca25a376373ddfe08c8a375c424e) )
@@ -1978,7 +1978,7 @@ ROM_START( mtlchampu1 )
ROM_LOADTILE_BYTE( "234a10.3h", 0x000004, 512*1024, CRC(51f50fe2) SHA1(164fc975feff442d93f1917727c159051dcd3a55) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "234a16.22k", 0x000000, 2*1024*1024, CRC(14d909a5) SHA1(15da356852fc0c63ecd924ac37ebe24bf3ba0760) )
ROM_LOAD64_WORD( "234a15.20k", 0x000002, 2*1024*1024, CRC(a5028418) SHA1(ec6fc7b38fb1d27490a5a9310ecac2d1049e197c) )
ROM_LOAD64_WORD( "234a14.19k", 0x000004, 2*1024*1024, CRC(d7921f47) SHA1(3fc97b308ad2ca25a376373ddfe08c8a375c424e) )
@@ -2015,7 +2015,7 @@ ROM_START( gaiapols )
ROM_LOADTILE_WORD( "123e17.2x", 0x000002, 1*1024*1024, CRC(bd0b9fb9) SHA1(1714c19d2123b8fd4cfedb66d13bdcee6fc77576) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "123e19.34u", 0x000000, 2*1024*1024, CRC(219a7c26) SHA1(0f24873523f91379862e0d4317fc42b8a10d412e) )
ROM_LOAD64_WORD( "123e21.34y", 0x000002, 2*1024*1024, CRC(1888947b) SHA1(41a046cbcd2406add2ff48cb82a1353d9ac5fa3c) )
ROM_LOAD64_WORD( "123e18.36u", 0x000004, 2*1024*1024, CRC(3719b6d4) SHA1(25ef6e8c3c7f151f1cee063356bdd56c713356ea) )
@@ -2062,7 +2062,7 @@ ROM_START( gaiapolsu )
ROM_LOADTILE_WORD( "123e17.2x", 0x000002, 1*1024*1024, CRC(bd0b9fb9) SHA1(1714c19d2123b8fd4cfedb66d13bdcee6fc77576) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "123e19.34u", 0x000000, 2*1024*1024, CRC(219a7c26) SHA1(0f24873523f91379862e0d4317fc42b8a10d412e) )
ROM_LOAD64_WORD( "123e21.34y", 0x000002, 2*1024*1024, CRC(1888947b) SHA1(41a046cbcd2406add2ff48cb82a1353d9ac5fa3c) )
ROM_LOAD64_WORD( "123e18.36u", 0x000004, 2*1024*1024, CRC(3719b6d4) SHA1(25ef6e8c3c7f151f1cee063356bdd56c713356ea) )
@@ -2109,7 +2109,7 @@ ROM_START( gaiapolsj )
ROM_LOADTILE_WORD( "123e17.2x", 0x000002, 1*1024*1024, CRC(bd0b9fb9) SHA1(1714c19d2123b8fd4cfedb66d13bdcee6fc77576) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0x800000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "123e19.34u", 0x000000, 2*1024*1024, CRC(219a7c26) SHA1(0f24873523f91379862e0d4317fc42b8a10d412e) )
ROM_LOAD64_WORD( "123e21.34y", 0x000002, 2*1024*1024, CRC(1888947b) SHA1(41a046cbcd2406add2ff48cb82a1353d9ac5fa3c) )
ROM_LOAD64_WORD( "123e18.36u", 0x000004, 2*1024*1024, CRC(3719b6d4) SHA1(25ef6e8c3c7f151f1cee063356bdd56c713356ea) )
@@ -2155,7 +2155,7 @@ ROM_START( mmaulers )
ROM_LOADTILE_BYTE( "170a24.5r", 0x000004, 512*1024, CRC(562ad4bd) SHA1(f55b29142ea39f090244f0945a56760bab25c7a7) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "170a19.34u", 0x000000, 2*1024*1024, CRC(be835141) SHA1(b76e1da45bf602dd9eb30fb8b7181cea2e820c3d) )
ROM_LOAD64_WORD( "170a21.34y", 0x000002, 2*1024*1024, CRC(bcb68136) SHA1(1d453f59d832b8ea99cf0a60a917edce5c1c90a0) )
ROM_LOAD64_WORD( "170a18.36u", 0x000004, 2*1024*1024, CRC(e1e3c8d2) SHA1(2c94fcedd1dcef3d3332af358ae8a67dea507216) )
@@ -2202,7 +2202,7 @@ ROM_START( dadandrn )
ROM_LOADTILE_BYTE( "170a24.5r", 0x000004, 512*1024, CRC(562ad4bd) SHA1(f55b29142ea39f090244f0945a56760bab25c7a7) )
/* sprites */
- ROM_REGION( 0xa00000, "gfx2", ROMREGION_ERASE00 )
+ ROM_REGION( 0xa00000, "k055673", ROMREGION_ERASE00 )
ROM_LOAD64_WORD( "170a19.34u", 0x000000, 2*1024*1024, CRC(be835141) SHA1(b76e1da45bf602dd9eb30fb8b7181cea2e820c3d) )
ROM_LOAD64_WORD( "170a21.34y", 0x000002, 2*1024*1024, CRC(bcb68136) SHA1(1d453f59d832b8ea99cf0a60a917edce5c1c90a0) )
ROM_LOAD64_WORD( "170a18.36u", 0x000004, 2*1024*1024, CRC(e1e3c8d2) SHA1(2c94fcedd1dcef3d3332af358ae8a67dea507216) )
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index f97040fd9b0..1718f6a6d12 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -186,9 +186,9 @@ void overdriv_state::overdriv_master_map(address_map &map)
}
#ifdef UNUSED_FUNCTION
-WRITE16_MEMBER( overdriv_state::overdriv_k053246_word_w )
+WRITE8_MEMBER( overdriv_state::overdriv_k053246_w )
{
- m_k053246->k053246_word_w(space,offset,data,mem_mask);
+ m_k053246->k053246_w(offset,data);
uint16_t *src, *dst;
@@ -215,27 +215,27 @@ TIMER_CALLBACK_MEMBER(overdriv_state::objdma_end_cb )
m_subcpu->set_input_line(6, HOLD_LINE);
}
-WRITE16_MEMBER(overdriv_state::objdma_w)
+WRITE8_MEMBER(overdriv_state::objdma_w)
{
if(data & 0x10)
m_objdma_end_timer->adjust(attotime::from_usec(100));
- m_k053246->k053246_w(space,5,data,mem_mask);
+ m_k053246->k053246_w(5,data);
}
void overdriv_state::overdriv_slave_map(address_map &map)
{
map(0x000000, 0x03ffff).rom();
map(0x080000, 0x083fff).ram(); /* work RAM */
- map(0x0c0000, 0x0c1fff).ram(); //AM_DEVREADWRITE("k053250_1", k053250_device, ram_r, ram_w)
+ map(0x0c0000, 0x0c1fff).ram(); //.rw("k053250_1", FUNC(k053250_device::ram_r), FUNC(k053250_device::ram_w));
map(0x100000, 0x10000f).rw("k053250_1", FUNC(k053250_device::reg_r), FUNC(k053250_device::reg_w));
map(0x108000, 0x10800f).rw("k053250_2", FUNC(k053250_device::reg_r), FUNC(k053250_device::reg_w));
map(0x118000, 0x118fff).rw(m_k053246, FUNC(k053247_device::k053247_word_r), FUNC(k053247_device::k053247_word_w)); // data gets copied to sprite chip with DMA..
- map(0x120000, 0x120001).r(m_k053246, FUNC(k053247_device::k053246_word_r));
+ map(0x120000, 0x120001).r(m_k053246, FUNC(k053247_device::k053246_r));
map(0x128000, 0x128001).rw(FUNC(overdriv_state::cpuB_ctrl_r), FUNC(overdriv_state::cpuB_ctrl_w)); /* enable K053247 ROM reading, plus something else */
map(0x130000, 0x130007).rw(m_k053246, FUNC(k053247_device::k053246_r), FUNC(k053247_device::k053246_w));
- map(0x130004, 0x130005).w(FUNC(overdriv_state::objdma_w));
- //AM_RANGE(0x140000, 0x140001) used in later stages, set after writes at 0x208000-0x20bfff range
+ map(0x130005, 0x130005).w(FUNC(overdriv_state::objdma_w));
+ //map(0x140000, 0x140001) used in later stages, set after writes at 0x208000-0x20bfff range
map(0x200000, 0x203fff).ram().share("share1");
map(0x208000, 0x20bfff).ram(); // sprite indirect table?
map(0x218000, 0x219fff).r("k053250_1", FUNC(k053250_device::rom_r));
@@ -259,11 +259,6 @@ void overdriv_state::overdriv_sound_map(address_map &map)
map(0x1000, 0xffff).rom();
}
-void overdriv_state::overdriv_k053260_map(address_map &map)
-{
- map(0x00000000, 0x001fffff).rom().region("k053260", 0);
-}
-
/* Both IPT_START1 assignments are needed. The game will reset during */
/* the "continue" sequence if the assignment on the first port */
/* is missing. */
@@ -357,7 +352,7 @@ void overdriv_state::overdriv(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(overdriv_state::sprite_callback), this);
- m_k053246->set_config("gfx1", NORMAL_PLANE_ORDER, 77, 22);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, 77, 22);
m_k053246->set_palette("palette");
K051316(config, m_k051316_1, 0);
@@ -386,12 +381,12 @@ void overdriv_state::overdriv(machine_config &config)
YM2151(config, "ymsnd", XTAL(3'579'545)).add_route(0, "lspeaker", 0.5).add_route(1, "rspeaker", 0.5);
k053260_device &k053260_1(K053260(config, "k053260_1", XTAL(3'579'545)));
- k053260_1.set_addrmap(0, &overdriv_state::overdriv_k053260_map);
+ k053260_1.set_device_rom_tag("k053260");
k053260_1.add_route(0, "lspeaker", 0.35);
k053260_1.add_route(1, "rspeaker", 0.35);
k053260_device &k053260_2(K053260(config, "k053260_2", XTAL(3'579'545)));
- k053260_2.set_addrmap(0, &overdriv_state::overdriv_k053260_map);
+ k053260_2.set_device_rom_tag("k053260");
k053260_2.add_route(0, "lspeaker", 0.35);
k053260_2.add_route(1, "rspeaker", 0.35);
}
@@ -416,7 +411,7 @@ ROM_START( overdriv )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "789_e01.e4", 0x00000, 0x10000, CRC(1085f069) SHA1(27228cedb357ff2e130a4bd6d8aa01cf537e034f) ) /* also found labeled as "5" */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* graphics (addressable by the CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the CPU) */
ROM_LOAD64_WORD( "789e12.r1", 0x000000, 0x100000, CRC(14a10fb2) SHA1(03fb9c15514c5ecc2d9ae4a53961c4bbb49cec73) ) /* sprites */
ROM_LOAD64_WORD( "789e13.r4", 0x000002, 0x100000, CRC(6314a628) SHA1(f8a8918998c266109348c77427a7696b503daeb3) )
ROM_LOAD64_WORD( "789e14.r10", 0x000004, 0x100000, CRC(b5eca14b) SHA1(a1c5f5e9cd8bbcfc875e2acb33be024724da63aa) )
@@ -454,7 +449,7 @@ ROM_START( overdriva )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "789_e01.e4", 0x00000, 0x10000, CRC(1085f069) SHA1(27228cedb357ff2e130a4bd6d8aa01cf537e034f) ) /* also found labeled as "5" */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* graphics (addressable by the CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the CPU) */
ROM_LOAD64_WORD( "789e12.r1", 0x000000, 0x100000, CRC(14a10fb2) SHA1(03fb9c15514c5ecc2d9ae4a53961c4bbb49cec73) ) /* sprites */
ROM_LOAD64_WORD( "789e13.r4", 0x000002, 0x100000, CRC(6314a628) SHA1(f8a8918998c266109348c77427a7696b503daeb3) )
ROM_LOAD64_WORD( "789e14.r10", 0x000004, 0x100000, CRC(b5eca14b) SHA1(a1c5f5e9cd8bbcfc875e2acb33be024724da63aa) )
@@ -492,7 +487,7 @@ ROM_START( overdrivb )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "789_e01.e4", 0x00000, 0x10000, CRC(1085f069) SHA1(27228cedb357ff2e130a4bd6d8aa01cf537e034f) ) /* also found labeled as "5" */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* graphics (addressable by the CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the CPU) */
ROM_LOAD64_WORD( "789e12.r1", 0x000000, 0x100000, CRC(14a10fb2) SHA1(03fb9c15514c5ecc2d9ae4a53961c4bbb49cec73) ) /* sprites */
ROM_LOAD64_WORD( "789e13.r4", 0x000002, 0x100000, CRC(6314a628) SHA1(f8a8918998c266109348c77427a7696b503daeb3) )
ROM_LOAD64_WORD( "789e14.r10", 0x000004, 0x100000, CRC(b5eca14b) SHA1(a1c5f5e9cd8bbcfc875e2acb33be024724da63aa) )
diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp
index 25a2f5e62c1..b42c050a2d6 100644
--- a/src/mame/drivers/piratesh.cpp
+++ b/src/mame/drivers/piratesh.cpp
@@ -405,7 +405,7 @@ void piratesh_state::piratesh_map(address_map &map)
map(0x084000, 0x087fff).ram();
map(0x100000, 0x10001f).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)).umask16(0x00ff); // CRTC
map(0x180000, 0x18003f).w(m_k056832, FUNC(k056832_device::word_w)); // TILEMAP
- map(0x280000, 0x280007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); // SPRITES
+ map(0x280000, 0x280007).w(m_k055673, FUNC(k055673_device::k053246_w)); // SPRITES
map(0x290000, 0x29000f).r(m_k055673, FUNC(k055673_device::k055673_ps_rom_word_r)); // SPRITES
map(0x290010, 0x29001f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w)); // SPRITES
map(0x2a0000, 0x2a0fff).rw(m_k055673, FUNC(k055673_device::k053247_word_r), FUNC(k055673_device::k053247_word_w)); // SPRITES
@@ -636,13 +636,13 @@ void piratesh_state::piratesh(machine_config &config)
K055673(config, m_k055673, 0);
m_k055673->set_sprite_callback(FUNC(piratesh_state::piratesh_sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_PS, -60, 24);
+ m_k055673->set_config(K055673_LAYOUT_PS, -60, 24);
m_k055673->set_palette("palette");
// ????
//K053246(config, m_k053246, 0);
//m_k053246->set_sprite_callback(FUNC(moo_state::sprite_callback), this);
- //m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -48+1, 23);
+ //m_k053246->set_config("k053246", NORMAL_PLANE_ORDER, -48+1, 23);
//m_k053246->set_palette(m_palette);
K054338(config, "k054338", 0, m_k055555).set_alpha_invert(1);
@@ -668,7 +668,7 @@ ROM_START( piratesh )
ROM_LOAD( "360ua-a01.17g", 0x000000, 0x80000, CRC(e39153f5) SHA1(5da9132a2c24a15b55c3f65c26e2ad0467411a88) )
/* sprites */
- ROM_REGION( 0x80000*8, "gfx2", ROMREGION_ERASE00 ) // 27C4096
+ ROM_REGION( 0x80000*8, "k055673", ROMREGION_ERASE00 ) // 27C4096
ROM_LOAD16_BYTE( "360ua-a02.21l", 0x000000, 0x80000, CRC(82207997) SHA1(fe143285a12fab5227e883113d798acad7bf4c97) )
ROM_LOAD16_BYTE( "360ua-a03.23l", 0x000001, 0x80000, CRC(a9e36d51) SHA1(1a8de8d8d2abfee5ac0f0822e203846f7f5f1767) )
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index db6766ca25a..525bea32edf 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -24,13 +24,13 @@
Change Log:
(AT070703)
- drivers\rungun.c (this file)
+ drivers\rungun.cpp (this file)
- mem maps, device settings, component communications, I/O's, sound...etc.
- video\rungun.c
+ video\rungun.cpp
- general clean-up, clipping, alignment
- video\konamiic.c
+ video\konamiic.cpp
- missing sprites and priority
@@ -193,7 +193,7 @@ void rungun_state::rungun_map(address_map &map)
map(0x5c0000, 0x5c000f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); // 246A ROM readback window
map(0x5c0010, 0x5c001f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w));
map(0x600000, 0x601fff).bankrw("spriteram_bank"); // OBJ RAM
- map(0x640000, 0x640007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); // '246A registers
+ map(0x640000, 0x640007).w(m_k055673, FUNC(k055673_device::k053246_w)); // '246A registers
map(0x680000, 0x68001f).w(m_k053936, FUNC(k053936_device::ctrl_w)); // '936 registers
map(0x6c0000, 0x6cffff).rw(FUNC(rungun_state::psac2_videoram_r), FUNC(rungun_state::psac2_videoram_w)); // PSAC2 ('936) RAM (34v + 35v)
map(0x700000, 0x7007ff).rw(m_k053936, FUNC(k053936_device::linectrl_r), FUNC(k053936_device::linectrl_w)); // PSAC "Line RAM"
@@ -239,7 +239,7 @@ WRITE_LINE_MEMBER(rungun_state::k054539_nmi_gen)
m_sound_nmi_clk = state;
}
-/* sound (this should be split into audio/xexex.c or pregx.c or so someday) */
+/* sound (this should be split into audio/xexex.cpp or pregx.cpp or so someday) */
void rungun_state::rungun_sound_map(address_map &map)
{
@@ -423,7 +423,7 @@ void rungun_state::rng(machine_config &config)
K055673(config, m_k055673, 0);
m_k055673->set_sprite_callback(FUNC(rungun_state::sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_RNG, -8, -15);
+ m_k055673->set_config(K055673_LAYOUT_RNG, -8, -15);
m_k055673->set_palette(m_palette);
m_k055673->set_screen(m_screen);
@@ -503,7 +503,7 @@ ROM_START( rungun )
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -545,7 +545,7 @@ ROM_START( rungund ) // same as above set, but with demux adapter connected
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -587,7 +587,7 @@ ROM_START( runguna )
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -630,7 +630,7 @@ ROM_START( rungunad ) // same as above set, but with demux adapter connected
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -677,7 +677,7 @@ ROM_START( rungunb )
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -720,7 +720,7 @@ ROM_START( rungunbd ) // same as above set, but with demux adapter connected
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -761,7 +761,7 @@ ROM_START( rungunua )
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -803,7 +803,7 @@ ROM_START( rungunuad ) // same as above set, but with demux adapter connected
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -845,7 +845,7 @@ ROM_START( slmdunkj )
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -887,7 +887,7 @@ ROM_START( slmdunkjd ) // same as above set, but with demux adapter connected
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
@@ -928,7 +928,7 @@ ROM_START( rungunud ) // dual cabinet setup ONLY
ROM_LOAD( "247a13", 0x000000, 0x200000, CRC(c5a8ef29) SHA1(23938b8093bc0b9eef91f6d38127ca7acbdc06a6) )
/* sprites */
- ROM_REGION( 0x800000, "gfx2", 0)
+ ROM_REGION( 0x800000, "k055673", 0)
ROM_LOAD64_WORD( "247-a11", 0x000000, 0x200000, CRC(c3f60854) SHA1(cbee7178ab9e5aa6a5aeed0511e370e29001fb01) ) // 5y
ROM_LOAD64_WORD( "247-a08", 0x000002, 0x200000, CRC(3e315eef) SHA1(898bc4d5ad244e5f91cbc87820b5d0be99ef6662) ) // 2u
ROM_LOAD64_WORD( "247-a09", 0x000004, 0x200000, CRC(5ca7bc06) SHA1(83c793c68227399f93bd1ed167dc9ed2aaac4167) ) // 2y
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index 2ae19559e14..4a81b67113d 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -356,7 +356,7 @@ void simpsons_state::simpsons(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(simpsons_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, 53, 23);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, 53, 23);
m_k053246->set_palette("palette");
K053251(config, m_k053251, 0);
@@ -398,7 +398,7 @@ ROM_START( simpsons ) /* World 4 Player */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -427,7 +427,7 @@ ROM_START( simpsons4pe ) /* World 4 Player, later? (by use of later leters) */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -456,7 +456,7 @@ ROM_START( simpsons4pa ) /* Asia 4 Player */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -486,7 +486,7 @@ ROM_START( simpsons2p ) /* World 2 Player */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -515,7 +515,7 @@ ROM_START( simpsons2p2 ) /* World 2 Player, alt */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -544,7 +544,7 @@ ROM_START( simpsons2p3 ) // no rom labels
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -573,7 +573,7 @@ ROM_START( simpsons2pa ) /* Asia 2 Player */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
@@ -602,7 +602,7 @@ ROM_START( simpsons2pj ) /* Japan 2 Player */
ROM_LOAD32_WORD( "072-b07.18h", 0x000000, 0x080000, CRC(ba1ec910) SHA1(0805ccb641271dea43185dc0365732260db1763d) )
ROM_LOAD32_WORD( "072-b06.16h", 0x000002, 0x080000, CRC(cf2bbcab) SHA1(47afea47f9bc8cb5eb1c7b7fbafe954b3e749aeb) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics */
ROM_LOAD64_WORD( "072-b08.3n", 0x000000, 0x100000, CRC(7de500ad) SHA1(61b76b8f402e3bde1509679aaaa28ef08cafb0ab) ) /* sprites */
ROM_LOAD64_WORD( "072-b09.8n", 0x000002, 0x100000, CRC(aa085093) SHA1(925239d79bf607021d371263352618876f59c1f8) )
ROM_LOAD64_WORD( "072-b10.12n", 0x000004, 0x100000, CRC(577dbd53) SHA1(e603e03e3dcba766074561faa92afafa5761953d) )
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index de123902fc7..9beb36406e3 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -242,7 +242,7 @@ 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));
+ map(0x4c0000, 0x4c0007).w(m_k055673, FUNC(k055673_device::k053246_w));
//map(0x4c4000, 0x4c4003).nopw();
//map(0x4c4004, 0x4c4007).nopw();
//map(0x4c801c, 0x4c801f).nopw();
@@ -676,7 +676,7 @@ void kongambl_state::kongambl(machine_config &config)
K055673(config, m_k055673, 0);
m_k055673->set_sprite_callback(FUNC(kongambl_state::sprite_callback), this);
- m_k055673->set_config("gfx2", K055673_LAYOUT_LE2, -48+1, -23);
+ m_k055673->set_config(K055673_LAYOUT_LE2, -48+1, -23);
m_k055673->set_palette(m_palette);
#if CUSTOM_DRAW
@@ -707,7 +707,7 @@ ROM_START( kingtut )
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) )
- ROM_REGION( 0x200000, "gfx2", 0 ) // 16x16x8 sprites
+ ROM_REGION( 0x200000, "k055673", 0 ) // 16x16x8 sprites
ROM_LOAD64_WORD( "kit11ll1_obj.17", 0x000000, 0x80000, CRC(a19338b8) SHA1(1aa68596e5bf493cb360495f1174dc1323086ad2) )
ROM_LOAD64_WORD( "kit11lm1_obj.15", 0x000002, 0x80000, CRC(1aea3f4d) SHA1(52fd1a7ffeeb3acce176ad3812a2ca146e02c324) )
ROM_LOAD64_WORD( "kit11hm1_obj.13", 0x000004, 0x80000, CRC(21cc4e40) SHA1(9e3735fc8cd53f7e831dc76697911216bd8bbc70) )
@@ -732,7 +732,7 @@ ROM_START( moneybnk )
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) )
- ROM_REGION( 0x200000, "gfx2", 0 ) // 16x16x8 sprites
+ ROM_REGION( 0x200000, "k055673", 0 ) // 16x16x8 sprites
ROM_LOAD64_WORD( "mob11ll1_obj.17", 0x000000, 0x80000, CRC(5c5959a3) SHA1(1eea6bf4c34aa05f45b2737eb6035f2762277cfb) )
ROM_LOAD64_WORD( "mob11lm1_obj.15", 0x000002, 0x80000, CRC(0b0e4e9b) SHA1(cbbbde7470f96e9f93fa848371e19ebfeea7fe4d) )
ROM_LOAD64_WORD( "mob11hm1_obj.13", 0x000004, 0x80000, CRC(6f84c287) SHA1(edccefa96d97c6f67a9cd02f70cf61385d70daae) )
@@ -757,7 +757,7 @@ ROM_START( dragsphr )
ROM_LOAD16_BYTE( "u21.bin", 0x00000, 0x080000, CRC(83fc3afe) SHA1(09cc89567b985685ed206b273915157fc46212f9) )
ROM_LOAD16_BYTE( "u23.bin", 0x00001, 0x080000, CRC(a29a777f) SHA1(1ca37e468f31246cbcbd2e1799e5a0137d19d0b9) )
- ROM_REGION( 0x200000, "gfx2", 0 ) // 16x16x8 sprites
+ ROM_REGION( 0x200000, "k055673", 0 ) // 16x16x8 sprites
ROM_LOAD64_WORD( "u17.bin", 0x000000, 0x080000, CRC(9352f279) SHA1(1795df2331fde6de06b7d910d74a3fde69379943) )
ROM_LOAD64_WORD( "u15.bin", 0x000002, 0x080000, CRC(4a7bc71a) SHA1(7b6bfc2b83ea6189a629b64cae295071b52c5fab) )
ROM_LOAD64_WORD( "u13.bin", 0x000004, 0x080000, CRC(a4a60822) SHA1(6f49ae6b40185a0b0dc796b32cdbd048bfcbd3de) )
@@ -782,7 +782,7 @@ ROM_START( ivorytsk )
ROM_LOAD16_BYTE( "u21_ba6dhex", 0x00000, 0x080000, CRC(d14efb82) SHA1(420bf5d807d59e6d17ee113125046b979e1d12f4) )
ROM_LOAD16_BYTE( "u23_9297hex", 0x00001, 0x080000, CRC(5e36ff5f) SHA1(9be65015217affc1e28d9ce855cd22f9cb147258) )
- ROM_REGION( 0x200000, "gfx2", 0 ) // 16x16x8 sprites
+ ROM_REGION( 0x200000, "k055673", 0 ) // 16x16x8 sprites
ROM_LOAD64_WORD( "u17_cof8hex", 0x000000, 0x080000, CRC(1ace8891) SHA1(91115680b50d6e31cdbac81ae439eeacb7a5f812) )
ROM_LOAD64_WORD( "u15_8e23hex", 0x000002, 0x080000, CRC(174114cb) SHA1(3f9151e5785482aebfcb6787ddd63d32e0225ad2) )
ROM_LOAD64_WORD( "u13_29fbhex", 0x000004, 0x080000, CRC(8f21cbb9) SHA1(a0e82e9f29f9eedabcd79a72db7187180e64a076) )
@@ -807,7 +807,7 @@ ROM_START( vikingt )
ROM_LOAD16_BYTE( "u21.bin", 0x00000, 0x080000, CRC(789d7c41) SHA1(a04b7e8c894e08e9210c630fabd878b8389ee82c) )
ROM_LOAD16_BYTE( "u23.bin", 0x00001, 0x080000, CRC(56ba968e) SHA1(100edc40748067683172480fc2b7d48f4dc89da7) )
- ROM_REGION( 0x200000, "gfx2", 0 ) // 16x16x8 sprites
+ ROM_REGION( 0x200000, "k055673", 0 ) // 16x16x8 sprites
ROM_LOAD64_WORD( "u17.bin", 0x000000, 0x080000, CRC(83e7f568) SHA1(0f82eadb3badb7074338099ff9f4d73216a1d5c7) )
ROM_LOAD64_WORD( "u15.bin", 0x000002, 0x080000, CRC(f349b72b) SHA1(d8abc42bbc607e36004a76e45dd88b581db60d09) )
ROM_LOAD64_WORD( "u13.bin", 0x000004, 0x080000, CRC(2cbda923) SHA1(888b3ef9fe91843b59b03b9dabc3fd32fb7fac20) )
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index aeba61d4167..79dbe54f851 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -16,7 +16,7 @@
Game driver for "ESCAPE KIDS (TM)" (KONAMI, 1991)
--------------------------------------------------------------------------------
- This driver was made on the basis of 'src/drivers/vendetta.c' file.
+ This driver was made on the basis of 'src/drivers/vendetta.cpp' file.
Driver by OHSAKI Masayuki (2002/08/13)
********************************************************************************
@@ -43,7 +43,6 @@
***** UnEmulated *****
------------
- 1) 0x3fc0-0x3fcf (052109 RAM area) access (053252 ???)
2) 0x7c00 (Banked ROM area) access to data WRITE (???)
3) 0x3fda (053248 RAM area) access to data WRITE (Watchdog ???)
@@ -242,7 +241,7 @@ void vendetta_state::esckids_map(address_map &map)
map(0x3f93, 0x3f93).portr("SERVICE");
map(0x3fa0, 0x3fa7).w(m_k053246, FUNC(k053247_device::k053246_w)); // 053246 (Sprite)
map(0x3fb0, 0x3fbf).w(m_k053251, FUNC(k053251_device::write)); // 053251 (Priority Encoder)
- map(0x3fc0, 0x3fcf).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)); // Not Emulated (053252 ???)
+ map(0x3fc0, 0x3fcf).rw(m_k053252, FUNC(k053252_device::read), FUNC(k053252_device::write)); // 053252
map(0x3fd0, 0x3fd0).w(FUNC(vendetta_state::_5fe0_w)); // Coin Counter, 052109 RMRD, 053246 OBJCHA
map(0x3fd2, 0x3fd2).w(FUNC(vendetta_state::eeprom_w)); // EEPROM, Video banking
map(0x3fd4, 0x3fd4).rw(FUNC(vendetta_state::z80_irq_r), FUNC(vendetta_state::z80_irq_w)); // Sound
@@ -462,7 +461,7 @@ void vendetta_state::vendetta(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(vendetta_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, 53, 6);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, 53, 6);
m_k053246->set_palette(m_palette);
K053251(config, m_k053251, 0);
@@ -497,7 +496,7 @@ void vendetta_state::esckids(machine_config &config)
m_k052109->set_palette(m_palette);
m_k052109->set_tile_callback(FUNC(vendetta_state::esckids_tile_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, 101, 6);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, 101, 6);
K053252(config, "k053252", 6000000).set_offsets(12*8, 1*8);
}
@@ -521,7 +520,7 @@ ROM_START( vendetta )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -545,7 +544,7 @@ ROM_START( vendettar )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -569,7 +568,7 @@ ROM_START( vendettaz )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -593,7 +592,7 @@ ROM_START( vendettaun )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -617,7 +616,7 @@ ROM_START( vendetta2pw )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -641,7 +640,7 @@ ROM_START( vendetta2peba )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -665,7 +664,7 @@ ROM_START( vendetta2pun )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -689,7 +688,7 @@ ROM_START( vendetta2pu )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -713,7 +712,7 @@ ROM_START( vendetta2pd )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -737,7 +736,7 @@ ROM_START( vendettan )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -761,7 +760,7 @@ ROM_START( vendetta2pp )
ROM_LOAD32_WORD( "081a09", 0x000000, 0x080000, CRC(b4c777a9) SHA1(cc2b1dff4404ecd72b604e25d00fffdf7f0f8b52) )
ROM_LOAD32_WORD( "081a08", 0x000002, 0x080000, CRC(272ac8d9) SHA1(2da12fe4c13921bf0d4ebffec326f8d207ec4fad) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics ( don't dispose as the program can read them ) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics ( don't dispose as the program can read them ) */
ROM_LOAD64_WORD( "081a04", 0x000000, 0x100000, CRC(464b9aa4) SHA1(28066ff0a07c3e56e7192918a882778c1b316b37) ) /* sprites */
ROM_LOAD64_WORD( "081a05", 0x000002, 0x100000, CRC(4e173759) SHA1(ce803f2aca7d7dedad00ab30e112443848747bd2) ) /* sprites */
ROM_LOAD64_WORD( "081a06", 0x000004, 0x100000, CRC(e9fe6d80) SHA1(2b7fc9d7fe43cd85dc8b975fe639c273cb0d9256) ) /* sprites */
@@ -786,7 +785,7 @@ ROM_START( esckids )
ROM_LOAD32_WORD( "975c09", 0x000000, 0x080000, CRC(bc52210e) SHA1(301a3892d250495c2e849d67fea5f01fb0196bed) )
ROM_LOAD32_WORD( "975c08", 0x000002, 0x080000, CRC(fcff9256) SHA1(b60d29f4d04f074120d4bb7f2a71b9e9bf252d33) )
- ROM_REGION( 0x400000, "gfx2", 0 ) // Sprite mask ROM (8M x 4)
+ ROM_REGION( 0x400000, "k053246", 0 ) // Sprite mask ROM (8M x 4)
ROM_LOAD64_WORD( "975c04", 0x000000, 0x100000, CRC(15688a6f) SHA1(a445237a11e5f98f0f9b2573a7ef0583366a137e) )
ROM_LOAD64_WORD( "975c05", 0x000002, 0x100000, CRC(1ff33bb7) SHA1(eb17da33ba2769ea02f91fece27de2e61705e75a) )
ROM_LOAD64_WORD( "975c06", 0x000004, 0x100000, CRC(36d410f9) SHA1(2b1fd93c11839480aa05a8bf27feef7591704f3d) )
@@ -811,7 +810,7 @@ ROM_START( esckidsj )
ROM_LOAD32_WORD( "975c09", 0x000000, 0x080000, CRC(bc52210e) SHA1(301a3892d250495c2e849d67fea5f01fb0196bed) )
ROM_LOAD32_WORD( "975c08", 0x000002, 0x080000, CRC(fcff9256) SHA1(b60d29f4d04f074120d4bb7f2a71b9e9bf252d33) )
- ROM_REGION( 0x400000, "gfx2", 0 ) // Sprite mask ROM (8M x 4)
+ ROM_REGION( 0x400000, "k053246", 0 ) // Sprite mask ROM (8M x 4)
ROM_LOAD64_WORD( "975c04", 0x000000, 0x100000, CRC(15688a6f) SHA1(a445237a11e5f98f0f9b2573a7ef0583366a137e) )
ROM_LOAD64_WORD( "975c05", 0x000002, 0x100000, CRC(1ff33bb7) SHA1(eb17da33ba2769ea02f91fece27de2e61705e75a) )
ROM_LOAD64_WORD( "975c06", 0x000004, 0x100000, CRC(36d410f9) SHA1(2b1fd93c11839480aa05a8bf27feef7591704f3d) )
diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp
index 6220cc84ad7..deeb1950f3b 100644
--- a/src/mame/drivers/xexex.cpp
+++ b/src/mame/drivers/xexex.cpp
@@ -349,8 +349,8 @@ void xexex_state::main_map(address_map &map)
map(0x090000, 0x097fff).ram().share("spriteram"); // K053247 sprite RAM
map(0x098000, 0x09ffff).rw(FUNC(xexex_state::spriteram_mirror_r), FUNC(xexex_state::spriteram_mirror_w)); // K053247 sprite RAM mirror read
map(0x0c0000, 0x0c003f).w(m_k056832, FUNC(k056832_device::word_w)); // VACSET (K054157)
- map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_word_w)); // OBJSET1
- map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_word_r)); // Passthrough to sprite roms
+ map(0x0c2000, 0x0c2007).w(m_k053246, FUNC(k053247_device::k053246_w)); // OBJSET1
+ map(0x0c4000, 0x0c4001).r(m_k053246, FUNC(k053247_device::k053246_r)); // Passthrough to sprite roms
map(0x0c6000, 0x0c7fff).rw(m_k053250, FUNC(k053250_device::ram_r), FUNC(k053250_device::ram_w)); // K053250 "road" RAM
map(0x0c8000, 0x0c800f).rw(m_k053250, FUNC(k053250_device::reg_r), FUNC(k053250_device::reg_w));
map(0x0ca000, 0x0ca01f).w(m_k054338, FUNC(k054338_device::word_w)); // CLTC
@@ -373,7 +373,7 @@ void xexex_state::main_map(address_map &map)
#if XE_DEBUG
map(0x0c0000, 0x0c003f).r(m_k056832, FUNC(k056832_device::word_r));
- map(0x0c2000, 0x0c2007).r(m_k053246, FUNC(k053247_device::k053246_reg_word_r));
+ map(0x0c2000, 0x0c2007).r(m_k053246, FUNC(k053247_device::k053246_read_register));
map(0x0ca000, 0x0ca01f).r(m_k054338, FUNC(k054338_device::register_r));
map(0x0cc000, 0x0cc01f).r(m_k053251, FUNC(k053251_device::read)).umask16(0x00ff);
map(0x0d8000, 0x0d8007).r(m_k056832, FUNC(k056832_device::b_word_r));
@@ -504,7 +504,7 @@ void xexex_state::xexex(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(xexex_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, -48, 32);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, -48, 32);
m_k053246->set_palette(m_palette);
K053250(config, m_k053250, 0, m_palette, m_screen, -5, -16);
@@ -555,7 +555,7 @@ ROM_START( xexex ) /* Europe, Version AA */
ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) )
ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "067b12.17n", 0x000000, 0x100000, CRC(08d611b0) SHA1(9cac60131e0411f173acd8ef3f206e5e58a7e5d2) )
ROM_LOAD64_WORD( "067b11.19n", 0x000002, 0x100000, CRC(a26f7507) SHA1(6bf717cb9fcad59a2eafda967f14120b9ebbc8c5) )
ROM_LOAD64_WORD( "067b10.20n", 0x000004, 0x100000, CRC(ee31db8d) SHA1(c41874fb8b401ea9cdd327ee6239b5925418cf7b) )
@@ -586,7 +586,7 @@ ROM_START( orius ) /* USA, Version AA */
ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) )
ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "067b12.17n", 0x000000, 0x100000, CRC(08d611b0) SHA1(9cac60131e0411f173acd8ef3f206e5e58a7e5d2) )
ROM_LOAD64_WORD( "067b11.19n", 0x000002, 0x100000, CRC(a26f7507) SHA1(6bf717cb9fcad59a2eafda967f14120b9ebbc8c5) )
ROM_LOAD64_WORD( "067b10.20n", 0x000004, 0x100000, CRC(ee31db8d) SHA1(c41874fb8b401ea9cdd327ee6239b5925418cf7b) )
@@ -617,7 +617,7 @@ ROM_START( xexexa ) /* Asia, Version AA */
ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) )
ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "067b12.17n", 0x000000, 0x100000, CRC(08d611b0) SHA1(9cac60131e0411f173acd8ef3f206e5e58a7e5d2) )
ROM_LOAD64_WORD( "067b11.19n", 0x000002, 0x100000, CRC(a26f7507) SHA1(6bf717cb9fcad59a2eafda967f14120b9ebbc8c5) )
ROM_LOAD64_WORD( "067b10.20n", 0x000004, 0x100000, CRC(ee31db8d) SHA1(c41874fb8b401ea9cdd327ee6239b5925418cf7b) )
@@ -648,7 +648,7 @@ ROM_START( xexexj ) /* Japan, Version AA */
ROM_LOAD32_WORD( "067b14.1n", 0x000000, 0x100000, CRC(02a44bfa) SHA1(ad95df4dbf8842820ef20f54407870afb6d0e4a3) )
ROM_LOAD32_WORD( "067b13.2n", 0x000002, 0x100000, CRC(633c8eb5) SHA1(a11f78003a1dffe2d8814d368155059719263082) )
- ROM_REGION( 0x400000, "gfx2", 0 )
+ ROM_REGION( 0x400000, "k053246", 0 )
ROM_LOAD64_WORD( "067b12.17n", 0x000000, 0x100000, CRC(08d611b0) SHA1(9cac60131e0411f173acd8ef3f206e5e58a7e5d2) )
ROM_LOAD64_WORD( "067b11.19n", 0x000002, 0x100000, CRC(a26f7507) SHA1(6bf717cb9fcad59a2eafda967f14120b9ebbc8c5) )
ROM_LOAD64_WORD( "067b10.20n", 0x000004, 0x100000, CRC(ee31db8d) SHA1(c41874fb8b401ea9cdd327ee6239b5925418cf7b) )
diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp
index 05ebccdc2ea..870add938bf 100644
--- a/src/mame/drivers/xmen.cpp
+++ b/src/mame/drivers/xmen.cpp
@@ -86,13 +86,13 @@ void xmen_state::main_map(address_map &map)
map(0x101000, 0x101fff).ram();
map(0x104000, 0x104fff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
map(0x108000, 0x108001).w(FUNC(xmen_state::eeprom_w));
- map(0x108020, 0x108027).w(m_k053246, FUNC(k053247_device::k053246_word_w));
+ map(0x108020, 0x108027).w(m_k053246, FUNC(k053247_device::k053246_w));
map(0x108040, 0x10805f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff);
map(0x108060, 0x10807f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff);
map(0x10a000, 0x10a001).portr("P2_P4").w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x10a002, 0x10a003).portr("P1_P3");
map(0x10a004, 0x10a005).portr("EEPROM");
- map(0x10a00c, 0x10a00d).r(m_k053246, FUNC(k053247_device::k053246_word_r));
+ map(0x10a00c, 0x10a00d).r(m_k053246, FUNC(k053247_device::k053246_r));
map(0x110000, 0x113fff).ram(); /* main RAM */
map(0x18c000, 0x197fff).rw(m_k052109, FUNC(k052109_device::read), FUNC(k052109_device::write)).umask16(0x00ff);
map(0x18fa00, 0x18fa01).w(FUNC(xmen_state::xmen_18fa00_w));
@@ -120,16 +120,16 @@ void xmen_state::_6p_main_map(address_map &map)
map(0x103000, 0x103fff).ram(); /* 6p - a buffer? */
map(0x104000, 0x104fff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
map(0x108000, 0x108001).w(FUNC(xmen_state::eeprom_w));
- map(0x108020, 0x108027).w(m_k053246, FUNC(k053247_device::k053246_word_w)); /* sprites */
+ map(0x108020, 0x108027).w(m_k053246, FUNC(k053247_device::k053246_w)); /* sprites */
map(0x108040, 0x10805f).m(m_k054321, FUNC(k054321_device::main_map)).umask16(0x00ff);
map(0x108060, 0x10807f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff);
map(0x10a000, 0x10a001).portr("P2_P4").w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x10a002, 0x10a003).portr("P1_P3");
map(0x10a004, 0x10a005).portr("EEPROM");
map(0x10a006, 0x10a007).portr("P5_P6");
- map(0x10a00c, 0x10a00d).r(m_k053246, FUNC(k053247_device::k053246_word_r)); /* sprites */
+ map(0x10a00c, 0x10a00d).r(m_k053246, FUNC(k053247_device::k053246_r)); /* sprites */
map(0x110000, 0x113fff).ram(); /* main RAM */
-/* map(0x18c000, 0x197fff).w("k052109", FUNC(k052109_device:lsb_w)).share("tilemapleft"); */
+/* map(0x18c000, 0x197fff).w("k052109", FUNC(k052109_device:write)).umask16(0x00ff).share("tilemapleft"); */
map(0x18c000, 0x197fff).ram().share("tilemapleft"); /* left tilemap (p1,p2,p3 counters) */
map(0x18fa00, 0x18fa01).w(FUNC(xmen_state::xmen_18fa00_w));
/*
@@ -330,7 +330,7 @@ void xmen_state::xmen(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(xmen_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, 53, -2);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, 53, -2);
m_k053246->set_palette("palette");
K053251(config, m_k053251, 0);
@@ -392,7 +392,7 @@ void xmen_state::xmen6p(machine_config &config)
K053246(config, m_k053246, 0);
m_k053246->set_sprite_callback(FUNC(xmen_state::sprite_callback), this);
- m_k053246->set_config("gfx2", NORMAL_PLANE_ORDER, 53, -2);
+ m_k053246->set_config(NORMAL_PLANE_ORDER, 53, -2);
m_k053246->set_screen(m_screen);
m_k053246->set_palette("palette");
@@ -482,7 +482,7 @@ ROM_START( xmen )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -509,7 +509,7 @@ ROM_START( xmenj )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -536,7 +536,7 @@ ROM_START( xmenja )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -563,7 +563,7 @@ ROM_START( xmene )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -590,7 +590,7 @@ ROM_START( xmena )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -617,7 +617,7 @@ ROM_START( xmenaa )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -644,7 +644,7 @@ ROM_START( xmen2pe )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -671,7 +671,7 @@ ROM_START( xmen2pu )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -698,7 +698,7 @@ ROM_START( xmen2pa )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -725,7 +725,7 @@ ROM_START( xmen2pj )
ROM_LOAD32_WORD( "065-a08.15l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.16l", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.2h", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.2l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.1h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -806,7 +806,7 @@ ROM_START( xmen6p )
ROM_LOAD32_WORD( "065-a08.1l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.1h", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.12l", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.17l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.22h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
@@ -833,7 +833,7 @@ ROM_START( xmen6pu )
ROM_LOAD32_WORD( "065-a08.1l", 0x000000, 0x100000, CRC(6b649aca) SHA1(2595f314517738e8614facf578cc951a6c36a180) )
ROM_LOAD32_WORD( "065-a07.1h", 0x000002, 0x100000, CRC(c5dc8fc4) SHA1(9887cb002c8b72be7ce933cb397f00cdc5506c8c) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x400000, "k053246", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD64_WORD( "065-a09.12l", 0x000000, 0x100000, CRC(ea05d52f) SHA1(7f2c14f907355856fb94e3a67b73aa1919776835) ) /* sprites */
ROM_LOAD64_WORD( "065-a10.17l", 0x000002, 0x100000, CRC(96b91802) SHA1(641943557b59b91f0edd49ec8a73cef7d9268b32) )
ROM_LOAD64_WORD( "065-a12.22h", 0x000004, 0x100000, CRC(321ed07a) SHA1(5b00ed676daeea974bdce6701667cfe573099dad) )
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index ac5702361ae..8174e31ca23 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -281,7 +281,7 @@ protected:
unsupported flipping modes (probably due to the way it's hooked up to the
rest of the chips) which is causing entirely the wrong output.
- -- furthermore video\k053936.c contains an implementation of
+ -- furthermore video\k053936.cpp contains an implementation of
the K053936_zoom_draw named K053936GP_zoom_draw that's only used in konamigx ...
diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h
index fa1d31aa051..7416a5d0f6b 100644
--- a/src/mame/includes/overdriv.h
+++ b/src/mame/includes/overdriv.h
@@ -46,7 +46,7 @@ private:
DECLARE_WRITE8_MEMBER(sound_ack_w);
DECLARE_WRITE16_MEMBER(slave_irq4_assert_w);
DECLARE_WRITE16_MEMBER(slave_irq5_assert_w);
- DECLARE_WRITE16_MEMBER(objdma_w);
+ DECLARE_WRITE8_MEMBER(objdma_w);
TIMER_CALLBACK_MEMBER(objdma_end_cb);
uint32_t screen_update_overdriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -56,7 +56,6 @@ private:
K051316_CB_MEMBER(zoom_callback_1);
K051316_CB_MEMBER(zoom_callback_2);
K053246_CB_MEMBER(sprite_callback);
- void overdriv_k053260_map(address_map &map);
void overdriv_master_map(address_map &map);
void overdriv_slave_map(address_map &map);
void overdriv_sound_map(address_map &map);
diff --git a/src/mame/machine/konamigx.cpp b/src/mame/machine/konamigx.cpp
index 202267f8f64..b927daf5156 100644
--- a/src/mame/machine/konamigx.cpp
+++ b/src/mame/machine/konamigx.cpp
@@ -2,7 +2,7 @@
// copyright-holders:R. Belmont, Acho A. Tang, Phil Stroffolino, Olivier Galibert
/**************************************************************************
*
- * machine/konamigx.c - contains various System GX hardware abstractions
+ * machine/konamigx.cpp - contains various System GX hardware abstractions
*
*/
diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp
index 7c9416de86f..7b46b032563 100644
--- a/src/mame/video/k053246_k053247_k055673.cpp
+++ b/src/mame/video/k053246_k053247_k055673.cpp
@@ -38,6 +38,8 @@ The sprite RAM format is very similar to the 053245.
#include "k053246_k053247_k055673.h"
#include "konami_helper.h"
+#include <algorithm>
+
#define VERBOSE 0
#include "logmacro.h"
@@ -52,58 +54,55 @@ void k053247_device::clear_all()
m_ram = nullptr;
m_gfx = nullptr;
- for (auto & elem : m_kx46_regs)
- elem = 0;
-
- for (auto & elem : m_kx47_regs)
- elem = 0;
+ std::fill(std::begin(m_kx46_regs), std::end(m_kx46_regs), 0);
+ std::fill(std::begin(m_kx47_regs), std::end(m_kx47_regs), 0);
m_objcha_line = 0;
m_z_rejection = 0;
}
-void k053247_device::k053247_get_ram( uint16_t **ram )
+void k053247_device::k053247_get_ram(u16 **ram)
{
*ram = m_ram.get();
}
-int k053247_device::k053247_get_dx( void )
+int k053247_device::k053247_get_dx(void)
{
return m_dx;
}
-int k053247_device::k053247_get_dy( void )
+int k053247_device::k053247_get_dy(void)
{
return m_dy;
}
-int k053247_device::k053246_read_register( int regnum )
+u8 k053247_device::k053246_read_register(offs_t offset)
{
- return(m_kx46_regs[regnum]);
+ return m_kx46_regs[offset];
}
-int k053247_device::k053247_read_register( int regnum )
+u16 k053247_device::k053247_read_register(offs_t offset)
{
- return(m_kx47_regs[regnum]);
+ return m_kx47_regs[offset];
}
-WRITE16_MEMBER( k053247_device::k055673_reg_word_w ) // write-only OBJSET2 registers (see p.43 table 6.1)
+void k053247_device::k055673_reg_word_w(offs_t offset, u16 data, u16 mem_mask) // write-only OBJSET2 registers (see p.43 table 6.1)
{
COMBINE_DATA(m_kx47_regs + offset);
}
-READ16_MEMBER( k053247_device::k053247_word_r )
+u16 k053247_device::k053247_word_r(offs_t offset)
{
return m_ram[offset];
}
-WRITE16_MEMBER( k053247_device::k053247_word_w )
+void k053247_device::k053247_word_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(m_ram.get() + offset);
}
-READ8_MEMBER( k053247_device::k053247_r )
+u8 k053247_device::k053247_r(offs_t offset)
{
int offs = offset >> 1;
@@ -113,7 +112,7 @@ READ8_MEMBER( k053247_device::k053247_r )
return(m_ram[offs] >> 8);
}
-WRITE8_MEMBER( k053247_device::k053247_w )
+void k053247_device::k053247_w(offs_t offset, u8 data)
{
int offs = offset >> 1;
@@ -129,10 +128,10 @@ WRITE8_MEMBER( k053247_device::k053247_w )
// in this window, +0 = 32 bits from one set of ROMs, and +8 = 32 bits from another set
// FIXME: rearrange ROM loading so this can be merged with the 4/6/8bpp version
-READ16_MEMBER( k053247_device::k055673_5bpp_rom_word_r ) // 5bpp
+u16 k053247_device::k055673_5bpp_rom_word_r(offs_t offset) // 5bpp
{
- uint8_t *ROM8 = (uint8_t *)&m_gfxrom[0];
- uint16_t *ROM = (uint16_t *)&m_gfxrom[0];
+ u8 *ROM8 = (u8 *)&m_gfxrom[0];
+ u16 *ROM = (u16 *)&m_gfxrom[0];
int size4 = (m_gfxrom.length() / (1024 * 1024)) / 5;
int romofs;
@@ -167,12 +166,12 @@ READ16_MEMBER( k053247_device::k055673_5bpp_rom_word_r ) // 5bpp
return 0;
}
-READ16_MEMBER( k053247_device::k055673_rom_word_r )
+u16 k053247_device::k055673_rom_word_r(offs_t offset)
{
if (m_bpp == 5)
- return k055673_5bpp_rom_word_r(space, offset, mem_mask);
+ return k055673_5bpp_rom_word_r(offset);
- uint16_t *ROM = (uint16_t *)&m_gfxrom[0];
+ u16 *ROM = (u16 *)&m_gfxrom[0];
int romofs;
romofs = m_kx46_regs[6] << 16 | m_kx46_regs[7] << 8 | m_kx46_regs[4];
@@ -184,9 +183,9 @@ READ16_MEMBER( k053247_device::k055673_rom_word_r )
return ROM[romofs + (offset & 0x3)];
}
-READ16_MEMBER( k053247_device::k055673_ps_rom_word_r )
+u16 k053247_device::k055673_ps_rom_word_r(offs_t offset)
{
- uint8_t *ROM = (uint8_t *)&m_gfxrom[0];
+ u8 *ROM = (u8 *)&m_gfxrom[0];
int romofs;
int magic = (offset & 1);
@@ -198,7 +197,7 @@ READ16_MEMBER( k053247_device::k055673_ps_rom_word_r )
return ROM[finoffs+2] | (ROM[finoffs]<<8);
}
-READ8_MEMBER( k053247_device::k053246_r )
+u8 k053247_device::k053246_r(offs_t offset)
{
if (m_objcha_line == ASSERT_LINE)
{
@@ -214,31 +213,17 @@ READ8_MEMBER( k053247_device::k053246_r )
}
}
-WRITE8_MEMBER( k053247_device::k053246_w )
+void k053247_device::k053246_w(offs_t offset, u8 data)
{
m_kx46_regs[offset] = data;
}
-READ16_MEMBER( k053247_device::k053246_word_r )
-{
- offset <<= 1;
- return k053246_r( space, offset + 1) | (k053246_r( space, offset) << 8);
-}
-
-WRITE16_MEMBER( k053247_device::k053246_word_w )
-{
- if (ACCESSING_BITS_8_15)
- k053246_w( space, offset << 1,(data >> 8) & 0xff);
- if (ACCESSING_BITS_0_7)
- k053246_w( space, (offset << 1) + 1,data & 0xff);
-}
-
-void k053247_device::k053246_set_objcha_line( int state )
+void k053247_device::k053246_set_objcha_line(int state)
{
m_objcha_line = state;
}
-int k053247_device::k053246_is_irq_enabled( void )
+int k053247_device::k053246_is_irq_enabled(void)
{
// This bit enables obj DMA rather than obj IRQ even though the two functions usually coincide.
return m_kx46_regs[5] & 0x10;
@@ -274,22 +259,17 @@ int k053247_device::k053246_is_irq_enabled( void )
*/
template<class _BitmapClass>
-void k053247_device::k053247_sprites_draw_common( _BitmapClass &bitmap, const rectangle &cliprect )
+void k053247_device::k053247_sprites_draw_common(_BitmapClass &bitmap, const rectangle &cliprect)
{
#define NUM_SPRITES 256
-
int code, color, x, y, shadow, shdmask, count, temp, primask;
int sortedlist[NUM_SPRITES];
int offs,zcode;
-
-
-
- uint8_t drawmode_table[256];
- uint8_t shadowmode_table[256];
-
+ u8 drawmode_table[256];
+ u8 shadowmode_table[256];
memset(drawmode_table, DRAWMODE_SOURCE, sizeof(drawmode_table));
drawmode_table[0] = DRAWMODE_NONE;
@@ -408,7 +388,7 @@ void k053247_device::k053247_sprites_draw_common( _BitmapClass &bitmap, const re
m_k053247_cb(&code, &color, &primask);
- k053247_draw_single_sprite_gxcore( bitmap, cliprect,
+ k053247_draw_single_sprite_gxcore(bitmap, cliprect,
nullptr, nullptr,
code, m_ram.get(), offs,
color,
@@ -424,12 +404,11 @@ void k053247_device::k053247_sprites_draw_common( _BitmapClass &bitmap, const re
#undef NUM_SPRITES
}
-void k053247_device::k053247_sprites_draw( bitmap_ind16 &bitmap, const rectangle &cliprect )
-{ k053247_sprites_draw_common( bitmap, cliprect); }
-
-void k053247_device::k053247_sprites_draw( bitmap_rgb32 &bitmap, const rectangle &cliprect )
-{ k053247_sprites_draw_common( bitmap, cliprect); }
+void k053247_device::k053247_sprites_draw(bitmap_ind16 &bitmap, const rectangle &cliprect)
+{ k053247_sprites_draw_common(bitmap, cliprect); }
+void k053247_device::k053247_sprites_draw(bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{ k053247_sprites_draw_common(bitmap, cliprect); }
/*
@@ -450,8 +429,8 @@ void k053247_device::k053247_sprites_draw( bitmap_rgb32 &bitmap, const rectangle
void k053247_device::zdrawgfxzoom32GP(
bitmap_rgb32 &bitmap, const rectangle &cliprect,
- uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy,
- int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, uint8_t* gx_objzbuf, uint8_t* gx_shdzbuf)
+ u32 code, u32 color, int flipx, int flipy, int sx, int sy,
+ int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, u8* gx_objzbuf, u8* gx_shdzbuf)
{
#define FP 19
#define FPONE (1<<FP)
@@ -459,21 +438,21 @@ void k053247_device::zdrawgfxzoom32GP(
#define FPENT 0
// inner loop
- const uint8_t *src_ptr;
+ const u8 *src_ptr;
int src_x;
int eax, ecx;
int src_fx, src_fdx;
int shdpen;
- uint8_t z8 = 0, p8 = 0;
- uint8_t *ozbuf_ptr;
- uint8_t *szbuf_ptr;
+ u8 z8 = 0, p8 = 0;
+ u8 *ozbuf_ptr;
+ u8 *szbuf_ptr;
const pen_t *pal_base;
const pen_t *shd_base;
- uint32_t *dst_ptr;
+ u32 *dst_ptr;
// outter loop
int src_fby, src_fdy, src_fbx;
- const uint8_t *src_base;
+ const u8 *src_base;
int dst_w, dst_h;
// one-time
@@ -574,8 +553,8 @@ void k053247_device::zdrawgfxzoom32GP(
// adjust insertion points and pre-entry constants
eax = (dst_y - dst_miny) * GX_ZBUFW + (dst_x - dst_minx) + dst_w;
- z8 = (uint8_t)zcode;
- p8 = (uint8_t)pri;
+ z8 = (u8)zcode;
+ p8 = (u8)pri;
ozbuf_ptr += eax;
szbuf_ptr += eax << 1;
dst_ptr += dst_y * dst_pitch + dst_x + dst_w;
@@ -735,7 +714,7 @@ void k053247_device::zdrawgfxzoom32GP(
// the shadow tables are 15-bit lookup tables which accept RGB15... lossy, nasty, yuck!
dst_ptr[ecx] = shd_base[pix.as_rgb15()];
- //dst_ptr[ecx] =(eax>>3&0x001f);lend_r32( eax, 0x00000000, 128);
+ //dst_ptr[ecx] =(eax>>3&0x001f);lend_r32(eax, 0x00000000, 128);
}
while (++ecx);
@@ -892,11 +871,10 @@ void k053247_device::zdrawgfxzoom32GP(
}
-
void k053247_device::zdrawgfxzoom32GP(
bitmap_ind16 &bitmap, const rectangle &cliprect,
- uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy,
- int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, uint8_t* gx_objzbuf, uint8_t* gx_shdzbuf)
+ u32 code, u32 color, int flipx, int flipy, int sx, int sy,
+ int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, u8* gx_objzbuf, u8* gx_shdzbuf)
{
fatalerror("no zdrawgfxzoom32GP for bitmap_ind16\n");
}
@@ -907,11 +885,9 @@ void k053247_device::zdrawgfxzoom32GP(
*****************************************************************************/
-
-
DEFINE_DEVICE_TYPE(K055673, k055673_device, "k055673", "K055673 Sprite Generator")
-k055673_device::k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+k055673_device::k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: k053247_device(mconfig, K055673, tag, owner, clock)
{
}
@@ -927,7 +903,7 @@ void k055673_device::device_start()
throw device_missing_dependencies();
int gfx_index = 0;
- uint32_t total;
+ u32 total;
static const gfx_layout spritelayout = /* System GX sprite layout */
{
@@ -982,12 +958,12 @@ void k055673_device::device_start()
{ 0, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960 },
16*16*4
};
- uint8_t *s1, *s2, *d;
+ u8 *s1, *s2, *d;
long i;
- uint16_t *alt_k055673_rom;
+ u16 *alt_k055673_rom;
int size4;
- alt_k055673_rom = (uint16_t *)&m_gfxrom[0];
+ alt_k055673_rom = (u16 *)&m_gfxrom[0];
/* decode the graphics */
switch (m_bpp)
@@ -996,10 +972,10 @@ void k055673_device::device_start()
size4 = (m_gfxrom.length()/(1024*1024))/5;
size4 *= 4*1024*1024;
/* set the # of tiles based on the 4bpp section */
- alt_k055673_rom = auto_alloc_array(machine(), uint16_t, size4 * 5 / 2);
- d = (uint8_t *)alt_k055673_rom;
+ alt_k055673_rom = auto_alloc_array(machine(), u16, size4 * 5 / 2);
+ d = (u8 *)alt_k055673_rom;
// now combine the graphics together to form 5bpp
- s1 = (uint8_t *)&m_gfxrom[0]; // 4bpp area
+ s1 = (u8 *)&m_gfxrom[0]; // 4bpp area
s2 = s1 + (size4); // 1bpp area
for (i = 0; i < size4; i+= 4)
{
@@ -1011,27 +987,27 @@ void k055673_device::device_start()
}
total = size4 / 128;
- konami_decode_gfx(*this, gfx_index, (uint8_t *)alt_k055673_rom, total, &spritelayout, 5);
+ konami_decode_gfx(*this, gfx_index, (u8 *)alt_k055673_rom, total, &spritelayout, 5);
break;
case K055673_LAYOUT_RNG:
total = m_gfxrom.length() / (16*16/2);
- konami_decode_gfx(*this, gfx_index, (uint8_t *)alt_k055673_rom, total, &spritelayout2, 4);
+ konami_decode_gfx(*this, gfx_index, (u8 *)alt_k055673_rom, total, &spritelayout2, 4);
break;
case K055673_LAYOUT_PS:
total = m_gfxrom.length() / (16*16/2);
- konami_decode_gfx(*this, gfx_index, (uint8_t *)alt_k055673_rom, total, &spritelayout5, 4);
+ konami_decode_gfx(*this, gfx_index, (u8 *)alt_k055673_rom, total, &spritelayout5, 4);
break;
case K055673_LAYOUT_LE2:
total = m_gfxrom.length() / (16*16);
- konami_decode_gfx(*this, gfx_index, (uint8_t *)alt_k055673_rom, total, &spritelayout3, 8);
+ konami_decode_gfx(*this, gfx_index, (u8 *)alt_k055673_rom, total, &spritelayout3, 8);
break;
case K055673_LAYOUT_GX6:
total = m_gfxrom.length() / (16*16*6/8);
- konami_decode_gfx(*this, gfx_index, (uint8_t *)alt_k055673_rom, total, &spritelayout4, 6);
+ konami_decode_gfx(*this, gfx_index, (u8 *)alt_k055673_rom, total, &spritelayout4, 6);
break;
default:
@@ -1044,11 +1020,11 @@ void k055673_device::device_start()
m_z_rejection = -1;
m_gfx = gfx(gfx_index);
m_objcha_line = CLEAR_LINE;
- m_ram = std::make_unique<uint16_t[]>(0x1000/2);
+ m_ram = std::make_unique<u16[]>(0x1000/2);
memset(m_ram.get(), 0, 0x1000);
- memset(m_kx46_regs, 0, 8);
- memset(m_kx47_regs, 0, 32);
+ std::fill(std::begin(m_kx46_regs), std::end(m_kx46_regs), 0);
+ std::fill(std::begin(m_kx47_regs), std::end(m_kx47_regs), 0);
save_pointer(NAME(m_ram), 0x800);
save_item(NAME(m_kx46_regs));
@@ -1061,20 +1037,19 @@ void k055673_device::device_start()
//-------------------------------------------------
-
DEFINE_DEVICE_TYPE(K053247, k053247_device, "k053247", "K053246/K053247 Sprite Generator")
decltype(K053247) K053246 = K053247;
-k053247_device::k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+k053247_device::k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: k053247_device(mconfig, K053247, tag, owner, clock)
{
}
-k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, type, tag, owner, clock),
device_video_interface(mconfig, *this),
device_gfx_interface(mconfig, *this, nullptr),
- m_gfxrom(*this, finder_base::DUMMY_TAG),
+ m_gfxrom(*this, DEVICE_SELF),
m_gfx_num(0)
{
clear_all();
@@ -1089,7 +1064,7 @@ void k053247_device::device_start()
if (!palette().device().started())
throw device_missing_dependencies();
- uint32_t total;
+ u32 total;
static const gfx_layout spritelayout =
{
16,16,
@@ -1108,7 +1083,7 @@ void k053247_device::device_start()
{
case NORMAL_PLANE_ORDER:
total = m_gfxrom.length() / 128;
- konami_decode_gfx(*this, m_gfx_num, (uint8_t *)&m_gfxrom[0], total, &spritelayout, 4);
+ konami_decode_gfx(*this, m_gfx_num, (u8 *)&m_gfxrom[0], total, &spritelayout, 4);
break;
default:
@@ -1131,7 +1106,7 @@ void k053247_device::device_start()
m_gfx = gfx(m_gfx_num);
- m_ram = make_unique_clear<uint16_t[]>(0x1000 / 2);
+ m_ram = make_unique_clear<u16[]>(0x1000 / 2);
save_pointer(NAME(m_ram), 0x1000 / 2);
save_item(NAME(m_kx46_regs));
@@ -1149,8 +1124,8 @@ void k053247_device::device_reset()
m_z_rejection = -1;
m_objcha_line = CLEAR_LINE;
- memset(m_kx46_regs, 0, 8);
- memset(m_kx47_regs, 0, 32);
+ std::fill(std::begin(m_kx46_regs), std::end(m_kx46_regs), 0);
+ std::fill(std::begin(m_kx47_regs), std::end(m_kx47_regs), 0);
}
@@ -1171,13 +1146,7 @@ void k053247_device::device_reset()
0x00-0xff = zcode to ignore
*/
-void k053247_device::k053247_set_z_rejection( int zcode )
+void k053247_device::k053247_set_z_rejection(int zcode)
{
m_z_rejection = zcode;
}
-
-
-READ16_MEMBER( k053247_device::k053246_reg_word_r )
-{
- return(m_kx46_regs[offset * 2] << 8 | m_kx46_regs[offset * 2 + 1]);
-} // OBJSET1
diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h
index d80a0dbf65b..dc122084b17 100644
--- a/src/mame/video/k053246_k053247_k055673.h
+++ b/src/mame/video/k053246_k053247_k055673.h
@@ -52,14 +52,13 @@ class k053247_device : public device_t,
public device_gfx_interface
{
public:
- k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// configuration
void set_k053247_callback(k053247_cb_delegate callback) { m_k053247_cb = callback; }
template <typename... T> void set_sprite_callback(T &&... args) { m_k053247_cb = k053247_cb_delegate(std::forward<T>(args)...); }
- template <typename T> void set_config(T &&tag, int bpp, int dx, int dy)
+ void set_config(int bpp, int dx, int dy)
{
- m_gfxrom.set_tag(tag);
m_bpp = bpp;
m_dx = dx;
m_dy = dy;
@@ -67,67 +66,63 @@ public:
void clear_all();
- DECLARE_READ16_MEMBER( k055673_rom_word_r );
- DECLARE_READ16_MEMBER( k055673_ps_rom_word_r );
- DECLARE_READ16_MEMBER( k055673_5bpp_rom_word_r );
-
- DECLARE_READ8_MEMBER( k053247_r );
- DECLARE_WRITE8_MEMBER( k053247_w );
- DECLARE_READ16_MEMBER( k053247_word_r );
- DECLARE_WRITE16_MEMBER( k053247_word_w );
- DECLARE_WRITE16_MEMBER( k055673_reg_word_w ); // "OBJSET2" registers
-
- void k053247_sprites_draw( bitmap_ind16 &bitmap,const rectangle &cliprect);
- void k053247_sprites_draw( bitmap_rgb32 &bitmap,const rectangle &cliprect);
- int k053247_read_register( int regnum);
- void k053247_set_z_rejection( int zcode); // common to k053246/7
- void k053247_get_ram( uint16_t **ram);
- int k053247_get_dx( void );
- int k053247_get_dy( void );
-
- DECLARE_READ8_MEMBER( k053246_r );
- DECLARE_WRITE8_MEMBER( k053246_w );
- DECLARE_READ16_MEMBER( k053246_word_r );
- DECLARE_WRITE16_MEMBER( k053246_word_w );
-
- void k053246_set_objcha_line( int state);
- int k053246_is_irq_enabled(void);
- int k053246_read_register( int regnum);
+ u16 k055673_rom_word_r(offs_t offset);
+ u16 k055673_ps_rom_word_r(offs_t offset);
+ u16 k055673_5bpp_rom_word_r(offs_t offset);
+
+ u8 k053247_r(offs_t offset);
+ void k053247_w(offs_t offset, u8 data);
+ u16 k053247_word_r(offs_t offset);
+ void k053247_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void k055673_reg_word_w(offs_t offset, u16 data, u16 mem_mask = ~0); // "OBJSET2" registers
+
+ void k053247_sprites_draw(bitmap_ind16 &bitmap,const rectangle &cliprect);
+ void k053247_sprites_draw(bitmap_rgb32 &bitmap,const rectangle &cliprect);
+ u16 k053247_read_register(offs_t offset);
+ void k053247_set_z_rejection(int zcode); // common to k053246/7
+ void k053247_get_ram(u16 **ram);
+ int k053247_get_dx(void);
+ int k053247_get_dy(void);
- DECLARE_READ16_MEMBER( k053246_reg_word_r ); // OBJSET1
+ u8 k053246_r(offs_t offset);
+ void k053246_w(offs_t offset, u8 data);
+
+ void k053246_set_objcha_line(int state);
+ int k053246_is_irq_enabled(void);
+ u8 k053246_read_register(offs_t offset);
- std::unique_ptr<uint16_t[]> m_ram;
+ std::unique_ptr<u16[]> m_ram;
gfx_element *m_gfx;
- uint8_t m_kx46_regs[8];
- uint16_t m_kx47_regs[16];
- int m_dx, m_dy;
- uint8_t m_objcha_line;
- int m_z_rejection;
+ u8 m_kx46_regs[8];
+ u16 m_kx47_regs[16];
+ int m_dx, m_dy;
+ u8 m_objcha_line;
+ int m_z_rejection;
k053247_cb_delegate m_k053247_cb;
- required_region_ptr<uint8_t> m_gfxrom;
+ required_region_ptr<u8> m_gfxrom;
int m_gfx_num;
int m_bpp;
/* alt implementation - to be collapsed */
void zdrawgfxzoom32GP(
bitmap_rgb32 &bitmap, const rectangle &cliprect,
- uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy,
- int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, uint8_t* gx_objzbuf, uint8_t* gx_shdzbuf);
+ u32 code, u32 color, int flipx, int flipy, int sx, int sy,
+ int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, u8* gx_objzbuf, u8* gx_shdzbuf);
void zdrawgfxzoom32GP(
bitmap_ind16 &bitmap, const rectangle &cliprect,
- uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy,
- int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, uint8_t* gx_objzbuf, uint8_t* gx_shdzbuf);
+ u32 code, u32 color, int flipx, int flipy, int sx, int sy,
+ int scalex, int scaley, int alpha, int drawmode, int zcode, int pri, u8* gx_objzbuf, u8* gx_shdzbuf);
template<class _BitmapClass>
inline void k053247_draw_single_sprite_gxcore(_BitmapClass &bitmap , rectangle const &cliprect,
- unsigned char*gx_objzbuf, unsigned char*gx_shdzbuf, int code, unsigned short*gx_spriteram, int offs,
+ u8* gx_objzbuf, u8* gx_shdzbuf, int code, u16* gx_spriteram, int offs,
int color, int alpha, int drawmode, int zcode, int pri,
- int primask, int shadow, unsigned char*drawmode_table, unsigned char*shadowmode_table, int shdmask)
+ int primask, int shadow, u8* drawmode_table, u8* shadowmode_table, int shdmask)
{
int xa,ya,ox,oy,flipx,flipy,mirrorx,mirrory,zoomx,zoomy,scalex,scaley,nozoom;
int temp, temp4;
@@ -172,7 +167,7 @@ public:
int objset1 = k053246_read_register(5);
// for Escape Kids (GX975)
- if ( objset1 & 8 ) // Check only "Bit #3 is '1'?"
+ if (objset1 & 8) // Check only "Bit #3 is '1'?"
{
int screenwidth = screen().width();
@@ -201,12 +196,10 @@ public:
ywraplim = 1024 - 512;
}
-
// get "display window" offsets
int offx = (short)((m_kx46_regs[0] << 8) | m_kx46_regs[1]);
int offy = (short)((m_kx46_regs[2] << 8) | m_kx46_regs[3]);
-
// apply wrapping and global offsets
temp = wrapsize-1;
@@ -221,7 +214,6 @@ public:
if (ox >= xwraplim) ox -= wrapsize;
if (oy >= ywraplim) oy -= wrapsize;
-
temp = temp4>>8 & 0x0f;
int width = 1 << (temp & 3);
int height = 1 << (temp>>2 & 3);
@@ -255,7 +247,7 @@ public:
}
else /* non-GX */
{
- uint8_t* whichtable = drawmode_table;
+ u8* whichtable = drawmode_table;
if (color == -1)
{
// drop the entire sprite to shadow unconditionally
@@ -300,7 +292,6 @@ public:
}
-
template<class _BitmapClass>
void k053247_draw_yxloop_gx(_BitmapClass &bitmap, const rectangle &cliprect,
int code,
@@ -314,10 +305,10 @@ public:
/* gx specifics */
int pri,
int zcode, int alpha, int drawmode,
- uint8_t* gx_objzbuf, uint8_t* gx_shdzbuf,
+ u8* gx_objzbuf, u8* gx_shdzbuf,
/* non-gx specifics */
int primask,
- uint8_t* whichtable
+ u8* whichtable
)
{
static const int xoffset[8] = { 0, 1, 4, 5, 16, 17, 20, 21 };
@@ -449,13 +440,13 @@ public:
protected:
- k053247_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ k053247_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- template <class _BitmapClass> void k053247_sprites_draw_common( _BitmapClass &bitmap, const rectangle &cliprect );
+ template <class _BitmapClass> void k053247_sprites_draw_common(_BitmapClass &bitmap, const rectangle &cliprect);
};
DECLARE_DEVICE_TYPE(K053247, k053247_device)
@@ -464,7 +455,7 @@ DECLARE_DEVICE_TYPE(K053246, k053247_device)
class k055673_device : public k053247_device
{
public:
- k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
~k055673_device() { }
protected:
diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp
index 07e984a3349..de95a75e1d7 100644
--- a/src/mame/video/konamigx.cpp
+++ b/src/mame/video/konamigx.cpp
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Acho A. Tang, Phil Stroffolino, Olivier Galibert
/*
- * video/konamigx.c - Konami GX video hardware (here there be dragons, and achocode)
+ * video/konamigx.cpp - Konami GX video hardware (here there be dragons, and achocode)
*
*/
diff --git a/src/mame/video/rungun.cpp b/src/mame/video/rungun.cpp
index eedf7dd0bfd..3dd606422aa 100644
--- a/src/mame/video/rungun.cpp
+++ b/src/mame/video/rungun.cpp
@@ -163,7 +163,6 @@ uint32_t rungun_state::screen_update_rng_dual_right(screen_device &screen, bitma
void rungun_state::sprite_dma_trigger(void)
{
- address_space &space = m_maincpu->space(AS_PROGRAM);
uint32_t src_address;
if(m_single_screen_mode == true)
@@ -173,5 +172,5 @@ void rungun_state::sprite_dma_trigger(void)
// TODO: size could be programmable somehow.
for(int i=0;i<0x1000;i+=2)
- m_k055673->k053247_word_w(space,i/2,m_banked_ram[(i + src_address) /2],0xffff);
+ m_k055673->k053247_word_w(i/2, m_banked_ram[(i + src_address) /2]);
}