summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar cam900 <dbtlrchl@naver.com>2018-10-17 10:48:18 +0900
committerGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2018-10-16 21:48:18 -0400
commitac8c6c6c575c1734d4654418e22b4db9ba44d3e6 (patch) (github)
tree24ca83b99ed52dd5d131f5f4bc1fe193cf4b7283
parent56e559e0ae7da8e2e7fae8489a0d1e41801e126c (diff)
downloadmame-ac8c6c6c575c1734d4654418e22b4db9ba44d3e6.tar.bz2
mame-ac8c6c6c575c1734d4654418e22b4db9ba44d3e6.zip
Various Namco hardwares update/cleanups (#4147)
* Various Namco hardwares update/cleanups namcofl.cpp : Confirmed XTALs, Remove unnecessary defines namconb1.cpp : Correct sprite lags, Remove unnecessary defines, Add screen raw params reference(nebulray) - https://youtu.be/mAB66HhZNIM namcos1.cpp : Convert pointer into required_region_ptr, Reduce duplicate namcos2.cpp : Remove unnecessary bankrw, Add screen raw params, Fix some namings, Remove MACHINE_START_MEMBER and MACHINE_RESET_MEMBER, Reduce unnecessary VIDEO_START_MEMBER namcos21*.cpp : Fix namings, Remove some unuseds, MACHINE_START_MEMBER and MACHINE_RESET_MEMBER namco_c116.cpp : Convert internal palette into device_palette_interface namco_c123tmap.cpp : Internalize gfxdecode(Gfx layout is shared at all hardwares - 8bit data bus for ROM), Mask region, Implement tilemap disable bit namco_c169roz.cpp : Internalize gfxdecode(Gfx layout is shared at all hardwares - 8bit data bus for ROM), Mask region namco_c355spr.cpp : Remove unnecessary device, Allow double and triple buffered sprites namcos2_roz.cpp : Remove unnecessary device, Internalize gfxdecode(8bit data bus for ROM) namcos2_sprite.cpp : Remove unnecessary device * namco_c355spr.cpp : struct'd sprite infos, Fix sprite lags
-rw-r--r--src/mame/drivers/gal3.cpp6
-rw-r--r--src/mame/drivers/namcofl.cpp93
-rw-r--r--src/mame/drivers/namconb1.cpp190
-rw-r--r--src/mame/drivers/namcos1.cpp89
-rw-r--r--src/mame/drivers/namcos2.cpp676
-rw-r--r--src/mame/drivers/namcos21.cpp90
-rw-r--r--src/mame/drivers/namcos21_c67.cpp91
-rw-r--r--src/mame/drivers/namcos21_de.cpp89
-rw-r--r--src/mame/includes/namcofl.h13
-rw-r--r--src/mame/includes/namconb1.h17
-rw-r--r--src/mame/includes/namcos1.h15
-rw-r--r--src/mame/includes/namcos2.h47
-rw-r--r--src/mame/machine/namcos2.cpp24
-rw-r--r--src/mame/video/namco_c116.cpp13
-rw-r--r--src/mame/video/namco_c116.h10
-rw-r--r--src/mame/video/namco_c123tmap.cpp49
-rw-r--r--src/mame/video/namco_c123tmap.h14
-rw-r--r--src/mame/video/namco_c169roz.cpp34
-rw-r--r--src/mame/video/namco_c169roz.h13
-rw-r--r--src/mame/video/namco_c355spr.cpp291
-rw-r--r--src/mame/video/namco_c355spr.h33
-rw-r--r--src/mame/video/namcofl.cpp2
-rw-r--r--src/mame/video/namconb1.cpp4
-rw-r--r--src/mame/video/namcos1.cpp56
-rw-r--r--src/mame/video/namcos2.cpp22
-rw-r--r--src/mame/video/namcos2_roz.cpp24
-rw-r--r--src/mame/video/namcos2_roz.h8
-rw-r--r--src/mame/video/namcos2_sprite.cpp8
-rw-r--r--src/mame/video/namcos2_sprite.h2
29 files changed, 947 insertions, 1076 deletions
diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp
index 520c5a20de0..d64fdccc9a4 100644
--- a/src/mame/drivers/gal3.cpp
+++ b/src/mame/drivers/gal3.cpp
@@ -137,7 +137,7 @@ better notes (complete chip lists) for each board still needed
#include "video/namco_c355spr.h"
#include "machine/namcos21_dsp_c67.h"
#include "video/namcos21_3d.h"
-
+#include "emupal.h"
#define NAMCOS21_NUM_COLORS 0x8000
@@ -653,7 +653,7 @@ MACHINE_CONFIG_START(gal3_state::gal3)
MCFG_PALETTE_FORMAT(XBRG)
NAMCO_C355SPR(config, m_c355spr[0], 0);
- m_c355spr[0]->set_palette_tag("palette_1");
+ m_c355spr[0]->set_screen("lscreen");
m_c355spr[0]->set_gfxdecode_tag("gfxdecode_1");
m_c355spr[0]->set_is_namcofl(false);
m_c355spr[0]->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
@@ -684,7 +684,7 @@ MACHINE_CONFIG_START(gal3_state::gal3)
MCFG_PALETTE_FORMAT(XBRG)
NAMCO_C355SPR(config, m_c355spr[1], 0);
- m_c355spr[1]->set_palette_tag("palette_2");
+ m_c355spr[1]->set_screen("rscreen");
m_c355spr[1]->set_gfxdecode_tag("gfxdecode_2");
m_c355spr[1]->set_is_namcofl(false);
m_c355spr[1]->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index 3f323ab60d5..426bf6f4602 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -483,34 +483,8 @@ static const gfx_layout obj_layout =
16*128
};
-static const gfx_layout tile_layout =
-{
- 8,8,
- RGN_FRAC(1,1),
- 8,
- { 0,1,2,3,4,5,6,7 },
- { 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8 },
- { 0*64,1*64,2*64,3*64,4*64,5*64,6*64,7*64 },
- 8*64
-};
-
-static const gfx_layout roz_layout =
-{
- 16,16,
- RGN_FRAC(1,1),
- 8,
- { 0,1,2,3,4,5,6,7 },
- { 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8,8*8,9*8,10*8,11*8,12*8,13*8,14*8,15*8 },
- {
- 0*128,1*128,2*128,3*128,4*128,5*128,6*128,7*128,8*128,9*128,10*128,11*128,12*128,13*128,14*128,15*128
- },
- 16*128
-};
-
static GFXDECODE_START( gfx_namcofl )
- GFXDECODE_ENTRY( NAMCOFL_TILEGFXREGION, 0, tile_layout, 0x1000, 0x08 )
- GFXDECODE_ENTRY( NAMCOFL_SPRITEGFXREGION, 0, obj_layout, 0x0000, 0x10 )
- GFXDECODE_ENTRY( NAMCOFL_ROTGFXREGION, 0, roz_layout, 0x1800, 0x08 )
+ GFXDECODE_ENTRY( "sprite", 0, obj_layout, 0x0000, 0x10 )
GFXDECODE_END
@@ -580,10 +554,10 @@ MACHINE_RESET_MEMBER(namcofl_state,namcofl)
MACHINE_CONFIG_START(namcofl_state::namcofl)
- MCFG_DEVICE_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
+ MCFG_DEVICE_ADD("maincpu", I960, 80_MHz_XTAL/4) // i80960KA-20 == 20 MHz part
MCFG_DEVICE_PROGRAM_MAP(namcofl_mem)
- MCFG_DEVICE_ADD("mcu", NAMCO_C75, 48384000/3)
+ MCFG_DEVICE_ADD("mcu", NAMCO_C75, 48.384_MHz_XTAL/3)
MCFG_DEVICE_PROGRAM_MAP(namcoc75_am)
MCFG_DEVICE_IO_MAP(namcoc75_io)
/* TODO: irq generation for these */
@@ -600,22 +574,19 @@ MACHINE_CONFIG_START(namcofl_state::namcofl)
MCFG_SCREEN_SIZE(NAMCOFL_HTOTAL, NAMCOFL_VTOTAL)
MCFG_SCREEN_VISIBLE_AREA(0, NAMCOFL_HBSTART-1, 0, NAMCOFL_VBSTART-1)
MCFG_SCREEN_UPDATE_DRIVER(namcofl_state, screen_update_namcofl)
- MCFG_SCREEN_PALETTE("palette")
-
- MCFG_PALETTE_ADD("palette", 8192)
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcofl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_c116, gfx_namcofl)
NAMCO_C169ROZ(config, m_c169roz, 0);
- m_c169roz->set_gfxdecode_tag("gfxdecode");
+ m_c169roz->set_palette(m_c116);
m_c169roz->set_is_namcofl(true);
m_c169roz->set_ram_words(0x20000/2);
m_c169roz->set_tile_callback(namco_c169roz_device::c169_tilemap_delegate(&namcofl_state::RozCB, this));
- m_c169roz->set_maskregion_tag(NAMCOFL_ROTMASKREGION);
- m_c169roz->set_gfxregion(NAMCOFL_ROTGFX);
+ m_c169roz->set_color_base(0x1800);
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(true);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate(&namcofl_state::FLobjcode2tile, this));
@@ -623,19 +594,17 @@ MACHINE_CONFIG_START(namcofl_state::namcofl)
m_c355spr->set_gfxregion(NAMCOFL_SPRITEGFX);
NAMCO_C123TMAP(config, m_c123tmap, 0);
- m_c123tmap->set_gfxdecode_tag("gfxdecode");
+ m_c123tmap->set_palette(m_c116);
m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcofl_state::TilemapCB, this));
- m_c123tmap->set_maskregion_tag(NAMCOFL_TILEMASKREGION);
- m_c123tmap->set_gfxregion(NAMCOFL_TILEGFX);
+ m_c123tmap->set_color_base(0x1000);
NAMCO_C116(config, m_c116, 0);
- m_c116->set_palette(m_palette);
MCFG_VIDEO_START_OVERRIDE(namcofl_state,namcofl)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- MCFG_DEVICE_ADD("c352", C352, 48384000/2, 288)
+ MCFG_DEVICE_ADD("c352", C352, 48.384_MHz_XTAL/2, 288)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
@@ -656,26 +625,26 @@ ROM_START( speedrcr )
ROM_REGION16_LE( 0x80000, "c75data", 0 ) // C75 data
ROM_LOAD("se1_spr.21l", 0x000000, 0x80000, CRC(850a27ac) SHA1(7d5db840ec67659a1f2e69a62cdb03ce6ee0b47b) )
- ROM_REGION( 0x200000, NAMCOFL_ROTGFXREGION, 0 ) // "RCHAR" (roz characters)
+ ROM_REGION( 0x200000, "c169roz", 0 ) // "RCHAR" (roz characters)
ROM_LOAD("se1_rch0.19j", 0x000000, 0x100000, CRC(a0827288) SHA1(13691ef4d402a6dc91851de4f82cfbdf96d417cb) )
ROM_LOAD("se1_rch1.18j", 0x100000, 0x100000, CRC(af7609ad) SHA1(b16041f0eb47d7566011d9d762a3083411dc422e) )
- ROM_REGION( 0x400000, NAMCOFL_TILEGFXREGION, 0 ) // "SCHAR" (regular BG characters)
+ ROM_REGION( 0x400000, "c123tmap", 0 ) // "SCHAR" (regular BG characters)
ROM_LOAD("se1_sch0.21p", 0x000000, 0x100000, CRC(7b5cfad0) SHA1(5a0355e37eb191bc0cf8b6b7c3d0274560b9bbd5) )
ROM_LOAD("se1_sch1.20p", 0x100000, 0x100000, CRC(5086e0d3) SHA1(0aa7d11f4f9a75117e69cc77f1b73a68d9007aef) )
ROM_LOAD("se1_sch2.19p", 0x200000, 0x100000, CRC(e59a731e) SHA1(3fed72e9bb485d4d689ab51490360c4c6f1dc5cb) )
ROM_LOAD("se1_sch3.18p", 0x300000, 0x100000, CRC(f817027a) SHA1(71745476f496c60d89c8563b3e46bc85eebc79ce) )
- ROM_REGION( 0x800000, NAMCOFL_SPRITEGFXREGION, 0 ) // OBJ
+ ROM_REGION( 0x800000, "sprite", 0 ) // OBJ
ROM_LOAD16_BYTE("se1obj0l.ic1", 0x000001, 0x200000, CRC(17585218) SHA1(3332afa9bd194ac37b8d6f352507c523a0f2e2b3) )
ROM_LOAD16_BYTE("se1obj0u.ic2", 0x000000, 0x200000, CRC(d14b1236) SHA1(e5447732ef3acec88fb7a00e0deca3e71a40ae65) )
ROM_LOAD16_BYTE("se1obj1l.ic3", 0x400001, 0x200000, CRC(c4809fd5) SHA1(e0b80fccc17c83fb9d08f7f1cf2cd2f0f3a510b4) )
ROM_LOAD16_BYTE("se1obj1u.ic4", 0x400000, 0x200000, CRC(0beefa56) SHA1(012fb7b330dbf851ab2217da0a0e7136ddc3d23f) )
- ROM_REGION( 0x100000, NAMCOFL_ROTMASKREGION, 0 ) // "RSHAPE" (roz mask like NB-1?)
+ ROM_REGION( 0x100000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?)
ROM_LOAD("se1_rsh.14k", 0x000000, 0x100000, CRC(7aa5a962) SHA1(ff936dfcfcc4ee1f5f2232df62def76ff99e671e) )
- ROM_REGION( 0x100000, NAMCOFL_TILEMASKREGION, 0 ) // "SSHAPE" (mask for other tiles?)
+ ROM_REGION( 0x100000, "c123tmap:mask", 0 ) // "SSHAPE" (mask for other tiles?)
ROM_LOAD("se1_ssh.18u", 0x000000, 0x100000, CRC(7a8e0bda) SHA1(f6a508d90274d0205fec0c46f5f783a2715c0c6e) )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
@@ -705,26 +674,26 @@ ROM_START( finalapr )
ROM_REGION16_LE( 0x80000, "c75data", 0 ) // C75 data
ROM_LOAD("flr1spr.21l", 0x000000, 0x20000, CRC(69bb0f5e) SHA1(6831d618de42a165e508ad37db594d3aa290c530) )
- ROM_REGION( 0x200000, NAMCOFL_ROTGFXREGION, 0 ) // "RCHAR" (roz characters)
+ ROM_REGION( 0x200000, "c169roz", 0 ) // "RCHAR" (roz characters)
ROM_LOAD("flr1rch0.19j", 0x000000, 0x100000, CRC(f413f50d) SHA1(cdd8073dda4feaea78e3b94520cf20a9799fd04d) )
ROM_LOAD("flr1rch1.18j", 0x100000, 0x100000, CRC(4654d519) SHA1(f8bb473013cdca48dd98df0de2f78c300c156e91) )
- ROM_REGION( 0x400000, NAMCOFL_TILEGFXREGION, 0 ) // "SCHAR" (regular BG characters)
+ ROM_REGION( 0x400000, "c123tmap", 0 ) // "SCHAR" (regular BG characters)
ROM_LOAD("flr1sch0.21p", 0x000000, 0x100000, CRC(7169efca) SHA1(66c7aa1b50b236b4700b07be0dca7aebdabedb8c) )
ROM_LOAD("flr1sch1.20p", 0x100000, 0x100000, CRC(aa233a02) SHA1(0011329f585658d90f820daf0ba08ce2735bddfc) )
ROM_LOAD("flr1sch2.19p", 0x200000, 0x100000, CRC(9b6b7abd) SHA1(5cdec70db1b46bc5d0866ca155b520157fef3adf) )
ROM_LOAD("flr1sch3.18p", 0x300000, 0x100000, CRC(50a14f54) SHA1(ab9c2f2e11f006a9dc7e5aedd5788d7d67166d36) )
- ROM_REGION( 0x800000, NAMCOFL_SPRITEGFXREGION, 0 ) // OBJ
+ ROM_REGION( 0x800000, "sprite", 0 ) // OBJ
ROM_LOAD16_BYTE("flr1obj0l.ic1", 0x000001, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) )
ROM_LOAD16_BYTE("flr1obj0u.ic2", 0x000000, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) )
ROM_LOAD16_BYTE("flr1obj1l.ic3", 0x400001, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) )
ROM_LOAD16_BYTE("flr1obj1u.ic4", 0x400000, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) )
- ROM_REGION( 0x80000, NAMCOFL_ROTMASKREGION, 0 ) // "RSHAPE" (roz mask like NB-1?)
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?)
ROM_LOAD("flr1rsh.14k", 0x000000, 0x080000, CRC(037c0983) SHA1(c48574a8ad125cedfaf2538c5ff824e121204629) )
- ROM_REGION( 0x80000, NAMCOFL_TILEMASKREGION, 0 ) // "SSHAPE" (mask for other tiles?)
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 ) // "SSHAPE" (mask for other tiles?)
ROM_LOAD("flr1ssh.18u", 0x000000, 0x080000, CRC(f70cb2bf) SHA1(dbddda822287783a43415172b81d0382a8ac43d8) )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
@@ -744,26 +713,26 @@ ROM_START( finalapro )
ROM_REGION16_LE( 0x80000, "c75data", 0 ) // C75 data
ROM_LOAD("flr1spr.21l", 0x000000, 0x20000, CRC(69bb0f5e) SHA1(6831d618de42a165e508ad37db594d3aa290c530) )
- ROM_REGION( 0x200000, NAMCOFL_ROTGFXREGION, 0 ) // "RCHAR" (roz characters)
+ ROM_REGION( 0x200000, "c169roz", 0 ) // "RCHAR" (roz characters)
ROM_LOAD("flr1rch0.19j", 0x000000, 0x100000, CRC(f413f50d) SHA1(cdd8073dda4feaea78e3b94520cf20a9799fd04d) )
ROM_LOAD("flr1rch1.18j", 0x100000, 0x100000, CRC(4654d519) SHA1(f8bb473013cdca48dd98df0de2f78c300c156e91) )
- ROM_REGION( 0x400000, NAMCOFL_TILEGFXREGION, 0 ) // "SCHAR" (regular BG characters)
+ ROM_REGION( 0x400000, "c123tmap", 0 ) // "SCHAR" (regular BG characters)
ROM_LOAD("flr1sch0.21p", 0x000000, 0x100000, CRC(7169efca) SHA1(66c7aa1b50b236b4700b07be0dca7aebdabedb8c) )
ROM_LOAD("flr1sch1.20p", 0x100000, 0x100000, CRC(aa233a02) SHA1(0011329f585658d90f820daf0ba08ce2735bddfc) )
ROM_LOAD("flr1sch2.19p", 0x200000, 0x100000, CRC(9b6b7abd) SHA1(5cdec70db1b46bc5d0866ca155b520157fef3adf) )
ROM_LOAD("flr1sch3.18p", 0x300000, 0x100000, CRC(50a14f54) SHA1(ab9c2f2e11f006a9dc7e5aedd5788d7d67166d36) )
- ROM_REGION( 0x800000, NAMCOFL_SPRITEGFXREGION, 0 ) // OBJ
+ ROM_REGION( 0x800000, "sprite", 0 ) // OBJ
ROM_LOAD16_BYTE("flr1obj0l.ic1", 0x000001, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) )
ROM_LOAD16_BYTE("flr1obj0u.ic2", 0x000000, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) )
ROM_LOAD16_BYTE("flr1obj1l.ic3", 0x400001, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) )
ROM_LOAD16_BYTE("flr1obj1u.ic4", 0x400000, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) )
- ROM_REGION( 0x80000, NAMCOFL_ROTMASKREGION, 0 ) // "RSHAPE" (roz mask like NB-1?)
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?)
ROM_LOAD("flr1rsh.14k", 0x000000, 0x080000, CRC(037c0983) SHA1(c48574a8ad125cedfaf2538c5ff824e121204629) )
- ROM_REGION( 0x80000, NAMCOFL_TILEMASKREGION, 0 ) // "SSHAPE" (mask for other tiles?)
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 ) // "SSHAPE" (mask for other tiles?)
ROM_LOAD("flr1ssh.18u", 0x000000, 0x080000, CRC(f70cb2bf) SHA1(dbddda822287783a43415172b81d0382a8ac43d8) )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
@@ -784,26 +753,26 @@ ROM_START( finalaprj )
ROM_REGION16_LE( 0x80000, "c75data", 0 ) // C75 data
ROM_LOAD("flr1spr.21l", 0x000000, 0x20000, CRC(69bb0f5e) SHA1(6831d618de42a165e508ad37db594d3aa290c530) )
- ROM_REGION( 0x200000, NAMCOFL_ROTGFXREGION, 0 ) // "RCHAR" (roz characters)
+ ROM_REGION( 0x200000, "c169roz", 0 ) // "RCHAR" (roz characters)
ROM_LOAD("flr1rch0.19j", 0x000000, 0x100000, CRC(f413f50d) SHA1(cdd8073dda4feaea78e3b94520cf20a9799fd04d) )
ROM_LOAD("flr1rch1.18j", 0x100000, 0x100000, CRC(4654d519) SHA1(f8bb473013cdca48dd98df0de2f78c300c156e91) )
- ROM_REGION( 0x400000, NAMCOFL_TILEGFXREGION, 0 ) // "SCHAR" (regular BG characters)
+ ROM_REGION( 0x400000, "c123tmap", 0 ) // "SCHAR" (regular BG characters)
ROM_LOAD("flr1sch0.21p", 0x000000, 0x100000, CRC(7169efca) SHA1(66c7aa1b50b236b4700b07be0dca7aebdabedb8c) )
ROM_LOAD("flr1sch1.20p", 0x100000, 0x100000, CRC(aa233a02) SHA1(0011329f585658d90f820daf0ba08ce2735bddfc) )
ROM_LOAD("flr1sch2.19p", 0x200000, 0x100000, CRC(9b6b7abd) SHA1(5cdec70db1b46bc5d0866ca155b520157fef3adf) )
ROM_LOAD("flr1sch3.18p", 0x300000, 0x100000, CRC(50a14f54) SHA1(ab9c2f2e11f006a9dc7e5aedd5788d7d67166d36) )
- ROM_REGION( 0x800000, NAMCOFL_SPRITEGFXREGION, 0 ) // OBJ
+ ROM_REGION( 0x800000, "sprite", 0 ) // OBJ
ROM_LOAD16_BYTE("flr1obj0l.ic1", 0x000001, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) )
ROM_LOAD16_BYTE("flr1obj0u.ic2", 0x000000, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) )
ROM_LOAD16_BYTE("flr1obj1l.ic3", 0x400001, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) )
ROM_LOAD16_BYTE("flr1obj1u.ic4", 0x400000, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) )
- ROM_REGION( 0x80000, NAMCOFL_ROTMASKREGION, 0 ) // "RSHAPE" (roz mask like NB-1?)
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?)
ROM_LOAD("flr1rsh.14k", 0x000000, 0x080000, CRC(037c0983) SHA1(c48574a8ad125cedfaf2538c5ff824e121204629) )
- ROM_REGION( 0x80000, NAMCOFL_TILEMASKREGION, 0 ) // "SSHAPE" (mask for other tiles?)
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 ) // "SSHAPE" (mask for other tiles?)
ROM_LOAD("flr1ssh.18u", 0x000000, 0x080000, CRC(f70cb2bf) SHA1(dbddda822287783a43415172b81d0382a8ac43d8) )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index 0c67eb74324..ad2d59dc0ba 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -301,7 +301,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namconb1_state::scantimer)
int scanline = param;
// Handle VBLANK
- if (scanline == NAMCONB1_VBSTART)
+ if (scanline == 224)
{
if (m_vbl_irq_level != 0)
m_maincpu->set_input_line(m_vbl_irq_level, ASSERT_LINE);
@@ -1019,40 +1019,9 @@ static const gfx_layout obj_layout =
16*128
}; /* obj_layout */
-static const gfx_layout tile_layout =
-{
- 8,8,
- RGN_FRAC(1,1),
- 8,
- { 0,1,2,3,4,5,6,7 },
- { 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8 },
- { 0*64,1*64,2*64,3*64,4*64,5*64,6*64,7*64 },
- 8*64
-}; /* tile_layout */
-
-static const gfx_layout roz_layout =
-{
- 16,16,
- RGN_FRAC(1,1),
- 8,
- { 0,1,2,3,4,5,6,7 },
- { 0*8,1*8,2*8,3*8,4*8,5*8,6*8,7*8,8*8,9*8,10*8,11*8,12*8,13*8,14*8,15*8 },
- {
- 0*128,1*128,2*128,3*128,4*128,5*128,6*128,7*128,8*128,9*128,10*128,11*128,12*128,13*128,14*128,15*128
- },
- 16*128
-}; /* roz_layout */
-
static GFXDECODE_START( gfx_namconb1 )
- GFXDECODE_ENTRY( NAMCONB1_TILEGFXREGION, 0, tile_layout, 0x1000, 0x10 )
- GFXDECODE_ENTRY( NAMCONB1_SPRITEGFXREGION, 0, obj_layout, 0x0000, 0x10 )
-GFXDECODE_END /* gfxdecodeinfo */
-
-static GFXDECODE_START( gfx_namconb2 )
- GFXDECODE_ENTRY( NAMCONB1_TILEGFXREGION, 0, tile_layout, 0x1000, 0x08 )
- GFXDECODE_ENTRY( NAMCONB1_SPRITEGFXREGION, 0, obj_layout, 0x0000, 0x10 )
- GFXDECODE_ENTRY( NAMCONB1_ROTGFXREGION, 0, roz_layout, 0x1800, 0x08 )
-GFXDECODE_END /* gfxdecodeinfo2 */
+ GFXDECODE_ENTRY( "sprite", 0, obj_layout, 0x0000, 0x10 )
+GFXDECODE_END /* gfx_namconb1 */
/***************************************************************/
@@ -1084,33 +1053,30 @@ MACHINE_CONFIG_START(namconb1_state::namconb1)
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq2", namconb1_state, mcu_irq2_cb, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_adc", namconb1_state, mcu_adc_cb, attotime::from_hz(60))
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(59.7)
- MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
- MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
- MCFG_SCREEN_UPDATE_DRIVER(namconb1_state, screen_update_namconb1)
- MCFG_SCREEN_PALETTE("palette")
+ SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+ m_screen->set_raw(MASTER_CLOCK/8, 384, 0, 288, 264, 0, 224);
+ m_screen->set_screen_update(FUNC(namconb1_state::screen_update_namconb1));
+ m_screen->screen_vblank().set(m_c355spr, FUNC(namco_c355spr_device::vblank));
+ m_screen->set_palette(m_c116);
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namconb1)
- MCFG_PALETTE_ADD("palette", 0x2000)
- MCFG_PALETTE_ENABLE_SHADOWS()
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_c116, gfx_namconb1)
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(false);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate(&namconb1_state::NB1objcode2tile, this));
m_c355spr->set_palxor(0x0);
+ m_c355spr->set_buffer(2); // triple buffered
m_c355spr->set_gfxregion(NAMCONB1_SPRITEGFX);
NAMCO_C123TMAP(config, m_c123tmap, 0);
- m_c123tmap->set_gfxdecode_tag("gfxdecode");
+ m_c123tmap->set_palette(m_c116);
m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namconb1_state::NB1TilemapCB, this));
- m_c123tmap->set_maskregion_tag(NAMCONB1_TILEMASKREGION);
- m_c123tmap->set_gfxregion(NAMCONB1_TILEGFX);
+ m_c123tmap->set_color_base(0x1000);
NAMCO_C116(config, m_c116, 0);
- m_c116->set_palette(m_palette);
+ m_c116->enable_shadows();
MCFG_VIDEO_START_OVERRIDE(namconb1_state,namconb1)
@@ -1128,17 +1094,13 @@ MACHINE_CONFIG_START(namconb1_state::namconb2)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(namconb2_am)
- MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_UPDATE_DRIVER(namconb1_state, screen_update_namconb2)
-
- MCFG_DEVICE_REPLACE("gfxdecode", GFXDECODE, "palette", gfx_namconb2)
+ m_screen->set_screen_update(FUNC(namconb1_state::screen_update_namconb2));
NAMCO_C169ROZ(config, m_c169roz, 0);
- m_c169roz->set_gfxdecode_tag("gfxdecode");
+ m_c169roz->set_palette(m_c116);
m_c169roz->set_is_namcofl(false);
m_c169roz->set_ram_words(0x20000/2);
- m_c169roz->set_maskregion_tag(NAMCONB1_ROTMASKREGION);
- m_c169roz->set_gfxregion(NAMCONB1_ROTGFX);
+ m_c169roz->set_color_base(0x1800);
MACHINE_CONFIG_END
@@ -1181,19 +1143,19 @@ ROM_START( ptblank ) /* World set using 4Mb sound data rom (verified) */
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "gn1-voi0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) )
- ROM_REGION( 0x800000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x800000, "sprite", 0 )
ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */
ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) )
ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) )
ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "gn1-chr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) )
ROM_LOAD( "gn1-chr1.9j", 0x100000, 0x100000, CRC(c8c59772) SHA1(91de633a300e3b25a919579eaada5549640ab6f0) )
ROM_LOAD( "gn1-chr2.10j", 0x200000, 0x100000, CRC(dc96d999) SHA1(d006a401762b57fef6716f56eb3a7edcb3d3c00e) )
ROM_LOAD( "gn1-chr3.11j", 0x300000, 0x100000, CRC(4352c308) SHA1(785c13df219dceac2f940519141665b630a29f86) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "gn1-sha0.5m", 0, 0x80000, CRC(86d4ff85) SHA1(a71056b2bcbba50c834fe28269ebda9719df354a) )
ROM_REGION( 0x0800, "eeprom", 0 ) // default gun calibration and settings
@@ -1212,19 +1174,19 @@ ROM_START( ptblanka ) /* World set using non standard ROM labels (NR is Namco's
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "nr4_spr0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) ) // == gn1-voi0.5j
- ROM_REGION( 0x800000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x800000, "sprite", 0 )
ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */
ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) )
ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) )
ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "nr5_spr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) ) // == gn1_chr0.8j
ROM_LOAD( "nr6_spr0.9j", 0x100000, 0x100000, CRC(c8c59772) SHA1(91de633a300e3b25a919579eaada5549640ab6f0) ) // == gn1_chr1.8j
ROM_LOAD( "nr7_spr0.10j", 0x200000, 0x100000, CRC(dc96d999) SHA1(d006a401762b57fef6716f56eb3a7edcb3d3c00e) ) // == gn1_chr2.10j
ROM_LOAD( "nr8_spr0.11j", 0x300000, 0x100000, CRC(4352c308) SHA1(785c13df219dceac2f940519141665b630a29f86) ) // == gn1_chr3.11j
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "nr9_spr0.5m", 0, 0x80000, CRC(86d4ff85) SHA1(a71056b2bcbba50c834fe28269ebda9719df354a) ) // == gn1-sha0.5m
ROM_REGION( 0x0800, "eeprom", 0 ) // default gun calibration and settings
@@ -1243,19 +1205,19 @@ ROM_START( gunbuletw ) /* World set using 4Mb sound data rom (verified) */
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "gn1-voi0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) )
- ROM_REGION( 0x800000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x800000, "sprite", 0 )
ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */
ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) )
ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) )
ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "gn1-chr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) )
ROM_LOAD( "gn1-chr1.9j", 0x100000, 0x100000, CRC(c8c59772) SHA1(91de633a300e3b25a919579eaada5549640ab6f0) )
ROM_LOAD( "gn1-chr2.10j", 0x200000, 0x100000, CRC(dc96d999) SHA1(d006a401762b57fef6716f56eb3a7edcb3d3c00e) )
ROM_LOAD( "gn1-chr3.11j", 0x300000, 0x100000, CRC(4352c308) SHA1(785c13df219dceac2f940519141665b630a29f86) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "gn1-sha0.5m", 0, 0x80000, CRC(86d4ff85) SHA1(a71056b2bcbba50c834fe28269ebda9719df354a) )
ROM_REGION( 0x0800, "eeprom", 0 ) // default gun calibration and settings
@@ -1274,19 +1236,19 @@ ROM_START( gunbuletj ) /* Japanese set using 1Mb sound data rom (verified) */
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "gn1-voi0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) )
- ROM_REGION( 0x800000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x800000, "sprite", 0 )
ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */
ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) )
ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) )
ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "gn1-chr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) )
ROM_LOAD( "gn1-chr1.9j", 0x100000, 0x100000, CRC(c8c59772) SHA1(91de633a300e3b25a919579eaada5549640ab6f0) )
ROM_LOAD( "gn1-chr2.10j", 0x200000, 0x100000, CRC(dc96d999) SHA1(d006a401762b57fef6716f56eb3a7edcb3d3c00e) )
ROM_LOAD( "gn1-chr3.11j", 0x300000, 0x100000, CRC(4352c308) SHA1(785c13df219dceac2f940519141665b630a29f86) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "gn1-sha0.5m", 0, 0x80000, CRC(86d4ff85) SHA1(a71056b2bcbba50c834fe28269ebda9719df354a) )
ROM_REGION( 0x0800, "eeprom", 0 ) // default gun calibration and settings
@@ -1304,7 +1266,7 @@ ROM_START( nebulray )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "nr1-voi0", 0, 0x200000, CRC(332d5e26) SHA1(9daddac3fbe0709e25ed8e0b456bac15bfae20d7) )
- ROM_REGION( 0x1000000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x1000000, "sprite", 0 )
ROM_LOAD16_BYTE( "nr1obj0u", 0x000000, 0x200000, CRC(fb82a881) SHA1(c9fa0728a37376a5c85bff1f6e8400c13ce15769) )
ROM_LOAD16_BYTE( "nr1obj0l", 0x000001, 0x200000, CRC(0e99ef46) SHA1(450fe61e448270b633f312361bd5ca89bb9684dd) )
ROM_LOAD16_BYTE( "nr1obj1u", 0x400000, 0x200000, CRC(49d9dbd7) SHA1(2dbd842c192d65888f931cdb5c9387127b1ab632) )
@@ -1314,13 +1276,13 @@ ROM_START( nebulray )
ROM_LOAD16_BYTE( "nr1obj3u", 0xc00000, 0x200000, CRC(d5918c9e) SHA1(530781fb44d7bbf01669bb265b658cb60e27bcd7) )
ROM_LOAD16_BYTE( "nr1obj3l", 0xc00001, 0x200000, CRC(c90d13ae) SHA1(675f7b8b3325aac91b2bae1cbebe274a65aedc43) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "nr1-chr0", 0x000000, 0x100000,CRC(8d5b54ea) SHA1(616d5729f474da91da19a8246066280652da998c) )
ROM_LOAD( "nr1-chr1", 0x100000, 0x100000,CRC(cd21630c) SHA1(9974c0eb1051ca52f001e6631264a1936bb50620) )
ROM_LOAD( "nr1-chr2", 0x200000, 0x100000,CRC(70a11023) SHA1(bead486a86bd96c6fdfd2ea4d4d37c38bbe9bfbb) )
ROM_LOAD( "nr1-chr3", 0x300000, 0x100000,CRC(8f4b1d51) SHA1(b48fb2c8ccd9105a5b48be44dd3fe4309769efa4) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "nr1-sha0", 0, 0x80000,CRC(ca667e13) SHA1(685032603224cb81bcb85361921477caec570d5e) )
ROM_REGION( 0x20, "proms", 0 ) /* custom key data? */
@@ -1338,7 +1300,7 @@ ROM_START( nebulrayj )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "nr1-voi0", 0, 0x200000, CRC(332d5e26) SHA1(9daddac3fbe0709e25ed8e0b456bac15bfae20d7) )
- ROM_REGION( 0x1000000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x1000000, "sprite", 0 )
ROM_LOAD16_BYTE( "nr1obj0u", 0x000000, 0x200000, CRC(fb82a881) SHA1(c9fa0728a37376a5c85bff1f6e8400c13ce15769) )
ROM_LOAD16_BYTE( "nr1obj0l", 0x000001, 0x200000, CRC(0e99ef46) SHA1(450fe61e448270b633f312361bd5ca89bb9684dd) )
ROM_LOAD16_BYTE( "nr1obj1u", 0x400000, 0x200000, CRC(49d9dbd7) SHA1(2dbd842c192d65888f931cdb5c9387127b1ab632) )
@@ -1348,13 +1310,13 @@ ROM_START( nebulrayj )
ROM_LOAD16_BYTE( "nr1obj3u", 0xc00000, 0x200000, CRC(d5918c9e) SHA1(530781fb44d7bbf01669bb265b658cb60e27bcd7) )
ROM_LOAD16_BYTE( "nr1obj3l", 0xc00001, 0x200000, CRC(c90d13ae) SHA1(675f7b8b3325aac91b2bae1cbebe274a65aedc43) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "nr1-chr0", 0x000000, 0x100000,CRC(8d5b54ea) SHA1(616d5729f474da91da19a8246066280652da998c) )
ROM_LOAD( "nr1-chr1", 0x100000, 0x100000,CRC(cd21630c) SHA1(9974c0eb1051ca52f001e6631264a1936bb50620) )
ROM_LOAD( "nr1-chr2", 0x200000, 0x100000,CRC(70a11023) SHA1(bead486a86bd96c6fdfd2ea4d4d37c38bbe9bfbb) )
ROM_LOAD( "nr1-chr3", 0x300000, 0x100000,CRC(8f4b1d51) SHA1(b48fb2c8ccd9105a5b48be44dd3fe4309769efa4) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "nr1-sha0", 0, 0x80000,CRC(ca667e13) SHA1(685032603224cb81bcb85361921477caec570d5e) )
ROM_REGION( 0x20, "proms", 0 ) /* custom key data? */
@@ -1372,17 +1334,17 @@ ROM_START( gslgr94u )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "gse-voi0.bin", 0, 0x200000, CRC(d3480574) SHA1(0c468ed060769b36b7e41cf4919cb6d8691d64f6) )
- ROM_REGION( 0x400000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "sprite", 0 )
ROM_LOAD16_BYTE( "gseobj0l.bin", 0x000001, 0x200000, CRC(531520ca) SHA1(2a1a5282549c6f7a37d5fb8c0b342edb9dc45315) )
ROM_LOAD16_BYTE( "gseobj0u.bin", 0x000000, 0x200000, CRC(fcc1283c) SHA1(fb44ed742f362e6737412cabf3f67d9506456a9e) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "gse-chr0.bin", 0x000000, 0x100000, CRC(9314085d) SHA1(150e8ea908861337f9be2749aa7f9e1d52570586) )
ROM_LOAD( "gse-chr1.bin", 0x100000, 0x100000, CRC(c128a887) SHA1(4faf78064dd48ec50684a7dc8d120f8c5985bf2a) )
ROM_LOAD( "gse-chr2.bin", 0x200000, 0x100000, CRC(48f0a311) SHA1(e39adcce835542e64ca87f6019d4a85fcbe388c2) )
ROM_LOAD( "gse-chr3.bin", 0x300000, 0x100000, CRC(adbd1f88) SHA1(3c7bb1a9a398412bd3c98cadf8ce63a16e2bfed5) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "gse-sha0.bin", 0, 0x80000, CRC(6b2beabb) SHA1(815f7aef44735584edd4a9ca7e672471d07f225e) )
ROM_END
@@ -1397,19 +1359,19 @@ ROM_START( gslgr94j )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "gs4voi0.5j", 0, 0x200000, CRC(c3053a90) SHA1(e76799b33b2457421255b03786bc24266d59c7dd) )
- ROM_REGION( 0x800000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x800000, "sprite", 0 )
ROM_LOAD16_BYTE( "gs4obj0l.bin", 0x000001, 0x200000, CRC(3b499da0) SHA1(91ad5f68dbda64dd07e1133eb09ee69da3da3103) )
ROM_LOAD16_BYTE( "gs4obj0u.bin", 0x000000, 0x200000, CRC(80016b50) SHA1(9f7604c196835d31894ba4db1de43d7d2614da84) )
ROM_LOAD16_BYTE( "gs4obj1l.bin", 0x400001, 0x200000, CRC(1f4847a7) SHA1(908e419e42fa8bd786cc3bc96d5ccb3a47c8e2dc) )
ROM_LOAD16_BYTE( "gs4obj1u.bin", 0x400000, 0x200000, CRC(49bc48cd) SHA1(6bcc41546f3bd609e3aa962e5ce3bf5bc6b9229a) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "gs4chr0.8j", 0x000000, 0x100000, CRC(8c6c682e) SHA1(ecf21035d5af28299c9cdb98d5d811b4d52857b8) )
ROM_LOAD( "gs4chr1.9j", 0x100000, 0x100000, CRC(523989f7) SHA1(fae0e2f58e9a8d0ddc7297b567579849e24e0a40) )
ROM_LOAD( "gs4chr2.10j", 0x200000, 0x100000, CRC(37569559) SHA1(ce31673f51c6302f4fb4e4c377e6693a40874f81) )
ROM_LOAD( "gs4chr3.11j", 0x300000, 0x100000, CRC(73ca58f6) SHA1(44bdc943fb10dc53279662cd528169a27d57e478) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "gs4sha0.5m", 0, 0x80000, CRC(40e7e6a5) SHA1(70af76b6034e0d6e1b96bf54c973ab411e5907ab) )
ROM_END
@@ -1549,17 +1511,17 @@ ROM_START( gslugrsj )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "gs1voi-0.5j", 0, 0x200000, CRC(6f8262aa) SHA1(beea98d9f8b927a572eb0bfcf678e9d6e40fc68d) )
- ROM_REGION( 0x400000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "sprite", 0 )
ROM_LOAD16_BYTE( "gs1obj-0.ic1", 0x000001, 0x200000, CRC(9a55238f) SHA1(fc3fd4b8b6322bbe343edbcad7815b597562266b) )
ROM_LOAD16_BYTE( "gs1obj-1.ic2", 0x000000, 0x200000, CRC(31c66f76) SHA1(8903e6586dff6f34a6ffca2d7c75343c0a5bff56) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "gs1chr-0.8j", 0x000000, 0x100000, CRC(e7ced86a) SHA1(de90c2e3870b317431d3910f581660681b46ff9d) )
ROM_LOAD( "gs1chr-1.9j", 0x100000, 0x100000, CRC(1fe46749) SHA1(f4c0ea666d52cb1c8b1da93e7486ade5eae336cc) )
ROM_LOAD( "gs1chr-2.10j", 0x200000, 0x100000, CRC(f53afa20) SHA1(5c317e276ca2355e9737c1e8114dccbb5e11058a) )
ROM_LOAD( "gs1chr-3.11j", 0x300000, 0x100000, CRC(b149d7da) SHA1(d50c6258db0ccdd69b563e880d1711aae811fbe3) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "gs1sha-0.5m", 0, 0x80000, CRC(8a2832fe) SHA1(a1f54754fb01bbbc87274b1a0a4127fa9296ad1a) )
ROM_END
@@ -1575,17 +1537,17 @@ ROM_START( sws95 )
ROM_LOAD( "ss51voi0.bin", 0, 0x200000, CRC(2740ec72) SHA1(9694a7378ea72771d2b1d43db6d74ed347ba27d3) )
- ROM_REGION( 0x400000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "sprite", 0 )
ROM_LOAD16_BYTE( "ss51ob0l.bin", 0x000001, 0x200000, CRC(e0395694) SHA1(e52045a7af4c4b0f9935695cfc5ff729bf9bd7c1) )
ROM_LOAD16_BYTE( "ss51ob0u.bin", 0x000000, 0x200000, CRC(b0745ca0) SHA1(579ea7fd7b9a181fd9d08c50c6c5941264aa0b6d) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "ss51chr0.bin", 0x000000, 0x100000, CRC(86dd3280) SHA1(07ba6d3edc5c38bf82ddaf8f6de7ef0f5d0788b2) )
ROM_LOAD( "ss51chr1.bin", 0x100000, 0x100000, CRC(2ba0fb9e) SHA1(39ceddad7bc0073b361eb776762002a9fc61b337) )
ROM_LOAD( "ss51chr2.bin", 0x200000, 0x100000, CRC(ca0e6c1a) SHA1(1221cd30894e97e2f7d456509c7b6732ec3d06a5) )
ROM_LOAD( "ss51chr3.bin", 0x300000, 0x100000, CRC(73ca58f6) SHA1(44bdc943fb10dc53279662cd528169a27d57e478) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "ss51sha0.bin", 0, 0x80000, CRC(3bf4d081) SHA1(7b07b86f753ea6bcd90eb7d152c12884a6fe785a) )
ROM_END
@@ -1600,17 +1562,17 @@ ROM_START( sws96 )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "ss61voi0.bin", 0, 0x200000, CRC(2740ec72) SHA1(9694a7378ea72771d2b1d43db6d74ed347ba27d3) )
- ROM_REGION( 0x400000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "sprite", 0 )
ROM_LOAD16_BYTE( "ss61ob0l.bin", 0x000001, 0x200000, CRC(579b19d4) SHA1(7f18097c683d2b1c532f54ee514dd499f5965165) )
ROM_LOAD16_BYTE( "ss61ob0u.bin", 0x000000, 0x200000, CRC(a69bbd9e) SHA1(8f4c44e2caa31d25433a04c19c51904ec9461e2f) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "ss61chr0.bin", 0x000000, 0x100000, CRC(9d2ae07b) SHA1(7d268f6c7d8145c913f80049369ae3106d69e939) )
ROM_LOAD( "ss61chr1.bin", 0x100000, 0x100000, CRC(4dc75da6) SHA1(a29932b4fb39648e2c02df668f46cafb80c53619) )
ROM_LOAD( "ss61chr2.bin", 0x200000, 0x100000, CRC(1240704b) SHA1(a24281681053cc6649f00ec5a31c7249101eaee1) )
ROM_LOAD( "ss61chr3.bin", 0x300000, 0x100000, CRC(066581d4) SHA1(999cd478d9da452bb57793cd276c6c0d87e2825e) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "ss61sha0.bin", 0, 0x80000, CRC(fceaa19c) SHA1(c9303a755ac7af19c4804a264d1a09d987f39e74) )
ROM_END
@@ -1625,17 +1587,17 @@ ROM_START( sws97 )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "ss71voi0.bin", 0, 0x200000, CRC(2740ec72) SHA1(9694a7378ea72771d2b1d43db6d74ed347ba27d3) )
- ROM_REGION( 0x400000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "sprite", 0 )
ROM_LOAD16_BYTE( "ss71ob0l.bin", 0x000001, 0x200000, CRC(9559ad44) SHA1(fd56a8620f6958cc090f783d74cb38bba46d2423) )
ROM_LOAD16_BYTE( "ss71ob0u.bin", 0x000000, 0x200000, CRC(4df4a722) SHA1(07eb94628ceeb7cbce2d39d479f33c37583a346a) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "ss71chr0.bin", 0x000000, 0x100000, CRC(bd606356) SHA1(a62c55600e46f8821db0b84d79fc2588742ad7ad) )
ROM_LOAD( "ss71chr1.bin", 0x100000, 0x100000, CRC(4dc75da6) SHA1(a29932b4fb39648e2c02df668f46cafb80c53619) )
ROM_LOAD( "ss71chr2.bin", 0x200000, 0x100000, CRC(1240704b) SHA1(a24281681053cc6649f00ec5a31c7249101eaee1) )
ROM_LOAD( "ss71chr3.bin", 0x300000, 0x100000, CRC(066581d4) SHA1(999cd478d9da452bb57793cd276c6c0d87e2825e) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "ss71sha0.bin", 0, 0x80000, CRC(be8c2758) SHA1(0a1b6c03cdaec6103ae8483b67faf3840234f825) )
ROM_END
@@ -1650,19 +1612,19 @@ ROM_START( vshoot )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "vsjvoi-0.5j", 0, 0x200000, CRC(0528c9ed) SHA1(52b67978fdeb97b77065575774a7ddeb49fe1d81) )
- ROM_REGION( 0x800000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x800000, "sprite", 0 )
ROM_LOAD16_BYTE( "vsjobj0l.ic1", 0x000001, 0x200000, CRC(e134faa7) SHA1(a844c8a5bd6d8907f9e5c7ba9e2ee8e9a886cd1e) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */
ROM_LOAD16_BYTE( "vsjobj0u.ic2", 0x000000, 0x200000, CRC(974d0714) SHA1(976050eaf82d4b66e13c1c579e5521eb867527fb) )
ROM_LOAD16_BYTE( "vsjobj1l.ic3", 0x400001, 0x200000, CRC(ba46f967) SHA1(ddfb0ac7fba7369869e4df9a66d465a662eba2e6) )
ROM_LOAD16_BYTE( "vsjobj1u.ic4", 0x400000, 0x200000, CRC(09da7e9c) SHA1(e98e07a886a4fe369748fc97f3cee6a4bb668385) )
- ROM_REGION( 0x400000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c123tmap", 0 )
ROM_LOAD( "vsjchr-0.8j", 0x000000, 0x100000, CRC(2af8ba7c) SHA1(74f5a382425974a9b2167bb01672dd13dea882f5) )
ROM_LOAD( "vsjchr-1.9j", 0x100000, 0x100000, CRC(b789d53e) SHA1(48b4cf956f9025e3c2b6f59b317596dfe0b6b142) )
ROM_LOAD( "vsjchr-2.10j", 0x200000, 0x100000, CRC(7ef80758) SHA1(c7e6d14f0823607dfd8a13ea6f164ffa85b5563e) )
ROM_LOAD( "vsjchr-3.11j", 0x300000, 0x100000, CRC(73ca58f6) SHA1(44bdc943fb10dc53279662cd528169a27d57e478) )
- ROM_REGION( 0x80000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x80000, "c123tmap:mask", 0 )
ROM_LOAD( "vsjsha-0.5m", 0, 0x80000, CRC(78335ea4) SHA1(d4b9f179b1b456a866354ea308664c036de6414d) )
ROM_END
@@ -1835,13 +1797,13 @@ ROM_START( outfxies )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "ou1voi0.6n", 0, 0x200000, CRC(2d8fb271) SHA1(bde9d45979728f5a2cd8ec89f5f81bf16b694cc2) )
- ROM_REGION( 0x200000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c123tmap:mask", 0 )
ROM_LOAD( "ou1shas.12s", 0, 0x200000,CRC(9bcb0397) SHA1(54a32b6394d0e6f51bfd281f8a4bafce6ddf6246) )
- ROM_REGION( 0x200000, NAMCONB1_ROTMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c169roz:mask", 0 )
ROM_LOAD( "ou1shar.18s", 0, 0x200000, CRC(fbb48194) SHA1(2d3ec5bc519fad2b755018f83fadfe0cba13c292) )
- ROM_REGION( 0x2000000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x2000000, "sprite", 0 )
ROM_LOAD16_BYTE( "ou1obj0l.4c", 0x0000001, 0x200000, CRC(1b4f7184) SHA1(a05d67842fce92f321d1fdd3bd30aa3427775a0c) )
ROM_LOAD16_BYTE( "ou1obj0u.8c", 0x0000000, 0x200000, CRC(d0a69794) SHA1(07d449e54e9971abeb9cd5bb7b372270fafa8bac) )
ROM_LOAD16_BYTE( "ou1obj1l.4b", 0x0400001, 0x200000, CRC(48a93e84) SHA1(6935ec161a12237d4cec732d42070f381c23b47c) )
@@ -1853,12 +1815,12 @@ ROM_START( outfxies )
ROM_LOAD16_BYTE( "ou1obj4l.6b", 0x1000001, 0x200000, CRC(99a5f9d7) SHA1(b0f46f4ac357918137031a19c36a56a47b7aefd6) )
ROM_LOAD16_BYTE( "ou1obj4u.9b", 0x1000000, 0x200000, CRC(70ecaabb) SHA1(521c6849526fb271e6447f6c4f5bfa081f96b91e) )
- ROM_REGION( 0x600000, NAMCONB1_ROTGFXREGION, 0 )
+ ROM_REGION( 0x600000, "c169roz", 0 )
ROM_LOAD( "ou1-rot0.3d", 0x000000, 0x200000, CRC(a50c67c8) SHA1(432b8451eb9eaa3078134fce1e5e2d58a8b64be3) )
ROM_LOAD( "ou1-rot1.3c", 0x200000, 0x200000, CRC(14866780) SHA1(4a54151fada4dfba7232e53e40623e5697eeb7db) )
ROM_LOAD( "ou1-rot2.3b", 0x400000, 0x200000, CRC(55ccf3af) SHA1(d98489aaa840cbffb21c47609961c1163b0336f3) )
- ROM_REGION( 0x200000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x200000, "c123tmap", 0 )
ROM_LOAD( "ou1-scr0.1d", 0x000000, 0x200000, CRC(b3b3f2e9) SHA1(541bd7e9ba12aff4ec4033bd9c6bb19476acb3c4) )
ROM_REGION32_BE( 0x100000, "data", 0 )
@@ -1877,13 +1839,13 @@ ROM_START( outfxiesj )
ROM_REGION( 0x1000000, "c352", 0 ) // Samples
ROM_LOAD( "ou1voi0.6n", 0, 0x200000, CRC(2d8fb271) SHA1(bde9d45979728f5a2cd8ec89f5f81bf16b694cc2) )
- ROM_REGION( 0x200000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c123tmap:mask", 0 )
ROM_LOAD( "ou1shas.12s", 0, 0x200000,CRC(9bcb0397) SHA1(54a32b6394d0e6f51bfd281f8a4bafce6ddf6246) )
- ROM_REGION( 0x200000, NAMCONB1_ROTMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c169roz:mask", 0 )
ROM_LOAD( "ou1shar.18s", 0, 0x200000, CRC(fbb48194) SHA1(2d3ec5bc519fad2b755018f83fadfe0cba13c292) )
- ROM_REGION( 0x2000000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x2000000, "sprite", 0 )
ROM_LOAD16_BYTE( "ou1obj0l.4c", 0x0000001, 0x200000, CRC(1b4f7184) SHA1(a05d67842fce92f321d1fdd3bd30aa3427775a0c) )
ROM_LOAD16_BYTE( "ou1obj0u.8c", 0x0000000, 0x200000, CRC(d0a69794) SHA1(07d449e54e9971abeb9cd5bb7b372270fafa8bac) )
ROM_LOAD16_BYTE( "ou1obj1l.4b", 0x0400001, 0x200000, CRC(48a93e84) SHA1(6935ec161a12237d4cec732d42070f381c23b47c) )
@@ -1895,12 +1857,12 @@ ROM_START( outfxiesj )
ROM_LOAD16_BYTE( "ou1obj4l.6b", 0x1000001, 0x200000, CRC(99a5f9d7) SHA1(b0f46f4ac357918137031a19c36a56a47b7aefd6) )
ROM_LOAD16_BYTE( "ou1obj4u.9b", 0x1000000, 0x200000, CRC(70ecaabb) SHA1(521c6849526fb271e6447f6c4f5bfa081f96b91e) )
- ROM_REGION( 0x600000, NAMCONB1_ROTGFXREGION, 0 )
+ ROM_REGION( 0x600000, "c169roz", 0 )
ROM_LOAD( "ou1-rot0.3d", 0x000000, 0x200000, CRC(a50c67c8) SHA1(432b8451eb9eaa3078134fce1e5e2d58a8b64be3) )
ROM_LOAD( "ou1-rot1.3c", 0x200000, 0x200000, CRC(14866780) SHA1(4a54151fada4dfba7232e53e40623e5697eeb7db) )
ROM_LOAD( "ou1-rot2.3b", 0x400000, 0x200000, CRC(55ccf3af) SHA1(d98489aaa840cbffb21c47609961c1163b0336f3) )
- ROM_REGION( 0x200000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x200000, "c123tmap", 0 )
ROM_LOAD( "ou1-scr0.1d", 0x000000, 0x200000, CRC(b3b3f2e9) SHA1(541bd7e9ba12aff4ec4033bd9c6bb19476acb3c4) )
ROM_REGION32_BE( 0x100000, "data", 0 )
@@ -1923,13 +1885,13 @@ ROM_START( machbrkr ) /* Defaults to Asia / 4 Player cabinet */
ROM_LOAD( "mb1_voi1.6p", 0x800000, 0x200000, CRC(7e1c2603) SHA1(533098a54fb897931f1d75be9e69a5c047e4c446) )
ROM_RELOAD( 0xc00000, 0x200000)
- ROM_REGION( 0x200000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c123tmap:mask", 0 )
ROM_LOAD( "mb1_shas.12s", 0, 0x100000, CRC(c51c614b) SHA1(519ecad2e4543c05ec35a727f4c875ab006291af) )
- ROM_REGION( 0x200000, NAMCONB1_ROTMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c169roz:mask", 0 )
ROM_LOAD( "mb1_shar.18s", 0, 0x080000, CRC(d9329b10) SHA1(149c8804c07350f47af36bc7902371f1dfbed272) )
- ROM_REGION( 0x2000000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x2000000, "sprite", 0 )
ROM_LOAD16_BYTE( "mb1obj0l.4c", 0x0000001, 0x200000, CRC(056e6b1c) SHA1(44e49de80c925c8fbe04bf9328a77a50a305a5a7) )
ROM_LOAD16_BYTE( "mb1obj0u.8c", 0x0000000, 0x200000, CRC(e19b1714) SHA1(ff43bf3c8e8698934c4057c7b4c72db73929e2af) )
ROM_LOAD16_BYTE( "mb1obj1l.4b", 0x0400001, 0x200000, CRC(af69f7f1) SHA1(414544ec1a9aaffb751beaf63d937ce78d0cf9c6) )
@@ -1941,11 +1903,11 @@ ROM_START( machbrkr ) /* Defaults to Asia / 4 Player cabinet */
ROM_LOAD16_BYTE( "mb1obj4l.6b", 0x1000001, 0x200000, CRC(a650b05e) SHA1(b247699433c7bf4b6ae990fc06255cfd48a248dd) )
ROM_LOAD16_BYTE( "mb1obj4u.9b", 0x1000000, 0x200000, CRC(6d0c37e9) SHA1(3a3feb74b890e0a933dcc791e5eee1fb4bdcbb69) )
- ROM_REGION( 0x400000, NAMCONB1_ROTGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c169roz", 0 )
ROM_LOAD( "mb1_rot0.3d", 0x000000, 0x200000, CRC(bc353630) SHA1(2bbddda632298899716394ddcfe51412576ca74a) )
ROM_LOAD( "mb1_rot1.3c", 0x200000, 0x200000, CRC(cf7688cb) SHA1(29a040ce2c4e3bf671cff1a7a1ade06103db236a) )
- ROM_REGION( 0x600000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x600000, "c123tmap", 0 )
ROM_LOAD( "mb1_scr0.1d", 0x000000, 0x200000, CRC(c678d5f3) SHA1(98d1523bef50d444be9485c4e7f6932cccbea191) )
ROM_LOAD( "mb1_scr1.1c", 0x200000, 0x200000, CRC(fb2b1939) SHA1(bf9d7b93205e7012aa86693f3d2ba8f4d729bc97) )
ROM_LOAD( "mb1_scr2.1b", 0x400000, 0x200000, CRC(0e6097a5) SHA1(b6c64b3e34ba913138b6b7c3d99d2be4f3ceda08) )
@@ -1969,13 +1931,13 @@ ROM_START( machbrkrj )
ROM_LOAD( "mb1_voi1.6p", 0x800000, 0x200000, CRC(7e1c2603) SHA1(533098a54fb897931f1d75be9e69a5c047e4c446) )
ROM_RELOAD( 0xc00000, 0x200000)
- ROM_REGION( 0x200000, NAMCONB1_TILEMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c123tmap:mask", 0 )
ROM_LOAD( "mb1_shas.12s", 0, 0x100000, CRC(c51c614b) SHA1(519ecad2e4543c05ec35a727f4c875ab006291af) )
- ROM_REGION( 0x200000, NAMCONB1_ROTMASKREGION, 0 )
+ ROM_REGION( 0x200000, "c169roz:mask", 0 )
ROM_LOAD( "mb1_shar.18s", 0, 0x080000, CRC(d9329b10) SHA1(149c8804c07350f47af36bc7902371f1dfbed272) )
- ROM_REGION( 0x2000000, NAMCONB1_SPRITEGFXREGION, 0 )
+ ROM_REGION( 0x2000000, "sprite", 0 )
ROM_LOAD16_BYTE( "mb1obj0l.4c", 0x0000001, 0x200000, CRC(056e6b1c) SHA1(44e49de80c925c8fbe04bf9328a77a50a305a5a7) )
ROM_LOAD16_BYTE( "mb1obj0u.8c", 0x0000000, 0x200000, CRC(e19b1714) SHA1(ff43bf3c8e8698934c4057c7b4c72db73929e2af) )
ROM_LOAD16_BYTE( "mb1obj1l.4b", 0x0400001, 0x200000, CRC(af69f7f1) SHA1(414544ec1a9aaffb751beaf63d937ce78d0cf9c6) )
@@ -1987,11 +1949,11 @@ ROM_START( machbrkrj )
ROM_LOAD16_BYTE( "mb1obj4l.6b", 0x1000001, 0x200000, CRC(a650b05e) SHA1(b247699433c7bf4b6ae990fc06255cfd48a248dd) )
ROM_LOAD16_BYTE( "mb1obj4u.9b", 0x1000000, 0x200000, CRC(6d0c37e9) SHA1(3a3feb74b890e0a933dcc791e5eee1fb4bdcbb69) )
- ROM_REGION( 0x400000, NAMCONB1_ROTGFXREGION, 0 )
+ ROM_REGION( 0x400000, "c169roz", 0 )
ROM_LOAD( "mb1_rot0.3d", 0x000000, 0x200000, CRC(bc353630) SHA1(2bbddda632298899716394ddcfe51412576ca74a) )
ROM_LOAD( "mb1_rot1.3c", 0x200000, 0x200000, CRC(cf7688cb) SHA1(29a040ce2c4e3bf671cff1a7a1ade06103db236a) )
- ROM_REGION( 0x600000, NAMCONB1_TILEGFXREGION, 0 )
+ ROM_REGION( 0x600000, "c123tmap", 0 )
ROM_LOAD( "mb1_scr0.1d", 0x000000, 0x200000, CRC(c678d5f3) SHA1(98d1523bef50d444be9485c4e7f6932cccbea191) )
ROM_LOAD( "mb1_scr1.1c", 0x200000, 0x200000, CRC(fb2b1939) SHA1(bf9d7b93205e7012aa86693f3d2ba8f4d729bc97) )
ROM_LOAD( "mb1_scr2.1b", 0x400000, 0x200000, CRC(0e6097a5) SHA1(b6c64b3e34ba913138b6b7c3d99d2be4f3ceda08) )
diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp
index 7af3d0a242a..84350e620fe 100644
--- a/src/mame/drivers/namcos1.cpp
+++ b/src/mame/drivers/namcos1.cpp
@@ -1065,15 +1065,12 @@ MACHINE_CONFIG_START(namcos1_state::ns1)
MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 9+8*8, 9+44*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos1_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos1_state, screen_vblank))
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos1)
-
- MCFG_PALETTE_ADD("palette", 0x2000)
- MCFG_PALETTE_ENABLE_SHADOWS()
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_c116, gfx_namcos1)
NAMCO_C116(config, m_c116, 0);
- m_c116->set_palette(m_palette);
+ m_c116->enable_shadows();
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
@@ -1148,7 +1145,7 @@ ROM_START( shadowld )
ROM_LOAD( "yd_voi-1.bin", 0x20000, 0x20000, CRC(7809035c) SHA1(d1d12db8f1d2c25545ccb92c0a2f2af2d0267161) ) // yd1.v1 + yd1.v4
ROM_LOAD( "yd_voi-2.bin", 0x40000, 0x20000, CRC(73bffc16) SHA1(a927e503bf8650e6b638d5c357cb48586cfa025b) ) // yd1.v2 + yd1.v5
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "yd_chr-8.bin", 0x00000, 0x20000, CRC(0c8e69d0) SHA1(cedf12db2d9b14396cc8a15ccb025b96c92e190d) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1194,7 +1191,7 @@ ROM_START( youkaidk2 )
ROM_LOAD( "yd_voi-1.bin", 0x20000, 0x20000, CRC(7809035c) SHA1(d1d12db8f1d2c25545ccb92c0a2f2af2d0267161) ) // yd1.v1 + yd1.v4
ROM_LOAD( "yd_voi-2.bin", 0x40000, 0x20000, CRC(73bffc16) SHA1(a927e503bf8650e6b638d5c357cb48586cfa025b) ) // yd1.v2 + yd1.v5
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "yd_chr-8.bin", 0x00000, 0x20000, CRC(0c8e69d0) SHA1(cedf12db2d9b14396cc8a15ccb025b96c92e190d) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1239,7 +1236,7 @@ ROM_START( youkaidk1 )
ROM_LOAD( "yd_voi-1.bin", 0x20000, 0x20000, CRC(7809035c) SHA1(d1d12db8f1d2c25545ccb92c0a2f2af2d0267161) ) // yd1.v1 + yd1.v4
ROM_LOAD( "yd_voi-2.bin", 0x40000, 0x20000, CRC(73bffc16) SHA1(a927e503bf8650e6b638d5c357cb48586cfa025b) ) // yd1.v2 + yd1.v5
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "yd_chr-8.bin", 0x00000, 0x20000, CRC(0c8e69d0) SHA1(cedf12db2d9b14396cc8a15ccb025b96c92e190d) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1286,7 +1283,7 @@ ROM_START( dspirit )
ROM_LOAD( "ds_voi-3.bin", 0x60000, 0x20000, CRC(13e84c7e) SHA1(6ad0eb50eb3312f614a891ae8d66faca6b48d204) )
ROM_LOAD( "ds_voi-4.bin", 0x80000, 0x20000, CRC(34fbb8cd) SHA1(3f56f136e9d54d45924802f7149bfbc319e0933a) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "ds_chr-8.bin", 0x00000, 0x20000, CRC(946eb242) SHA1(6964fff430fe306c575ff07e4c054c70aa7d96ca) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1333,7 +1330,7 @@ ROM_START( dspirit2 )
ROM_LOAD( "ds_voi-3.bin", 0x60000, 0x20000, CRC(13e84c7e) SHA1(6ad0eb50eb3312f614a891ae8d66faca6b48d204) )
ROM_LOAD( "ds_voi-4.bin", 0x80000, 0x20000, CRC(34fbb8cd) SHA1(3f56f136e9d54d45924802f7149bfbc319e0933a) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "ds_chr-8.bin", 0x00000, 0x20000, CRC(946eb242) SHA1(6964fff430fe306c575ff07e4c054c70aa7d96ca) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1380,7 +1377,7 @@ ROM_START( dspirit1 )
ROM_LOAD( "ds_voi-3.bin", 0x60000, 0x20000, CRC(13e84c7e) SHA1(6ad0eb50eb3312f614a891ae8d66faca6b48d204) )
ROM_LOAD( "ds_voi-4.bin", 0x80000, 0x20000, CRC(34fbb8cd) SHA1(3f56f136e9d54d45924802f7149bfbc319e0933a) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "ds_chr-8.bin", 0x00000, 0x20000, CRC(946eb242) SHA1(6964fff430fe306c575ff07e4c054c70aa7d96ca) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1426,7 +1423,7 @@ ROM_START( blazer )
ROM_LOAD( "bz_voi-3.bin", 0x60000, 0x20000, CRC(26cfc510) SHA1(749680eaf3072db5331cc76a21cd022c50f95647) )
ROM_LOAD( "bz_voi-4.bin", 0x80000, 0x20000, CRC(d206b1bd) SHA1(32702fa67339ab337a2a70946e3861420a07b11b) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "bz_chr-8.bin", 0x00000, 0x20000, CRC(db28bfca) SHA1(510dd204da389db7eb5d9ce34dc0daf60bad1219) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1468,7 +1465,7 @@ ROM_START( quester )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "qs1_v0.bin", 0x00000, 0x10000, CRC(6a2f3038) SHA1(00870da9b7f65536ff052c32da2d553f8c6b994b) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "qs1_c8.bin", 0x00000, 0x10000, CRC(06730d54) SHA1(53d79c27e2f1b192b1de781b6b5024eb1e8126ad) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1501,7 +1498,7 @@ ROM_START( questers )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "qs1_v0.bin", 0x00000, 0x10000, CRC(6a2f3038) SHA1(00870da9b7f65536ff052c32da2d553f8c6b994b) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "qs1_c8.bin", 0x00000, 0x10000, CRC(06730d54) SHA1(53d79c27e2f1b192b1de781b6b5024eb1e8126ad) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1535,7 +1532,7 @@ ROM_START( pacmania )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "pn2_v0.bin", 0x00000, 0x10000, CRC(1ad5788f) SHA1(f6b1ccdcc3db11c0ab83e3ff24e772cd2b491468) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "pn2_c8.bin", 0x00000, 0x10000, CRC(f3afd65d) SHA1(51daefd8685b49c464130b9e7d93e31cfdda724e) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1571,7 +1568,7 @@ ROM_START( pacmaniao )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "pac-mania_111187.voice0", 0x00000, 0x10000, CRC(1ad5788f) SHA1(f6b1ccdcc3db11c0ab83e3ff24e772cd2b491468) ) // identical to world version
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "pn1_c8.bin", 0x00000, 0x10000, CRC(f3afd65d) SHA1(51daefd8685b49c464130b9e7d93e31cfdda724e) ) // same as the Japanese version
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1607,7 +1604,7 @@ ROM_START( pacmaniaj )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "pn1_v0.bin", 0x00000, 0x10000, CRC(e2689f79) SHA1(b88e3435f2932901cc0a3b379b31a764bb9b2e2b) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "pn1_c8.bin", 0x00000, 0x10000, CRC(f3afd65d) SHA1(51daefd8685b49c464130b9e7d93e31cfdda724e) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1648,7 +1645,7 @@ ROM_START( galaga88 )
ROM_LOAD_HS( "g81_v4.bin", 0x80000, 0x10000, CRC(ac0279a7) SHA1(8d25292eec9953516fc5d25a94e30acc8159b360) )
ROM_LOAD_HS( "g81_v5.bin", 0xa0000, 0x10000, CRC(014ddba1) SHA1(26590b77a0c386dc076a8f8eccf6244c7e5a1e10) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "g8_chr-8.bin", 0x00000, 0x20000, CRC(3862ed0a) SHA1(4cae42bbfa434c7dce63fdceaa569fcb28768420) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1693,7 +1690,7 @@ ROM_START( galaga88j )
ROM_LOAD_HS( "g81_v4.bin", 0x80000, 0x10000, CRC(ac0279a7) SHA1(8d25292eec9953516fc5d25a94e30acc8159b360) )
ROM_LOAD_HS( "g81_v5.bin", 0xa0000, 0x10000, CRC(014ddba1) SHA1(26590b77a0c386dc076a8f8eccf6244c7e5a1e10) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "g8_chr-8.bin", 0x00000, 0x20000, CRC(3862ed0a) SHA1(4cae42bbfa434c7dce63fdceaa569fcb28768420) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1738,7 +1735,7 @@ ROM_START( galaga88a )
ROM_LOAD_HS( "g81_v4.bin", 0x80000, 0x10000, CRC(ac0279a7) SHA1(8d25292eec9953516fc5d25a94e30acc8159b360) ) // 12-11-87
ROM_LOAD_HS( "g81_v5.bin", 0xa0000, 0x10000, CRC(014ddba1) SHA1(26590b77a0c386dc076a8f8eccf6244c7e5a1e10) ) // 12-11-87
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "g8_chr-8.bin", 0x00000, 0x20000, CRC(3862ed0a) SHA1(4cae42bbfa434c7dce63fdceaa569fcb28768420) ) // 12-11-87
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1746,7 +1743,7 @@ ROM_START( galaga88a )
ROM_LOAD( "g8_chr-1.bin", 0x20000, 0x20000, CRC(3dc0f93f) SHA1(0db9f37cf6e06013b402df23e615b0ab0d32b9ee) ) // 12-11-87
ROM_LOAD( "g8_chr-2.bin", 0x40000, 0x20000, CRC(dbf26f1f) SHA1(e52723647a8fe6db0b9c5e11c02486b20a549506) ) // 12-11-87
ROM_LOAD( "g8_chr-3.bin", 0x60000, 0x20000, CRC(f5d6cac5) SHA1(3d098b8219de4a7729ec95547eebff17c9b505b9) ) // 12-11-87
- ROM_LOAD( "g8chr-7.m8", 0xe0000, 0x20000, CRC(5f655016) SHA1(f6f1fa26dad363f1b50995fd1c52db0671365d83) ) // 10-27-87 (present, but not used by this version? possibly leftover from earlier development)
+ ROM_LOAD( "g8chr-7.m8", 0xe0000, 0x20000, CRC(5f655016) SHA1(f6f1fa26dad363f1b50995fd1c52db0671365d83) ) // 10-27-87 (present, but not used by this version? possibly leftover from earlier development)
ROM_REGION( 0x100000, "gfx3", 0 ) /* sprites */
ROM_LOAD( "g8_obj-0.bin", 0x00000, 0x20000, CRC(d7112e3f) SHA1(476f9e1b636b257e517fc789508dac923d05ef67) ) // 12-11-87
@@ -1781,7 +1778,7 @@ ROM_START( ws )
ROM_LOAD_HS( "ws1_voi0.bin", 0x00000, 0x10000, CRC(f6949199) SHA1(ef596b02060f8e58eac37765663dd16377244391) )
ROM_LOAD( "ws_voi-1.bin", 0x20000, 0x20000, CRC(210e2af9) SHA1(f8a1f8c6b9fbb8a9b3f298674600c1fbb9c5840e) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "ws_chr-8.bin", 0x00000, 0x20000, CRC(d1897b9b) SHA1(29906614b879e5623b49bc925e80006aee3997b9) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1822,7 +1819,7 @@ ROM_START( berabohm )
ROM_LOAD( "bm_voi-1.bin", 0x20000, 0x20000, CRC(be9ce0a8) SHA1(a211216125615cb14e515317f56976c4ebe13f5f) )
ROM_LOAD_HS( "bm1_v2.bin", 0x40000, 0x10000, CRC(41225d04) SHA1(a670c5ce63ff1d2ed94aa5ea17cb2c91eb768f14) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "bm_chr-8.bin", 0x00000, 0x20000, CRC(92860e95) SHA1(d8c8d5aed956c876809f287700f33bc70a1b58a3) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1866,7 +1863,7 @@ ROM_START( berabohmb )
ROM_LOAD( "bm_voi-1.bin", 0x20000, 0x20000, CRC(be9ce0a8) SHA1(a211216125615cb14e515317f56976c4ebe13f5f) )
ROM_LOAD_HS( "bm1_v2.bin", 0x40000, 0x10000, CRC(41225d04) SHA1(a670c5ce63ff1d2ed94aa5ea17cb2c91eb768f14) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "bm_chr-8.bin", 0x00000, 0x20000, CRC(92860e95) SHA1(d8c8d5aed956c876809f287700f33bc70a1b58a3) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1911,7 +1908,7 @@ ROM_START( mmaze )
ROM_LOAD( "mm_voi-0.bin", 0x00000, 0x20000, CRC(ee974cff) SHA1(f211c461a36dae9ce5ee614aaaabf92556181a85) )
ROM_LOAD( "mm_voi-1.bin", 0x20000, 0x20000, CRC(d09b5830) SHA1(954be797e30f7d126b4fc2b04f190bfd7dc23bff) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "mm_chr-8.bin", 0x00000, 0x20000, CRC(a3784dfe) SHA1(7bcd71e0c675cd16587b61c23b470abb8ba434d3) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1954,7 +1951,7 @@ ROM_START( mmaze2 )
ROM_LOAD( "mm_voi-0.bin", 0x00000, 0x20000, CRC(ee974cff) SHA1(f211c461a36dae9ce5ee614aaaabf92556181a85) )
ROM_LOAD( "mm_voi-1.bin", 0x20000, 0x20000, CRC(d09b5830) SHA1(954be797e30f7d126b4fc2b04f190bfd7dc23bff) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "mm_chr-8.bin", 0x00000, 0x20000, CRC(a3784dfe) SHA1(7bcd71e0c675cd16587b61c23b470abb8ba434d3) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -1996,7 +1993,7 @@ ROM_START( bakutotu )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "bk1_v0.bin", 0x00000, 0x10000, CRC(008e290e) SHA1(87ac7291088f0d6a7179b1a5f3567a72dc92177c) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "bk_chr-8.bin", 0x00000, 0x20000, CRC(6c8d4029) SHA1(2eb6fd89ffaecfa53f9adcdebbe8f550199d067f) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2041,7 +2038,7 @@ ROM_START( wldcourt )
ROM_LOAD_HS( "wc1_voi0.bin", 0x00000, 0x10000, CRC(b57919f7) SHA1(5305c479513943a5d92988a63ad1671744e944b5) )
ROM_LOAD( "wc1_voi1.bin", 0x20000, 0x20000, CRC(97974b4b) SHA1(1e4d10ce28cabc01f1f233a0edc05e20874e0285) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "wc1_chr8.bin", 0x00000, 0x20000, CRC(23e1c399) SHA1(2d22da5c68c0924767f18fb19576cb76a016ae8e) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2204,7 +2201,7 @@ ROM_START( splatter )
ROM_LOAD( "sh_voi-2.bin", 0x40000, 0x20000, CRC(25ea75b6) SHA1(aafebbdddf4a2924d9e5a850ffb6861cb5c4a769) )
ROM_LOAD( "sh_voi-3.bin", 0x60000, 0x20000, CRC(5eebcdb4) SHA1(973e95a49cb1dda14e4c61580501c997fc7bc015) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "sh_chr-8.bin", 0x00000, 0x20000, CRC(321f483b) SHA1(84d75367d2e3ae210ecd17c163b336f609628a91) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2250,7 +2247,7 @@ ROM_START( splatter2 )
ROM_LOAD( "sh_voi-2.bin", 0x40000, 0x20000, CRC(25ea75b6) SHA1(aafebbdddf4a2924d9e5a850ffb6861cb5c4a769) )
ROM_LOAD( "sh_voi-3.bin", 0x60000, 0x20000, CRC(5eebcdb4) SHA1(973e95a49cb1dda14e4c61580501c997fc7bc015) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "sh_chr-8.bin", 0x00000, 0x20000, CRC(321f483b) SHA1(84d75367d2e3ae210ecd17c163b336f609628a91) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2296,7 +2293,7 @@ ROM_START( splatterj )
ROM_LOAD( "sh_voi-2.bin", 0x40000, 0x20000, CRC(25ea75b6) SHA1(aafebbdddf4a2924d9e5a850ffb6861cb5c4a769) )
ROM_LOAD( "sh_voi-3.bin", 0x60000, 0x20000, CRC(5eebcdb4) SHA1(973e95a49cb1dda14e4c61580501c997fc7bc015) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "sh_chr-8.bin", 0x00000, 0x20000, CRC(321f483b) SHA1(84d75367d2e3ae210ecd17c163b336f609628a91) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2340,7 +2337,7 @@ ROM_START( faceoff )
ROM_LOAD_HS( "fo1_v0.bin", 0x00000, 0x10000, CRC(e6edf63e) SHA1(095f7fa93233e4b4f25e728868c212170be48550) )
ROM_LOAD_HS( "fo1_v1.bin", 0x20000, 0x10000, CRC(132a5d90) SHA1(d5ceae68d7aea7cdde43600453f9724f35834519) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "fo1_c8.bin", 0x00000, 0x10000, CRC(d397216c) SHA1(baa3747bf3e12246e2629eaf0abdb3df05e423bd) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2378,7 +2375,7 @@ ROM_START( rompers )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD( "rp_voi-0.bin", 0x00000, 0x20000, CRC(11caef7e) SHA1(c6470cbbc6402872794e0a4e822a5d08ca2448ef) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "rp1_chr8.bin", 0x00000, 0x10000, CRC(69cfe46a) SHA1(01c5af1b7fc337ec06a5afabd87b9a6a7dcf3503) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2418,7 +2415,7 @@ ROM_START( romperso )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD( "rp_voi-0.bin", 0x00000, 0x20000, CRC(11caef7e) SHA1(c6470cbbc6402872794e0a4e822a5d08ca2448ef) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "rp1_chr8.bin", 0x00000, 0x10000, CRC(69cfe46a) SHA1(01c5af1b7fc337ec06a5afabd87b9a6a7dcf3503) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2461,7 +2458,7 @@ ROM_START( blastoff )
ROM_LOAD( "bo_voi-1.bin", 0x20000, 0x20000, CRC(0308b18e) SHA1(7196abdf36d660089d739e3f3a362648768a6127) )
ROM_LOAD( "bo_voi-2.bin", 0x40000, 0x20000, CRC(88cab230) SHA1(659c4efeb8aa24f8b32509ee563407ed1e17d564) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "bo_chr-8.bin", 0x00000, 0x20000, CRC(e8b5f2d4) SHA1(70dd2898dcfed5f43f6c50f852660f24a9d7ec9d) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2504,7 +2501,7 @@ ROM_START( ws89 )
ROM_LOAD_HS( "ws1_voi0.bin", 0x00000, 0x10000, CRC(f6949199) SHA1(ef596b02060f8e58eac37765663dd16377244391) )
ROM_LOAD( "ws_voi-1.bin", 0x20000, 0x20000, CRC(210e2af9) SHA1(f8a1f8c6b9fbb8a9b3f298674600c1fbb9c5840e) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "ws_chr-8.bin", 0x00000, 0x20000, CRC(d1897b9b) SHA1(29906614b879e5623b49bc925e80006aee3997b9) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2543,7 +2540,7 @@ ROM_START( dangseed )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD( "dr_voi-0.bin", 0x00000, 0x20000, CRC(de4fdc0e) SHA1(b5e952aaf5a81a2b4ff1c7cae141d50360545770) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "dr_chr-8.bin", 0x00000, 0x20000, CRC(0fbaa10e) SHA1(18ea77544678d889aded927a96a11bc04ad42fa6) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2584,7 +2581,7 @@ ROM_START( ws90 )
ROM_LOAD_HS( "ws1_voi0.bin", 0x00000, 0x10000, CRC(f6949199) SHA1(ef596b02060f8e58eac37765663dd16377244391) )
ROM_LOAD( "ws_voi-1.bin", 0x20000, 0x20000, CRC(210e2af9) SHA1(f8a1f8c6b9fbb8a9b3f298674600c1fbb9c5840e) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "ws_chr-8.bin", 0x00000, 0x20000, CRC(d1897b9b) SHA1(29906614b879e5623b49bc925e80006aee3997b9) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2625,7 +2622,7 @@ ROM_START( pistoldm )
ROM_LOAD( "pd_voi-1.bin", 0x20000, 0x20000, CRC(2871c494) SHA1(9ac0dc559c22ac5083025c32f28e353b04348155) )
ROM_LOAD( "pd_voi-2.bin", 0x40000, 0x20000, CRC(e783f0c4) SHA1(6a43f22226d1637d507c8194244058e8d96f8692) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "pd_chr-8.bin", 0x00000, 0x20000, CRC(a5f516db) SHA1(262c3a99cfa3061b58331d8ed254b49a06bfdd9f) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2666,7 +2663,7 @@ ROM_START( boxyboy )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "sb1_voi0.bin", 0x00000, 0x10000, CRC(63d9cedf) SHA1(117767c6b25325bf3005756d74196da56008498c) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "sb1_chr8.bin", 0x00000, 0x10000, CRC(5692b297) SHA1(ed20a0f4ce80674d01cd2a30571ffeff9f9066fd) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2699,7 +2696,7 @@ ROM_START( soukobdx )
ROM_REGION( 0xc0000, "voice", 0 ) /* MCU external ROM */
ROM_LOAD_HS( "sb1_voi0.bin", 0x00000, 0x10000, CRC(63d9cedf) SHA1(117767c6b25325bf3005756d74196da56008498c) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "sb1_chr8.bin", 0x00000, 0x10000, CRC(5692b297) SHA1(ed20a0f4ce80674d01cd2a30571ffeff9f9066fd) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2732,7 +2729,7 @@ ROM_START( puzlclub )
ROM_REGION( 0xc0000, "voice", ROMREGION_ERASEFF ) /* MCU external ROM */
/* no voices */
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "pc1-c8.bin", 0x00000, 0x20000, CRC(4e196bcd) SHA1(2e27538bbbebeda32353c0c02f98d52f0d1994f9) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2772,7 +2769,7 @@ ROM_START( tankfrce )
ROM_LOAD( "tf1_voi0.bin", 0x00000, 0x20000, CRC(f542676a) SHA1(38d54db0807c58152bd120c393bf63b68754e8ff) )
ROM_LOAD( "tf1_voi1.bin", 0x20000, 0x20000, CRC(615d09cd) SHA1(0aecf7ca6b65ddfcdcf74f8d412169ec800ba3a3) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "tf1_chr8.bin", 0x00000, 0x20000, CRC(7d53b31e) SHA1(7e4b5fc92f7956477392f1e14c6edfc0cada2be0) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2810,7 +2807,7 @@ ROM_START( tankfrce4 )
ROM_LOAD( "tf1_voi0.bin", 0x00000, 0x20000, CRC(f542676a) SHA1(38d54db0807c58152bd120c393bf63b68754e8ff) )
ROM_LOAD( "tf1_voi1.bin", 0x20000, 0x20000, CRC(615d09cd) SHA1(0aecf7ca6b65ddfcdcf74f8d412169ec800ba3a3) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "tf1_chr8.bin", 0x00000, 0x20000, CRC(7d53b31e) SHA1(7e4b5fc92f7956477392f1e14c6edfc0cada2be0) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
@@ -2848,7 +2845,7 @@ ROM_START( tankfrcej )
ROM_LOAD( "tf1_voi0.bin", 0x00000, 0x20000, CRC(f542676a) SHA1(38d54db0807c58152bd120c393bf63b68754e8ff) )
ROM_LOAD( "tf1_voi1.bin", 0x20000, 0x20000, CRC(615d09cd) SHA1(0aecf7ca6b65ddfcdcf74f8d412169ec800ba3a3) )
- ROM_REGION( 0x20000, "gfx1", 0 ) /* character mask */
+ ROM_REGION( 0x20000, "tmap_mask", 0 ) /* character mask */
ROM_LOAD( "tf1_chr8.bin", 0x00000, 0x20000, CRC(7d53b31e) SHA1(7e4b5fc92f7956477392f1e14c6edfc0cada2be0) )
ROM_REGION( 0x100000, "gfx2", 0 ) /* characters */
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index fdda8d52e8e..aacadc4a2c2 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -710,8 +710,8 @@ void namcos2_state::master_default_am(address_map &map)
{
common_default_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM);
- map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x100000, 0x10ffff).ram();
+ map(0x180000, 0x183fff).rw(FUNC(namcos2_state::eeprom_r), FUNC(namcos2_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
}
@@ -719,7 +719,7 @@ void namcos2_state::slave_default_am(address_map &map)
{
common_default_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x13ffff).bankrw(NAMCOS2_68K_SLAVE_RAM);
+ map(0x100000, 0x13ffff).ram();
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
}
@@ -740,8 +740,8 @@ void namcos2_state::master_finallap_am(address_map &map)
{
common_finallap_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM);
- map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x100000, 0x10ffff).ram();
+ map(0x180000, 0x183fff).rw(FUNC(namcos2_state::eeprom_r), FUNC(namcos2_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
}
@@ -749,7 +749,7 @@ void namcos2_state::slave_finallap_am(address_map &map)
{
common_finallap_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x13ffff).bankrw(NAMCOS2_68K_SLAVE_RAM);
+ map(0x100000, 0x13ffff).ram();
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
}
@@ -767,8 +767,8 @@ void namcos2_state::master_sgunner_am(address_map &map)
{
common_sgunner_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM);
- map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x100000, 0x10ffff).ram();
+ map(0x180000, 0x183fff).rw(FUNC(namcos2_state::eeprom_r), FUNC(namcos2_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
}
@@ -776,7 +776,7 @@ void namcos2_state::slave_sgunner_am(address_map &map)
{
common_sgunner_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x13ffff).bankrw(NAMCOS2_68K_SLAVE_RAM);
+ map(0x100000, 0x13ffff).ram();
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
}
@@ -795,8 +795,8 @@ void namcos2_state::master_metlhawk_am(address_map &map)
{
common_metlhawk_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM);
- map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x100000, 0x10ffff).ram();
+ map(0x180000, 0x183fff).rw(FUNC(namcos2_state::eeprom_r), FUNC(namcos2_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
}
@@ -804,7 +804,7 @@ void namcos2_state::slave_metlhawk_am(address_map &map)
{
common_metlhawk_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x13ffff).bankrw(NAMCOS2_68K_SLAVE_RAM);
+ map(0x100000, 0x13ffff).ram();
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
}
@@ -827,8 +827,8 @@ void namcos2_state::master_suzuka8h_am(address_map &map)
{
common_suzuka8h_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM);
- map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x100000, 0x10ffff).ram();
+ map(0x180000, 0x183fff).rw(FUNC(namcos2_state::eeprom_r), FUNC(namcos2_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
map(0xc00000, 0xc0ffff).ram(); // is roz hardware populated?
map(0xd00000, 0xd0001f).ram(); // is roz hardware populated?
@@ -838,7 +838,7 @@ void namcos2_state::slave_suzuka8h_am(address_map &map)
{
common_suzuka8h_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x13ffff).bankrw(NAMCOS2_68K_SLAVE_RAM);
+ map(0x100000, 0x13ffff).ram();
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
map(0xc00000, 0xc0ffff).ram(); // is roz hardware populated?
map(0xd00000, 0xd0001f).ram(); // is roz hardware populated?
@@ -848,8 +848,8 @@ void namcos2_state::master_luckywld_am(address_map &map)
{
common_suzuka8h_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x10ffff).bankrw(NAMCOS2_68K_MASTER_RAM);
- map(0x180000, 0x183fff).rw(FUNC(namcos2_state::namcos2_68k_eeprom_r), FUNC(namcos2_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x100000, 0x10ffff).ram();
+ map(0x180000, 0x183fff).rw(FUNC(namcos2_state::eeprom_r), FUNC(namcos2_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
map(0xc00000, 0xc0ffff).rw(m_c169roz, FUNC(namco_c169roz_device::videoram_r), FUNC(namco_c169roz_device::videoram_w));
map(0xd00000, 0xd0001f).rw(m_c169roz, FUNC(namco_c169roz_device::control_r), FUNC(namco_c169roz_device::control_w));
@@ -859,7 +859,7 @@ void namcos2_state::slave_luckywld_am(address_map &map)
{
common_suzuka8h_am(map);
map(0x000000, 0x03ffff).rom();
- map(0x100000, 0x13ffff).bankrw(NAMCOS2_68K_SLAVE_RAM);
+ map(0x100000, 0x13ffff).ram();
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
map(0xc00000, 0xc0ffff).rw(m_c169roz, FUNC(namco_c169roz_device::videoram_r), FUNC(namco_c169roz_device::videoram_w));
map(0xd00000, 0xd0001f).rw(m_c169roz, FUNC(namco_c169roz_device::control_r), FUNC(namco_c169roz_device::control_w));
@@ -878,7 +878,7 @@ void namcos2_state::sound_default_am(address_map &map)
map(0x7800, 0x7fff).rw(FUNC(namcos2_state::dpram_byte_r), FUNC(namcos2_state::dpram_byte_w)); /* mirror */
map(0x8000, 0x9fff).ram();
map(0xa000, 0xbfff).nopw(); /* Amplifier enable on 1st write */
- map(0xc000, 0xc001).w(FUNC(namcos2_state::namcos2_sound_bankselect_w));
+ map(0xc000, 0xc001).w(FUNC(namcos2_state::sound_bankselect_w));
map(0xd001, 0xd001).nopw(); /* Watchdog */
map(0xe000, 0xe000).nopw();
map(0xd000, 0xffff).rom().region("audiocpu", 0x01000);
@@ -1586,17 +1586,7 @@ static const gfx_layout obj_layout = {
0x800 /* sprite offset */
};
-static const gfx_layout chr_layout = {
- 8,8,
- RGN_FRAC(1,1),
- 8,
- { STEP8(0,1) },
- { STEP8(0,8) },
- { STEP8(0,8*8) },
- 8*64
-};
-
-static const gfx_layout luckywld_sprite_layout = /* same as Namco System21 */
+static const gfx_layout c355_sprite_layout = /* same as Namco System21 */
{
16,16,
RGN_FRAC(1,4), /* number of tiles */
@@ -1619,17 +1609,6 @@ static const gfx_layout luckywld_sprite_layout = /* same as Namco System21 */
8*64 /* sprite offset */
};
-static const gfx_layout luckywld_roz_layout =
-{
- 16,16,
- RGN_FRAC(1,1),
- 8,
- { STEP8(0,1) },
- { STEP16(0,8) },
- { STEP16(0,8*16) },
- 16*128
-};
-
static const gfx_layout metlhawk_sprite_layout = {
32,32,
RGN_FRAC(1,1), /* number of sprites */
@@ -1651,35 +1630,17 @@ static const gfx_layout metlhawk_sprite_layout_swapped = {
};
static GFXDECODE_START( gfx_metlhawk )
- GFXDECODE_ENTRY( "gfx1", 0x000000, metlhawk_sprite_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx3", 0x000000, luckywld_roz_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 )
- GFXDECODE_ENTRY( "gfx1", 0x000000, metlhawk_sprite_layout_swapped, 0*256, 16 )
+ GFXDECODE_ENTRY( "sprite", 0x000000, metlhawk_sprite_layout, 0, 16 )
+ GFXDECODE_ENTRY( "sprite", 0x000000, metlhawk_sprite_layout_swapped, 0, 16 )
GFXDECODE_END
static GFXDECODE_START( gfx_namcos2 )
- GFXDECODE_ENTRY( "gfx1", 0x000000, obj_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx1", 0x200000, obj_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 )
- GFXDECODE_ENTRY( "gfx3", 0x000000, chr_layout, 0*256, 16 )
-GFXDECODE_END
-
-static GFXDECODE_START( gfx_finallap )
- GFXDECODE_ENTRY( "gfx1", 0x000000, obj_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx1", 0x200000, obj_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 )
+ GFXDECODE_ENTRY( "sprite", 0x000000, obj_layout, 0, 16 )
+ GFXDECODE_ENTRY( "sprite", 0x200000, obj_layout, 0, 16 )
GFXDECODE_END
-static GFXDECODE_START( gfx_sgunner )
- GFXDECODE_ENTRY( "gfx1", 0x000000, luckywld_sprite_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx3", 0x000000, luckywld_roz_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 )
-GFXDECODE_END
-
-static GFXDECODE_START( gfx_luckywld )
- GFXDECODE_ENTRY( "gfx1", 0x000000, luckywld_sprite_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx3", 0x000000, luckywld_roz_layout, 0*256, 16 )
- GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 )
+static GFXDECODE_START( gfx_c355 )
+ GFXDECODE_ENTRY( "sprite", 0x000000, c355_sprite_layout, 0, 16 )
GFXDECODE_END
/* end */
@@ -1716,11 +1677,8 @@ via software as INT1
void namcos2_state::configure_c116_standard(machine_config &config)
{
- PALETTE(config, m_palette, 0x2000);
- m_palette->enable_shadows();
-
NAMCO_C116(config, m_c116, 0);
- m_c116->set_palette(m_palette);
+ m_c116->enable_shadows();
}
void namcos2_state::configure_c148_standard(machine_config &config)
@@ -1814,10 +1772,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos2_state::screen_scanline)
void namcos2_state::configure_c123tmap_standard(machine_config &config)
{
NAMCO_C123TMAP(config, m_c123tmap, 0);
- m_c123tmap->set_gfxdecode_tag("gfxdecode");
+ m_c123tmap->set_palette(m_c116);
m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos2_state::TilemapCB, this));
- m_c123tmap->set_maskregion_tag("gfx4");
- m_c123tmap->set_gfxregion(2);
+ m_c123tmap->set_color_base(16*256);
}
MACHINE_CONFIG_START(namcos2_state::base_noio)
@@ -1835,36 +1792,30 @@ MACHINE_CONFIG_START(namcos2_state::base_noio)
MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
configure_c123tmap_standard(config);
NAMCOS2_SPRITE(config, m_ns2sprite, 0);
- m_ns2sprite->set_palette_tag("palette");
m_ns2sprite->set_gfxdecode_tag("gfxdecode");
m_ns2sprite->set_spriteram_tag("spriteram");
NAMCOS2_ROZ(config, m_ns2roz, 0);
- m_ns2roz->set_palette_tag("palette");
- m_ns2roz->set_gfxdecode_tag("gfxdecode");
+ m_ns2roz->set_palette(m_c116);
m_ns2roz->set_rozram_tag("rozram");
m_ns2roz->set_rozctrl_tag("rozctrl");
configure_c116_standard(config);
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_namcos2)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_namcos2)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
@@ -1935,32 +1886,26 @@ MACHINE_CONFIG_START(namcos2_state::gollygho)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_namcos2)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_namcos2)
configure_c123tmap_standard(config);
NAMCOS2_SPRITE(config, m_ns2sprite, 0);
- m_ns2sprite->set_palette_tag("palette");
m_ns2sprite->set_gfxdecode_tag("gfxdecode");
m_ns2sprite->set_spriteram_tag("spriteram");
NAMCOS2_ROZ(config, m_ns2roz, 0);
- m_ns2roz->set_palette_tag("palette");
- m_ns2roz->set_gfxdecode_tag("gfxdecode");
+ m_ns2roz->set_palette(m_c116);
m_ns2roz->set_rozram_tag("rozram");
m_ns2roz->set_rozctrl_tag("rozctrl");
@@ -1980,7 +1925,6 @@ MACHINE_CONFIG_START(namcos2_state::gollygho)
MACHINE_CONFIG_END
-
MACHINE_CONFIG_START(namcos2_state::finallap_noio)
MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_DEVICE_PROGRAM_MAP(master_finallap_am)
@@ -1996,35 +1940,28 @@ MACHINE_CONFIG_START(namcos2_state::finallap_noio)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_finallap)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_finallap)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_namcos2)
configure_c123tmap_standard(config);
NAMCOS2_SPRITE(config, m_ns2sprite, 0);
- m_ns2sprite->set_palette_tag("palette");
m_ns2sprite->set_gfxdecode_tag("gfxdecode");
m_ns2sprite->set_spriteram_tag("spriteram");
configure_c116_standard(config);
- MCFG_VIDEO_START_OVERRIDE(namcos2_state, finallap)
-
NAMCO_C45_ROAD(config, m_c45_road, 0);
- m_c45_road->set_palette(m_palette);
+ m_c45_road->set_palette(m_c116);
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
@@ -2055,16 +1992,12 @@ MACHINE_CONFIG_START(namcos2_state::finalap2)
finallap(config);
m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos2_state::TilemapCB_finalap2, this));
-
- MCFG_VIDEO_START_OVERRIDE(namcos2_state, finalap2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::finalap3)
finallap_c68(config);
m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos2_state::TilemapCB_finalap2, this));
-
- MCFG_VIDEO_START_OVERRIDE(namcos2_state, finalap2)
MACHINE_CONFIG_END
@@ -2085,24 +2018,20 @@ MACHINE_CONFIG_START(namcos2_state::sgunner)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_sgunner)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_sgunner)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_c355)
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(false);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
@@ -2145,24 +2074,20 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_sgunner)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_sgunner)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_c355)
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(false);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
@@ -2205,24 +2130,20 @@ MACHINE_CONFIG_START(namcos2_state::suzuka8h)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_luckywld)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_luckywld)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_c355)
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(false);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
@@ -2236,7 +2157,7 @@ MACHINE_CONFIG_START(namcos2_state::suzuka8h)
MCFG_VIDEO_START_OVERRIDE(namcos2_state, luckywld)
NAMCO_C45_ROAD(config, m_c45_road, 0);
- m_c45_road->set_palette(m_palette);
+ m_c45_road->set_palette(m_c116);
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
@@ -2260,14 +2181,12 @@ MACHINE_CONFIG_START(namcos2_state::luckywld)
MCFG_DEVICE_MODIFY("slave")
MCFG_DEVICE_PROGRAM_MAP(slave_luckywld_am)
-
NAMCO_C169ROZ(config, m_c169roz, 0);
- m_c169roz->set_gfxdecode_tag("gfxdecode");
+ m_c169roz->set_palette(m_c116);
m_c169roz->set_is_namcofl(false);
m_c169roz->set_ram_words(0x10000/2);
m_c169roz->set_tile_callback(namco_c169roz_device::c169_tilemap_delegate(&namcos2_state::RozCB_luckywld, this));
- m_c169roz->set_maskregion_tag("gfx5");
- m_c169roz->set_gfxregion(1);
+ m_c169roz->set_color_base(0*256);
MACHINE_CONFIG_END
@@ -2288,34 +2207,28 @@ MACHINE_CONFIG_START(namcos2_state::metlhawk)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2)
- MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
configure_c148_standard(config);
NAMCO_C139(config, m_sci, 0);
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MCFG_SCREEN_SIZE(384, 264)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_metlhawk)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE(m_c116)
- MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_metlhawk)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_metlhawk)
NAMCO_C169ROZ(config, m_c169roz, 0);
- m_c169roz->set_gfxdecode_tag("gfxdecode");
+ m_c169roz->set_palette(m_c116);
m_c169roz->set_is_namcofl(false);
m_c169roz->set_ram_words(0x10000/2);
m_c169roz->set_tile_callback(namco_c169roz_device::c169_tilemap_delegate(&namcos2_state::RozCB_metlhawk, this));
- m_c169roz->set_maskregion_tag("gfx5");
- m_c169roz->set_gfxregion(1);
+ m_c169roz->set_color_base(0*256);
configure_c123tmap_standard(config);
NAMCOS2_SPRITE(config, m_ns2sprite, 0);
- m_ns2sprite->set_palette_tag("palette");
m_ns2sprite->set_gfxdecode_tag("gfxdecode");
m_ns2sprite->set_spriteram_tag("spriteram");
@@ -2395,7 +2308,7 @@ ROM_START( assault )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65b.bin", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "atobj0.bin", 0x000000, CRC(22240076) SHA1(916fc0e6b338a6dda84399df910c3c9463e6b915) )
NAMCOS2_GFXROM_LOAD_128K( "atobj1.bin", 0x080000, CRC(2284a8e8) SHA1(80f9143e08f9f8ff3e937312a8ce76855a1929ad) )
NAMCOS2_GFXROM_LOAD_128K( "atobj2.bin", 0x100000, CRC(51425476) SHA1(12a2fb1b61adfa4c21a5af4f206ffe48a045a953) )
@@ -2405,11 +2318,11 @@ ROM_START( assault )
NAMCOS2_GFXROM_LOAD_128K( "atobj6.bin", 0x300000, CRC(12f6a569) SHA1(e3051de0961f34e15b8642fa769deac3cb0c8305) )
NAMCOS2_GFXROM_LOAD_128K( "atobj7.bin", 0x380000, CRC(06a929f2) SHA1(65308972a27ab4a649fd08414a89e6f97a09240e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "atchr0.bin", 0x000000, CRC(6f8e968a) SHA1(b771359a3b08c1aeeb248eff325b19238bb88bf8) )
NAMCOS2_GFXROM_LOAD_128K( "atchr1.bin", 0x080000, CRC(88cf7cbe) SHA1(df7565cb36658311b784d5406dc6f83141af58a9) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "atroz0.bin", 0x000000, CRC(8c247a97) SHA1(e06dc0b46fa06f41d2017ec8113baf5c4ba832ab) )
NAMCOS2_GFXROM_LOAD_128K( "atroz1.bin", 0x080000, CRC(e44c475b) SHA1(64768692a8d38377fa1109cd9f7c86b31c01e13c) )
NAMCOS2_GFXROM_LOAD_128K( "atroz2.bin", 0x100000, CRC(770f377f) SHA1(3a7d4f4b9eb01d4366119f34b0d7d7db2f5a2471) )
@@ -2419,7 +2332,7 @@ ROM_START( assault )
NAMCOS2_GFXROM_LOAD_128K( "atroz6.bin", 0x300000, CRC(9089e477) SHA1(929d7d81c05aa148212e22969d147296811d433c) )
NAMCOS2_GFXROM_LOAD_128K( "atroz7.bin", 0x380000, CRC(62b2783a) SHA1(d1ba043a2ec9390c2f281f53de6e59bd936ea6f6) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2446,7 +2359,7 @@ ROM_START( assaultj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65b.bin", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "atobj0.bin", 0x000000, CRC(22240076) SHA1(916fc0e6b338a6dda84399df910c3c9463e6b915) )
NAMCOS2_GFXROM_LOAD_128K( "atobj1.bin", 0x080000, CRC(2284a8e8) SHA1(80f9143e08f9f8ff3e937312a8ce76855a1929ad) )
NAMCOS2_GFXROM_LOAD_128K( "atobj2.bin", 0x100000, CRC(51425476) SHA1(12a2fb1b61adfa4c21a5af4f206ffe48a045a953) )
@@ -2456,11 +2369,11 @@ ROM_START( assaultj )
NAMCOS2_GFXROM_LOAD_128K( "atobj6.bin", 0x300000, CRC(12f6a569) SHA1(e3051de0961f34e15b8642fa769deac3cb0c8305) )
NAMCOS2_GFXROM_LOAD_128K( "atobj7.bin", 0x380000, CRC(06a929f2) SHA1(65308972a27ab4a649fd08414a89e6f97a09240e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "atchr0.bin", 0x000000, CRC(6f8e968a) SHA1(b771359a3b08c1aeeb248eff325b19238bb88bf8) )
NAMCOS2_GFXROM_LOAD_128K( "atchr1.bin", 0x080000, CRC(88cf7cbe) SHA1(df7565cb36658311b784d5406dc6f83141af58a9) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "atroz0.bin", 0x000000, CRC(8c247a97) SHA1(e06dc0b46fa06f41d2017ec8113baf5c4ba832ab) )
NAMCOS2_GFXROM_LOAD_128K( "atroz1.bin", 0x080000, CRC(e44c475b) SHA1(64768692a8d38377fa1109cd9f7c86b31c01e13c) )
NAMCOS2_GFXROM_LOAD_128K( "atroz2.bin", 0x100000, CRC(770f377f) SHA1(3a7d4f4b9eb01d4366119f34b0d7d7db2f5a2471) )
@@ -2470,7 +2383,7 @@ ROM_START( assaultj )
NAMCOS2_GFXROM_LOAD_128K( "atroz6.bin", 0x300000, CRC(9089e477) SHA1(929d7d81c05aa148212e22969d147296811d433c) )
NAMCOS2_GFXROM_LOAD_128K( "atroz7.bin", 0x380000, CRC(62b2783a) SHA1(d1ba043a2ec9390c2f281f53de6e59bd936ea6f6) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2497,7 +2410,7 @@ ROM_START( assaultp )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65b.bin", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "atobj0.bin", 0x000000, CRC(22240076) SHA1(916fc0e6b338a6dda84399df910c3c9463e6b915) )
NAMCOS2_GFXROM_LOAD_128K( "atobj1.bin", 0x080000, CRC(2284a8e8) SHA1(80f9143e08f9f8ff3e937312a8ce76855a1929ad) )
NAMCOS2_GFXROM_LOAD_128K( "atobj2.bin", 0x100000, CRC(51425476) SHA1(12a2fb1b61adfa4c21a5af4f206ffe48a045a953) )
@@ -2507,11 +2420,11 @@ ROM_START( assaultp )
NAMCOS2_GFXROM_LOAD_128K( "atobj6.bin", 0x300000, CRC(12f6a569) SHA1(e3051de0961f34e15b8642fa769deac3cb0c8305) )
NAMCOS2_GFXROM_LOAD_128K( "atobj7.bin", 0x380000, CRC(06a929f2) SHA1(65308972a27ab4a649fd08414a89e6f97a09240e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "atchr0.bin", 0x000000, CRC(6f8e968a) SHA1(b771359a3b08c1aeeb248eff325b19238bb88bf8) )
NAMCOS2_GFXROM_LOAD_128K( "atchr1.bin", 0x080000, CRC(88cf7cbe) SHA1(df7565cb36658311b784d5406dc6f83141af58a9) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "atroz0.bin", 0x000000, CRC(8c247a97) SHA1(e06dc0b46fa06f41d2017ec8113baf5c4ba832ab) )
NAMCOS2_GFXROM_LOAD_128K( "atroz1.bin", 0x080000, CRC(e44c475b) SHA1(64768692a8d38377fa1109cd9f7c86b31c01e13c) )
NAMCOS2_GFXROM_LOAD_128K( "atroz2.bin", 0x100000, CRC(770f377f) SHA1(3a7d4f4b9eb01d4366119f34b0d7d7db2f5a2471) )
@@ -2521,7 +2434,7 @@ ROM_START( assaultp )
NAMCOS2_GFXROM_LOAD_128K( "atroz6.bin", 0x300000, CRC(9089e477) SHA1(929d7d81c05aa148212e22969d147296811d433c) )
NAMCOS2_GFXROM_LOAD_128K( "atroz7.bin", 0x380000, CRC(62b2783a) SHA1(d1ba043a2ec9390c2f281f53de6e59bd936ea6f6) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2548,13 +2461,13 @@ ROM_START( burnforc )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "bu_obj-0.bin", 0x000000, 0x80000, CRC(24c919a1) SHA1(ddf5bfbf1bbe2a10d6708b618b77f1d6d7862372) )
ROM_LOAD( "bu_obj-1.bin", 0x080000, 0x80000, CRC(5bcb519b) SHA1(1d2979a4bed7e952ec77d3a5891a6412044d5f49) )
ROM_LOAD( "bu_obj-2.bin", 0x100000, 0x80000, CRC(509dd5d0) SHA1(68a9054fcde7b677f529ef4db6a8b29750649a2a) )
ROM_LOAD( "bu_obj-3.bin", 0x180000, 0x80000, CRC(270a161e) SHA1(e26092b6950e2adba34f0c5c08179b83fcd86949) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-0.bin", 0x000000, CRC(c2109f73) SHA1(5f09aa9afb027850f21175614c24071db8c754b5) )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-1.bin", 0x080000, CRC(67d6aa67) SHA1(ac7791e4984c6e736ab12e538d856e4fc63383b4) )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-2.bin", 0x100000, CRC(52846eff) SHA1(f925512f382a51040401d5833015cce17b8eb1fd) )
@@ -2562,7 +2475,7 @@ ROM_START( burnforc )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-4.bin", 0x200000, CRC(81a66286) SHA1(650273269cba96f223413ec04928408378170f62) )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-5.bin", 0x280000, CRC(629aa67f) SHA1(f626b2faf8a1eed1a59124e74fbc05cd99dfb1d9) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-0.bin", 0x000000, CRC(65fefc83) SHA1(cf11e62476ca41f76b685011f94234769e37bf5f) )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-1.bin", 0x080000, CRC(979580c2) SHA1(cac8342fd4c41084ce6f578206a9c20d399babde) )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-2.bin", 0x100000, CRC(548b6ad8) SHA1(170113dc6f61ad737f72f58a29ea61347f819ddb) )
@@ -2571,7 +2484,7 @@ ROM_START( burnforc )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-5.bin", 0x280000, CRC(4b864b0e) SHA1(a0b23f49fc85d39bc9dc950ac763fe12454dcdb1) )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-6.bin", 0x300000, CRC(38bd25ba) SHA1(8eb6ba969660ab62102ded2f0c39837fd90f3f7d) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "bu_shape.bin", 0x000000,CRC(80a6b722) SHA1(2c24327a890310c5e8086dc6821627108a88c62e) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2597,13 +2510,13 @@ ROM_START( burnforco )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "bu_obj-0.bin", 0x000000, 0x80000, CRC(24c919a1) SHA1(ddf5bfbf1bbe2a10d6708b618b77f1d6d7862372) )
ROM_LOAD( "bu_obj-1.bin", 0x080000, 0x80000, CRC(5bcb519b) SHA1(1d2979a4bed7e952ec77d3a5891a6412044d5f49) )
ROM_LOAD( "bu_obj-2.bin", 0x100000, 0x80000, CRC(509dd5d0) SHA1(68a9054fcde7b677f529ef4db6a8b29750649a2a) )
ROM_LOAD( "bu_obj-3.bin", 0x180000, 0x80000, CRC(270a161e) SHA1(e26092b6950e2adba34f0c5c08179b83fcd86949) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-0.bin", 0x000000, CRC(c2109f73) SHA1(5f09aa9afb027850f21175614c24071db8c754b5) )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-1.bin", 0x080000, CRC(67d6aa67) SHA1(ac7791e4984c6e736ab12e538d856e4fc63383b4) )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-2.bin", 0x100000, CRC(52846eff) SHA1(f925512f382a51040401d5833015cce17b8eb1fd) )
@@ -2611,7 +2524,7 @@ ROM_START( burnforco )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-4.bin", 0x200000, CRC(81a66286) SHA1(650273269cba96f223413ec04928408378170f62) )
NAMCOS2_GFXROM_LOAD_128K( "bu_chr-5.bin", 0x280000, CRC(629aa67f) SHA1(f626b2faf8a1eed1a59124e74fbc05cd99dfb1d9) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-0.bin", 0x000000, CRC(65fefc83) SHA1(cf11e62476ca41f76b685011f94234769e37bf5f) )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-1.bin", 0x080000, CRC(979580c2) SHA1(cac8342fd4c41084ce6f578206a9c20d399babde) )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-2.bin", 0x100000, CRC(548b6ad8) SHA1(170113dc6f61ad737f72f58a29ea61347f819ddb) )
@@ -2620,7 +2533,7 @@ ROM_START( burnforco )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-5.bin", 0x280000, CRC(4b864b0e) SHA1(a0b23f49fc85d39bc9dc950ac763fe12454dcdb1) )
NAMCOS2_GFXROM_LOAD_128K( "bu_roz-6.bin", 0x300000, CRC(38bd25ba) SHA1(8eb6ba969660ab62102ded2f0c39837fd90f3f7d) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "bu_shape.bin", 0x000000,CRC(80a6b722) SHA1(2c24327a890310c5e8086dc6821627108a88c62e) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2647,22 +2560,22 @@ ROM_START( cosmogng )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "co1obj0.bin", 0x000000, 0x80000, CRC(5df8ce0c) SHA1(afb9fb6e048af5aed8976192b847c0674c5e5ce1) )
ROM_LOAD( "co1obj1.bin", 0x080000, 0x80000, CRC(3d152497) SHA1(70c6725cacf86ba4d4b9dbeed7a1e04df9301228) )
ROM_LOAD( "co1obj2.bin", 0x100000, 0x80000, CRC(4e50b6ee) SHA1(0fd4c19fa77ba6774237c760ac1096d4806248dd) )
ROM_LOAD( "co1obj3.bin", 0x180000, 0x80000, CRC(7beed669) SHA1(92e5eb2a8de3ff71c002807f31581a79a5db5422) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "co1chr0.bin", 0x000000, 0x80000, CRC(ee375b3e) SHA1(e7cc3a137450a79c6068c3bf2c15149f6f6dd18a) )
ROM_LOAD( "co1chr1.bin", 0x080000, 0x80000, CRC(0149de65) SHA1(36d42e56251c850e26ee2253cebf62682ac7516f) )
ROM_LOAD( "co1chr2.bin", 0x100000, 0x80000, CRC(93d565a0) SHA1(c6e993dc77c5a30daee5de4363454e2ccf3bd02d) )
ROM_LOAD( "co1chr3.bin", 0x180000, 0x80000, CRC(4d971364) SHA1(579f7e37bfa37b8b152ac44cdfe712c2ec2cda8b) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "co1roz0.bin", 0x000000, 0x80000, CRC(2bea6951) SHA1(273e3e8ccb042ec794b1709d6626603c8a39a73a) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "co1sha0.bin", 0x000000, 0x80000, CRC(063a70cc) SHA1(c3179d55d57c47d3fef49d45e45b88c4d8250548) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2690,22 +2603,22 @@ ROM_START( cosmogngj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "co1obj0.bin", 0x000000, 0x80000, CRC(5df8ce0c) SHA1(afb9fb6e048af5aed8976192b847c0674c5e5ce1) )
ROM_LOAD( "co1obj1.bin", 0x080000, 0x80000, CRC(3d152497) SHA1(70c6725cacf86ba4d4b9dbeed7a1e04df9301228) )
ROM_LOAD( "co1obj2.bin", 0x100000, 0x80000, CRC(4e50b6ee) SHA1(0fd4c19fa77ba6774237c760ac1096d4806248dd) )
ROM_LOAD( "co1obj3.bin", 0x180000, 0x80000, CRC(7beed669) SHA1(92e5eb2a8de3ff71c002807f31581a79a5db5422) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "co1chr0.bin", 0x000000, 0x80000, CRC(ee375b3e) SHA1(e7cc3a137450a79c6068c3bf2c15149f6f6dd18a) )
ROM_LOAD( "co1chr1.bin", 0x080000, 0x80000, CRC(0149de65) SHA1(36d42e56251c850e26ee2253cebf62682ac7516f) )
ROM_LOAD( "co1chr2.bin", 0x100000, 0x80000, CRC(93d565a0) SHA1(c6e993dc77c5a30daee5de4363454e2ccf3bd02d) )
ROM_LOAD( "co1chr3.bin", 0x180000, 0x80000, CRC(4d971364) SHA1(579f7e37bfa37b8b152ac44cdfe712c2ec2cda8b) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "co1roz0.bin", 0x000000, 0x80000, CRC(2bea6951) SHA1(273e3e8ccb042ec794b1709d6626603c8a39a73a) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "co1sha0.bin", 0x000000, 0x80000, CRC(063a70cc) SHA1(c3179d55d57c47d3fef49d45e45b88c4d8250548) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2733,19 +2646,19 @@ ROM_START( dirtfoxj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "df1_obj0.bin", 0x000000, 0x80000, CRC(b6bd1a68) SHA1(38677b54cd257411db499ba03b9176422797bf64) )
ROM_LOAD( "df1_obj1.bin", 0x080000, 0x80000, CRC(05421dc1) SHA1(d538bb33b1ec1a3ad0feaa75d69a7a327c7dc6fa) )
ROM_LOAD( "df1_obj2.bin", 0x100000, 0x80000, CRC(9390633e) SHA1(91d1a7f2c981c893e4c5d0c6c7199646b86bd1e0) )
ROM_LOAD( "df1_obj3.bin", 0x180000, 0x80000, CRC(c8447b33) SHA1(1f62af3a8b16915adf993ed675cba368f13d4acf) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "df1_chr0.bin", 0x000000, CRC(4b10e4ed) SHA1(b3c56f712b05837590d25dfa7535b0f63cbd61c5) )
NAMCOS2_GFXROM_LOAD_128K( "df1_chr1.bin", 0x080000, CRC(8f63f3d6) SHA1(4432b611550e6890bc351a0db7a90deabe489824) )
NAMCOS2_GFXROM_LOAD_128K( "df1_chr2.bin", 0x100000, CRC(5a1b852a) SHA1(84cbfc04614ed85fdf0efe5ab10d1b6e86bea028) )
NAMCOS2_GFXROM_LOAD_128K( "df1_chr3.bin", 0x180000, CRC(28570676) SHA1(2a0c90839fda6153f6fe42a759d51293998034e2) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_256K( "df1_roz0.bin", 0x000000, CRC(a6129f94) SHA1(5c6f36dce703d985704676948999c81374ac1856) )
NAMCOS2_GFXROM_LOAD_256K( "df1_roz1.bin", 0x080000, CRC(c8e7ce73) SHA1(7e113a56c6c115c251bf8b17d763c8955757edd2) )
NAMCOS2_GFXROM_LOAD_256K( "df1_roz2.bin", 0x100000, CRC(c598e923) SHA1(67b8d74c7a44a896d842271842bb5d2b26d565be) )
@@ -2755,7 +2668,7 @@ ROM_START( dirtfoxj )
NAMCOS2_GFXROM_LOAD_256K( "df1_roz6.bin", 0x300000, CRC(7f3a1ed9) SHA1(df62bc3a236046b73b296cb396f6e7ee6861de09) )
NAMCOS2_GFXROM_LOAD_256K( "df1_roz7.bin", 0x380000, CRC(dd546ae8) SHA1(a5b50b4e8027027ec272ed5c71c7bff4b03e9f92) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "df1_sha.bin", 0x000000, CRC(9a7c9a9b) SHA1(06221ae8d3f6bebbb5a7ab2eaaf35b9922389115) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2786,20 +2699,20 @@ ROM_START( dsaber )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "do obj-0a.obj0", 0x000000, 0x80000, CRC(f08c6648) SHA1(ac5221ba159f2390060cbbb7d9cd8148c7bb4a02) )
ROM_LOAD( "do obj-1a.obj1", 0x080000, 0x80000, CRC(34e0810d) SHA1(679d9b82879cff5197a5098e5dc724c85373b9dc) )
ROM_LOAD( "do obj-2a.obj2", 0x100000, 0x80000, CRC(bccdabf3) SHA1(d079d89083ac6e71ac8926792d0d7cdcebc848a9) )
ROM_LOAD( "do obj-3a.obj3", 0x180000, 0x80000, CRC(2a60a4b8) SHA1(5923e08121ad27629bd917d890e037e888e6d356) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "do chr-0a.chr0", 0x000000, 0x80000, CRC(c6058df6) SHA1(13bacad6d593aa5533161e410e22f351c77f29c4) )
ROM_LOAD( "do chr-1a.chr1", 0x080000, 0x80000, CRC(67aaab36) SHA1(3abb7e226badcfe016325d42c40f06ee020124e3) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "roz0.bin", 0x000000, 0x80000, CRC(32aab758) SHA1(a3220c2a02b9d8bdd95004d36d2aa5ddf57adfbb) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2834,20 +2747,20 @@ ROM_START( dsabera )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "do obj-0a.obj0", 0x000000, 0x80000, CRC(f08c6648) SHA1(ac5221ba159f2390060cbbb7d9cd8148c7bb4a02) )
ROM_LOAD( "do obj-1a.obj1", 0x080000, 0x80000, CRC(34e0810d) SHA1(679d9b82879cff5197a5098e5dc724c85373b9dc) )
ROM_LOAD( "do obj-2a.obj2", 0x100000, 0x80000, CRC(bccdabf3) SHA1(d079d89083ac6e71ac8926792d0d7cdcebc848a9) )
ROM_LOAD( "do obj-3a.obj3", 0x180000, 0x80000, CRC(2a60a4b8) SHA1(5923e08121ad27629bd917d890e037e888e6d356) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "do chr-0a.chr0", 0x000000, 0x80000, CRC(c6058df6) SHA1(13bacad6d593aa5533161e410e22f351c77f29c4) )
ROM_LOAD( "do chr-1a.chr1", 0x080000, 0x80000, CRC(67aaab36) SHA1(3abb7e226badcfe016325d42c40f06ee020124e3) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "roz0.bin", 0x000000, 0x80000, CRC(32aab758) SHA1(a3220c2a02b9d8bdd95004d36d2aa5ddf57adfbb) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2881,20 +2794,20 @@ ROM_START( dsaberj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "do obj-0a.obj0", 0x000000, 0x80000, CRC(f08c6648) SHA1(ac5221ba159f2390060cbbb7d9cd8148c7bb4a02) )
ROM_LOAD( "do obj-1a.obj1", 0x080000, 0x80000, CRC(34e0810d) SHA1(679d9b82879cff5197a5098e5dc724c85373b9dc) )
ROM_LOAD( "do obj-2a.obj2", 0x100000, 0x80000, CRC(bccdabf3) SHA1(d079d89083ac6e71ac8926792d0d7cdcebc848a9) )
ROM_LOAD( "do obj-3a.obj3", 0x180000, 0x80000, CRC(2a60a4b8) SHA1(5923e08121ad27629bd917d890e037e888e6d356) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "do chr-0a.chr0", 0x000000, 0x80000, CRC(c6058df6) SHA1(13bacad6d593aa5533161e410e22f351c77f29c4) )
ROM_LOAD( "do chr-1a.chr1", 0x080000, 0x80000, CRC(67aaab36) SHA1(3abb7e226badcfe016325d42c40f06ee020124e3) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "roz0.bin", 0x000000, 0x80000, CRC(32aab758) SHA1(a3220c2a02b9d8bdd95004d36d2aa5ddf57adfbb) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -2927,14 +2840,14 @@ ROM_START( finallap )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
/* no external MCU ROM? previously loaded type C, but the game predates it */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_FILL( 0, 0x200000, 0xff )
ROM_LOAD( "obj-0b", 0x200000, 0x80000, CRC(c6986523) SHA1(1a4b0e95ade6314850b6e44f2debda0ab6e91397) )
ROM_LOAD( "obj-1b", 0x280000, 0x80000, CRC(6af7d284) SHA1(c74f975c301ff15040be1b38359624ec9c83ac76) )
ROM_LOAD( "obj-2b", 0x300000, 0x80000, CRC(de45ca8d) SHA1(f476ff1719f60d721d55fd1e40e465f48e7ed019) )
ROM_LOAD( "obj-3b", 0x380000, 0x80000, CRC(dba830a2) SHA1(5bd899b39458978dd419bf01082782a02b2d9c20) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fl1-c0", 0x000000, CRC(cd9d2966) SHA1(39671f846542ba6ae47764674509127cf73e3d71) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c1", 0x080000, CRC(b0efec87) SHA1(6d042f35942c2bdbf5aeb31358d3837ee9c8e5fa) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c2", 0x100000, CRC(263b8e31) SHA1(e2665edd89f7bb8c699e61df6de6a2e8e0698092) )
@@ -2943,7 +2856,7 @@ ROM_START( finallap )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c5", 0x280000, CRC(ab89da77) SHA1(5cbead4289269a832c0d44d0ded79b58fcc4cc17) )
NAMCOS2_GFXROM_LOAD_128K( "fl2-c6", 0x300000, CRC(239bd9a0) SHA1(729abe89bea31b4e21161c69579df775b1cba6fe) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -2979,14 +2892,14 @@ ROM_START( finallapd )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
/* no external MCU ROM? previously loaded type C, but the game predates it */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_FILL( 0, 0x200000, 0xff )
ROM_LOAD( "obj-0b", 0x200000, 0x80000, CRC(c6986523) SHA1(1a4b0e95ade6314850b6e44f2debda0ab6e91397) )
ROM_LOAD( "obj-1b", 0x280000, 0x80000, CRC(6af7d284) SHA1(c74f975c301ff15040be1b38359624ec9c83ac76) )
ROM_LOAD( "obj-2b", 0x300000, 0x80000, CRC(de45ca8d) SHA1(f476ff1719f60d721d55fd1e40e465f48e7ed019) )
ROM_LOAD( "obj-3b", 0x380000, 0x80000, CRC(dba830a2) SHA1(5bd899b39458978dd419bf01082782a02b2d9c20) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fl1-c0", 0x000000, CRC(cd9d2966) SHA1(39671f846542ba6ae47764674509127cf73e3d71) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c1", 0x080000, CRC(b0efec87) SHA1(6d042f35942c2bdbf5aeb31358d3837ee9c8e5fa) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c2", 0x100000, CRC(263b8e31) SHA1(e2665edd89f7bb8c699e61df6de6a2e8e0698092) )
@@ -2995,7 +2908,7 @@ ROM_START( finallapd )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c5", 0x280000, CRC(ab89da77) SHA1(5cbead4289269a832c0d44d0ded79b58fcc4cc17) )
NAMCOS2_GFXROM_LOAD_128K( "fl2-c6", 0x300000, CRC(239bd9a0) SHA1(729abe89bea31b4e21161c69579df775b1cba6fe) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -3031,14 +2944,14 @@ ROM_START( finallapc )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
/* no external MCU ROM? previously loaded type C, but the game predates it */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_FILL( 0, 0x200000, 0xff )
ROM_LOAD( "obj-0b", 0x200000, 0x80000, CRC(c6986523) SHA1(1a4b0e95ade6314850b6e44f2debda0ab6e91397) )
ROM_LOAD( "obj-1b", 0x280000, 0x80000, CRC(6af7d284) SHA1(c74f975c301ff15040be1b38359624ec9c83ac76) )
ROM_LOAD( "obj-2b", 0x300000, 0x80000, CRC(de45ca8d) SHA1(f476ff1719f60d721d55fd1e40e465f48e7ed019) )
ROM_LOAD( "obj-3b", 0x380000, 0x80000, CRC(dba830a2) SHA1(5bd899b39458978dd419bf01082782a02b2d9c20) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fl1-c0", 0x000000, CRC(cd9d2966) SHA1(39671f846542ba6ae47764674509127cf73e3d71) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c1", 0x080000, CRC(b0efec87) SHA1(6d042f35942c2bdbf5aeb31358d3837ee9c8e5fa) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c2", 0x100000, CRC(263b8e31) SHA1(e2665edd89f7bb8c699e61df6de6a2e8e0698092) )
@@ -3047,7 +2960,7 @@ ROM_START( finallapc )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c5", 0x280000, CRC(ab89da77) SHA1(5cbead4289269a832c0d44d0ded79b58fcc4cc17) )
NAMCOS2_GFXROM_LOAD_128K( "fl2-c6", 0x300000, CRC(239bd9a0) SHA1(729abe89bea31b4e21161c69579df775b1cba6fe) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -3083,14 +2996,14 @@ ROM_START( finallapjc )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
/* no external MCU ROM? previously loaded type C, but the game predates it */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_FILL( 0, 0x200000, 0xff )
ROM_LOAD( "obj-0b", 0x200000, 0x80000, CRC(c6986523) SHA1(1a4b0e95ade6314850b6e44f2debda0ab6e91397) )
ROM_LOAD( "obj-1b", 0x280000, 0x80000, CRC(6af7d284) SHA1(c74f975c301ff15040be1b38359624ec9c83ac76) )
ROM_LOAD( "obj-2b", 0x300000, 0x80000, CRC(de45ca8d) SHA1(f476ff1719f60d721d55fd1e40e465f48e7ed019) )
ROM_LOAD( "obj-3b", 0x380000, 0x80000, CRC(dba830a2) SHA1(5bd899b39458978dd419bf01082782a02b2d9c20) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fl1-c0", 0x000000, CRC(cd9d2966) SHA1(39671f846542ba6ae47764674509127cf73e3d71) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c1", 0x080000, CRC(b0efec87) SHA1(6d042f35942c2bdbf5aeb31358d3837ee9c8e5fa) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c2", 0x100000, CRC(263b8e31) SHA1(e2665edd89f7bb8c699e61df6de6a2e8e0698092) )
@@ -3099,7 +3012,7 @@ ROM_START( finallapjc )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c5", 0x280000, CRC(ab89da77) SHA1(5cbead4289269a832c0d44d0ded79b58fcc4cc17) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c6", 0x300000, CRC(8e78a3c3) SHA1(d1cd7fad038d52430f933b3ee2440554d2aeade9) ) // Japan specific (was labeled fl2 - seems like fl1 is correct, fl2 is the english version?)
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fl1_sha.bin", 0x000000, CRC(b7e1c7a3) SHA1(b82f9b340d95b80a12286647adba8c139b4d081a) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -3135,14 +3048,14 @@ ROM_START( finallapjb )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
/* no external MCU ROM? previously loaded type C, but the game predates it */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_FILL( 0, 0x200000, 0xff )
ROM_LOAD( "obj-0b", 0x200000, 0x80000, CRC(c6986523) SHA1(1a4b0e95ade6314850b6e44f2debda0ab6e91397) )
ROM_LOAD( "obj-1b", 0x280000, 0x80000, CRC(6af7d284) SHA1(c74f975c301ff15040be1b38359624ec9c83ac76) )
ROM_LOAD( "obj-2b", 0x300000, 0x80000, CRC(de45ca8d) SHA1(f476ff1719f60d721d55fd1e40e465f48e7ed019) )
ROM_LOAD( "obj-3b", 0x380000, 0x80000, CRC(dba830a2) SHA1(5bd899b39458978dd419bf01082782a02b2d9c20) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fl1-c0", 0x000000, CRC(cd9d2966) SHA1(39671f846542ba6ae47764674509127cf73e3d71) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c1", 0x080000, CRC(b0efec87) SHA1(6d042f35942c2bdbf5aeb31358d3837ee9c8e5fa) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c2", 0x100000, CRC(263b8e31) SHA1(e2665edd89f7bb8c699e61df6de6a2e8e0698092) )
@@ -3151,7 +3064,7 @@ ROM_START( finallapjb )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c5", 0x280000, CRC(ab89da77) SHA1(5cbead4289269a832c0d44d0ded79b58fcc4cc17) )
NAMCOS2_GFXROM_LOAD_128K( "fl1-c6", 0x300000, CRC(8e78a3c3) SHA1(d1cd7fad038d52430f933b3ee2440554d2aeade9) ) // Japan specific (was labeled fl2 - seems like fl1 is correct, fl2 is the english version?)
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fl1_sha.bin", 0x000000, CRC(b7e1c7a3) SHA1(b82f9b340d95b80a12286647adba8c139b4d081a) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -3186,7 +3099,7 @@ ROM_START( finalap2 )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fl2obj0", 0x000000, 0x80000, CRC(3657dd7a) SHA1(8f286ec0642b09ff42bf0dbd784ae257d4ab278a) )
ROM_LOAD( "fl2obj2", 0x080000, 0x80000, CRC(8ac933fd) SHA1(b158df2ec55f49ec05861075c8d7bd265361dab0) )
ROM_LOAD( "fl2obj4", 0x100000, 0x80000, CRC(e7b989e6) SHA1(485e8148510edd1645f5b4fbbc9a53e8bf1c3e5f) )
@@ -3196,7 +3109,7 @@ ROM_START( finalap2 )
ROM_LOAD( "fl2obj5", 0x300000, 0x80000, CRC(d74ae0d3) SHA1(96c9798378da7bdc127ed7d02a4dd14dfd142550) )
ROM_LOAD( "fl2obj7", 0x380000, 0x80000, CRC(5ca68c93) SHA1(fa326992338843ccfa458a5b85ba58537da666d0) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "fls2chr0", 0x000000, 0x40000, CRC(7bbda499) SHA1(cf6ff072a40063cbe41eae1f60b29447a0020926) )
ROM_LOAD( "fls2chr1", 0x040000, 0x40000, CRC(ac8940e5) SHA1(449687d38cf830445df713ed4d675ed94ca5b375) )
ROM_LOAD( "fls2chr2", 0x080000, 0x40000, CRC(1756173d) SHA1(c912163979098387aea9a0580e9ca55c1f7275f3) )
@@ -3206,7 +3119,7 @@ ROM_START( finalap2 )
ROM_LOAD( "fls2chr6", 0x180000, 0x40000, CRC(1ef4bdde) SHA1(ceb36c021450efa4cb0fee278fa0b9d65f7d1f05) )
ROM_LOAD( "fls2chr7", 0x1c0000, 0x40000, CRC(53dafcde) SHA1(f9d9460349b34bda95b8c206af7ce2347c951214) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "fls2sha", 0x000000, CRC(f7b40a85) SHA1(a458a1cc0dae757fe8a15cb5f5ae46d3c033df00) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3240,7 +3153,7 @@ ROM_START( finalap2j )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fl2obj0", 0x000000, 0x80000, CRC(3657dd7a) SHA1(8f286ec0642b09ff42bf0dbd784ae257d4ab278a) )
ROM_LOAD( "fl2obj2", 0x080000, 0x80000, CRC(8ac933fd) SHA1(b158df2ec55f49ec05861075c8d7bd265361dab0) )
ROM_LOAD( "fl2obj4", 0x100000, 0x80000, CRC(e7b989e6) SHA1(485e8148510edd1645f5b4fbbc9a53e8bf1c3e5f) )
@@ -3251,7 +3164,7 @@ ROM_START( finalap2j )
ROM_LOAD( "fl2obj7", 0x380000, 0x80000, CRC(5ca68c93) SHA1(fa326992338843ccfa458a5b85ba58537da666d0) )
// The Japanese version should not be using the same ROMs as the World version here, causes corrupt text in attract mode should probably be fls1
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "fls2chr0", 0x000000, 0x40000, BAD_DUMP CRC(7bbda499) SHA1(cf6ff072a40063cbe41eae1f60b29447a0020926) )
ROM_LOAD( "fls2chr1", 0x040000, 0x40000, BAD_DUMP CRC(ac8940e5) SHA1(449687d38cf830445df713ed4d675ed94ca5b375) )
ROM_LOAD( "fls2chr2", 0x080000, 0x40000, BAD_DUMP CRC(1756173d) SHA1(c912163979098387aea9a0580e9ca55c1f7275f3) )
@@ -3261,7 +3174,7 @@ ROM_START( finalap2j )
ROM_LOAD( "fls2chr6", 0x180000, 0x40000, BAD_DUMP CRC(1ef4bdde) SHA1(ceb36c021450efa4cb0fee278fa0b9d65f7d1f05) )
ROM_LOAD( "fls2chr7", 0x1c0000, 0x40000, BAD_DUMP CRC(53dafcde) SHA1(f9d9460349b34bda95b8c206af7ce2347c951214) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "fls2sha", 0x000000, BAD_DUMP CRC(f7b40a85) SHA1(a458a1cc0dae757fe8a15cb5f5ae46d3c033df00) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3295,7 +3208,7 @@ ROM_START( finalap3 ) // this set displays MOTION (Ver. 3) in the test mode menu
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "flt_obj-0.4c", 0x000000, 0x80000, CRC(eab19ec6) SHA1(2859e88b94aa873f3b6ba22790f2211f3e172dd1) )
ROM_LOAD( "flt_obj-2.4a", 0x080000, 0x80000, CRC(2a3b7ded) SHA1(455d9d6cf7d497687f93af899fc20bbff6129391) )
ROM_LOAD( "flt_obj-4.8c", 0x100000, 0x80000, CRC(84aa500c) SHA1(087c0089478a270154f50f3b0f001428e80d74c7) )
@@ -3305,7 +3218,7 @@ ROM_START( finalap3 ) // this set displays MOTION (Ver. 3) in the test mode menu
ROM_LOAD( "flt_obj-5.5c", 0x300000, 0x80000, CRC(6a53e603) SHA1(6087c694e0e30a98c84227991d9c2e9c39c3e9ca) )
ROM_LOAD( "flt_obj-7.6a", 0x380000, 0x80000, CRC(b52a85e2) SHA1(1eea10eb20ae56309397238a52e9ea0756912412) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "flt2_chr-0.11n", 0x000000, 0x40000, CRC(5954f270) SHA1(6f26365d89f38d4ab477908f32823e06f1a84e09) )
ROM_LOAD( "fltchr-1.11p", 0x040000, 0x40000, CRC(2e68d13c) SHA1(46bb0628da1f97e0f6865f37e53a01d2e8391255) )
ROM_LOAD( "flt2_chr-2.11r", 0x080000, 0x40000, CRC(98f3b190) SHA1(4858dab070c0c46d37148312664c6a616765c240) )
@@ -3315,7 +3228,7 @@ ROM_START( finalap3 ) // this set displays MOTION (Ver. 3) in the test mode menu
ROM_LOAD( "fltchr-6.9r", 0x180000, 0x40000, CRC(4b0baea2) SHA1(a75ba5294f06ddbe170988073b8f4a74a7cbcee1) )
ROM_LOAD( "fltchr-7.9s", 0x1c0000, 0x40000, CRC(85db9e94) SHA1(918f414c1dd51f7451a9a491ba1d60f5f9a38c3e) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.7n", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */
@@ -3353,7 +3266,7 @@ ROM_START( finalap3a )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "flt_obj-0.4c", 0x000000, 0x80000, CRC(eab19ec6) SHA1(2859e88b94aa873f3b6ba22790f2211f3e172dd1) )
ROM_LOAD( "flt_obj-2.4a", 0x080000, 0x80000, CRC(2a3b7ded) SHA1(455d9d6cf7d497687f93af899fc20bbff6129391) )
ROM_LOAD( "flt_obj-4.8c", 0x100000, 0x80000, CRC(84aa500c) SHA1(087c0089478a270154f50f3b0f001428e80d74c7) )
@@ -3363,7 +3276,7 @@ ROM_START( finalap3a )
ROM_LOAD( "flt_obj-5.5c", 0x300000, 0x80000, CRC(6a53e603) SHA1(6087c694e0e30a98c84227991d9c2e9c39c3e9ca) )
ROM_LOAD( "flt_obj-7.6a", 0x380000, 0x80000, CRC(b52a85e2) SHA1(1eea10eb20ae56309397238a52e9ea0756912412) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "flt2_chr-0.11n", 0x000000, 0x40000, CRC(5954f270) SHA1(6f26365d89f38d4ab477908f32823e06f1a84e09) )
ROM_LOAD( "fltchr-1.11p", 0x040000, 0x40000, CRC(2e68d13c) SHA1(46bb0628da1f97e0f6865f37e53a01d2e8391255) )
ROM_LOAD( "flt2_chr-2.11r", 0x080000, 0x40000, CRC(98f3b190) SHA1(4858dab070c0c46d37148312664c6a616765c240) )
@@ -3373,7 +3286,7 @@ ROM_START( finalap3a )
ROM_LOAD( "fltchr-6.9r", 0x180000, 0x40000, CRC(4b0baea2) SHA1(a75ba5294f06ddbe170988073b8f4a74a7cbcee1) )
ROM_LOAD( "fltchr-7.9s", 0x1c0000, 0x40000, CRC(85db9e94) SHA1(918f414c1dd51f7451a9a491ba1d60f5f9a38c3e) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.7n", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */
@@ -3414,7 +3327,7 @@ ROM_START( finalap3j )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "flt_obj-0.4c", 0x000000, 0x80000, CRC(eab19ec6) SHA1(2859e88b94aa873f3b6ba22790f2211f3e172dd1) )
ROM_LOAD( "flt_obj-2.4a", 0x080000, 0x80000, CRC(2a3b7ded) SHA1(455d9d6cf7d497687f93af899fc20bbff6129391) )
ROM_LOAD( "flt_obj-4.8c", 0x100000, 0x80000, CRC(84aa500c) SHA1(087c0089478a270154f50f3b0f001428e80d74c7) )
@@ -3424,7 +3337,7 @@ ROM_START( finalap3j )
ROM_LOAD( "flt_obj-5.5c", 0x300000, 0x80000, CRC(6a53e603) SHA1(6087c694e0e30a98c84227991d9c2e9c39c3e9ca) )
ROM_LOAD( "flt_obj-7.6a", 0x380000, 0x80000, CRC(b52a85e2) SHA1(1eea10eb20ae56309397238a52e9ea0756912412) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "fltchr-0.11n", 0x000000, 0x40000, CRC(97ed5b62) SHA1(ce076ae71c6b2950be2a303829072d59732315df) )
ROM_LOAD( "fltchr-1.11p", 0x040000, 0x40000, CRC(2e68d13c) SHA1(46bb0628da1f97e0f6865f37e53a01d2e8391255) )
ROM_LOAD( "fltchr-2.11r", 0x080000, 0x40000, CRC(43c3abf8) SHA1(de66bcdb3e419725b7e7d9ae0c95e13ee99ec5c9) )
@@ -3434,7 +3347,7 @@ ROM_START( finalap3j )
ROM_LOAD( "fltchr-6.9r", 0x180000, 0x40000, CRC(4b0baea2) SHA1(a75ba5294f06ddbe170988073b8f4a74a7cbcee1) )
ROM_LOAD( "fltchr-7.9s", 0x1c0000, 0x40000, CRC(85db9e94) SHA1(918f414c1dd51f7451a9a491ba1d60f5f9a38c3e) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "flt_sha.7n", 0x000000, CRC(211bbd83) SHA1(17502830d1af1e2cfbc17e2f3bb303f2a0c27e68) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */
@@ -3471,7 +3384,7 @@ ROM_START( finalap3jc )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "flt_obj-0.4c", 0x000000, 0x80000, CRC(eab19ec6) SHA1(2859e88b94aa873f3b6ba22790f2211f3e172dd1) )
ROM_LOAD( "flt_obj-2.4a", 0x080000, 0x80000, CRC(2a3b7ded) SHA1(455d9d6cf7d497687f93af899fc20bbff6129391) )
ROM_LOAD( "flt_obj-4.8c", 0x100000, 0x80000, CRC(84aa500c) SHA1(087c0089478a270154f50f3b0f001428e80d74c7) )
@@ -3481,7 +3394,7 @@ ROM_START( finalap3jc )
ROM_LOAD( "flt_obj-5.5c", 0x300000, 0x80000, CRC(6a53e603) SHA1(6087c694e0e30a98c84227991d9c2e9c39c3e9ca) )
ROM_LOAD( "flt_obj-7.6a", 0x380000, 0x80000, CRC(b52a85e2) SHA1(1eea10eb20ae56309397238a52e9ea0756912412) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "flt_chr-0.11n", 0x000000, 0x40000, CRC(97ed5b62) SHA1(ce076ae71c6b2950be2a303829072d59732315df) )
ROM_LOAD( "flt_chr-1.11p", 0x040000, 0x40000, CRC(2e68d13c) SHA1(46bb0628da1f97e0f6865f37e53a01d2e8391255) )
ROM_LOAD( "flt_chr-2.11r", 0x080000, 0x40000, CRC(43c3abf8) SHA1(de66bcdb3e419725b7e7d9ae0c95e13ee99ec5c9) )
@@ -3491,7 +3404,7 @@ ROM_START( finalap3jc )
ROM_LOAD( "flt_chr-6.9r", 0x180000, 0x40000, CRC(4b0baea2) SHA1(a75ba5294f06ddbe170988073b8f4a74a7cbcee1) )
ROM_LOAD( "flt_chr-7.9s", 0x1c0000, 0x40000, CRC(85db9e94) SHA1(918f414c1dd51f7451a9a491ba1d60f5f9a38c3e) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "flt_sha.7n", 0x000000, CRC(211bbd83) SHA1(17502830d1af1e2cfbc17e2f3bb303f2a0c27e68) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */
@@ -3527,7 +3440,7 @@ ROM_START( finalap3bl ) // bootleg set
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fltobj0", 0x000000, 0x80000, CRC(eab19ec6) SHA1(2859e88b94aa873f3b6ba22790f2211f3e172dd1) )
ROM_LOAD( "fltobj2", 0x080000, 0x80000, CRC(2a3b7ded) SHA1(455d9d6cf7d497687f93af899fc20bbff6129391) )
ROM_LOAD( "fltobj4", 0x100000, 0x80000, CRC(84aa500c) SHA1(087c0089478a270154f50f3b0f001428e80d74c7) )
@@ -3537,7 +3450,7 @@ ROM_START( finalap3bl ) // bootleg set
ROM_LOAD( "fltobj5", 0x300000, 0x80000, CRC(6a53e603) SHA1(6087c694e0e30a98c84227991d9c2e9c39c3e9ca) )
ROM_LOAD( "fltobj7", 0x380000, 0x80000, CRC(b52a85e2) SHA1(1eea10eb20ae56309397238a52e9ea0756912412) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "flt2_chr-0.bin", 0x000000, 0x40000, CRC(5954f270) SHA1(6f26365d89f38d4ab477908f32823e06f1a84e09) )
ROM_LOAD( "fltchr-1.11p", 0x040000, 0x40000, CRC(2e68d13c) SHA1(46bb0628da1f97e0f6865f37e53a01d2e8391255) )
ROM_LOAD( "flt2_chr-2.bin", 0x080000, 0x40000, CRC(98f3b190) SHA1(4858dab070c0c46d37148312664c6a616765c240) )
@@ -3547,7 +3460,7 @@ ROM_START( finalap3bl ) // bootleg set
ROM_LOAD( "fltchr-6.9r", 0x180000, 0x40000, CRC(4b0baea2) SHA1(a75ba5294f06ddbe170988073b8f4a74a7cbcee1) )
ROM_LOAD( "fltchr-7.9s", 0x1c0000, 0x40000, CRC(85db9e94) SHA1(918f414c1dd51f7451a9a491ba1d60f5f9a38c3e) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.bin", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3584,13 +3497,13 @@ ROM_START( finehour )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fh1_ob0.bin", 0x000000, 0x80000, CRC(b1fd86f1) SHA1(5504ca1a83c329a19d5632b9ac40cfa7e8ced304) )
ROM_LOAD( "fh1_ob1.bin", 0x080000, 0x80000, CRC(519c44ce) SHA1(f4b033d1caac1944a870d94a06a40aad332a75db) )
ROM_LOAD( "fh1_ob2.bin", 0x100000, 0x80000, CRC(9c5de4fa) SHA1(ead6e53d3fd7adc6f1cb4971a0858ff0098e9897) )
ROM_LOAD( "fh1_ob3.bin", 0x180000, 0x80000, CRC(54d4edce) SHA1(1cf090b215f62528d13a8de6936be96bfe7d343a) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_256K( "fh1_ch0.bin", 0x000000, CRC(516900d1) SHA1(f3d95fa4c060a37164a6e3a87b056d032f3d1f6c) )
NAMCOS2_GFXROM_LOAD_256K( "fh1_ch1.bin", 0x080000, CRC(964d06bd) SHA1(bd9a30bde66f680fdc45cb8823fac9672075a7bb) )
NAMCOS2_GFXROM_LOAD_256K( "fh1_ch2.bin", 0x100000, CRC(fbb9449e) SHA1(291d4678e9972fd3ad2822bef90c57548d284482) )
@@ -3598,7 +3511,7 @@ ROM_START( finehour )
NAMCOS2_GFXROM_LOAD_256K( "fh1_ch4.bin", 0x200000, CRC(80dd188a) SHA1(6d4f029983e98acee612c0f394675f7dd41208c7) )
NAMCOS2_GFXROM_LOAD_256K( "fh1_ch5.bin", 0x280000, CRC(40969876) SHA1(6f444e7fc658ce557d0f54498614a2c05e14f280) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fh1_rz0.bin", 0x000000, CRC(6c96c5c1) SHA1(a69321ccb17497671352ab5f4d8f331668f982d2) )
NAMCOS2_GFXROM_LOAD_128K( "fh1_rz1.bin", 0x080000, CRC(44699eb9) SHA1(9f289fccfd56692e0dda5331160a21b6ed824d7d) )
NAMCOS2_GFXROM_LOAD_128K( "fh1_rz2.bin", 0x100000, CRC(5ec14abf) SHA1(088b4da0f20286e72c7e02a6708ce46823f40237) )
@@ -3606,7 +3519,7 @@ ROM_START( finehour )
NAMCOS2_GFXROM_LOAD_128K( "fh1_rz4.bin", 0x200000, CRC(0b4379e6) SHA1(3455211a9a3c8412609fdbb98aa8911db3a47e09) )
NAMCOS2_GFXROM_LOAD_128K( "fh1_rz5.bin", 0x280000, CRC(e034e560) SHA1(3b5ccdd93e2729875305a7016b3b9de237526358) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "fh1_sha.bin", 0x000000, CRC(15875eb0) SHA1(9225df6b01897938488461ebf0717e6d7b81d562) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3795,7 +3708,7 @@ ROM_START( fourtrax )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fx_obj-0.4c", 0x000000, 0x040000, CRC(1aa60ffa) SHA1(1fa625a52c763b8db718af14e9f3cc3e076ff83b) )
ROM_LOAD( "fx_obj-1.3c", 0x040000, 0x040000, CRC(7509bc09) SHA1(823d8d884afc685dda26c1256c2d241c7f626f9e) )
ROM_LOAD( "fx_obj-4.4a", 0x080000, 0x040000, CRC(30add52a) SHA1(ff782d9dca96967233e435c3dd7d69ffde45db43) )
@@ -3813,7 +3726,7 @@ ROM_START( fourtrax )
ROM_LOAD( "fx_obj-14.6a", 0x380000, 0x040000, CRC(c1658c77) SHA1(ec689d0e5cf95085c193aa8949c6ec6e7243338b) )
ROM_LOAD( "fx_obj-15.5a", 0x3c0000, 0x040000, CRC(2bc909b3) SHA1(29c668d6d12ccdee25e97373bc4786894858d463) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-0.11n", 0x000000, CRC(6658c1c3) SHA1(64b5466e0f94cf5f3cb92915a26331748f67041a) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-1.11p", 0x080000, CRC(3a888943) SHA1(6540b417003045dfa1401a1ff04ac55b86cc177f) )
NAMCOS2_GFXROM_LOAD_128K( "fx2_chr-2.11r", 0x100000, CRC(fdf1e86b) SHA1(91a61c10a9e92f8bbc26ffc9cb72deb31378a843) )
@@ -3823,10 +3736,7 @@ ROM_START( fourtrax )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-6.9r", 0x300000, CRC(c3dba42e) SHA1(2b5a8fabec11ccd44156ecfccf86fc713845d262) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-7.9s", 0x380000, CRC(c009f3ae) SHA1(394beed29bda97f4f5ba532bc0bd22177154746b) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
- /* No ROZ files in zip */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fx_sha.7n", 0x000000, CRC(f7aa4af7) SHA1(b18ffda9e35beb0f072825e2899691be370f33b1) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3857,7 +3767,7 @@ ROM_START( fourtraxj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fx_obj-0.4c", 0x000000, 0x040000, CRC(1aa60ffa) SHA1(1fa625a52c763b8db718af14e9f3cc3e076ff83b) )
ROM_LOAD( "fx_obj-1.3c", 0x040000, 0x040000, CRC(7509bc09) SHA1(823d8d884afc685dda26c1256c2d241c7f626f9e) )
ROM_LOAD( "fx_obj-4.4a", 0x080000, 0x040000, CRC(30add52a) SHA1(ff782d9dca96967233e435c3dd7d69ffde45db43) )
@@ -3875,7 +3785,7 @@ ROM_START( fourtraxj )
ROM_LOAD( "fx_obj-14.6a", 0x380000, 0x040000, CRC(c1658c77) SHA1(ec689d0e5cf95085c193aa8949c6ec6e7243338b) )
ROM_LOAD( "fx_obj-15.5a", 0x3c0000, 0x040000, CRC(2bc909b3) SHA1(29c668d6d12ccdee25e97373bc4786894858d463) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-0.11n", 0x000000, CRC(6658c1c3) SHA1(64b5466e0f94cf5f3cb92915a26331748f67041a) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-1.11p", 0x080000, CRC(3a888943) SHA1(6540b417003045dfa1401a1ff04ac55b86cc177f) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-2.11r", 0x100000, CRC(179e4ec6) SHA1(2936ef847c5a9e527f7198f65a21eee7ac36891c) )
@@ -3885,10 +3795,7 @@ ROM_START( fourtraxj )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-6.9r", 0x300000, CRC(c3dba42e) SHA1(2b5a8fabec11ccd44156ecfccf86fc713845d262) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-7.9s", 0x380000, CRC(c009f3ae) SHA1(394beed29bda97f4f5ba532bc0bd22177154746b) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
- /* No ROZ files in zip */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fx_sha.7n", 0x000000, CRC(f7aa4af7) SHA1(b18ffda9e35beb0f072825e2899691be370f33b1) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3930,7 +3837,7 @@ ROM_START( fourtraxa )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "fx_obj-0.4c", 0x000000, 0x040000, CRC(1aa60ffa) SHA1(1fa625a52c763b8db718af14e9f3cc3e076ff83b) )
ROM_LOAD( "fx_obj-1.3c", 0x040000, 0x040000, CRC(7509bc09) SHA1(823d8d884afc685dda26c1256c2d241c7f626f9e) )
ROM_LOAD( "fx_obj-4.4a", 0x080000, 0x040000, CRC(30add52a) SHA1(ff782d9dca96967233e435c3dd7d69ffde45db43) )
@@ -3948,7 +3855,7 @@ ROM_START( fourtraxa )
ROM_LOAD( "fx_obj-14.6a", 0x380000, 0x040000, CRC(c1658c77) SHA1(ec689d0e5cf95085c193aa8949c6ec6e7243338b) )
ROM_LOAD( "fx_obj-15.5a", 0x3c0000, 0x040000, CRC(2bc909b3) SHA1(29c668d6d12ccdee25e97373bc4786894858d463) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-0.11n", 0x000000, CRC(6658c1c3) SHA1(64b5466e0f94cf5f3cb92915a26331748f67041a) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-1.11p", 0x080000, CRC(3a888943) SHA1(6540b417003045dfa1401a1ff04ac55b86cc177f) )
NAMCOS2_GFXROM_LOAD_128K( "fx4_chr-2a.11r", 0x100000, CRC(a5d1ab10) SHA1(8624ef0911c57155b46e184d10cb122d4a41a2de) ) // unique to this set, mask ROM intentionally replaced
@@ -3958,10 +3865,7 @@ ROM_START( fourtraxa )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-6.9r", 0x300000, CRC(c3dba42e) SHA1(2b5a8fabec11ccd44156ecfccf86fc713845d262) )
NAMCOS2_GFXROM_LOAD_128K( "fx_chr-7.9s", 0x380000, CRC(c009f3ae) SHA1(394beed29bda97f4f5ba532bc0bd22177154746b) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
- /* No ROZ files in zip */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "fx_sha.7n", 0x000000, CRC(f7aa4af7) SHA1(b18ffda9e35beb0f072825e2899691be370f33b1) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -3994,26 +3898,26 @@ ROM_START( marvland )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj0.bin", 0x000000, CRC(73a29361) SHA1(fc8ac9a063c1f18ae619ddca3062491774c86040) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj1.bin", 0x080000, CRC(abbe4a99) SHA1(7f8df4b40236b97a0dce984698308647d5803244) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj2.bin", 0x100000, CRC(753659e0) SHA1(2662acf7bec528c7ac4181f62154581e304eea82) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj3.bin", 0x180000, CRC(d1ce7339) SHA1(a89a0ef39b6ac3fdaf6a2b3c04fd048827fcdb13) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr0.bin", 0x000000, CRC(1c7e8b4f) SHA1(b9d61895d9c9302c5cb5f7bb7f045b2014c12317) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr1.bin", 0x080000, CRC(01e4cafd) SHA1(27c911d6d4501233094826cf1b4b809b832d6d9f) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr2.bin", 0x100000, CRC(198fcc6f) SHA1(b28f97d58fb2365843bbc3764cb59bfb9d5dfd92) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr3.bin", 0x180000, CRC(ed6f22a5) SHA1(62ab2a2746abbbed533a5b519bbb0d603030cdca) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz0.bin", 0x000000, CRC(7381a5a9) SHA1(0515630f124725adfd21575b390209833bb6a6ef) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz1.bin", 0x080000, CRC(e899482e) SHA1(caa511baba1805c485503353efdade9e218f2ba5) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz2.bin", 0x100000, CRC(de141290) SHA1(c1daa6c01ba592138cffef02edfa0928f2232079) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz3.bin", 0x180000, CRC(e310324d) SHA1(936c7aeace677ed51a720e4ae96cdac0f4984a9b) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz4.bin", 0x200000, CRC(48ddc5a9) SHA1(c524b18d7b4526227d5b99d7e4a4582ce2ecd373) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4042,26 +3946,26 @@ ROM_START( marvlandj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj0.bin", 0x000000, CRC(73a29361) SHA1(fc8ac9a063c1f18ae619ddca3062491774c86040) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj1.bin", 0x080000, CRC(abbe4a99) SHA1(7f8df4b40236b97a0dce984698308647d5803244) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj2.bin", 0x100000, CRC(753659e0) SHA1(2662acf7bec528c7ac4181f62154581e304eea82) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-obj3.bin", 0x180000, CRC(d1ce7339) SHA1(a89a0ef39b6ac3fdaf6a2b3c04fd048827fcdb13) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr0.bin", 0x000000, CRC(1c7e8b4f) SHA1(b9d61895d9c9302c5cb5f7bb7f045b2014c12317) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr1.bin", 0x080000, CRC(01e4cafd) SHA1(27c911d6d4501233094826cf1b4b809b832d6d9f) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr2.bin", 0x100000, CRC(198fcc6f) SHA1(b28f97d58fb2365843bbc3764cb59bfb9d5dfd92) )
NAMCOS2_GFXROM_LOAD_256K( "mv1-chr3.bin", 0x180000, CRC(ed6f22a5) SHA1(62ab2a2746abbbed533a5b519bbb0d603030cdca) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz0.bin", 0x000000, CRC(7381a5a9) SHA1(0515630f124725adfd21575b390209833bb6a6ef) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz1.bin", 0x080000, CRC(e899482e) SHA1(caa511baba1805c485503353efdade9e218f2ba5) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz2.bin", 0x100000, CRC(de141290) SHA1(c1daa6c01ba592138cffef02edfa0928f2232079) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz3.bin", 0x180000, CRC(e310324d) SHA1(936c7aeace677ed51a720e4ae96cdac0f4984a9b) )
NAMCOS2_GFXROM_LOAD_128K( "mv1-roz4.bin", 0x200000, CRC(48ddc5a9) SHA1(c524b18d7b4526227d5b99d7e4a4582ce2ecd373) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4088,7 +3992,7 @@ ROM_START( metlhawk )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x200000, "sprite", 0 ) /* Sprites */
ROM_LOAD32_BYTE( "mhobj-4.5c", 0x000000, 0x40000, CRC(e3590e1a) SHA1(9afffa54a63e676f5d78a01c76ca50cd795dd6e9) )
ROM_LOAD32_BYTE( "mhobj-5.5a", 0x000001, 0x40000, CRC(b85c0d07) SHA1(e1ae542c0e884ef454ba57ecdfd007b85f2dc59d) )
ROM_LOAD32_BYTE( "mhobj-6.6c", 0x000002, 0x40000, CRC(90c4523d) SHA1(c6f84da3187ebb747445b1b7499acf5adc0f39d8) )
@@ -4098,13 +4002,13 @@ ROM_START( metlhawk )
ROM_LOAD32_BYTE( "mhobj-2.6d", 0x100002, 0x40000, CRC(6221b927) SHA1(caa106a47bc9e24fb90752175dc5156f7249d12a) )
ROM_LOAD32_BYTE( "mhobj-3.6b", 0x100003, 0x40000, CRC(fd09f2f1) SHA1(4ef5aef0fab89699cb6007103c286c54bd91b66e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "mhchr-0.11n", 0x000000, CRC(e2da1b14) SHA1(95adcd7814fc77ad8b6c208c8da86b1557c5ec22) )
NAMCOS2_GFXROM_LOAD_128K( "mhchr-1.11p", 0x080000, CRC(023c78f9) SHA1(d11fa58c2429fa1db2081e7d653a01577d0850ac) )
NAMCOS2_GFXROM_LOAD_128K( "mhchr-2.11r", 0x100000, CRC(ece47e91) SHA1(a07e056f85a9207d6cc8e844a1afe6622bfe5f9b) )
NAMCOS2_GFXROM_LOAD_128K( "mh1c3.11s", 0x180000, CRC(9303aa7f) SHA1(1c7ed8d16a706f47bbd2970afd36b467ce19e9ee) )
- ROM_REGION( 0x200000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x200000, "c169roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "mhr0z-0.2d", 0x000000, 0x40000, CRC(30ade98f) SHA1(6bf3d2f729e9f5e2c3f1a69845afbbfcafbf2d56) )
ROM_LOAD( "mhr0z-1.2c", 0x040000, 0x40000, CRC(a7fff42a) SHA1(5e13a11b8277842f6e1ae3a7f772f51ab07d0bfe) )
ROM_LOAD( "mhr0z-2.2b", 0x080000, 0x40000, CRC(6abec820) SHA1(bcacda96f6e69046dc59125374f169753ddda683) )
@@ -4114,10 +4018,10 @@ ROM_START( metlhawk )
ROM_LOAD( "mhr0z-6.3b", 0x180000, 0x40000, CRC(6c74977e) SHA1(ccdc1922a3e759eec0b68d1a7fde271dde54d9b2) )
ROM_LOAD( "mhr0z-7.3a", 0x1c0000, 0x40000, CRC(68a19cbd) SHA1(99759f7a670e41d92aba36c68fd66d74250445a3) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape (tiles) */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape (tiles) */
NAMCOS2_GFXROM_LOAD_128K( "mh1sha.7n", 0x000000, CRC(6ac22294) SHA1(6b2cd7589691e6d01f16b162db7c928767750bd3) )
- ROM_REGION( 0x80000, "gfx5", 0 ) /* Mask shape (ROZ) */
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) /* Mask shape (ROZ) */
ROM_LOAD( "mh-rzsh.bin", 0x000000, 0x40000, CRC(5090b1cf) SHA1(b814f8309a6133c6ece5f20161ebd02a981da66f) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4156,7 +4060,7 @@ ROM_START( metlhawkj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x200000, "sprite", 0 ) /* Sprites */
ROM_LOAD32_BYTE( "mhobj-4.5c", 0x000000, 0x40000, CRC(e3590e1a) SHA1(9afffa54a63e676f5d78a01c76ca50cd795dd6e9) )
ROM_LOAD32_BYTE( "mhobj-5.5a", 0x000001, 0x40000, CRC(b85c0d07) SHA1(e1ae542c0e884ef454ba57ecdfd007b85f2dc59d) )
ROM_LOAD32_BYTE( "mhobj-6.6c", 0x000002, 0x40000, CRC(90c4523d) SHA1(c6f84da3187ebb747445b1b7499acf5adc0f39d8) )
@@ -4166,13 +4070,13 @@ ROM_START( metlhawkj )
ROM_LOAD32_BYTE( "mhobj-2.6d", 0x100002, 0x40000, CRC(6221b927) SHA1(caa106a47bc9e24fb90752175dc5156f7249d12a) )
ROM_LOAD32_BYTE( "mhobj-3.6b", 0x100003, 0x40000, CRC(fd09f2f1) SHA1(4ef5aef0fab89699cb6007103c286c54bd91b66e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "mhchr-0.11n", 0x000000, CRC(e2da1b14) SHA1(95adcd7814fc77ad8b6c208c8da86b1557c5ec22) )
NAMCOS2_GFXROM_LOAD_128K( "mhchr-1.11p", 0x080000, CRC(023c78f9) SHA1(d11fa58c2429fa1db2081e7d653a01577d0850ac) )
NAMCOS2_GFXROM_LOAD_128K( "mhchr-2.11r", 0x100000, CRC(ece47e91) SHA1(a07e056f85a9207d6cc8e844a1afe6622bfe5f9b) )
NAMCOS2_GFXROM_LOAD_128K( "mh1c3.11s", 0x180000, CRC(9303aa7f) SHA1(1c7ed8d16a706f47bbd2970afd36b467ce19e9ee) )
- ROM_REGION( 0x200000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x200000, "c169roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "mhr0z-0.2d", 0x000000, 0x40000, CRC(30ade98f) SHA1(6bf3d2f729e9f5e2c3f1a69845afbbfcafbf2d56) )
ROM_LOAD( "mhr0z-1.2c", 0x040000, 0x40000, CRC(a7fff42a) SHA1(5e13a11b8277842f6e1ae3a7f772f51ab07d0bfe) )
ROM_LOAD( "mhr0z-2.2b", 0x080000, 0x40000, CRC(6abec820) SHA1(bcacda96f6e69046dc59125374f169753ddda683) )
@@ -4182,10 +4086,10 @@ ROM_START( metlhawkj )
ROM_LOAD( "mhr0z-6.3b", 0x180000, 0x40000, CRC(6c74977e) SHA1(ccdc1922a3e759eec0b68d1a7fde271dde54d9b2) )
ROM_LOAD( "mhr0z-7.3a", 0x1c0000, 0x40000, CRC(68a19cbd) SHA1(99759f7a670e41d92aba36c68fd66d74250445a3) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape (tiles) */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape (tiles) */
NAMCOS2_GFXROM_LOAD_128K( "mh1sha.7n", 0x000000, CRC(6ac22294) SHA1(6b2cd7589691e6d01f16b162db7c928767750bd3) )
- ROM_REGION( 0x80000, "gfx5", 0 ) /* Mask shape (ROZ) */
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) /* Mask shape (ROZ) */
ROM_LOAD( "mh-rzsh.bin", 0x000000, 0x40000, CRC(5090b1cf) SHA1(b814f8309a6133c6ece5f20161ebd02a981da66f) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4224,7 +4128,7 @@ ROM_START( mirninja )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65b.bin", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "mn_obj0.bin", 0x000000, CRC(6bd1e290) SHA1(11e5f7adef0d7a519246c6d88f9371e49a6b49e9) )
NAMCOS2_GFXROM_LOAD_128K( "mn_obj1.bin", 0x080000, CRC(5e8503be) SHA1(e03e13e70932b65e1bd560f685eda107f00a8bb6) )
NAMCOS2_GFXROM_LOAD_128K( "mn_obj2.bin", 0x100000, CRC(a96d9b45) SHA1(5ad32ef08c38bff368590e0549c4b4552af5c2c8) )
@@ -4234,7 +4138,7 @@ ROM_START( mirninja )
NAMCOS2_GFXROM_LOAD_128K( "mn_obj6.bin", 0x300000, CRC(a052c582) SHA1(eadf07df0e7e13c6e51672860aad4c22b5dcc853) )
NAMCOS2_GFXROM_LOAD_128K( "mn_obj7.bin", 0x380000, CRC(1854c6f5) SHA1(f49d18655d05ea9abf1dded17abc61855dba61ef) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "mn_chr0.bin", 0x000000, CRC(4f66df26) SHA1(7ca1215cb33b9c0898fc17721618a3129d751722) )
NAMCOS2_GFXROM_LOAD_128K( "mn_chr1.bin", 0x080000, CRC(f5de5ea7) SHA1(58ba4a5cca631e53b685db342697625c9c9ea50c) )
NAMCOS2_GFXROM_LOAD_128K( "mn_chr2.bin", 0x100000, CRC(9ff61924) SHA1(27537743b2df32eb492ec933faabd149e3283256) )
@@ -4244,11 +4148,11 @@ ROM_START( mirninja )
NAMCOS2_GFXROM_LOAD_128K( "mn_chr6.bin", 0x300000, CRC(114aca76) SHA1(d2c6bdfdd0e42cd0c6f99517321c2105e5fc780d) )
NAMCOS2_GFXROM_LOAD_128K( "mn_chr7.bin", 0x380000, CRC(2d5705d3) SHA1(690a50b3950a1cf9c27461aa3722c3f1f6a90c87) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "mn_roz0.bin", 0x000000, CRC(677a4f25) SHA1(8ca64833189c75c3f4efd022dbddc54dc2632ec1) )
NAMCOS2_GFXROM_LOAD_128K( "mn_roz1.bin", 0x080000, CRC(f00ae572) SHA1(cd7f28b2ba03a0bb4d5702ffa36b1140560c9541) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "mn_sha.bin", 0x000000, CRC(c28af90f) SHA1(8b7f95375eb32c3e30c2a55b7f543235f56d3a13) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4276,7 +4180,7 @@ ROM_START( ordyne )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2_c65b.3f", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "or_obj-0.obj0", 0x000000, CRC(67b2b9e4) SHA1(4e589c28ed23224e40d3c68055ada0136cbf94cb) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-1.obj1", 0x080000, CRC(8a54fa5e) SHA1(8f71a79dc3bdf8ea4f11cfc31338836ab0c695a5) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-2.obj2", 0x100000, CRC(a2c1cca0) SHA1(f2e8b1b09751695c18bbfbdbe1765e3802833850) )
@@ -4286,7 +4190,7 @@ ROM_START( ordyne )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-6.obj6", 0x300000, CRC(e284c30c) SHA1(f77a3cd81ac1d0fb06317db51b576f1aaa9bbec7) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-7.obj7", 0x380000, CRC(262b7112) SHA1(1f275eeb621d28a2efb3be9dad76606eeba78e8b) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "or_chr-0.chr0", 0x000000, CRC(e7c47934) SHA1(c86791ea11a72cd2b59293dca74fa08ec86edc80) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-1.chr1", 0x080000, CRC(874b332d) SHA1(307ce6ad8013dbd0528a8c5d736bff21a34c4318) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-3.chr3", 0x180000, CRC(5471a834) SHA1(91bd76eb6e03d6fdf636381a5ce1123291bd49ba) )
@@ -4294,14 +4198,14 @@ ROM_START( ordyne )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-6.chr6", 0x300000, CRC(3adc09c8) SHA1(5302796c7a7f3621e2a068b5a3932f0020785836) )
NAMCOS2_GFXROM_LOAD_128K( "or2_chr7.chr7", 0x380000, CRC(8c0d2ab7) SHA1(5e0e61623fcbaac261763fbb42079f32d1ac963c) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "or_roz-0.roz0", 0x000000, CRC(c88a9e6b) SHA1(58d73615d6d3446407dd192b7ae36dcdc1dced24) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-1.roz1", 0x080000, CRC(c20cc749) SHA1(93142454f428ec3386bc94f1b8f7300f8e0414bc) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-2.roz2", 0x100000, CRC(148c9866) SHA1(e2cf7f76a6e0adc22e8b0c347cf5bb9d913b6b0c) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-3.roz3", 0x180000, CRC(4e727b7e) SHA1(272ffb137bdfabef83d6180c8667ec7e08265ea6) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-4.roz4", 0x200000, CRC(17b04396) SHA1(410dd04538f5d9d147dfefc658b0640a771e1032) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "or_shape.shape", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4332,7 +4236,7 @@ ROM_START( ordyneje )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2_c65b.3f", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "or_obj-0.obj0", 0x000000, CRC(67b2b9e4) SHA1(4e589c28ed23224e40d3c68055ada0136cbf94cb) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-1.obj1", 0x080000, CRC(8a54fa5e) SHA1(8f71a79dc3bdf8ea4f11cfc31338836ab0c695a5) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-2.obj2", 0x100000, CRC(a2c1cca0) SHA1(f2e8b1b09751695c18bbfbdbe1765e3802833850) )
@@ -4342,7 +4246,7 @@ ROM_START( ordyneje )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-6.obj6", 0x300000, CRC(e284c30c) SHA1(f77a3cd81ac1d0fb06317db51b576f1aaa9bbec7) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-7.obj7", 0x380000, CRC(262b7112) SHA1(1f275eeb621d28a2efb3be9dad76606eeba78e8b) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "or_chr-0.chr0", 0x000000, CRC(e7c47934) SHA1(c86791ea11a72cd2b59293dca74fa08ec86edc80) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-1.chr1", 0x080000, CRC(874b332d) SHA1(307ce6ad8013dbd0528a8c5d736bff21a34c4318) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-3.chr3", 0x180000, CRC(5471a834) SHA1(91bd76eb6e03d6fdf636381a5ce1123291bd49ba) )
@@ -4350,14 +4254,14 @@ ROM_START( ordyneje )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-6.chr6", 0x300000, CRC(3adc09c8) SHA1(5302796c7a7f3621e2a068b5a3932f0020785836) )
NAMCOS2_GFXROM_LOAD_128K( "or1_ch7e.chr7", 0x380000, CRC(8c0d2ab7) SHA1(5e0e61623fcbaac261763fbb42079f32d1ac963c) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "or_roz-0.roz0", 0x000000, CRC(c88a9e6b) SHA1(58d73615d6d3446407dd192b7ae36dcdc1dced24) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-1.roz1", 0x080000, CRC(c20cc749) SHA1(93142454f428ec3386bc94f1b8f7300f8e0414bc) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-2.roz2", 0x100000, CRC(148c9866) SHA1(e2cf7f76a6e0adc22e8b0c347cf5bb9d913b6b0c) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-3.roz3", 0x180000, CRC(4e727b7e) SHA1(272ffb137bdfabef83d6180c8667ec7e08265ea6) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-4.roz4", 0x200000, CRC(17b04396) SHA1(410dd04538f5d9d147dfefc658b0640a771e1032) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "or_shape.shape", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4388,7 +4292,7 @@ ROM_START( ordynej )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2_c65b.3f", 0x000000, 0x008000, CRC(e9f2922a) SHA1(5767d2f85e1eb3de19192e73b02221f28b1fbb83) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_128K( "or_obj-0.obj0", 0x000000, CRC(67b2b9e4) SHA1(4e589c28ed23224e40d3c68055ada0136cbf94cb) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-1.obj1", 0x080000, CRC(8a54fa5e) SHA1(8f71a79dc3bdf8ea4f11cfc31338836ab0c695a5) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-2.obj2", 0x100000, CRC(a2c1cca0) SHA1(f2e8b1b09751695c18bbfbdbe1765e3802833850) )
@@ -4398,7 +4302,7 @@ ROM_START( ordynej )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-6.obj6", 0x300000, CRC(e284c30c) SHA1(f77a3cd81ac1d0fb06317db51b576f1aaa9bbec7) )
NAMCOS2_GFXROM_LOAD_128K( "or_obj-7.obj7", 0x380000, CRC(262b7112) SHA1(1f275eeb621d28a2efb3be9dad76606eeba78e8b) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "or_chr-0.chr0", 0x000000, CRC(e7c47934) SHA1(c86791ea11a72cd2b59293dca74fa08ec86edc80) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-1.chr1", 0x080000, CRC(874b332d) SHA1(307ce6ad8013dbd0528a8c5d736bff21a34c4318) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-3.chr3", 0x180000, CRC(5471a834) SHA1(91bd76eb6e03d6fdf636381a5ce1123291bd49ba) )
@@ -4406,14 +4310,14 @@ ROM_START( ordynej )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-6.chr6", 0x300000, CRC(3adc09c8) SHA1(5302796c7a7f3621e2a068b5a3932f0020785836) )
NAMCOS2_GFXROM_LOAD_128K( "or_chr-7.chr7", 0x380000, CRC(f050a152) SHA1(e8d868c15f6319a4d4434ba889f1dfd160056c23) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "or_roz-0.roz0", 0x000000, CRC(c88a9e6b) SHA1(58d73615d6d3446407dd192b7ae36dcdc1dced24) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-1.roz1", 0x080000, CRC(c20cc749) SHA1(93142454f428ec3386bc94f1b8f7300f8e0414bc) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-2.roz2", 0x100000, CRC(148c9866) SHA1(e2cf7f76a6e0adc22e8b0c347cf5bb9d913b6b0c) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-3.roz3", 0x180000, CRC(4e727b7e) SHA1(272ffb137bdfabef83d6180c8667ec7e08265ea6) )
NAMCOS2_GFXROM_LOAD_128K( "or_roz-4.roz4", 0x200000, CRC(17b04396) SHA1(410dd04538f5d9d147dfefc658b0640a771e1032) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "or_shape.shape", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4444,7 +4348,7 @@ ROM_START( phelios )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2_c65c.3f", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-0.obj0", 0x000000, CRC(f323db2b) SHA1(fa3c42c618da06af161ad3f8aa1283e9c4bd63c0) )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-1.obj1", 0x080000, CRC(faf7c2f5) SHA1(d0d33eddaf5de2b639717db83a85f441d81a5924) )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-2.obj2", 0x100000, CRC(828178ba) SHA1(d35ab8020ebaad0b4c0b24fa9edc2886b713a8ed) )
@@ -4454,7 +4358,7 @@ ROM_START( phelios )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-6.obj6", 0x300000, CRC(032ea497) SHA1(89f4deed8fa076683abc1f2e961ceb920ab9848d) )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-7.obj7", 0x380000, CRC(f6183b36) SHA1(d1fec216e88f6a07f03d1e458a105548d0376ef3) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-0.chr0", 0x000000, CRC(668b6670) SHA1(35bdac5478cee37b82a8a5367a2a08c70014131d) )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-1.chr1", 0x080000, CRC(80c30742) SHA1(e9307b6a4a6a749a97f76355fb3785945e303289) )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-2.chr2", 0x100000, CRC(f4e11bf7) SHA1(4506fdc83956d7e58bee1a6661da9fe12f1317a9) )
@@ -4463,7 +4367,7 @@ ROM_START( phelios )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-5.chr5", 0x280000, CRC(8ca72d35) SHA1(e3af2d3772468bd26b552a3f15c8a9dd562b1361) )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-6.chr6", 0x300000, CRC(da3543a9) SHA1(085ac3a7e71db8cc60fc343d3a6b009a81f751ee) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-0.roz0", 0x000000, CRC(68043d7e) SHA1(ee81e0f3fc1cd0aa903ad670aa7832c972613a80) )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-1.roz1", 0x080000, CRC(029802b4) SHA1(b9966d13f80faa5befa43cfa9628afd6a4ff783e) )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-2.roz2", 0x100000, CRC(bf0b76dc) SHA1(28f01dc16ee8818291f89cfc03b126c6cd7ced72) )
@@ -4472,7 +4376,7 @@ ROM_START( phelios )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-5.roz5", 0x280000, CRC(fc5a99d0) SHA1(e61d45347ec0ee6db27edd6da797e810052803a2) )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-6.roz6", 0x300000, CRC(a2a17587) SHA1(44a58735e6efdfa815576ed134a1295db49430fb) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "ps_shape.shape", 0x000000, CRC(58e26fcf) SHA1(9edc3b54964f923ed07ee878520ccf3f188f04ad) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4499,7 +4403,7 @@ ROM_START( pheliosj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2_c65c.3f", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-0.obj0", 0x000000, CRC(f323db2b) SHA1(fa3c42c618da06af161ad3f8aa1283e9c4bd63c0) )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-1.obj1", 0x080000, CRC(faf7c2f5) SHA1(d0d33eddaf5de2b639717db83a85f441d81a5924) )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-2.obj2", 0x100000, CRC(828178ba) SHA1(d35ab8020ebaad0b4c0b24fa9edc2886b713a8ed) )
@@ -4509,7 +4413,7 @@ ROM_START( pheliosj )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-6.obj6", 0x300000, CRC(032ea497) SHA1(89f4deed8fa076683abc1f2e961ceb920ab9848d) )
NAMCOS2_GFXROM_LOAD_256K( "ps_obj-7.obj7", 0x380000, CRC(f6183b36) SHA1(d1fec216e88f6a07f03d1e458a105548d0376ef3) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-0.chr0", 0x000000, CRC(668b6670) SHA1(35bdac5478cee37b82a8a5367a2a08c70014131d) )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-1.chr1", 0x080000, CRC(80c30742) SHA1(e9307b6a4a6a749a97f76355fb3785945e303289) )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-2.chr2", 0x100000, CRC(f4e11bf7) SHA1(4506fdc83956d7e58bee1a6661da9fe12f1317a9) )
@@ -4518,7 +4422,7 @@ ROM_START( pheliosj )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-5.chr5", 0x280000, CRC(8ca72d35) SHA1(e3af2d3772468bd26b552a3f15c8a9dd562b1361) )
NAMCOS2_GFXROM_LOAD_128K( "ps_chr-6.chr6", 0x300000, CRC(da3543a9) SHA1(085ac3a7e71db8cc60fc343d3a6b009a81f751ee) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-0.roz0", 0x000000, CRC(68043d7e) SHA1(ee81e0f3fc1cd0aa903ad670aa7832c972613a80) )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-1.roz1", 0x080000, CRC(029802b4) SHA1(b9966d13f80faa5befa43cfa9628afd6a4ff783e) )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-2.roz2", 0x100000, CRC(bf0b76dc) SHA1(28f01dc16ee8818291f89cfc03b126c6cd7ced72) )
@@ -4527,7 +4431,7 @@ ROM_START( pheliosj )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-5.roz5", 0x280000, CRC(fc5a99d0) SHA1(e61d45347ec0ee6db27edd6da797e810052803a2) )
NAMCOS2_GFXROM_LOAD_128K( "ps_roz-6.roz6", 0x300000, CRC(a2a17587) SHA1(44a58735e6efdfa815576ed134a1295db49430fb) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "ps_shape.shape", 0x000000, CRC(58e26fcf) SHA1(9edc3b54964f923ed07ee878520ccf3f188f04ad) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4555,20 +4459,20 @@ ROM_START( rthun2 )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "rst1_obj0.bin", 0x000000, 0x80000, CRC(e5cb82c1) SHA1(2dc1922ecfd9e52af8c4a1edac1df343be64b499) )
ROM_LOAD( "rst1_obj1.bin", 0x080000, 0x80000, CRC(19ebe9fd) SHA1(6d7991a52a707f710c809eb44f1dfa4873369c17) )
ROM_LOAD( "rst1_obj2.bin", 0x100000, 0x80000, CRC(455c4a2f) SHA1(9d7944b41e98f990423d315365106890e2c5ae77) )
ROM_LOAD( "rst1_obj3.bin", 0x180000, 0x80000, CRC(fdcae8a9) SHA1(a1e1057b3263ee9af9e2d861cf8879f51265805e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "rst1_chr0.bin", 0x000000, 0x80000, CRC(6f0e9a68) SHA1(873296778104eff11b828273abf7f6ca461c055a) )
ROM_LOAD( "rst1_chr1.bin", 0x080000, 0x80000, CRC(15e44adc) SHA1(fead0b2d693f9b6267895d8339bb250f5c77fb4d) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "rst1_roz0.bin", 0x000000, 0x80000, CRC(482d0554) SHA1(95b99d1db5851b83b2af4deda2b61635a0562604) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4598,20 +4502,20 @@ ROM_START( rthun2j )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "rst1_obj0.bin", 0x000000, 0x80000, CRC(e5cb82c1) SHA1(2dc1922ecfd9e52af8c4a1edac1df343be64b499) )
ROM_LOAD( "rst1_obj1.bin", 0x080000, 0x80000, CRC(19ebe9fd) SHA1(6d7991a52a707f710c809eb44f1dfa4873369c17) )
ROM_LOAD( "rst1_obj2.bin", 0x100000, 0x80000, CRC(455c4a2f) SHA1(9d7944b41e98f990423d315365106890e2c5ae77) )
ROM_LOAD( "rst1_obj3.bin", 0x180000, 0x80000, CRC(fdcae8a9) SHA1(a1e1057b3263ee9af9e2d861cf8879f51265805e) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "rst1_chr0.bin", 0x000000, 0x80000, CRC(6f0e9a68) SHA1(873296778104eff11b828273abf7f6ca461c055a) )
ROM_LOAD( "rst1_chr1.bin", 0x080000, 0x80000, CRC(15e44adc) SHA1(fead0b2d693f9b6267895d8339bb250f5c77fb4d) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "rst1_roz0.bin", 0x000000, 0x80000, CRC(482d0554) SHA1(95b99d1db5851b83b2af4deda2b61635a0562604) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4648,7 +4552,7 @@ ROM_START( sgunner )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sn_obj0.8c", 0x000000, 0x80000, CRC(bbae38f7) SHA1(7a40ade13307791f5c5d300882f9a38e18c411d6) )
ROM_LOAD( "sn_obj1.12c", 0x100000, 0x80000, CRC(4dfacb51) SHA1(1b5ae37f7ee12b791ce80422bd7472aa38c41ddd) )
ROM_LOAD( "sn_obj2.10c", 0x200000, 0x80000, CRC(313a308f) SHA1(0773a567cf649394cd6fcdd6fba0c4575220a582) )
@@ -4658,14 +4562,14 @@ ROM_START( sgunner )
ROM_LOAD( "sn_obj6.11c", 0x280000, 0x80000, CRC(9c6504f7) SHA1(0dc2960ec5b5ce75e06d0f84917286f360e98316) )
ROM_LOAD( "sn_obj7.15c", 0x380000, 0x80000, CRC(cd1356c0) SHA1(7a21f315442857716eac813adc29cc4f7e28bee8) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sn_chr0.11n", 0x000000, 0x80000, CRC(b433c37b) SHA1(514dcffd0f20faae0f5297b68d8946cfbc54e493) )
ROM_LOAD( "sn_chr1.11p", 0x080000, 0x80000, CRC(b7dd41f9) SHA1(2119bca16cdb55df2416222b66272f681abd0359) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* NO ROZ ROMS PRESENT */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sn_sha0.8n", 0x000000, 0x80000, CRC(01e20999) SHA1(5f925b5b43aa8889e077f7854a89d0731052605d) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4696,7 +4600,7 @@ ROM_START( sgunnerj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sn_obj0.8c", 0x000000, 0x80000, CRC(bbae38f7) SHA1(7a40ade13307791f5c5d300882f9a38e18c411d6) )
ROM_LOAD( "sn_obj1.12c", 0x100000, 0x80000, CRC(4dfacb51) SHA1(1b5ae37f7ee12b791ce80422bd7472aa38c41ddd) )
ROM_LOAD( "sn_obj2.10c", 0x200000, 0x80000, CRC(313a308f) SHA1(0773a567cf649394cd6fcdd6fba0c4575220a582) )
@@ -4706,14 +4610,14 @@ ROM_START( sgunnerj )
ROM_LOAD( "sn_obj6.11c", 0x280000, 0x80000, CRC(9c6504f7) SHA1(0dc2960ec5b5ce75e06d0f84917286f360e98316) )
ROM_LOAD( "sn_obj7.15c", 0x380000, 0x80000, CRC(cd1356c0) SHA1(7a21f315442857716eac813adc29cc4f7e28bee8) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sn_chr0.11n", 0x000000, 0x80000, CRC(b433c37b) SHA1(514dcffd0f20faae0f5297b68d8946cfbc54e493) )
ROM_LOAD( "sn_chr1.11p", 0x080000, 0x80000, CRC(b7dd41f9) SHA1(2119bca16cdb55df2416222b66272f681abd0359) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* NO ROZ ROMS PRESENT */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sn_sha0.8n", 0x000000, 0x80000, CRC(01e20999) SHA1(5f925b5b43aa8889e077f7854a89d0731052605d) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4744,7 +4648,7 @@ ROM_START( sgunner2 )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sns_obj0.bin", 0x000000, 0x80000, CRC(c762445c) SHA1(108170c9a5c82c23c1ac09f91195137ca05989f4) )
ROM_LOAD( "sns_obj1.bin", 0x100000, 0x80000, CRC(e9e379d8) SHA1(01b5f5946e746a5265d230273c99a41910fd9e6f) )
ROM_LOAD( "sns_obj2.bin", 0x200000, 0x80000, CRC(0d076f6c) SHA1(247da0514c3809350ce308334e601f1689a7449f) )
@@ -4754,16 +4658,16 @@ ROM_START( sgunner2 )
ROM_LOAD( "sns_obj6.bin", 0x280000, 0x80000, CRC(c2e94ed2) SHA1(213f57e1a4c8e8ba3c8cbd212431ff7a44d0ffc1) )
ROM_LOAD( "sns_obj7.bin", 0x380000, 0x80000, CRC(fc1f26af) SHA1(1f0c36587bc9f80a39b49b6fd43d1773b2f49361) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sns_chr0.bin", 0x000000, 0x80000, CRC(cdc42b61) SHA1(20cdd5a81ce4612f9eecd8f057d2e22e5baeb216) )
ROM_LOAD( "sns_chr1.bin", 0x080000, 0x80000, CRC(42d4cbb7) SHA1(2ba52987b59f2ae327b341c696fb4a4bbdccb093) )
ROM_LOAD( "sns_chr2.bin", 0x100000, 0x80000, CRC(7dbaa14e) SHA1(6df4fbe85560d2c1624ac2d6c80d6f7827954775) )
ROM_LOAD( "sns_chr3.bin", 0x180000, 0x80000, CRC(b562ff72) SHA1(6b74bca0555e51d7b15fc5d8fe865900646acbc6) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* NO ROZ ROMS PRESENT IN ZIP */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sns_sha0.bin", 0x000000, 0x80000, CRC(0374fd67) SHA1(2f09536ef4f8e1aa719108e73642feb376d6efff) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4796,7 +4700,7 @@ ROM_START( sgunner2j )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sns_obj0.bin", 0x000000, 0x80000, CRC(c762445c) SHA1(108170c9a5c82c23c1ac09f91195137ca05989f4) )
ROM_LOAD( "sns_obj1.bin", 0x100000, 0x80000, CRC(e9e379d8) SHA1(01b5f5946e746a5265d230273c99a41910fd9e6f) )
ROM_LOAD( "sns_obj2.bin", 0x200000, 0x80000, CRC(0d076f6c) SHA1(247da0514c3809350ce308334e601f1689a7449f) )
@@ -4806,16 +4710,16 @@ ROM_START( sgunner2j )
ROM_LOAD( "sns_obj6.bin", 0x280000, 0x80000, CRC(c2e94ed2) SHA1(213f57e1a4c8e8ba3c8cbd212431ff7a44d0ffc1) )
ROM_LOAD( "sns_obj7.bin", 0x380000, 0x80000, CRC(fc1f26af) SHA1(1f0c36587bc9f80a39b49b6fd43d1773b2f49361) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sns_chr0.bin", 0x000000, 0x80000, CRC(cdc42b61) SHA1(20cdd5a81ce4612f9eecd8f057d2e22e5baeb216) )
ROM_LOAD( "sns_chr1.bin", 0x080000, 0x80000, CRC(42d4cbb7) SHA1(2ba52987b59f2ae327b341c696fb4a4bbdccb093) )
ROM_LOAD( "sns_chr2.bin", 0x100000, 0x80000, CRC(7dbaa14e) SHA1(6df4fbe85560d2c1624ac2d6c80d6f7827954775) )
ROM_LOAD( "sns_chr3.bin", 0x180000, 0x80000, CRC(b562ff72) SHA1(6b74bca0555e51d7b15fc5d8fe865900646acbc6) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* NO ROZ ROMS PRESENT IN ZIP */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sns_sha0.bin", 0x000000, 0x80000, CRC(0374fd67) SHA1(2f09536ef4f8e1aa719108e73642feb376d6efff) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4848,21 +4752,21 @@ ROM_START( sws )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "ss1_obj0.5b", 0x000000, 0x80000, CRC(9bd6add1) SHA1(34595987670d7f64ba18a840e98667b96ae5e4bf) )
ROM_LOAD( "ss1_obj1.4b", 0x080000, 0x80000, CRC(a9db3d02) SHA1(63ff1ebc3fe27cd58fda0133bade9ca177ad2d89) )
ROM_LOAD( "ss1_obj2.5d", 0x100000, 0x80000, CRC(b4a73ced) SHA1(9d8476fb3db7fd2fce124dab09094f0ce0057116) )
ROM_LOAD( "ss1_obj3.4d", 0x180000, 0x80000, CRC(0a832b36) SHA1(56879a208e106105b8c0add3c7f7a69ce1ecbd9a) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "ss1_chr0.11n", 0x000000, 0x80000, CRC(ab0141de) SHA1(b63f5a1ca23a56f8da71741f64d410a323ff277f) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "ss_roz0.bin", 0x000000, 0x80000, CRC(40ce9a58) SHA1(240433e4fe31d333bcc8890c0a8e9ac84086fb07) )
ROM_LOAD( "ss_roz1.bin", 0x080000, 0x80000, CRC(c98902ff) SHA1(fef954e90552a09fa4c9a8e4acc18c1e0e762900) )
ROM_LOAD( "ss1_roz2.1c", 0x100000, 0x80000, CRC(b603e1a1) SHA1(bfe7ec0425c390390b3e3d17a9a57bca69346f98) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "ss1_sha0.7n", 0x000000, 0x80000, CRC(fea6952c) SHA1(3bf27ee1e7e4c5ee0d53f28d49ef063b3f8064ba) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4889,23 +4793,23 @@ ROM_START( sws92 )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sss_obj0.bin", 0x000000, 0x80000, CRC(375e8f1f) SHA1(b737bcceb498a66593d06ef102958bea90032106) )
ROM_LOAD( "sss_obj1.bin", 0x080000, 0x80000, CRC(675c1014) SHA1(b960a1f72cddc5e369ab7063678e5548b508e376) )
ROM_LOAD( "sss_obj2.bin", 0x100000, 0x80000, CRC(bdc55f1c) SHA1(fa4f454406eb7e21daed16fedba2adcdb0fb6247) )
ROM_LOAD( "sss_obj3.bin", 0x180000, 0x80000, CRC(e32ac432) SHA1(a8572adb38e72cb72b5d4ba8968a300c675465ba) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sss_chr0.bin", 0x000000, 0x80000, CRC(1d2876f2) SHA1(00b3113ea3e4f316f5bf2d3164cfe98d326f66bd) )
ROM_LOAD( "sss_chr6.bin", 0x300000, 0x80000, CRC(354f0ed2) SHA1(ea6370a460ef4319b6425dc0c8de687a9edbccdb) )
ROM_LOAD( "sss_chr7.bin", 0x380000, 0x80000, CRC(4032f4c1) SHA1(4d6e3391e03864abfa16002bb883b636b0f3e574) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "ss_roz0.bin", 0x000000, 0x80000, CRC(40ce9a58) SHA1(240433e4fe31d333bcc8890c0a8e9ac84086fb07) )
ROM_LOAD( "ss_roz1.bin", 0x080000, 0x80000, CRC(c98902ff) SHA1(fef954e90552a09fa4c9a8e4acc18c1e0e762900) )
ROM_LOAD( "sss_roz2.bin", 0x100000, 0x80000, CRC(c9855c10) SHA1(40a3fe1204f20b8295e790bc7cb6706fb46d4d51) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sss_sha0.bin", 0x000000, 0x80000, CRC(b71a731a) SHA1(29eab0ad5618f54e6c790d20f7dc895afae6c709) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4932,23 +4836,23 @@ ROM_START( sws92g )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sss_obj0.bin", 0x000000, 0x80000, CRC(375e8f1f) SHA1(b737bcceb498a66593d06ef102958bea90032106) )
ROM_LOAD( "sss_obj1.bin", 0x080000, 0x80000, CRC(675c1014) SHA1(b960a1f72cddc5e369ab7063678e5548b508e376) )
ROM_LOAD( "sss_obj2.bin", 0x100000, 0x80000, CRC(bdc55f1c) SHA1(fa4f454406eb7e21daed16fedba2adcdb0fb6247) )
ROM_LOAD( "sss_obj3.bin", 0x180000, 0x80000, CRC(e32ac432) SHA1(a8572adb38e72cb72b5d4ba8968a300c675465ba) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sss_chr0.bin", 0x000000, 0x80000, CRC(1d2876f2) SHA1(00b3113ea3e4f316f5bf2d3164cfe98d326f66bd) )
ROM_LOAD( "sss_chr6.bin", 0x300000, 0x80000, CRC(354f0ed2) SHA1(ea6370a460ef4319b6425dc0c8de687a9edbccdb) )
ROM_LOAD( "sss_chr7.bin", 0x380000, 0x80000, CRC(4032f4c1) SHA1(4d6e3391e03864abfa16002bb883b636b0f3e574) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "ss_roz0.bin", 0x000000, 0x80000, CRC(40ce9a58) SHA1(240433e4fe31d333bcc8890c0a8e9ac84086fb07) )
ROM_LOAD( "ss_roz1.bin", 0x080000, 0x80000, CRC(c98902ff) SHA1(fef954e90552a09fa4c9a8e4acc18c1e0e762900) )
ROM_LOAD( "sss_roz2.bin", 0x100000, 0x80000, CRC(c9855c10) SHA1(40a3fe1204f20b8295e790bc7cb6706fb46d4d51) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sss_sha0.bin", 0x000000, 0x80000, CRC(b71a731a) SHA1(29eab0ad5618f54e6c790d20f7dc895afae6c709) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -4977,23 +4881,23 @@ ROM_START( sws93 )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "sst_obj0.bin", 0x000000, 0x80000, CRC(4089dfd7) SHA1(d37fb08d03a4d3f87b10a8e73bbb1817543396ff) )
ROM_LOAD( "sst_obj1.bin", 0x080000, 0x80000, CRC(cfbc25c7) SHA1(7b6459bda373d1025db6bc8df671d73d6c0963b9) )
ROM_LOAD( "sst_obj2.bin", 0x100000, 0x80000, CRC(61ed3558) SHA1(af1785e909f61db4ad1b250a7064ad07d886edd5) )
ROM_LOAD( "sst_obj3.bin", 0x180000, 0x80000, CRC(0e3bc05d) SHA1(9b7dd60074a17d75633c9e804d62e9a7a94e0698) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "sst_chr0.bin", 0x000000, 0x80000, CRC(3397850d) SHA1(2c06810bc3769b7d7d8d02a8f9aa27b0cbb06b6b) )
ROM_LOAD( "sss_chr6.bin", 0x300000, 0x80000, CRC(354f0ed2) SHA1(ea6370a460ef4319b6425dc0c8de687a9edbccdb) )
ROM_LOAD( "sst_chr7.bin", 0x380000, 0x80000, CRC(e0abb763) SHA1(6c60a4986562bad0da6b7009a5f5165a81f801d7) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
ROM_LOAD( "ss_roz0.bin", 0x000000, 0x80000, CRC(40ce9a58) SHA1(240433e4fe31d333bcc8890c0a8e9ac84086fb07) )
ROM_LOAD( "ss_roz1.bin", 0x080000, 0x80000, CRC(c98902ff) SHA1(fef954e90552a09fa4c9a8e4acc18c1e0e762900) )
ROM_LOAD( "sss_roz2.bin", 0x100000, 0x80000, CRC(c9855c10) SHA1(40a3fe1204f20b8295e790bc7cb6706fb46d4d51) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "sst_sha0.bin", 0x000000, 0x80000, CRC(4f64d4bd) SHA1(0eb5311448cfd91b1e139b64b2f35b5179237e58) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5020,7 +4924,7 @@ ROM_START( suzuka8h )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "eh1-obj0.bin", 0x000000, 0x80000, CRC(864b6816) SHA1(72d831b631afb2848578bd49cd7d3e12a78644b4) )
ROM_LOAD( "eh1-obj1.bin", 0x100000, 0x80000, CRC(d4921c35) SHA1(fe1b3997c3298e58919fa5602b94bd121439d5bc) )
ROM_LOAD( "eh1-obj2.bin", 0x200000, 0x80000, CRC(966d3f19) SHA1(997669cce56350cd7ed02eec0a88696469435490) )
@@ -5030,14 +4934,12 @@ ROM_START( suzuka8h )
ROM_LOAD( "eh1-obj6.bin", 0x280000, 0x80000, CRC(6019fc8c) SHA1(f3eb74fe0df2efbfeeaf4f8b43c93f104009da0b) )
ROM_LOAD( "eh1-obj7.bin", 0x380000, 0x80000, CRC(0bd966b8) SHA1(70d6b12139b2563a646da7d11c554f2f6ffb3559) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "eh2-chr0.bin", 0x000000, 0x80000, CRC(b2450fd2) SHA1(4aafb2c96b15e01364eb61ad0a71929c730e30a4) )
ROM_LOAD( "eh2-chr1.bin", 0x080000, 0x80000, CRC(57204651) SHA1(72cd7bd761a2b0fd12b3c3214098439d85438db8) )
ROM_LOAD( "eh1-chr2.bin", 0x100000, 0x80000, CRC(8150f644) SHA1(bf41d43938dbae6fd3162caebe8ffd4ec4bbd169) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASE00 ) /* 16x16 Tiles */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "eh2-sha0.bin", 0x000000, 0x80000, CRC(7f24619c) SHA1(0d19ab621cb42c5315be9a6b56f6711fc46ffff7) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5069,7 +4971,7 @@ ROM_START( suzuka8hj )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "eh1-obj0.bin", 0x000000, 0x80000, CRC(864b6816) SHA1(72d831b631afb2848578bd49cd7d3e12a78644b4) )
ROM_LOAD( "eh1-obj1.bin", 0x100000, 0x80000, CRC(d4921c35) SHA1(fe1b3997c3298e58919fa5602b94bd121439d5bc) )
ROM_LOAD( "eh1-obj2.bin", 0x200000, 0x80000, CRC(966d3f19) SHA1(997669cce56350cd7ed02eec0a88696469435490) )
@@ -5079,14 +4981,12 @@ ROM_START( suzuka8hj )
ROM_LOAD( "eh1-obj6.bin", 0x280000, 0x80000, CRC(6019fc8c) SHA1(f3eb74fe0df2efbfeeaf4f8b43c93f104009da0b) )
ROM_LOAD( "eh1-obj7.bin", 0x380000, 0x80000, CRC(0bd966b8) SHA1(70d6b12139b2563a646da7d11c554f2f6ffb3559) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "eh1-chr0.bin", 0x000000, 0x80000, CRC(bc90ebef) SHA1(592ca134cc018e87214f72a97979cbf9425cfffd) )
ROM_LOAD( "eh1-chr1.bin", 0x080000, 0x80000, CRC(61395018) SHA1(4ffb8323b5671f99bb420881f84be58de7d79d07) )
ROM_LOAD( "eh1-chr2.bin", 0x100000, 0x80000, CRC(8150f644) SHA1(bf41d43938dbae6fd3162caebe8ffd4ec4bbd169) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASE00 ) /* 16x16 Tiles */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "eh1-sha0.bin", 0x000000, 0x80000, CRC(39585cf9) SHA1(8cc18b5745ab2cf50d4df0a17fc1a57771db28ab) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5118,7 +5018,7 @@ ROM_START( suzuk8h2 )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "ehs1-obj0.3p", 0x000000, 0x80000, CRC(a0acf307) SHA1(6d79d2dd00da4f8f0462245f42a9d88b6ad632b1) )
ROM_LOAD( "ehs1-obj1.3w", 0x100000, 0x80000, CRC(ca780b44) SHA1(d16263851c165f5958b0a2ad1ba199058a8d56d5) )
ROM_LOAD( "ehs1-obj2.3t", 0x200000, 0x80000, CRC(83b45afe) SHA1(10a4b88b36f8d037cbb611cb273613b1d45e8eb5) )
@@ -5128,7 +5028,7 @@ ROM_START( suzuk8h2 )
ROM_LOAD( "ehs1-obj6.3j", 0x280000, 0x80000, CRC(f5fc8b23) SHA1(d7cd4596cd6991db72c371d835051cc8001f30b3) )
ROM_LOAD( "ehs1-obj7.3z", 0x380000, 0x80000, CRC(da6bf51b) SHA1(b9b49b983f76989067c4763fd88bfa11bbf5d064) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "ehs1-chr0.11n", 0x000000, 0x80000, CRC(844efe0d) SHA1(032a2d268bbab60706d911ab42206b5329e1abba) )
ROM_LOAD( "ehs1-chr1.11p", 0x080000, 0x80000, CRC(e8480a6d) SHA1(247a7ab2f5270a87c6a05b12f01b884fb05dabd2) )
ROM_LOAD( "ehs1-chr2.11r", 0x100000, 0x80000, CRC(ace2d871) SHA1(1a10f571268d83c70fe00fad2f1ce2b48fb764b1) )
@@ -5138,10 +5038,7 @@ ROM_START( suzuk8h2 )
ROM_LOAD( "ehs1-chr6.9r", 0x300000, 0x80000, CRC(2d1c01ad) SHA1(1ed79e22b964fe648d22e43b78c1c3b5a7d5f8c8) )
ROM_LOAD( "ehs1-chr7.9s", 0x380000, 0x80000, CRC(18dd8676) SHA1(59b9a07f4a980fd920a29b8a90ef54c8c3b53e97) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
- /* No ROZ hardware on PCB */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "ehs1-sha0.7n", 0x000000, 0x80000, CRC(0f0e2dbf) SHA1(a4575fbdc868ba959d23204be7d659d40d8db4c2) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5174,7 +5071,7 @@ ROM_START( suzuk8h2j )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "ehs1-obj0.3p", 0x000000, 0x80000, CRC(a0acf307) SHA1(6d79d2dd00da4f8f0462245f42a9d88b6ad632b1) )
ROM_LOAD( "ehs1-obj1.3w", 0x100000, 0x80000, CRC(ca780b44) SHA1(d16263851c165f5958b0a2ad1ba199058a8d56d5) )
ROM_LOAD( "ehs1-obj2.3t", 0x200000, 0x80000, CRC(83b45afe) SHA1(10a4b88b36f8d037cbb611cb273613b1d45e8eb5) )
@@ -5184,7 +5081,7 @@ ROM_START( suzuk8h2j )
ROM_LOAD( "ehs1-obj6.3j", 0x280000, 0x80000, CRC(f5fc8b23) SHA1(d7cd4596cd6991db72c371d835051cc8001f30b3) )
ROM_LOAD( "ehs1-obj7.3z", 0x380000, 0x80000, CRC(da6bf51b) SHA1(b9b49b983f76989067c4763fd88bfa11bbf5d064) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "ehs1-chr0.11n", 0x000000, 0x80000, CRC(844efe0d) SHA1(032a2d268bbab60706d911ab42206b5329e1abba) )
ROM_LOAD( "ehs1-chr1.11p", 0x080000, 0x80000, CRC(e8480a6d) SHA1(247a7ab2f5270a87c6a05b12f01b884fb05dabd2) )
ROM_LOAD( "ehs1-chr2.11r", 0x100000, 0x80000, CRC(ace2d871) SHA1(1a10f571268d83c70fe00fad2f1ce2b48fb764b1) )
@@ -5194,10 +5091,7 @@ ROM_START( suzuk8h2j )
ROM_LOAD( "ehs1-chr6.9r", 0x300000, 0x80000, CRC(2d1c01ad) SHA1(1ed79e22b964fe648d22e43b78c1c3b5a7d5f8c8) )
ROM_LOAD( "ehs1-chr7.9s", 0x380000, 0x80000, CRC(18dd8676) SHA1(59b9a07f4a980fd920a29b8a90ef54c8c3b53e97) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
- /* No ROZ hardware on PCB */
-
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "ehs1-sha0.7n", 0x000000, 0x80000, CRC(0f0e2dbf) SHA1(a4575fbdc868ba959d23204be7d659d40d8db4c2) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5230,7 +5124,7 @@ ROM_START( valkyrie )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
NAMCOS2_GFXROM_LOAD_256K( "wdobj0.bin", 0x000000, CRC(e8089451) SHA1(f4d05df0015de01ec570f5f89ea11592204e4fe2) )
NAMCOS2_GFXROM_LOAD_256K( "wdobj1.bin", 0x080000, CRC(7ca65666) SHA1(39d792abf5a1a5f3906cb6ab4626f4a5b20cb081) )
NAMCOS2_GFXROM_LOAD_256K( "wdobj2.bin", 0x100000, CRC(7c159407) SHA1(ed5472eb9df7990b8d80ff5a587e41d138f48db8) )
@@ -5240,7 +5134,7 @@ ROM_START( valkyrie )
NAMCOS2_GFXROM_LOAD_256K( "wdobj6.bin", 0x300000, CRC(9fa2ea21) SHA1(89cefc286cf4de7f6e32dc6dc689835a21bea2ed) )
NAMCOS2_GFXROM_LOAD_256K( "wdobj7.bin", 0x380000, CRC(66e07a36) SHA1(2f84128bbdc9dcfd783d3a85cb47a92087e71272) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "wdchr0.bin", 0x000000, CRC(debb0116) SHA1(ba4a9a166e22cf4930574eeadd127520ff7192b4) )
NAMCOS2_GFXROM_LOAD_128K( "wdchr1.bin", 0x080000, CRC(8a1431e8) SHA1(ef3c81ea92f2541387760c24395ddf7a02f907f2) )
NAMCOS2_GFXROM_LOAD_128K( "wdchr2.bin", 0x100000, CRC(62f75f69) SHA1(bcfd34c3c450cd05eb6a080307dc962687ccc799) )
@@ -5248,13 +5142,13 @@ ROM_START( valkyrie )
NAMCOS2_GFXROM_LOAD_128K( "wdchr4.bin", 0x200000, CRC(2f73d05e) SHA1(76341fd8c5e4216430eb09ded38ac554b5777ee5) )
NAMCOS2_GFXROM_LOAD_128K( "wdchr5.bin", 0x280000, CRC(b632b2ec) SHA1(914cb9a0dd42067b93e47c8cf847d588f361854f) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_128K( "wdroz0.bin", 0x000000, CRC(f776bf66) SHA1(2b134d5f9ede1205260a2109fdcd0d5c47b397ba) )
NAMCOS2_GFXROM_LOAD_128K( "wdroz1.bin", 0x080000, CRC(c1a345c3) SHA1(3d8c2ab457b81485014a83b4d9e8a80fe487ddef) )
NAMCOS2_GFXROM_LOAD_128K( "wdroz2.bin", 0x100000, CRC(28ffb44a) SHA1(207343e76dd02cbfe7575edd9b18074f68bb6768) )
NAMCOS2_GFXROM_LOAD_128K( "wdroz3.bin", 0x180000, CRC(7e77b46d) SHA1(db0ba244fb878120a4f06af4666ddc4cc430c97a) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "wdshape.bin", 0x000000, CRC(3b5e0249) SHA1(259bbabf57a8ad739c646c56aad6d0b92e10adcd) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5286,25 +5180,25 @@ ROM_START( kyukaidk )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "ky1_o0.bin", 0x000000, 0x80000, CRC(ebec5132) SHA1(8d2dec3f1cd27c203899bb715a9983fff7ab820d) )
ROM_LOAD( "ky1_o1.bin", 0x080000, 0x80000, CRC(fde7e5ae) SHA1(e17822f885977e10b6d1524a3d97fa9640472f8a) )
ROM_LOAD( "ky1_o2.bin", 0x100000, 0x80000, CRC(2a181698) SHA1(bad62c6c59b4362d6815749b5622e321b6051ea4) )
ROM_LOAD( "ky1_o3.bin", 0x180000, 0x80000, CRC(71fcd3a6) SHA1(8f2ba9c1d4fabbac07d1c80dfc3580cc67594071) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "ky1_c0.bin", 0x000000, CRC(7bd69a2d) SHA1(21402395eaacd4c25e5f023ea48a206b818b9c25) )
NAMCOS2_GFXROM_LOAD_128K( "ky1_c1.bin", 0x080000, CRC(66a623fe) SHA1(35404b3aa05263dda6be7c1903ea77677e3c58cb) )
NAMCOS2_GFXROM_LOAD_128K( "ky1_c2.bin", 0x100000, CRC(e84b3dfd) SHA1(742c88c187c14301afaabd0d2d8eba11185aaef1) )
NAMCOS2_GFXROM_LOAD_128K( "ky1_c3.bin", 0x180000, CRC(69e67c86) SHA1(c835ad3e6908acd96b299826c2caa61255958f8c) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_256K( "ky1_r0.bin", 0x000000, CRC(9213e8c4) SHA1(178ea4db500adbc945bab0b6f1a014e89c077d77) )
NAMCOS2_GFXROM_LOAD_256K( "ky1_r1.bin", 0x080000, CRC(97d1a641) SHA1(d1708dcc668ad126ee34f7f84cbac9a56a617d7b) )
NAMCOS2_GFXROM_LOAD_256K( "ky1_r2.bin", 0x100000, CRC(39b58792) SHA1(1c30a04a370f56d2b548bf19c551acc95316693b) )
NAMCOS2_GFXROM_LOAD_256K( "ky1_r3.bin", 0x180000, CRC(90c60d92) SHA1(b581d5f4d6c353604e0c9bcb27252a44b1b4e91c) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "ky1_sha.bin", 0x000000, CRC(380a20d7) SHA1(9627d2e0192779d50bfb25d5c19976275818c310) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5333,25 +5227,25 @@ ROM_START( kyukaidko )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "ky1_o0.bin", 0x000000, 0x80000, CRC(ebec5132) SHA1(8d2dec3f1cd27c203899bb715a9983fff7ab820d) )
ROM_LOAD( "ky1_o1.bin", 0x080000, 0x80000, CRC(fde7e5ae) SHA1(e17822f885977e10b6d1524a3d97fa9640472f8a) )
ROM_LOAD( "ky1_o2.bin", 0x100000, 0x80000, CRC(2a181698) SHA1(bad62c6c59b4362d6815749b5622e321b6051ea4) )
ROM_LOAD( "ky1_o3.bin", 0x180000, 0x80000, CRC(71fcd3a6) SHA1(8f2ba9c1d4fabbac07d1c80dfc3580cc67594071) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
NAMCOS2_GFXROM_LOAD_128K( "ky1_c0.bin", 0x000000, CRC(7bd69a2d) SHA1(21402395eaacd4c25e5f023ea48a206b818b9c25) )
NAMCOS2_GFXROM_LOAD_128K( "ky1_c1.bin", 0x080000, CRC(66a623fe) SHA1(35404b3aa05263dda6be7c1903ea77677e3c58cb) )
NAMCOS2_GFXROM_LOAD_128K( "ky1_c2.bin", 0x100000, CRC(e84b3dfd) SHA1(742c88c187c14301afaabd0d2d8eba11185aaef1) )
NAMCOS2_GFXROM_LOAD_128K( "ky1_c3.bin", 0x180000, CRC(69e67c86) SHA1(c835ad3e6908acd96b299826c2caa61255958f8c) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
NAMCOS2_GFXROM_LOAD_256K( "ky1_r0.bin", 0x000000, CRC(9213e8c4) SHA1(178ea4db500adbc945bab0b6f1a014e89c077d77) )
NAMCOS2_GFXROM_LOAD_256K( "ky1_r1.bin", 0x080000, CRC(97d1a641) SHA1(d1708dcc668ad126ee34f7f84cbac9a56a617d7b) )
NAMCOS2_GFXROM_LOAD_256K( "ky1_r2.bin", 0x100000, CRC(39b58792) SHA1(1c30a04a370f56d2b548bf19c551acc95316693b) )
NAMCOS2_GFXROM_LOAD_256K( "ky1_r3.bin", 0x180000, CRC(90c60d92) SHA1(b581d5f4d6c353604e0c9bcb27252a44b1b4e91c) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "ky1_sha.bin", 0x000000, CRC(380a20d7) SHA1(9627d2e0192779d50bfb25d5c19976275818c310) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5380,21 +5274,21 @@ ROM_START( gollygho )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "gl1edr0c.ic7", 0x0000, 0x8000, CRC(db60886f) SHA1(a1183c058c0470a4ef8b0f69a3637b1640c5b5a4) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "gl1obj0.5b", 0x000000, 0x40000, CRC(6809d267) SHA1(8a0f636067974e51659bd05a3c17819c630d70e3) )
ROM_LOAD( "gl1obj1.4b", 0x080000, 0x40000, CRC(ae4304d4) SHA1(e3db507acf2ab9392060fc603bb95492d0251adc) )
ROM_LOAD( "gl1obj2.5d", 0x100000, 0x40000, CRC(9f2e9eb0) SHA1(d3b001286a5ede58860505bb2f48a755cc661f1f) )
ROM_LOAD( "gl1obj3.4d", 0x180000, 0x40000, CRC(3a85f3c2) SHA1(013148cc0174d39bb16a71cce01c0dc7044d2f42) )
- ROM_REGION( 0x60000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x60000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "gl1chr0.11n", 0x00000, 0x20000, CRC(1a7c8abd) SHA1(59ddc278c46e545bbc3d66e84810c40aaf703d9a) )
ROM_LOAD( "gl1chr1.11p", 0x20000, 0x20000, CRC(36aa0fbc) SHA1(47dc10e689843962b51097c6ca27e00a221d2b48) )
ROM_LOAD( "gl1chr2.11r", 0x40000, 0x10000, CRC(6c1964ba) SHA1(1aec2ce598751f4f0ba575f4a944647e831f6a87) )
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* All ROZ ROM sockets unpopulated on PCB */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
NAMCOS2_GFXROM_LOAD_128K( "gl1sha0.7n", 0x000000, CRC(8886f6f5) SHA1(3b311c5061449e1bbde1a1006fd967a6154326b8) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -5426,20 +5320,20 @@ ROM_START( bubbletr ) /* All labels were hand written and included the rom size,
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "bt1edr0a.ic7", 0x0000, 0x8000, CRC(155b02fc) SHA1(191683c19f756ac150b8e037f46a6daca1a082fa) ) /* dated 4/24 */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "bt1-obj0.5b", 0x000000, 0x80000, CRC(16b5dc04) SHA1(57cc4b7907442f922102fbd61e470c149f0379ac) ) /* dated 4/24 */
ROM_LOAD( "bt1-obj1.4b", 0x080000, 0x80000, CRC(ae37a969) SHA1(524a8ef68a62f9168d356e6cd37a72a888ced202) ) /* dated 4/24 */
ROM_LOAD( "bt1-obj2.5d", 0x100000, 0x80000, CRC(75f74871) SHA1(75c47a2132e21a2d82000bca137929bffecc96ef) ) /* dated 4/24 */
ROM_LOAD( "bt1-obj3.4d", 0x180000, 0x80000, CRC(7fb23c05) SHA1(da97c595a3338021c1bc46f9668e1ec6c7985cea) ) /* dated 4/24 */
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "bt1-chr0.11n", 0x00000, 0x80000, CRC(11574c30) SHA1(6e85dd1448961b89a13e8cf905b24a69d182edd8) ) /* dated 4/24 */
/* no chr1, chr2 missing or just not needed? probably just not needed as I see no tile glitches */
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* All ROZ ROM sockets unpopulated on PCB */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "bt1-sha0.7n", 0x000000, 0x80000, CRC(dc4664df) SHA1(59818b14e74ee9b15a66e850658e4697d78b28d9) ) /* dated 4/24 */
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -5472,20 +5366,20 @@ ROM_START( bubbletrj )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "bt1edr0a.ic7", 0x0000, 0x8000, CRC(155b02fc) SHA1(191683c19f756ac150b8e037f46a6daca1a082fa) )
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "bt1-obj0.5b", 0x000000, 0x80000, CRC(16b5dc04) SHA1(57cc4b7907442f922102fbd61e470c149f0379ac) )
ROM_LOAD( "bt1-obj1.4b", 0x080000, 0x80000, CRC(ae37a969) SHA1(524a8ef68a62f9168d356e6cd37a72a888ced202) )
ROM_LOAD( "bt1-obj2.5d", 0x100000, 0x80000, CRC(75f74871) SHA1(75c47a2132e21a2d82000bca137929bffecc96ef) )
ROM_LOAD( "bt1-obj3.4d", 0x180000, 0x80000, CRC(7fb23c05) SHA1(da97c595a3338021c1bc46f9668e1ec6c7985cea) )
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Tiles */
+ ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */
ROM_LOAD( "bt1-chr0.11n", 0x00000, 0x80000, CRC(11574c30) SHA1(6e85dd1448961b89a13e8cf905b24a69d182edd8) )
/* no chr1, chr2 missing or just not needed? probably just not needed as I see no tile glitches */
- ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASEFF ) /* ROZ Tiles */
+ ROM_REGION( 0x400000, "s2roz", ROMREGION_ERASEFF ) /* ROZ Tiles */
/* All ROZ ROM sockets unpopulated on PCB */
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
ROM_LOAD( "bt1-sha0.7n", 0x000000, 0x80000, CRC(dc4664df) SHA1(59818b14e74ee9b15a66e850658e4697d78b28d9) )
ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */
@@ -5626,7 +5520,7 @@ ROM_START( luckywld )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "lw1obj0.3p", 0x000000, 0x80000, CRC(21485830) SHA1(e55a1f6df90c17b9c49e2b08c423b9be86996659) )
ROM_LOAD( "lw1obj1.3w", 0x100000, 0x80000, CRC(d6437a82) SHA1(0aad3242828ed7dce65db75cad196c44ddd55ba8) )
ROM_LOAD( "lw1obj2.3t", 0x200000, 0x80000, CRC(ceb6f516) SHA1(943dfe3bcf71a4885ce0ff33aaf81b2a49cf0b70) )
@@ -5637,7 +5531,7 @@ ROM_START( luckywld )
ROM_LOAD( "lw1obj6.3u", 0x280000, 0x80000, CRC(29740c88) SHA1(4078a5084256653a9c8ff72a7e2c652b0fbca425) )
ROM_LOAD( "lw1obj7.3z", 0x380000, 0x80000, CRC(8cbd62b4) SHA1(c6605ae2629b34f036e440573b2bb68e26aced9b) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* 8x8 Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* 8x8 Tiles */
ROM_LOAD( "lw1chr0.11n", 0x000000, 0x80000, CRC(a0da15fd) SHA1(d772f712f0c150fdeb5aafb84f27a1495ad3492c) )
ROM_LOAD( "lw1chr1.11p", 0x080000, 0x80000, CRC(89102445) SHA1(74d4e51a3540f72cc90fad04c7f0622930e0f854) )
ROM_LOAD( "lw1chr2.11r", 0x100000, 0x80000, CRC(c749b778) SHA1(f1e30f5269eced00a09af40717634ec65e64f06b) )
@@ -5645,15 +5539,15 @@ ROM_START( luckywld )
ROM_LOAD( "lw1chr4.9n", 0x200000, 0x80000, CRC(2f8ab45e) SHA1(2c7e5597ebf020aa88349c6d5a419ba0eee2db90) )
ROM_LOAD( "lw1chr5.9p", 0x280000, 0x80000, CRC(c9acbe61) SHA1(3a42ec1fcdf994bd9a309fdb48da01af4afb0a3f) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* 16x16 Tiles */
+ ROM_REGION( 0x400000, "c169roz", 0 ) /* 16x16 Tiles */
ROM_LOAD( "lw1roz1.23c", 0x080000, 0x80000, CRC(74e98793) SHA1(973dce838d9fbdf112429ab20edcdfbf07c3a9dc) )
ROM_LOAD( "lw1roz2.23e", 0x000000, 0x80000, CRC(1ef46d82) SHA1(2234585875bccdff74fa3f66d2d25d4b419c3bfe) )
ROM_LOAD( "lw1roz0.23b", 0x1c0000, 0x80000, CRC(a14079c9) SHA1(631f9b63488fd3194ebb41c9c7ec39d576b098d7) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* 8x8 shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* 8x8 shape */
ROM_LOAD( "lw1sha0.7n", 0x000000, 0x80000, CRC(e3a65196) SHA1(c983a6d16dc10f0acd5f4ef5e148271f46ffbf28) )
- ROM_REGION( 0x80000, "gfx5", 0 ) /* 16x16 shape */
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) /* 16x16 shape */
ROM_LOAD( "lw1rzs0.20z", 0x000000, 0x80000, CRC(a1071537) SHA1(bb8a97b82066d7838471e258d1c3c716ede7572c) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5689,7 +5583,7 @@ ROM_START( luckywldj )
ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */
/* external ROM not populated, unclear how it would map */
- ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
ROM_LOAD( "lw1obj0.3p", 0x000000, 0x80000, CRC(21485830) SHA1(e55a1f6df90c17b9c49e2b08c423b9be86996659) )
ROM_LOAD( "lw1obj1.3w", 0x100000, 0x80000, CRC(d6437a82) SHA1(0aad3242828ed7dce65db75cad196c44ddd55ba8) )
ROM_LOAD( "lw1obj2.3t", 0x200000, 0x80000, CRC(ceb6f516) SHA1(943dfe3bcf71a4885ce0ff33aaf81b2a49cf0b70) )
@@ -5700,7 +5594,7 @@ ROM_START( luckywldj )
ROM_LOAD( "lw1obj6.3u", 0x280000, 0x80000, CRC(29740c88) SHA1(4078a5084256653a9c8ff72a7e2c652b0fbca425) )
ROM_LOAD( "lw1obj7.3z", 0x380000, 0x80000, CRC(8cbd62b4) SHA1(c6605ae2629b34f036e440573b2bb68e26aced9b) )
- ROM_REGION( 0x400000, "gfx2", 0 ) /* 8x8 Tiles */
+ ROM_REGION( 0x400000, "c123tmap", 0 ) /* 8x8 Tiles */
ROM_LOAD( "lw1chr0.11n", 0x000000, 0x80000, CRC(a0da15fd) SHA1(d772f712f0c150fdeb5aafb84f27a1495ad3492c) )
ROM_LOAD( "lw1chr1.11p", 0x080000, 0x80000, CRC(89102445) SHA1(74d4e51a3540f72cc90fad04c7f0622930e0f854) )
ROM_LOAD( "lw1chr2.11r", 0x100000, 0x80000, CRC(c749b778) SHA1(f1e30f5269eced00a09af40717634ec65e64f06b) )
@@ -5708,15 +5602,15 @@ ROM_START( luckywldj )
ROM_LOAD( "lw1chr4.9n", 0x200000, 0x80000, CRC(2f8ab45e) SHA1(2c7e5597ebf020aa88349c6d5a419ba0eee2db90) )
ROM_LOAD( "lw1chr5.9p", 0x280000, 0x80000, CRC(c9acbe61) SHA1(3a42ec1fcdf994bd9a309fdb48da01af4afb0a3f) )
- ROM_REGION( 0x400000, "gfx3", 0 ) /* 16x16 Tiles */
+ ROM_REGION( 0x400000, "c169roz", 0 ) /* 16x16 Tiles */
ROM_LOAD( "lw1roz1.23c", 0x080000, 0x80000, CRC(74e98793) SHA1(973dce838d9fbdf112429ab20edcdfbf07c3a9dc) )
ROM_LOAD( "lw1roz2.23e", 0x000000, 0x80000, CRC(1ef46d82) SHA1(2234585875bccdff74fa3f66d2d25d4b419c3bfe) )
ROM_LOAD( "lw1roz0.23b", 0x1c0000, 0x80000, CRC(a14079c9) SHA1(631f9b63488fd3194ebb41c9c7ec39d576b098d7) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* 8x8 shape */
+ ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* 8x8 shape */
ROM_LOAD( "lw1sha0.7n", 0x000000, 0x80000, CRC(e3a65196) SHA1(c983a6d16dc10f0acd5f4ef5e148271f46ffbf28) )
- ROM_REGION( 0x80000, "gfx5", 0 ) /* 16x16 shape */
+ ROM_REGION( 0x80000, "c169roz:mask", 0 ) /* 16x16 shape */
ROM_LOAD( "lw1rzs0.20z", 0x000000, 0x80000, CRC(a1071537) SHA1(bb8a97b82066d7838471e258d1c3c716ede7572c) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
@@ -5820,8 +5714,8 @@ void namcos2_state::init_marvland()
void namcos2_state::init_metlhawk()
{
/* unscramble sprites */
- uint8_t *data = memregion("gfx1")->base();
- int size = memregion("gfx1")->bytes();
+ uint8_t *data = memregion("sprite")->base();
+ int size = memregion("sprite")->bytes();
for (int i=0; i<size; i+=32*32)
{
for (int j=0; j<32*32; j+=32*4)
@@ -5945,7 +5839,7 @@ void namcos2_state::init_bubbletr()
void namcos2_state::init_luckywld()
{
- uint8_t *pData = (uint8_t *)memregion( "gfx5" )->base();
+ uint8_t *pData = (uint8_t *)memregion( "c169roz:mask" )->base();
int i;
for( i=0; i<32*0x4000; i++ )
{ /* unscramble gfx mask */
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index 4918e168877..5b716da7488 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -316,7 +316,7 @@ public:
m_palette(*this, "palette"),
m_screen(*this, "screen"),
m_audiobank(*this, "audiobank"),
- m_mpDualPortRAM(*this,"mpdualportram"),
+ m_dpram(*this, "dpram"),
m_gpu_intc(*this, "gpu_intc"),
m_namcos21_3d(*this, "namcos21_3d"),
m_namcos21_dsp(*this, "namcos21dsp")
@@ -339,7 +339,7 @@ private:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
required_memory_bank m_audiobank;
- required_shared_ptr<uint8_t> m_mpDualPortRAM;
+ required_shared_ptr<uint8_t> m_dpram;
required_device<namco_c148_device> m_gpu_intc;
required_device<namcos21_3d_device> m_namcos21_3d;
required_device<namcos21_dsp_device> m_namcos21_dsp;
@@ -351,13 +351,13 @@ private:
uint16_t m_winrun_color;
uint16_t m_winrun_gpu_register[0x10/2];
- DECLARE_READ16_MEMBER(namcos21_video_enable_r);
- DECLARE_WRITE16_MEMBER(namcos21_video_enable_w);
+ DECLARE_READ16_MEMBER(video_enable_r);
+ DECLARE_WRITE16_MEMBER(video_enable_w);
- DECLARE_READ16_MEMBER(namcos2_68k_dualportram_word_r);
- DECLARE_WRITE16_MEMBER(namcos2_68k_dualportram_word_w);
- DECLARE_READ8_MEMBER(namcos2_dualportram_byte_r);
- DECLARE_WRITE8_MEMBER(namcos2_dualportram_byte_w);
+ DECLARE_READ16_MEMBER(dpram_word_r);
+ DECLARE_WRITE16_MEMBER(dpram_word_w);
+ DECLARE_READ8_MEMBER(dpram_byte_r);
+ DECLARE_WRITE8_MEMBER(dpram_byte_w);
DECLARE_READ16_MEMBER(winrun_gpu_color_r);
DECLARE_WRITE16_MEMBER(winrun_gpu_color_w);
@@ -366,10 +366,10 @@ private:
DECLARE_WRITE16_MEMBER(winrun_gpu_videoram_w);
DECLARE_READ16_MEMBER(winrun_gpu_videoram_r);
- DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w );
- DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r );
+ DECLARE_WRITE8_MEMBER(eeprom_w);
+ DECLARE_READ8_MEMBER(eeprom_r);
- DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w );
+ DECLARE_WRITE8_MEMBER(sound_bankselect_w);
DECLARE_WRITE8_MEMBER(sound_reset_w);
DECLARE_WRITE8_MEMBER(system_reset_w);
@@ -379,17 +379,14 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline);
- DECLARE_MACHINE_START(namcos21);
- DECLARE_MACHINE_RESET(namcos21);
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
- uint32_t screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_winrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_driveyes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void winrun_bitmap_draw(bitmap_ind16 &bitmap, const rectangle &cliprect);
void configure_c65_namcos21(machine_config &config);
- void configure_c68_namcos21(machine_config &config);
void winrun_master_map(address_map &map);
void winrun_slave_map(address_map &map);
@@ -475,7 +472,7 @@ void namcos21_state::winrun_bitmap_draw(bitmap_ind16 &bitmap, const rectangle &c
}
-uint32_t namcos21_state::screen_update_winrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t namcos21_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0xff, cliprect );
@@ -490,17 +487,17 @@ uint32_t namcos21_state::screen_update_winrun(screen_device &screen, bitmap_ind1
-READ16_MEMBER(namcos21_state::namcos21_video_enable_r)
+READ16_MEMBER(namcos21_state::video_enable_r)
{
return m_video_enable;
}
-WRITE16_MEMBER(namcos21_state::namcos21_video_enable_w)
+WRITE16_MEMBER(namcos21_state::video_enable_w)
{
COMBINE_DATA( &m_video_enable ); /* 0x40 = enable */
if( m_video_enable!=0 && m_video_enable!=0x40 )
{
- logerror( "unexpected namcos21_video_enable_w=0x%x\n", m_video_enable );
+ logerror( "unexpected video_enable_w=0x%x\n", m_video_enable );
}
}
@@ -508,27 +505,27 @@ WRITE16_MEMBER(namcos21_state::namcos21_video_enable_w)
/* dual port ram memory handlers */
-READ16_MEMBER(namcos21_state::namcos2_68k_dualportram_word_r)
+READ16_MEMBER(namcos21_state::dpram_word_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE16_MEMBER(namcos21_state::namcos2_68k_dualportram_word_w)
+WRITE16_MEMBER(namcos21_state::dpram_word_w)
{
if( ACCESSING_BITS_0_7 )
{
- m_mpDualPortRAM[offset] = data&0xff;
+ m_dpram[offset] = data&0xff;
}
}
-READ8_MEMBER(namcos21_state::namcos2_dualportram_byte_r)
+READ8_MEMBER(namcos21_state::dpram_byte_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE8_MEMBER(namcos21_state::namcos2_dualportram_byte_w)
+WRITE8_MEMBER(namcos21_state::dpram_byte_w)
{
- m_mpDualPortRAM[offset] = data;
+ m_dpram[offset] = data;
}
/******************************************************************************/
@@ -537,7 +534,7 @@ void namcos21_state::winrun_master_map(address_map &map)
{
map(0x000000, 0x03ffff).rom();
map(0x100000, 0x10ffff).ram(); /* work RAM */
- map(0x180000, 0x183fff).rw(FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x180000, 0x183fff).rw(FUNC(namcos21_state::eeprom_r), FUNC(namcos21_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
// DSP Related
@@ -552,7 +549,7 @@ void namcos21_state::winrun_master_map(address_map &map)
map(0x600000, 0x60ffff).ram().share("gpu_comram");
map(0x800000, 0x87ffff).rom().region("data", 0);
map(0x900000, 0x90ffff).ram().share("sharedram");
- map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w));
+ map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::dpram_word_r), FUNC(namcos21_state::dpram_word_w));
map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w));
map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map));
}
@@ -565,7 +562,7 @@ void namcos21_state::winrun_slave_map(address_map &map)
map(0x600000, 0x60ffff).ram().share("gpu_comram");
map(0x800000, 0x87ffff).rom().region("data", 0);
map(0x900000, 0x90ffff).ram().share("sharedram");
- map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w));
+ map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::dpram_word_r), FUNC(namcos21_state::dpram_word_w));
map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w));
map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map));
}
@@ -597,12 +594,12 @@ void namcos21_state::sound_map(address_map &map)
map(0x3000, 0x3003).nopw(); /* ? */
map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x5000, 0x6fff).rw(m_c140, FUNC(c140_device::c140_r), FUNC(c140_device::c140_w));
- map(0x7000, 0x77ff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)).share("mpdualportram");
- map(0x7800, 0x7fff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)); /* mirror */
+ map(0x7000, 0x77ff).rw(FUNC(namcos21_state::dpram_byte_r), FUNC(namcos21_state::dpram_byte_w)).share("dpram");
+ map(0x7800, 0x7fff).rw(FUNC(namcos21_state::dpram_byte_r), FUNC(namcos21_state::dpram_byte_w)); /* mirror */
map(0x8000, 0x9fff).ram();
map(0xa000, 0xbfff).nopw(); /* amplifier enable on 1st write */
map(0xc000, 0xffff).nopw(); /* avoid debug log noise; games write frequently to 0xe000 */
- map(0xc000, 0xc001).w(FUNC(namcos21_state::namcos2_sound_bankselect_w));
+ map(0xc000, 0xc001).w(FUNC(namcos21_state::sound_bankselect_w));
map(0xd001, 0xd001).nopw(); /* watchdog */
map(0xd000, 0xffff).rom().region("audiocpu", 0x01000);
}
@@ -631,8 +628,8 @@ void namcos21_state::configure_c65_namcos21(machine_config &config)
m_c65->an5_in_cb().set_ioport("AN5");
m_c65->an6_in_cb().set_ioport("AN6");
m_c65->an7_in_cb().set_ioport("AN7");
- m_c65->dp_in_callback().set(FUNC(namcos21_state::namcos2_dualportram_byte_r));
- m_c65->dp_out_callback().set(FUNC(namcos21_state::namcos2_dualportram_byte_w));
+ m_c65->dp_in_callback().set(FUNC(namcos21_state::dpram_byte_r));
+ m_c65->dp_out_callback().set(FUNC(namcos21_state::dpram_byte_w));
}
/*************************************************************/
@@ -765,7 +762,7 @@ static INPUT_PORTS_START( winrungp )
PORT_DIPSETTING( 0x00, "4M" )
INPUT_PORTS_END
-WRITE8_MEMBER( namcos21_state::namcos2_sound_bankselect_w )
+WRITE8_MEMBER( namcos21_state::sound_bankselect_w )
{
m_audiobank->set_entry(data>>4);
}
@@ -799,22 +796,20 @@ void namcos21_state::reset_all_subcpus(int state)
m_c65->ext_reset(state);
}
-WRITE8_MEMBER(namcos21_state::namcos2_68k_eeprom_w)
+WRITE8_MEMBER(namcos21_state::eeprom_w)
{
m_eeprom[offset] = data;
}
-READ8_MEMBER(namcos21_state::namcos2_68k_eeprom_r)
+READ8_MEMBER(namcos21_state::eeprom_r)
{
return m_eeprom[offset];
}
-MACHINE_RESET_MEMBER(namcos21_state, namcos21)
+void namcos21_state::machine_reset()
{
- address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
-
/* Initialise the bank select in the sound CPU */
- namcos2_sound_bankselect_w(audio_space, 0, 0); /* Page in bank 0 */
+ m_audiobank->set_entry(0); /* Page in bank 0 */
m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE );
@@ -824,7 +819,7 @@ MACHINE_RESET_MEMBER(namcos21_state, namcos21)
-MACHINE_START_MEMBER(namcos21_state,namcos21)
+void namcos21_state::machine_start()
{
m_eeprom = std::make_unique<uint8_t[]>(0x2000);
subdevice<nvram_device>("nvram")->set_base(m_eeprom.get(), 0x2000);
@@ -833,7 +828,6 @@ MACHINE_START_MEMBER(namcos21_state,namcos21)
for (int i = 0; i < 0x10; i++)
m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
- m_audiobank->set_entry(0);
}
TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline)
@@ -892,13 +886,11 @@ MACHINE_CONFIG_START(namcos21_state::winrun)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos21_state,namcos21)
- MCFG_MACHINE_RESET_OVERRIDE(namcos21_state,namcos21)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS_NAMCO480I
- MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update_winrun)
+ MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS)
diff --git a/src/mame/drivers/namcos21_c67.cpp b/src/mame/drivers/namcos21_c67.cpp
index 0d602311347..49eaf55274e 100644
--- a/src/mame/drivers/namcos21_c67.cpp
+++ b/src/mame/drivers/namcos21_c67.cpp
@@ -269,6 +269,7 @@ Namco System 21 Video Hardware
#include "video/namcos21_3d.h"
#include "sound/c140.h"
#include "sound/ym2151.h"
+#include "emupal.h"
// TODO: basic parameters to get 60.606060 Hz, x2 is for interlace
#define MCFG_SCREEN_RAW_PARAMS_NAMCO480I \
@@ -295,7 +296,7 @@ public:
m_palette(*this, "palette"),
m_screen(*this, "screen"),
m_audiobank(*this, "audiobank"),
- m_mpDualPortRAM(*this,"mpdualportram"),
+ m_dpram(*this, "dpram"),
m_namcos21_3d(*this, "namcos21_3d"),
m_namcos21_dsp_c67(*this, "namcos21dsp_c67")
{ }
@@ -322,24 +323,24 @@ private:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
required_memory_bank m_audiobank;
- required_shared_ptr<uint8_t> m_mpDualPortRAM;
+ required_shared_ptr<uint8_t> m_dpram;
required_device<namcos21_3d_device> m_namcos21_3d;
required_device<namcos21_dsp_c67_device> m_namcos21_dsp_c67;
uint16_t m_video_enable;
- DECLARE_READ16_MEMBER(namcos21_video_enable_r);
- DECLARE_WRITE16_MEMBER(namcos21_video_enable_w);
+ DECLARE_READ16_MEMBER(video_enable_r);
+ DECLARE_WRITE16_MEMBER(video_enable_w);
- DECLARE_READ16_MEMBER(namcos2_68k_dualportram_word_r);
- DECLARE_WRITE16_MEMBER(namcos2_68k_dualportram_word_w);
- DECLARE_READ8_MEMBER(namcos2_dualportram_byte_r);
- DECLARE_WRITE8_MEMBER(namcos2_dualportram_byte_w);
+ DECLARE_READ16_MEMBER(dpram_word_r);
+ DECLARE_WRITE16_MEMBER(dpram_word_w);
+ DECLARE_READ8_MEMBER(dpram_byte_r);
+ DECLARE_WRITE8_MEMBER(dpram_byte_w);
- DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w );
- DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r );
+ DECLARE_WRITE8_MEMBER(eeprom_w);
+ DECLARE_READ8_MEMBER(eeprom_r);
- DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w );
+ DECLARE_WRITE8_MEMBER(sound_bankselect_w);
DECLARE_WRITE8_MEMBER(sound_reset_w);
DECLARE_WRITE8_MEMBER(system_reset_w);
@@ -351,10 +352,10 @@ private:
DECLARE_WRITE_LINE_MEMBER(yield_hack);
- DECLARE_MACHINE_START(namcos21);
- DECLARE_MACHINE_RESET(namcos21);
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
- uint32_t screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void configure_c68_namcos21(machine_config &config);
@@ -366,7 +367,7 @@ private:
};
-uint32_t namcos21_c67_state::screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t namcos21_c67_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
//uint8_t *videoram = m_gpu_videoram.get();
int pivot = 3;
@@ -390,17 +391,17 @@ uint32_t namcos21_c67_state::screen_update_namcos21(screen_device &screen, bitma
return 0;
}
-READ16_MEMBER(namcos21_c67_state::namcos21_video_enable_r)
+READ16_MEMBER(namcos21_c67_state::video_enable_r)
{
return m_video_enable;
}
-WRITE16_MEMBER(namcos21_c67_state::namcos21_video_enable_w)
+WRITE16_MEMBER(namcos21_c67_state::video_enable_w)
{
COMBINE_DATA( &m_video_enable ); /* 0x40 = enable */
if( m_video_enable!=0 && m_video_enable!=0x40 )
{
- logerror( "unexpected namcos21_video_enable_w=0x%x\n", m_video_enable );
+ logerror( "unexpected video_enable_w=0x%x\n", m_video_enable );
}
}
@@ -408,27 +409,27 @@ WRITE16_MEMBER(namcos21_c67_state::namcos21_video_enable_w)
/* dual port ram memory handlers */
-READ16_MEMBER(namcos21_c67_state::namcos2_68k_dualportram_word_r)
+READ16_MEMBER(namcos21_c67_state::dpram_word_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE16_MEMBER(namcos21_c67_state::namcos2_68k_dualportram_word_w)
+WRITE16_MEMBER(namcos21_c67_state::dpram_word_w)
{
if( ACCESSING_BITS_0_7 )
{
- m_mpDualPortRAM[offset] = data&0xff;
+ m_dpram[offset] = data&0xff;
}
}
-READ8_MEMBER(namcos21_c67_state::namcos2_dualportram_byte_r)
+READ8_MEMBER(namcos21_c67_state::dpram_byte_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE8_MEMBER(namcos21_c67_state::namcos2_dualportram_byte_w)
+WRITE8_MEMBER(namcos21_c67_state::dpram_byte_w)
{
- m_mpDualPortRAM[offset] = data;
+ m_dpram[offset] = data;
}
/******************************************************************************/
@@ -448,10 +449,10 @@ void namcos21_c67_state::common_map(address_map &map)
map(0x720000, 0x720007).rw(m_c355spr, FUNC(namco_c355spr_device::position_r), FUNC(namco_c355spr_device::position_w));
map(0x740000, 0x74ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x750000, 0x75ffff).ram().w(m_palette, FUNC(palette_device::write16_ext)).share("palette_ext");
- map(0x760000, 0x760001).rw(FUNC(namcos21_c67_state::namcos21_video_enable_r), FUNC(namcos21_c67_state::namcos21_video_enable_w));
+ map(0x760000, 0x760001).rw(FUNC(namcos21_c67_state::video_enable_r), FUNC(namcos21_c67_state::video_enable_w));
map(0x800000, 0x8fffff).rom().region("data", 0);
map(0x900000, 0x90ffff).ram().share("sharedram");
- map(0xa00000, 0xa00fff).rw(FUNC(namcos21_c67_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_c67_state::namcos2_68k_dualportram_word_w));
+ map(0xa00000, 0xa00fff).rw(FUNC(namcos21_c67_state::dpram_word_r), FUNC(namcos21_c67_state::dpram_word_w));
map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w));
map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map));
map(0xc00000, 0xcfffff).rom().mirror(0x100000).region("edata", 0);
@@ -462,7 +463,7 @@ void namcos21_c67_state::master_map(address_map &map)
common_map(map);
map(0x000000, 0x0fffff).rom();
map(0x100000, 0x10ffff).ram(); /* private work RAM */
- map(0x180000, 0x183fff).rw(FUNC(namcos21_c67_state::namcos2_68k_eeprom_r), FUNC(namcos21_c67_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x180000, 0x183fff).rw(FUNC(namcos21_c67_state::eeprom_r), FUNC(namcos21_c67_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
map(0x200000, 0x20ffff).rw(m_namcos21_dsp_c67, FUNC(namcos21_dsp_c67_device::dspram16_r), FUNC(namcos21_dsp_c67_device::dspram16_hack_w));
}
@@ -486,12 +487,12 @@ void namcos21_c67_state::sound_map(address_map &map)
map(0x3000, 0x3003).nopw(); /* ? */
map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x5000, 0x6fff).rw(m_c140, FUNC(c140_device::c140_r), FUNC(c140_device::c140_w));
- map(0x7000, 0x77ff).rw(FUNC(namcos21_c67_state::namcos2_dualportram_byte_r), FUNC(namcos21_c67_state::namcos2_dualportram_byte_w)).share("mpdualportram");
- map(0x7800, 0x7fff).rw(FUNC(namcos21_c67_state::namcos2_dualportram_byte_r), FUNC(namcos21_c67_state::namcos2_dualportram_byte_w)); /* mirror */
+ map(0x7000, 0x77ff).rw(FUNC(namcos21_c67_state::dpram_byte_r), FUNC(namcos21_c67_state::dpram_byte_w)).share("dpram");
+ map(0x7800, 0x7fff).rw(FUNC(namcos21_c67_state::dpram_byte_r), FUNC(namcos21_c67_state::dpram_byte_w)); /* mirror */
map(0x8000, 0x9fff).ram();
map(0xa000, 0xbfff).nopw(); /* amplifier enable on 1st write */
map(0xc000, 0xffff).nopw(); /* avoid debug log noise; games write frequently to 0xe000 */
- map(0xc000, 0xc001).w(FUNC(namcos21_c67_state::namcos2_sound_bankselect_w));
+ map(0xc000, 0xc001).w(FUNC(namcos21_c67_state::sound_bankselect_w));
map(0xd001, 0xd001).nopw(); /* watchdog */
map(0xd000, 0xffff).rom().region("audiocpu", 0x01000);
}
@@ -519,8 +520,8 @@ void namcos21_c67_state::configure_c68_namcos21(machine_config &config)
m_c68->an5_in_cb().set_ioport("AN5");
m_c68->an6_in_cb().set_ioport("AN6");
m_c68->an7_in_cb().set_ioport("AN7");
- m_c68->dp_in_callback().set(FUNC(namcos21_c67_state::namcos2_dualportram_byte_r));
- m_c68->dp_out_callback().set(FUNC(namcos21_c67_state::namcos2_dualportram_byte_w));
+ m_c68->dp_in_callback().set(FUNC(namcos21_c67_state::dpram_byte_r));
+ m_c68->dp_out_callback().set(FUNC(namcos21_c67_state::dpram_byte_w));
}
/*************************************************************/
@@ -709,7 +710,7 @@ static GFXDECODE_START( gfx_namcos21 )
GFXDECODE_END
-WRITE8_MEMBER( namcos21_c67_state::namcos2_sound_bankselect_w )
+WRITE8_MEMBER( namcos21_c67_state::sound_bankselect_w )
{
m_audiobank->set_entry(data>>4);
}
@@ -750,22 +751,20 @@ void namcos21_c67_state::reset_all_subcpus(int state)
m_namcos21_dsp_c67->reset_dsps(state);
}
-WRITE8_MEMBER(namcos21_c67_state::namcos2_68k_eeprom_w)
+WRITE8_MEMBER(namcos21_c67_state::eeprom_w)
{
m_eeprom[offset] = data;
}
-READ8_MEMBER(namcos21_c67_state::namcos2_68k_eeprom_r)
+READ8_MEMBER(namcos21_c67_state::eeprom_r)
{
return m_eeprom[offset];
}
-MACHINE_RESET_MEMBER(namcos21_c67_state, namcos21)
+void namcos21_c67_state::machine_reset()
{
- address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
-
/* Initialise the bank select in the sound CPU */
- namcos2_sound_bankselect_w(audio_space, 0, 0); /* Page in bank 0 */
+ m_audiobank->set_entry(0); /* Page in bank 0 */
m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE );
@@ -775,7 +774,7 @@ MACHINE_RESET_MEMBER(namcos21_c67_state, namcos21)
-MACHINE_START_MEMBER(namcos21_c67_state,namcos21)
+void namcos21_c67_state::machine_start()
{
m_eeprom = std::make_unique<uint8_t[]>(0x2000);
subdevice<nvram_device>("nvram")->set_base(m_eeprom.get(), 0x2000);
@@ -784,8 +783,6 @@ MACHINE_START_MEMBER(namcos21_c67_state,namcos21)
for (int i = 0; i < 0x10; i++)
m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
- m_audiobank->set_entry(0);
-
}
TIMER_DEVICE_CALLBACK_MEMBER(namcos21_c67_state::screen_scanline)
@@ -833,13 +830,11 @@ MACHINE_CONFIG_START(namcos21_c67_state::namcos21)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
- MCFG_MACHINE_START_OVERRIDE(namcos21_c67_state,namcos21)
- MCFG_MACHINE_RESET_OVERRIDE(namcos21_c67_state,namcos21)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS_NAMCO480I
- MCFG_SCREEN_UPDATE_DRIVER(namcos21_c67_state, screen_update_namcos21)
+ MCFG_SCREEN_UPDATE_DRIVER(namcos21_c67_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
NAMCOS21_3D(config, m_namcos21_3d, 0);
@@ -855,7 +850,7 @@ MACHINE_CONFIG_START(namcos21_c67_state::namcos21)
MCFG_PALETTE_FORMAT(XBRG)
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(false);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
diff --git a/src/mame/drivers/namcos21_de.cpp b/src/mame/drivers/namcos21_de.cpp
index 175c9a517a6..a25b87a67c4 100644
--- a/src/mame/drivers/namcos21_de.cpp
+++ b/src/mame/drivers/namcos21_de.cpp
@@ -46,6 +46,7 @@ Driver's Eyes works,
#include "video/namcos21_3d.h"
#include "sound/ym2151.h"
#include "sound/c140.h"
+#include "emupal.h"
// TODO: basic parameters to get 60.606060 Hz, x2 is for interlace
#define MCFG_SCREEN_RAW_PARAMS_NAMCO480I \
@@ -88,24 +89,24 @@ private:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
required_memory_bank m_audiobank;
- required_shared_ptr<uint8_t> m_mpDualPortRAM;
+ required_shared_ptr<uint8_t> m_dpram;
required_device<namcos21_3d_device> m_namcos21_3d;
required_device<namcos21_dsp_device> m_namcos21_dsp;
uint16_t m_video_enable;
- DECLARE_READ16_MEMBER(namcos21_video_enable_r);
- DECLARE_WRITE16_MEMBER(namcos21_video_enable_w);
+ DECLARE_READ16_MEMBER(video_enable_r);
+ DECLARE_WRITE16_MEMBER(video_enable_w);
- DECLARE_READ16_MEMBER(namcos2_68k_dualportram_word_r);
- DECLARE_WRITE16_MEMBER(namcos2_68k_dualportram_word_w);
- DECLARE_READ8_MEMBER(namcos2_dualportram_byte_r);
- DECLARE_WRITE8_MEMBER(namcos2_dualportram_byte_w);
+ DECLARE_READ16_MEMBER(dpram_word_r);
+ DECLARE_WRITE16_MEMBER(dpram_word_w);
+ DECLARE_READ8_MEMBER(dpram_byte_r);
+ DECLARE_WRITE8_MEMBER(dpram_byte_w);
- DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w );
- DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r );
+ DECLARE_WRITE8_MEMBER(eeprom_w);
+ DECLARE_READ8_MEMBER(eeprom_r);
- DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w );
+ DECLARE_WRITE8_MEMBER(sound_bankselect_w);
DECLARE_WRITE8_MEMBER(sound_reset_w);
DECLARE_WRITE8_MEMBER(system_reset_w);
@@ -115,7 +116,7 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline);
- uint32_t screen_update_driveyes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void configure_c68_namcos21(machine_config &config);
@@ -144,7 +145,7 @@ namco_de_pcbstack_device::namco_de_pcbstack_device(const machine_config &mconfig
m_palette(*this, "palette"),
m_screen(*this, "screen"),
m_audiobank(*this, "audiobank"),
- m_mpDualPortRAM(*this, "mpdualportram"),
+ m_dpram(*this, "dpram"),
m_namcos21_3d(*this, "namcos21_3d"),
m_namcos21_dsp(*this, "namcos21dsp")
{}
@@ -208,7 +209,7 @@ MACHINE_CONFIG_START(namco_de_pcbstack_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS_NAMCO480I
- MCFG_SCREEN_UPDATE_DRIVER(namco_de_pcbstack_device, screen_update_driveyes)
+ MCFG_SCREEN_UPDATE_DRIVER(namco_de_pcbstack_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos21)
@@ -222,7 +223,7 @@ MACHINE_CONFIG_START(namco_de_pcbstack_device::device_add_mconfig)
m_namcos21_3d->set_framebuffer_size(496,480);
NAMCO_C355SPR(config, m_c355spr, 0);
- m_c355spr->set_palette_tag("palette");
+ m_c355spr->set_screen(m_screen);
m_c355spr->set_gfxdecode_tag("gfxdecode");
m_c355spr->set_is_namcofl(false);
m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate());
@@ -243,7 +244,7 @@ MACHINE_CONFIG_START(namco_de_pcbstack_device::device_add_mconfig)
MACHINE_CONFIG_END
-uint32_t namco_de_pcbstack_device::screen_update_driveyes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t namco_de_pcbstack_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
//uint8_t *videoram = m_gpu_videoram.get();
int pivot = 3;
@@ -271,17 +272,17 @@ uint32_t namco_de_pcbstack_device::screen_update_driveyes(screen_device &screen,
}
-READ16_MEMBER(namco_de_pcbstack_device::namcos21_video_enable_r)
+READ16_MEMBER(namco_de_pcbstack_device::video_enable_r)
{
return m_video_enable;
}
-WRITE16_MEMBER(namco_de_pcbstack_device::namcos21_video_enable_w)
+WRITE16_MEMBER(namco_de_pcbstack_device::video_enable_w)
{
COMBINE_DATA( &m_video_enable ); /* 0x40 = enable */
if( m_video_enable!=0 && m_video_enable!=0x40 )
{
- logerror( "unexpected namcos21_video_enable_w=0x%x\n", m_video_enable );
+ logerror( "unexpected video_enable_w=0x%x\n", m_video_enable );
}
}
@@ -289,27 +290,27 @@ WRITE16_MEMBER(namco_de_pcbstack_device::namcos21_video_enable_w)
/* dual port ram memory handlers */
-READ16_MEMBER(namco_de_pcbstack_device::namcos2_68k_dualportram_word_r)
+READ16_MEMBER(namco_de_pcbstack_device::dpram_word_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE16_MEMBER(namco_de_pcbstack_device::namcos2_68k_dualportram_word_w)
+WRITE16_MEMBER(namco_de_pcbstack_device::dpram_word_w)
{
if( ACCESSING_BITS_0_7 )
{
- m_mpDualPortRAM[offset] = data&0xff;
+ m_dpram[offset] = data&0xff;
}
}
-READ8_MEMBER(namco_de_pcbstack_device::namcos2_dualportram_byte_r)
+READ8_MEMBER(namco_de_pcbstack_device::dpram_byte_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE8_MEMBER(namco_de_pcbstack_device::namcos2_dualportram_byte_w)
+WRITE8_MEMBER(namco_de_pcbstack_device::dpram_byte_w)
{
- m_mpDualPortRAM[offset] = data;
+ m_dpram[offset] = data;
}
/*************************************************************/
@@ -322,12 +323,12 @@ void namco_de_pcbstack_device::sound_map(address_map &map)
map(0x3000, 0x3003).nopw(); /* ? */
map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x5000, 0x6fff).rw(m_c140, FUNC(c140_device::c140_r), FUNC(c140_device::c140_w));
- map(0x7000, 0x77ff).rw(FUNC(namco_de_pcbstack_device::namcos2_dualportram_byte_r), FUNC(namco_de_pcbstack_device::namcos2_dualportram_byte_w)).share("mpdualportram");
- map(0x7800, 0x7fff).rw(FUNC(namco_de_pcbstack_device::namcos2_dualportram_byte_r), FUNC(namco_de_pcbstack_device::namcos2_dualportram_byte_w)); /* mirror */
+ map(0x7000, 0x77ff).rw(FUNC(namco_de_pcbstack_device::dpram_byte_r), FUNC(namco_de_pcbstack_device::dpram_byte_w)).share("dpram");
+ map(0x7800, 0x7fff).rw(FUNC(namco_de_pcbstack_device::dpram_byte_r), FUNC(namco_de_pcbstack_device::dpram_byte_w)); /* mirror */
map(0x8000, 0x9fff).ram();
map(0xa000, 0xbfff).nopw(); /* amplifier enable on 1st write */
map(0xc000, 0xffff).nopw(); /* avoid debug log noise; games write frequently to 0xe000 */
- map(0xc000, 0xc001).w(FUNC(namco_de_pcbstack_device::namcos2_sound_bankselect_w));
+ map(0xc000, 0xc001).w(FUNC(namco_de_pcbstack_device::sound_bankselect_w));
map(0xd001, 0xd001).nopw(); /* watchdog */
map(0xd000, 0xffff).rom().region("audiocpu", 0x01000);
}
@@ -355,8 +356,8 @@ void namco_de_pcbstack_device::configure_c68_namcos21(machine_config &config)
m_c68->an5_in_cb().set_ioport("AN5");
m_c68->an6_in_cb().set_ioport("AN6");
m_c68->an7_in_cb().set_ioport("AN7");
- m_c68->dp_in_callback().set(FUNC(namco_de_pcbstack_device::namcos2_dualportram_byte_r));
- m_c68->dp_out_callback().set(FUNC(namco_de_pcbstack_device::namcos2_dualportram_byte_w));
+ m_c68->dp_in_callback().set(FUNC(namco_de_pcbstack_device::dpram_byte_r));
+ m_c68->dp_out_callback().set(FUNC(namco_de_pcbstack_device::dpram_byte_w));
}
/*************************************************************/
@@ -370,10 +371,10 @@ void namco_de_pcbstack_device::driveyes_common_map(address_map &map)
map(0x720000, 0x720007).rw(m_c355spr, FUNC(namco_c355spr_device::position_r), FUNC(namco_c355spr_device::position_w));
map(0x740000, 0x74ffff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x750000, 0x75ffff).ram().w(m_palette, FUNC(palette_device::write16_ext)).share("palette_ext");
- map(0x760000, 0x760001).rw(FUNC(namco_de_pcbstack_device::namcos21_video_enable_r), FUNC(namco_de_pcbstack_device::namcos21_video_enable_w));
+ map(0x760000, 0x760001).rw(FUNC(namco_de_pcbstack_device::video_enable_r), FUNC(namco_de_pcbstack_device::video_enable_w));
map(0x800000, 0x8fffff).rom().region("data", 0);
map(0x900000, 0x90ffff).ram().share("sharedram");
- map(0xa00000, 0xa00fff).rw(FUNC(namco_de_pcbstack_device::namcos2_68k_dualportram_word_r), FUNC(namco_de_pcbstack_device::namcos2_68k_dualportram_word_w));
+ map(0xa00000, 0xa00fff).rw(FUNC(namco_de_pcbstack_device::dpram_word_r), FUNC(namco_de_pcbstack_device::dpram_word_w));
map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w));
map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map));
}
@@ -383,7 +384,7 @@ void namco_de_pcbstack_device::driveyes_master_map(address_map &map)
driveyes_common_map(map);
map(0x000000, 0x03ffff).rom();
map(0x100000, 0x10ffff).ram(); /* private work RAM */
- map(0x180000, 0x183fff).rw(FUNC(namco_de_pcbstack_device::namcos2_68k_eeprom_r), FUNC(namco_de_pcbstack_device::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x180000, 0x183fff).rw(FUNC(namco_de_pcbstack_device::eeprom_r), FUNC(namco_de_pcbstack_device::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
// DSP related
@@ -403,7 +404,7 @@ void namco_de_pcbstack_device::driveyes_slave_map(address_map &map)
map(0x1c0000, 0x1fffff).m(m_slave_intc, FUNC(namco_c148_device::map));
}
-WRITE8_MEMBER( namco_de_pcbstack_device::namcos2_sound_bankselect_w )
+WRITE8_MEMBER( namco_de_pcbstack_device::sound_bankselect_w )
{
m_audiobank->set_entry(data>>4);
}
@@ -437,12 +438,12 @@ void namco_de_pcbstack_device::reset_all_subcpus(int state)
m_c68->ext_reset(state);
}
-WRITE8_MEMBER(namco_de_pcbstack_device::namcos2_68k_eeprom_w)
+WRITE8_MEMBER(namco_de_pcbstack_device::eeprom_w)
{
m_eeprom[offset] = data;
}
-READ8_MEMBER(namco_de_pcbstack_device::namcos2_68k_eeprom_r)
+READ8_MEMBER(namco_de_pcbstack_device::eeprom_r)
{
return m_eeprom[offset];
}
@@ -477,22 +478,16 @@ void namco_de_pcbstack_device::device_start()
m_eeprom = std::make_unique<uint8_t[]>(0x2000);
subdevice<nvram_device>("nvram")->set_base(m_eeprom.get(), 0x2000);
- if (m_audiobank)
- {
- uint32_t max = memregion("audiocpu")->bytes() / 0x4000;
- for (int i = 0; i < 0x10; i++)
- m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
+ uint32_t max = memregion("audiocpu")->bytes() / 0x4000;
+ for (int i = 0; i < 0x10; i++)
+ m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
- m_audiobank->set_entry(0);
- }
}
void namco_de_pcbstack_device::device_reset()
{
- address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
-
/* Initialise the bank select in the sound CPU */
- namcos2_sound_bankselect_w(audio_space, 0, 0); /* Page in bank 0 */
+ m_audiobank->set_entry(0); /* Page in bank 0 */
m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE );
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index 2f2f63e2f55..1f9bce51306 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -7,21 +7,14 @@
#include "video/namco_c116.h"
#include "video/namco_c169roz.h"
#include "video/namco_c355spr.h"
+#include "emupal.h"
#define NAMCOFL_HTOTAL (288) /* wrong */
#define NAMCOFL_HBSTART (288)
#define NAMCOFL_VTOTAL (262) /* needs to be checked */
#define NAMCOFL_VBSTART (224)
-#define NAMCOFL_TILEMASKREGION "tilemask"
-#define NAMCOFL_TILEGFXREGION "tile"
-#define NAMCOFL_SPRITEGFXREGION "sprite"
-#define NAMCOFL_ROTMASKREGION "rotmask"
-#define NAMCOFL_ROTGFXREGION "rot"
-
-#define NAMCOFL_TILEGFX 0
-#define NAMCOFL_SPRITEGFX 1
-#define NAMCOFL_ROTGFX 2
+#define NAMCOFL_SPRITEGFX 0
class namcofl_state : public driver_device
{
@@ -29,7 +22,6 @@ public:
namcofl_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
- m_palette(*this, "palette"),
m_c116(*this, "c116"),
m_screen(*this, "screen"),
m_c123tmap(*this, "c123tmap"),
@@ -52,7 +44,6 @@ public:
private:
required_device<cpu_device> m_maincpu;
- required_device<palette_device> m_palette;
required_device<namco_c116_device> m_c116;
required_device<screen_device> m_screen;
required_device<namco_c123tmap_device> m_c123tmap;
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index b69bcf0872e..07fc4f29eac 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -14,20 +14,7 @@
#include "video/namco_c123tmap.h"
#include "video/namco_c169roz.h"
-#define NAMCONB1_HTOTAL (288) /* wrong */
-#define NAMCONB1_HBSTART (288)
-#define NAMCONB1_VTOTAL (262) /* needs to be checked */
-#define NAMCONB1_VBSTART (224)
-
-#define NAMCONB1_TILEMASKREGION "tilemask"
-#define NAMCONB1_TILEGFXREGION "tile"
-#define NAMCONB1_SPRITEGFXREGION "sprite"
-#define NAMCONB1_ROTMASKREGION "rotmask"
-#define NAMCONB1_ROTGFXREGION "rot"
-
-#define NAMCONB1_TILEGFX 0
-#define NAMCONB1_SPRITEGFX 1
-#define NAMCONB1_ROTGFX 2
+#define NAMCONB1_SPRITEGFX 0
@@ -38,7 +25,6 @@ public:
driver_device(mconfig, type, tag),
m_gametype(0),
m_maincpu(*this, "maincpu"),
- m_palette(*this, "palette"),
m_c116(*this, "c116"),
m_c123tmap(*this, "c123tmap"),
m_c355spr(*this, "c355spr"),
@@ -96,7 +82,6 @@ private:
};
required_device<cpu_device> m_maincpu;
- required_device<palette_device> m_palette;
required_device<namco_c116_device> m_c116;
required_device<namco_c123tmap_device> m_c123tmap;
required_device<namco_c355spr_device> m_c355spr;
diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h
index 79fc9d1922a..a8932a1d298 100644
--- a/src/mame/includes/namcos1.h
+++ b/src/mame/includes/namcos1.h
@@ -6,7 +6,6 @@
#include "sound/namco.h"
#include "video/namco_c116.h"
#include "machine/74157.h"
-#include "emupal.h"
class namcos1_state : public driver_device
{
@@ -22,12 +21,12 @@ public:
m_dac0(*this, "dac0"),
m_dac1(*this, "dac1"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette"),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_playfield_control(*this, "pfcontrol"),
m_triram(*this, "triram"),
m_rom(*this, "user1"),
+ m_tilemap_maskdata(*this, "tmap_mask"),
m_soundbank(*this, "soundbank"),
m_mcubank(*this, "mcubank"),
m_io_dipsw(*this, "DIPSW"),
@@ -70,13 +69,13 @@ private:
required_device<dac_8bit_r2r_device> m_dac0;
required_device<dac_8bit_r2r_device> m_dac1;
required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_playfield_control;
required_shared_ptr<uint8_t> m_triram;
required_region_ptr<uint8_t> m_rom;
+ required_region_ptr<uint8_t> m_tilemap_maskdata;
required_memory_bank m_soundbank;
required_memory_bank m_mcubank;
@@ -102,7 +101,6 @@ private:
int m_strobe_count;
int m_stored_input[2];
tilemap_t *m_bg_tilemap[6];
- uint8_t *m_tilemap_maskdata;
int m_copy_sprites;
uint8_t m_drawmode_table[16];
@@ -135,12 +133,7 @@ private:
virtual void video_start() override;
void driver_init() override;
- TILE_GET_INFO_MEMBER(bg_get_info0);
- TILE_GET_INFO_MEMBER(bg_get_info1);
- TILE_GET_INFO_MEMBER(bg_get_info2);
- TILE_GET_INFO_MEMBER(bg_get_info3);
- TILE_GET_INFO_MEMBER(fg_get_info4);
- TILE_GET_INFO_MEMBER(fg_get_info5);
+ template <int Offset> TILE_GET_INFO_MEMBER(get_tile_info);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -152,6 +145,4 @@ private:
void sound_map(address_map &map);
void sub_map(address_map &map);
void virtual_map(address_map &map);
-
- inline void get_tile_info(tile_data &tileinfo,int tile_index,uint8_t *info_vram);
};
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 0ca56072e47..f2bac3e842a 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -25,7 +25,6 @@
#include "video/namco_c123tmap.h"
#include "video/namcos2_sprite.h"
#include "video/namcos2_roz.h"
-#include "emupal.h"
#include "screen.h"
/*********************************************/
@@ -53,7 +52,6 @@ public:
m_sci(*this, "sci"),
m_c169roz(*this, "c169roz"),
m_c355spr(*this, "c355spr"),
- m_palette(*this, "palette"),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_audiobank(*this, "audiobank"),
@@ -163,22 +161,21 @@ enum
int m_gametype;
required_device<cpu_device> m_maincpu;
- optional_device<cpu_device> m_slave;
- optional_device<cpu_device> m_audiocpu;
+ required_device<cpu_device> m_slave;
+ required_device<cpu_device> m_audiocpu;
optional_device<namcoc65_device> m_c65;
optional_device<namcoc68_device> m_c68;
- optional_device<c140_device> m_c140;
- optional_device<namco_c116_device> m_c116;
- optional_device<namco_c123tmap_device> m_c123tmap;
- optional_device<namco_c148_device> m_master_intc;
- optional_device<namco_c148_device> m_slave_intc;
- optional_device<namco_c139_device> m_sci;
+ required_device<c140_device> m_c140;
+ required_device<namco_c116_device> m_c116;
+ required_device<namco_c123tmap_device> m_c123tmap;
+ required_device<namco_c148_device> m_master_intc;
+ required_device<namco_c148_device> m_slave_intc;
+ required_device<namco_c139_device> m_sci;
optional_device<namco_c169roz_device> m_c169roz;
optional_device<namco_c355spr_device> m_c355spr;
- required_device<palette_device> m_palette;
optional_device<gfxdecode_device> m_gfxdecode;
- optional_device<screen_device> m_screen;
- optional_memory_bank m_audiobank;
+ required_device<screen_device> m_screen;
+ required_memory_bank m_audiobank;
std::unique_ptr<uint8_t[]> m_eeprom;
@@ -187,18 +184,16 @@ enum
DECLARE_READ8_MEMBER(dpram_byte_r);
DECLARE_WRITE8_MEMBER(dpram_byte_w);
- DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w );
- DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r );
+ DECLARE_WRITE8_MEMBER(eeprom_w);
+ DECLARE_READ8_MEMBER(eeprom_r);
- DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w );
+ DECLARE_WRITE8_MEMBER(sound_bankselect_w);
DECLARE_WRITE8_MEMBER(sound_reset_w);
DECLARE_WRITE8_MEMBER(system_reset_w);
void reset_all_subcpus(int state);
virtual void video_start() override;
- void video_start_finallap();
- void video_start_finalap2();
void video_start_luckywld();
void video_start_metlhawk();
void video_start_sgunner();
@@ -214,8 +209,8 @@ enum
DECLARE_READ16_MEMBER( gfx_ctrl_r );
DECLARE_WRITE16_MEMBER( gfx_ctrl_w );
- DECLARE_MACHINE_START(namcos2);
- DECLARE_MACHINE_RESET(namcos2);
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
void create_shadow_table();
void apply_clip( rectangle &clip, const rectangle &cliprect );
@@ -282,16 +277,4 @@ enum
#define NAMCOS2_C148_SERIRQ 6 /* 0x1cc000 */
#define NAMCOS2_C148_VBLANKIRQ 7 /* 0x1ce000 */
-/**************************************************************/
-/* MASTER CPU RAM MEMORY */
-/**************************************************************/
-
-#define NAMCOS2_68K_MASTER_RAM "bank3"
-
-/**************************************************************/
-/* SLAVE CPU RAM MEMORY */
-/**************************************************************/
-
-#define NAMCOS2_68K_SLAVE_RAM "bank4"
-
#endif // MAME_INCLUDES_NAMCOS2_H
diff --git a/src/mame/machine/namcos2.cpp b/src/mame/machine/namcos2.cpp
index d2dea28aac2..15f6273d97b 100644
--- a/src/mame/machine/namcos2.cpp
+++ b/src/mame/machine/namcos2.cpp
@@ -71,28 +71,24 @@ READ16_MEMBER( namcos2_state::namcos2_finallap_prot_r )
// S2 copy
-MACHINE_START_MEMBER(namcos2_state,namcos2)
+void namcos2_state::machine_start()
{
m_eeprom = std::make_unique<uint8_t[]>(0x2000);
subdevice<nvram_device>("nvram")->set_base(m_eeprom.get(), 0x2000);
- if (m_audiobank)
- {
- uint32_t max = memregion("audiocpu")->bytes() / 0x4000;
- for (int i = 0; i < 0x10; i++)
- m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
+ uint32_t max = memregion("audiocpu")->bytes() / 0x4000;
+ for (int i = 0; i < 0x10; i++)
+ m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
- m_audiobank->set_entry(0);
- }
}
-MACHINE_RESET_MEMBER(namcos2_state, namcos2)
+void namcos2_state::machine_reset()
{
// address_space &space = m_maincpu->space(AS_PROGRAM);
- address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
+// address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
/* Initialise the bank select in the sound CPU */
- namcos2_sound_bankselect_w(audio_space, 0, 0); /* Page in bank 0 */
+ m_audiobank->set_entry(0); /* Page in bank 0 */
m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE );
@@ -145,12 +141,12 @@ WRITE8_MEMBER(namcos2_state::system_reset_w)
/* EEPROM Load/Save and read/write handling */
/*************************************************************/
-WRITE8_MEMBER( namcos2_state::namcos2_68k_eeprom_w )
+WRITE8_MEMBER( namcos2_state::eeprom_w )
{
m_eeprom[offset] = data;
}
-READ8_MEMBER( namcos2_state::namcos2_68k_eeprom_r )
+READ8_MEMBER( namcos2_state::eeprom_r )
{
return m_eeprom[offset];
}
@@ -397,7 +393,7 @@ WRITE16_MEMBER( namcos2_state::namcos2_68k_key_w )
/* Sound sub-system */
/**************************************************************/
-WRITE8_MEMBER( namcos2_state::namcos2_sound_bankselect_w )
+WRITE8_MEMBER( namcos2_state::sound_bankselect_w )
{
m_audiobank->set_entry(data>>4);
}
diff --git a/src/mame/video/namco_c116.cpp b/src/mame/video/namco_c116.cpp
index 2f519eba05d..91791cc027f 100644
--- a/src/mame/video/namco_c116.cpp
+++ b/src/mame/video/namco_c116.cpp
@@ -68,6 +68,8 @@ i960 CPU, needs to write its clip and raster values byteswapped.
#include "emu.h"
#include "video/namco_c116.h"
+#include <algorithm>
+
DEFINE_DEVICE_TYPE(NAMCO_C116, namco_c116_device, "namco_c116", "Namco C116 Video Controller")
//-------------------------------------------------
@@ -75,9 +77,10 @@ DEFINE_DEVICE_TYPE(NAMCO_C116, namco_c116_device, "namco_c116", "Namco C116 Vide
//-------------------------------------------------
namco_c116_device::namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_C116, tag, owner, clock),
- device_gfx_interface(mconfig, *this),
- device_video_interface(mconfig, *this)
+ : device_t(mconfig, NAMCO_C116, tag, owner, clock)
+ , device_palette_interface(mconfig, *this)
+ , device_video_interface(mconfig, *this)
+ , m_enable_shadows(false)
{
}
@@ -91,7 +94,7 @@ void namco_c116_device::device_start()
m_ram_r.resize(0x2000);
m_ram_g.resize(0x2000);
m_ram_b.resize(0x2000);
- memset(m_regs, 0, sizeof(m_regs));
+ std::fill(std::begin(m_regs), std::end(m_regs), 0);
save_item(NAME(m_ram_r));
save_item(NAME(m_ram_g));
@@ -175,5 +178,5 @@ WRITE8_MEMBER(namco_c116_device::write)
}
int color = ((offset & 0x6000) >> 2) | (offset & 0x7ff);
RAM[color] = data;
- palette().set_pen_color(color,m_ram_r[color],m_ram_g[color],m_ram_b[color]);
+ set_pen_color(color,m_ram_r[color],m_ram_g[color],m_ram_b[color]);
}
diff --git a/src/mame/video/namco_c116.h b/src/mame/video/namco_c116.h
index e24d61119c0..7638b12b903 100644
--- a/src/mame/video/namco_c116.h
+++ b/src/mame/video/namco_c116.h
@@ -13,13 +13,16 @@
class namco_c116_device :
public device_t,
- public device_gfx_interface,
+ public device_palette_interface,
public device_video_interface
{
public:
//construction/destruction
namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ // configuration
+ void enable_shadows() { m_enable_shadows = true; }
+
//read/write handlers
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -31,12 +34,17 @@ protected:
// device-level overrides
virtual void device_start() override;
+ // device_palette_interface overrides
+ virtual uint32_t palette_entries() const override { return 0x2000; }
+ virtual bool palette_shadows_enabled() const override { return m_enable_shadows; }
+
private:
// internal state
std::vector<uint8_t> m_ram_r;
std::vector<uint8_t> m_ram_g;
std::vector<uint8_t> m_ram_b;
uint16_t m_regs[8];
+ bool m_enable_shadows; // are shadows enabled?
};
DECLARE_DEVICE_TYPE(NAMCO_C116, namco_c116_device)
diff --git a/src/mame/video/namco_c123tmap.cpp b/src/mame/video/namco_c123tmap.cpp
index 0c864845ae4..73b80e82c96 100644
--- a/src/mame/video/namco_c123tmap.cpp
+++ b/src/mame/video/namco_c123tmap.cpp
@@ -17,30 +17,44 @@
#include "emu.h"
#include "namco_c123tmap.h"
+static const gfx_layout layout =
+{
+ 8,8,
+ RGN_FRAC(1,1),
+ 8,
+ { STEP8(0,1) },
+ { STEP8(0,8) },
+ { STEP8(0,8*8) },
+ 8*8*8
+};
+
+GFXDECODE_START( namco_c123tmap_device::gfxinfo )
+ GFXDECODE_DEVICE( DEVICE_SELF, 0, layout, 0, 32 )
+GFXDECODE_END
+
DEFINE_DEVICE_TYPE(NAMCO_C123TMAP, namco_c123tmap_device, "namco_c123tmap", "Namco C123 (4x + 2x Tilemaps)")
namco_c123tmap_device::namco_c123tmap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
device_t(mconfig, NAMCO_C123TMAP, tag, owner, clock),
- m_gfxdecode(*this, finder_base::DUMMY_TAG),
- m_maskregion(*this, finder_base::DUMMY_TAG)
+ device_gfx_interface(mconfig, *this, gfxinfo),
+ m_color_base(0),
+ m_mask(*this, "mask")
{
}
void namco_c123tmap_device::device_start()
{
- m_tilemapinfo.maskBaseAddr = m_maskregion->base();
-
m_tilemapinfo.videoram = std::make_unique<uint16_t[]>(0x10000);
/* four scrolling tilemaps */
- m_tilemapinfo.tmap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x0000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
- m_tilemapinfo.tmap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x1000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
- m_tilemapinfo.tmap[2] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x2000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
- m_tilemapinfo.tmap[3] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x3000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ m_tilemapinfo.tmap[0] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x0000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ m_tilemapinfo.tmap[1] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x1000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ m_tilemapinfo.tmap[2] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x2000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ m_tilemapinfo.tmap[3] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x3000>), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
/* two non-scrolling tilemaps */
- m_tilemapinfo.tmap[4] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x4008>), this), TILEMAP_SCAN_ROWS, 8, 8, 36, 28);
- m_tilemapinfo.tmap[5] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x4408>), this), TILEMAP_SCAN_ROWS, 8, 8, 36, 28);
+ m_tilemapinfo.tmap[4] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x4008>), this), TILEMAP_SCAN_ROWS, 8, 8, 36, 28);
+ m_tilemapinfo.tmap[5] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namco_c123tmap_device::get_tile_info<0x4408>), this), TILEMAP_SCAN_ROWS, 8, 8, 36, 28);
/* define offsets for scrolling */
for (int i = 0; i < 4; i++)
@@ -51,7 +65,6 @@ void namco_c123tmap_device::device_start()
m_tilemapinfo.tmap[i]->set_scrolldy(-24, 224 + 24);
}
-
save_item(NAME(m_tilemapinfo.control));
save_pointer(NAME(m_tilemapinfo.videoram), 0x10000);
}
@@ -72,19 +85,19 @@ TILE_GET_INFO_MEMBER(namco_c123tmap_device::get_tile_info)
const uint16_t *vram = &m_tilemapinfo.videoram[Offset];
int tile, mask;
m_tilemapinfo.cb(vram[tile_index], &tile, &mask);
- tileinfo.mask_data = m_tilemapinfo.maskBaseAddr + mask * 8;
- SET_TILE_INFO_MEMBER(m_tilemapinfo.gfxbank, tile, 0, 0);
+ tileinfo.mask_data = m_mask + mask * 8;
+ SET_TILE_INFO_MEMBER(0, tile, 0, 0);
} /* get_tile_info */
void namco_c123tmap_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri)
{
for (int i = 0; i < 6; i++)
{
- /* note: priority is only in range 0..7, but Point Blank uses 0xf to hide a layer */
- if ((m_tilemapinfo.control[0x20 / 2 + i] & 0xf) == pri)
+ // bit 3 : disable layer
+ if ((m_tilemapinfo.control[0x20 / 2 + i] & 0x7) == pri)
{
int color = m_tilemapinfo.control[0x30 / 2 + i] & 0x07;
- m_tilemapinfo.tmap[i]->set_palette_offset(color * 256);
+ m_tilemapinfo.tmap[i]->set_palette_offset(color * 256 + m_color_base);
m_tilemapinfo.tmap[i]->draw(screen, bitmap, cliprect, 0, 0);
}
}
@@ -137,6 +150,10 @@ void namco_c123tmap_device::set_tilemap_control(int offset, uint16_t newword)
}
}
}
+ else if (offset <= 0x2a / 2)
+ {
+ m_tilemapinfo.tmap[offset & 7]->enable(BIT(~newword, 3));
+ }
newword &= 0x1ff;
if (m_tilemapinfo.control[0x02 / 2] & 0x8000)
{
diff --git a/src/mame/video/namco_c123tmap.h b/src/mame/video/namco_c123tmap.h
index b626ac09a73..8465ce6d61b 100644
--- a/src/mame/video/namco_c123tmap.h
+++ b/src/mame/video/namco_c123tmap.h
@@ -7,17 +7,14 @@
#pragma once
#include "screen.h"
-#include "emupal.h"
-class namco_c123tmap_device : public device_t
+class namco_c123tmap_device : public device_t, public device_gfx_interface
{
public:
// construction/destruction
namco_c123tmap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); }
- template <typename T> void set_maskregion_tag(T &&tag) { m_maskregion.set_tag(std::forward<T>(tag)); }
- void set_gfxregion(int region) { m_tilemapinfo.gfxbank = region; }
+ void set_color_base(int color) { m_color_base = color; }
typedef delegate<void(uint16_t, int*, int*)> c123_tilemap_delegate;
void set_tile_callback(c123_tilemap_delegate tilemap_cb) { m_tilemapinfo.cb = tilemap_cb; }
@@ -56,15 +53,14 @@ private:
*/
tilemap_t *tmap[6];
std::unique_ptr<uint16_t[]> videoram;
- int gfxbank;
- uint8_t *maskBaseAddr;
c123_tilemap_delegate cb;
};
info m_tilemapinfo;
+ DECLARE_GFXDECODE_MEMBER(gfxinfo);
- required_device<gfxdecode_device> m_gfxdecode;
- required_memory_region m_maskregion;
+ int m_color_base;
+ required_region_ptr<uint8_t> m_mask;
};
// device type definition
diff --git a/src/mame/video/namco_c169roz.cpp b/src/mame/video/namco_c169roz.cpp
index 43c46c72ad7..09ab88ec06f 100644
--- a/src/mame/video/namco_c169roz.cpp
+++ b/src/mame/video/namco_c169roz.cpp
@@ -19,32 +19,44 @@
#include "emu.h"
#include "namco_c169roz.h"
+static const gfx_layout layout =
+{
+ 16,16,
+ RGN_FRAC(1,1),
+ 8,
+ { STEP8(0,1) },
+ { STEP16(0,8) },
+ { STEP16(0,8*16) },
+ 16*128
+};
+
+GFXDECODE_START( namco_c169roz_device::gfxinfo )
+ GFXDECODE_DEVICE( DEVICE_SELF, 0, layout, 0, 32 )
+GFXDECODE_END
+
DEFINE_DEVICE_TYPE(NAMCO_C169ROZ, namco_c169roz_device, "namco_c169roz", "Namco C169 (ROZ)")
namco_c169roz_device::namco_c169roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
device_t(mconfig, NAMCO_C169ROZ, tag, owner, clock),
- m_gfx_region(0),
- m_mask(nullptr),
+ device_gfx_interface(mconfig, *this, gfxinfo),
+ m_color_base(0),
m_is_namcofl(false),
- m_gfxdecode(*this, finder_base::DUMMY_TAG),
- m_maskregion(*this, finder_base::DUMMY_TAG)
+ m_mask(*this, "mask")
{
}
void namco_c169roz_device::device_start()
{
- m_mask = m_maskregion->base();
-
m_videoram.resize(m_ramsize);
std::fill(std::begin(m_videoram), std::end(m_videoram), 0x0000);
- m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode,
+ m_tilemap[0] = &machine().tilemap().create(*this,
tilemap_get_info_delegate(FUNC(namco_c169roz_device::get_info<0>), this),
tilemap_mapper_delegate(FUNC(namco_c169roz_device::mapper), this),
16, 16,
256, 256);
- m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode,
+ m_tilemap[1] = &machine().tilemap().create(*this,
tilemap_get_info_delegate(FUNC(namco_c169roz_device::get_info<1>), this),
tilemap_mapper_delegate(FUNC(namco_c169roz_device::mapper), this),
16, 16,
@@ -73,7 +85,7 @@ TILE_GET_INFO_MEMBER(namco_c169roz_device::get_info)
m_c169_cb(m_videoram[tile_index&(m_ramsize-1)] & 0x3fff, &tile, &mask, Which); // need to mask with ramsize because the nb1/fl games have twice as much RAM, presumably the tilemaps mirror in ns2?
tileinfo.mask_data = m_mask + 32 * mask;
- SET_TILE_INFO_MEMBER(m_gfx_region, tile, 0/*color*/, 0/*flag*/);
+ SET_TILE_INFO_MEMBER(0, tile, 0/*color*/, 0/*flag*/);
}
TILEMAP_MAPPER_MEMBER( namco_c169roz_device::mapper )
@@ -160,7 +172,7 @@ void namco_c169roz_device::draw_helper(screen_device &screen, bitmap_ind16 &bitm
uint32_t xpos = (((cx >> 16) & size_mask) + params.left) & 0xfff;
uint32_t ypos = (((cy >> 16) & size_mask) + params.top) & 0xfff;
if (flagsbitmap.pix(ypos, xpos) & TILEMAP_PIXEL_LAYER0)
- *dest = srcbitmap.pix(ypos, xpos) + params.color;
+ *dest = srcbitmap.pix(ypos, xpos) + params.color + m_color_base;
cx += params.incxx;
cy += params.incxy;
x++;
@@ -173,7 +185,7 @@ void namco_c169roz_device::draw_helper(screen_device &screen, bitmap_ind16 &bitm
}
else
{
- tmap.set_palette_offset(params.color);
+ tmap.set_palette_offset(m_color_base + params.color);
tmap.draw_roz(
screen,
bitmap,
diff --git a/src/mame/video/namco_c169roz.h b/src/mame/video/namco_c169roz.h
index b3299171c04..90507f9e1b1 100644
--- a/src/mame/video/namco_c169roz.h
+++ b/src/mame/video/namco_c169roz.h
@@ -7,17 +7,15 @@
#pragma once
-class namco_c169roz_device : public device_t
+class namco_c169roz_device : public device_t, public device_gfx_interface
{
public:
// construction/destruction
namco_c169roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); }
void set_is_namcofl(bool state) { m_is_namcofl = state; }
void set_ram_words(uint32_t size) { m_ramsize = size; }
- template <typename T> void set_maskregion_tag(T &&tag) { m_maskregion.set_tag(std::forward<T>(tag)); }
- void set_gfxregion(int region) { m_gfx_region = region; }
+ void set_color_base(int color) { m_color_base = color; }
DECLARE_READ16_MEMBER( control_r );
DECLARE_WRITE16_MEMBER( control_w );
@@ -56,15 +54,14 @@ private:
tilemap_t *m_tilemap[ROZ_TILEMAP_COUNT];
uint16_t m_control[0x20/2];
std::vector<uint16_t> m_videoram;
- int m_gfx_region;
- uint8_t *m_mask;
+ int m_color_base;
+ DECLARE_GFXDECODE_MEMBER(gfxinfo);
uint32_t m_ramsize;
// per-game hacks
bool m_is_namcofl;
- required_device<gfxdecode_device> m_gfxdecode;
- required_memory_region m_maskregion;
+ required_region_ptr<uint8_t> m_mask;
};
// device type definition
diff --git a/src/mame/video/namco_c355spr.cpp b/src/mame/video/namco_c355spr.cpp
index b5edea53ad7..f81ab57eccf 100644
--- a/src/mame/video/namco_c355spr.cpp
+++ b/src/mame/video/namco_c355spr.cpp
@@ -19,11 +19,12 @@ DEFINE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device, "namco_c355spr", "Namco
namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
device_t(mconfig, NAMCO_C355SPR, tag, owner, clock),
+ device_video_interface(mconfig, *this),
m_gfx_region(0),
m_palxor(0),
m_is_namcofl(false),
- m_gfxdecode(*this, finder_base::DUMMY_TAG),
- m_palette(*this, finder_base::DUMMY_TAG)
+ m_buffer(0),
+ m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
}
@@ -39,10 +40,11 @@ void namco_c355spr_device::zdrawgfxzoom(
if (!scalex || !scaley) return;
if (dest_bmp.bpp() == 16)
{
- if( gfx )
+ if (gfx)
{
- int shadow_offset = (m_palette->shadows_enabled())?m_palette->entries():0;
- const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors()));
+ device_palette_interface &palette = m_gfxdecode->palette();
+ int shadow_offset = (palette.shadows_enabled())?palette.entries():0;
+ const pen_t *pal = &palette.pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors()));
const uint8_t *source_base = gfx->get_data(code % gfx->elements());
int sprite_screen_height = (scaley*gfx->height()+0x8000)>>16;
int sprite_screen_width = (scalex*gfx->width()+0x8000)>>16;
@@ -58,7 +60,7 @@ void namco_c355spr_device::zdrawgfxzoom(
int x_index_base;
int y_index;
- if( flipx )
+ if (flipx)
{
x_index_base = (sprite_screen_width-1)*dx;
dx = -dx;
@@ -68,7 +70,7 @@ void namco_c355spr_device::zdrawgfxzoom(
x_index_base = 0;
}
- if( flipy )
+ if (flipy)
{
y_index = (sprite_screen_height-1)*dy;
dy = -dy;
@@ -78,51 +80,51 @@ void namco_c355spr_device::zdrawgfxzoom(
y_index = 0;
}
- if( sx < clip.min_x)
+ if (sx < clip.min_x)
{ /* clip left */
int pixels = clip.min_x-sx;
sx += pixels;
x_index_base += pixels*dx;
}
- if( sy < clip.min_y )
+ if (sy < clip.min_y)
{ /* clip top */
int pixels = clip.min_y-sy;
sy += pixels;
y_index += pixels*dy;
}
- if( ex > clip.max_x+1 )
+ if (ex > clip.max_x+1)
{ /* clip right */
int pixels = ex-clip.max_x-1;
ex -= pixels;
}
- if( ey > clip.max_y+1 )
+ if (ey > clip.max_y+1)
{ /* clip bottom */
int pixels = ey-clip.max_y-1;
ey -= pixels;
}
- if( ex>sx )
+ if (ex>sx)
{ /* skip if inner loop doesn't draw anything */
int y;
bitmap_ind8 &priority_bitmap = screen.priority();
- if( priority_bitmap.valid() )
+ if (priority_bitmap.valid())
{
- for( y=sy; y<ey; y++ )
+ for (y = sy; y < ey; y++)
{
const uint8_t *source = source_base + (y_index>>16) * gfx->rowbytes();
uint16_t *dest = &dest_bmp.pix16(y);
uint8_t *pri = &priority_bitmap.pix8(y);
int x, x_index = x_index_base;
- if( m_palxor )
+ if (m_palxor)
{
- for( x=sx; x<ex; x++ )
+ for (x = sx; x < ex; x++)
{
int c = source[x_index>>16];
- if( c != 0xff )
+ if (c != 0xff)
{
- if( pri[x]<=zpos )
+ if (pri[x] <= zpos)
{
- switch( c )
+ switch (c)
{
case 0:
dest[x] = 0x4000|(dest[x]&0x1fff);
@@ -143,14 +145,14 @@ void namco_c355spr_device::zdrawgfxzoom(
}
else
{
- for( x=sx; x<ex; x++ )
+ for (x = sx; x < ex; x++)
{
int c = source[x_index>>16];
- if( c != 0xff )
+ if (c != 0xff)
{
- if( pri[x]<=zpos )
+ if (pri[x] <= zpos )
{
- if( color == 0xf && c==0xfe && shadow_offset )
+ if (color == 0xf && c == 0xfe && shadow_offset)
{
dest[x] |= shadow_offset;
}
@@ -184,11 +186,15 @@ void namco_c355spr_device::zdrawgfxzoom(
void namco_c355spr_device::device_start()
{
- //m_spriteram.resize(m_ramsize);
- std::fill(std::begin(m_spriteram), std::end(m_spriteram), 0x0000); // needed for Nebulas Ray
std::fill(std::begin(m_position), std::end(m_position), 0x0000);
+ for (int i = 0; i < 2; i++)
+ {
+ m_spritelist[i] = auto_alloc_array(machine(), struct c355_sprite, 0x100);
+ m_sprite_end[i] = m_spritelist[i];
+ m_spriteram[i].resize(0x20000/2, 0);
+ save_item(NAME(m_spriteram[i]), i);
+ }
- save_item(NAME(m_spriteram));
save_item(NAME(m_position));
}
@@ -216,17 +222,15 @@ READ16_MEMBER( namco_c355spr_device::position_r )
* 0x10000 sprite attr (page1)
* 0x14000 sprite list (page1)
*/
-template<class _BitmapClass>
-void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, const uint16_t *pSource, int pri, int zpos )
+void namco_c355spr_device::get_single_sprite(const uint16_t *pSource, struct c355_sprite *sprite_ptr)
{
- uint16_t *spriteram16 = m_spriteram;
+ uint16_t *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0];
unsigned screen_height_remaining, screen_width_remaining;
unsigned source_height_remaining, source_width_remaining;
int hpos,vpos;
uint16_t hsize,vsize;
uint16_t palette;
uint16_t linkno;
- uint16_t offset;
uint16_t format;
int tile_index;
int num_cols,num_rows;
@@ -239,7 +243,6 @@ void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitm
int tile_screen_height;
const uint16_t *spriteformat16 = &spriteram16[0x4000/2];
const uint16_t *spritetile16 = &spriteram16[0x8000/2];
- int color;
const uint16_t *pWinAttr;
rectangle clip;
int xscroll, yscroll;
@@ -250,34 +253,35 @@ void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitm
* ------------xxxx palette select
*/
palette = pSource[6];
- if( pri != ((palette>>4)&0xf) )
- {
- return;
- }
-
- linkno = pSource[0]; /* LINKNO */
- offset = pSource[1]; /* OFFSET */
- hpos = pSource[2]; /* HPOS 0x000..0x7ff (signed) */
- vpos = pSource[3]; /* VPOS 0x000..0x7ff (signed) */
- hsize = pSource[4]; /* HSIZE max 0x3ff pixels */
- vsize = pSource[5]; /* VSIZE max 0x3ff pixels */
+ sprite_ptr->pri = ((palette>>4)&0xf);
+
+ linkno = pSource[0]; /* LINKNO */
+ sprite_ptr->offset = pSource[1]; /* OFFSET */
+ hpos = pSource[2]; /* HPOS 0x000..0x7ff (signed) */
+ vpos = pSource[3]; /* VPOS 0x000..0x7ff (signed) */
+ hsize = pSource[4]; /* HSIZE max 0x3ff pixels */
+ vsize = pSource[5]; /* VSIZE max 0x3ff pixels */
/* pSource[6] contains priority/palette */
/* pSource[7] is used in Lucky & Wild, possibly for sprite-road priority */
- if( linkno*4>=0x4000/2 ) return; /* avoid garbage memory reads */
+ if (linkno*4>=0x4000/2) /* avoid garbage memory reads */
+ {
+ sprite_ptr->disable = true;
+ return;
+ }
xscroll = (int16_t)m_position[1];
yscroll = (int16_t)m_position[0];
-// xscroll &= 0x3ff; if( xscroll & 0x200 ) xscroll |= ~0x3ff;
- xscroll &= 0x1ff; if( xscroll & 0x100 ) xscroll |= ~0x1ff;
- yscroll &= 0x1ff; if( yscroll & 0x100 ) yscroll |= ~0x1ff;
+// xscroll &= 0x3ff; if (xscroll & 0x200 ) xscroll |= ~0x3ff;
+ xscroll &= 0x1ff; if (xscroll & 0x100 ) xscroll |= ~0x1ff;
+ yscroll &= 0x1ff; if (yscroll & 0x100 ) yscroll |= ~0x1ff;
- if( bitmap.width() > 384 )
+ if (screen().height() > 384)
{ /* Medium Resolution: System21 adjust */
xscroll = (int16_t)m_position[1];
- xscroll &= 0x3ff; if( xscroll & 0x200 ) xscroll |= ~0x3ff;
- if( yscroll<0 )
+ xscroll &= 0x3ff; if (xscroll & 0x200) xscroll |= ~0x3ff;
+ if (yscroll<0)
{ /* solvalou */
yscroll += 0x20;
}
@@ -299,9 +303,9 @@ void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitm
vpos -= yscroll;
pWinAttr = &spriteram16[0x2400/2+((palette>>8)&0xf)*4];
clip.set(pWinAttr[0] - xscroll, pWinAttr[1] - xscroll, pWinAttr[2] - yscroll, pWinAttr[3] - yscroll);
- clip &= cliprect;
- hpos&=0x7ff; if( hpos&0x400 ) hpos |= ~0x7ff; /* sign extend */
- vpos&=0x7ff; if( vpos&0x400 ) vpos |= ~0x7ff; /* sign extend */
+ sprite_ptr->clip = clip;
+ hpos&=0x7ff; if (hpos&0x400 ) hpos |= ~0x7ff; /* sign extend */
+ vpos&=0x7ff; if (vpos&0x400 ) vpos |= ~0x7ff; /* sign extend */
tile_index = spriteformat16[linkno*4+0];
format = spriteformat16[linkno*4+1];
@@ -310,13 +314,17 @@ void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitm
num_cols = (format>>4)&0xf;
num_rows = (format)&0xf;
- if( num_cols == 0 ) num_cols = 0x10;
+ if (num_cols == 0) num_cols = 0x10;
flipx = (hsize&0x8000)?1:0;
hsize &= 0x3ff;//0x1ff;
- if( hsize == 0 ) return;
+ if (hsize == 0)
+ {
+ sprite_ptr->disable = true;
+ return;
+ }
zoomx = (hsize<<16)/(num_cols*16);
dx = (dx*zoomx+0x8000)>>16;
- if( flipx )
+ if (flipx)
{
hpos += dx;
}
@@ -325,13 +333,17 @@ void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitm
hpos -= dx;
}
- if( num_rows == 0 ) num_rows = 0x10;
+ if (num_rows == 0) num_rows = 0x10;
flipy = (vsize&0x8000)?1:0;
vsize &= 0x3ff;
- if( vsize == 0 ) return;
+ if (vsize == 0)
+ {
+ sprite_ptr->disable = true;
+ return;
+ }
zoomy = (vsize<<16)/(num_rows*16);
dy = (dy*zoomy+0x8000)>>16;
- if( flipy )
+ if (flipy)
{
vpos += dy;
}
@@ -340,52 +352,52 @@ void namco_c355spr_device::draw_sprite(screen_device &screen, _BitmapClass &bitm
vpos -= dy;
}
- color = (palette&0xf)^m_palxor;
+ sprite_ptr->flipx = flipx;
+ sprite_ptr->flipy = flipy;
+ sprite_ptr->size = num_rows * num_cols;
+ sprite_ptr->color = (palette&0xf)^m_palxor;
source_height_remaining = num_rows*16;
screen_height_remaining = vsize;
sy = vpos;
- for( row=0; row<num_rows; row++ )
+ int ind = 0;
+ for (row = 0; row < num_rows; row++)
{
tile_screen_height = 16*screen_height_remaining/source_height_remaining;
zoomy = (screen_height_remaining<<16)/source_height_remaining;
- if( flipy )
+ if (flipy)
{
sy -= tile_screen_height;
}
source_width_remaining = num_cols*16;
screen_width_remaining = hsize;
sx = hpos;
- for( col=0; col<num_cols; col++ )
+ for (col = 0; col < num_cols; col++)
{
tile_screen_width = 16*screen_width_remaining/source_width_remaining;
zoomx = (screen_width_remaining<<16)/source_width_remaining;
- if( flipx )
+ if (flipx)
{
sx -= tile_screen_width;
}
tile = spritetile16[tile_index++];
- if( (tile&0x8000)==0 )
+ sprite_ptr->tile[ind] = tile;
+ if ((tile&0x8000)==0)
{
- zdrawgfxzoom(
- screen,
- bitmap,
- clip,
- m_gfxdecode->gfx(m_gfx_region),
- m_code2tile(tile) + offset,
- color,
- flipx,flipy,
- sx,sy,
- zoomx, zoomy, zpos );
+ sprite_ptr->x[ind] = sx;
+ sprite_ptr->y[ind] = sy;
+ sprite_ptr->zoomx[ind] = zoomx;
+ sprite_ptr->zoomy[ind] = zoomy;
}
- if( !flipx )
+ if (!flipx)
{
sx += tile_screen_width;
}
screen_width_remaining -= tile_screen_width;
source_width_remaining -= 16;
+ ind++;
} /* next col */
- if( !flipy )
+ if (!flipy)
{
sy += tile_screen_height;
}
@@ -400,51 +412,144 @@ int namco_c355spr_device::default_code2tile(int code)
return code;
}
-template<class _BitmapClass>
-void namco_c355spr_device::draw_list(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int pri, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable)
+void namco_c355spr_device::get_list(int no, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable)
{
- int i;
/* draw the sprites */
- for( i=0; i<256; i++ )
+ struct c355_sprite *sprite_ptr = m_spritelist[no];
+ for (int i = 0; i < 256; i++)
{
+ sprite_ptr->disable = false;
uint16_t which = pSpriteList16[i];
- draw_sprite(screen, bitmap, cliprect, &pSpriteTable[(which&0xff)*8], pri, i );
- if( which&0x100 ) break;
+ get_single_sprite(&pSpriteTable[(which&0xff)*8], sprite_ptr);
+ sprite_ptr++;
+ if (which&0x100) break;
}
+ m_sprite_end[no] = sprite_ptr;
}
-void namco_c355spr_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri)
+void namco_c355spr_device::get_sprites()
{
+ int buffer = std::max(0, m_buffer - 1);
// int offs = spriteram16[0x18000/2]; /* end-of-sprite-list */
- if (pri == 0)
- screen.priority().fill(0, cliprect);
// if (offs == 0) // boot
// TODO: solvalou service mode wants 0x14000/2 & 0x00000/2
- draw_list(screen, bitmap, cliprect, pri, &m_spriteram[0x02000/2], &m_spriteram[0x00000/2]);
+ get_list(0, &m_spriteram[buffer][0x02000/2], &m_spriteram[buffer][0x00000/2]);
// else
- draw_list(screen, bitmap, cliprect, pri, &m_spriteram[0x14000/2], &m_spriteram[0x10000/2]);
+ get_list(1, &m_spriteram[buffer][0x14000/2], &m_spriteram[buffer][0x10000/2]);
+}
+
+void namco_c355spr_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri)
+{
+// int offs = spriteram16[0x18000/2]; /* end-of-sprite-list */
+ if (pri == 0)
+ {
+ screen.priority().fill(0, cliprect);
+ if (m_buffer == 0) // not buffered sprites
+ get_sprites();
+ }
+
+ for (int no = 0; no < 2; no++)
+ {
+ //if (offs == no)
+ {
+ int i = 0;
+ struct c355_sprite *sprite_ptr = m_spritelist[no];
+
+ while (sprite_ptr != m_sprite_end[no])
+ {
+ if ((sprite_ptr->pri == pri) && (sprite_ptr->disable == false))
+ {
+ rectangle clip = sprite_ptr->clip;
+ clip &= cliprect;
+ for (int ind = 0; ind < sprite_ptr->size; ind++)
+ {
+ if ((sprite_ptr->tile[ind] & 0x8000) == 0)
+ {
+ zdrawgfxzoom(
+ screen,
+ bitmap,
+ clip,
+ m_gfxdecode->gfx(m_gfx_region),
+ m_code2tile(sprite_ptr->tile[ind]) + sprite_ptr->offset,
+ sprite_ptr->color,
+ sprite_ptr->flipx, sprite_ptr->flipy,
+ sprite_ptr->x[ind], sprite_ptr->y[ind],
+ sprite_ptr->zoomx[ind], sprite_ptr->zoomy[ind], i);
+ }
+ }
+ }
+ i++;
+ sprite_ptr++;
+ }
+ }
+ }
}
void namco_c355spr_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int pri)
{
// int offs = spriteram16[0x18000/2]; /* end-of-sprite-list */
if (pri == 0)
+ {
screen.priority().fill(0, cliprect);
+ if (m_buffer == 0) // not buffered sprites
+ get_sprites();
+ }
-// if (offs == 0) // boot
- draw_list(screen, bitmap, cliprect, pri, &m_spriteram[0x02000/2], &m_spriteram[0x00000/2]);
-// else
- draw_list(screen, bitmap, cliprect, pri, &m_spriteram[0x14000/2], &m_spriteram[0x10000/2]);
+ for (int no = 0; no < 2; no++)
+ {
+ //if (offs == no)
+ {
+ int i = 0;
+ struct c355_sprite *sprite_ptr = m_spritelist[no];
+
+ while (sprite_ptr != m_sprite_end[no])
+ {
+ if (sprite_ptr->pri == pri)
+ {
+ sprite_ptr->clip &= cliprect;
+ for (int ind = 0; ind < sprite_ptr->size; ind++)
+ {
+ if ((sprite_ptr->tile[ind] & 0x8000) == 0)
+ {
+ zdrawgfxzoom(
+ screen,
+ bitmap,
+ sprite_ptr->clip,
+ m_gfxdecode->gfx(m_gfx_region),
+ m_code2tile(sprite_ptr->tile[ind]) + sprite_ptr->offset,
+ sprite_ptr->color,
+ sprite_ptr->flipx,sprite_ptr->flipy,
+ sprite_ptr->x[ind],sprite_ptr->y[ind],
+ sprite_ptr->zoomx[ind], sprite_ptr->zoomy[ind], i );
+ }
+ }
+ }
+ sprite_ptr++;
+ }
+ }
+ }
}
WRITE16_MEMBER( namco_c355spr_device::spriteram_w )
{
- COMBINE_DATA(&m_spriteram[offset]);
+ COMBINE_DATA(&m_spriteram[0][offset]);
}
READ16_MEMBER( namco_c355spr_device::spriteram_r )
{
- return m_spriteram[offset];
+ return m_spriteram[0][offset];
+}
+
+WRITE_LINE_MEMBER( namco_c355spr_device::vblank )
+{
+ if (state)
+ {
+ if (m_buffer > 0)
+ get_sprites();
+
+ if (m_buffer > 1)
+ std::copy(m_spriteram[0].begin(), m_spriteram[0].end(), m_spriteram[1].begin());
+ }
}
diff --git a/src/mame/video/namco_c355spr.h b/src/mame/video/namco_c355spr.h
index c9ec0ba6d46..d25ee80cdf4 100644
--- a/src/mame/video/namco_c355spr.h
+++ b/src/mame/video/namco_c355spr.h
@@ -7,25 +7,25 @@
#pragma once
#include "screen.h"
-#include "emupal.h"
-class namco_c355spr_device : public device_t
+class namco_c355spr_device : public device_t, public device_video_interface
{
public:
// construction/destruction
namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- template <typename T> void set_palette_tag(T &&tag) { m_palette.set_tag(std::forward<T>(tag)); }
template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); }
void set_is_namcofl(bool state) { m_is_namcofl = state; }
//void set_ram_words(uint32_t size) { m_ramsize = size; }
void set_palxor(int palxor) { m_palxor = palxor; }
void set_gfxregion(int region) { m_gfx_region = region; }
+ void set_buffer(int buffer) { m_buffer = buffer; }
DECLARE_READ16_MEMBER( spriteram_r );
DECLARE_WRITE16_MEMBER( spriteram_w );
DECLARE_READ16_MEMBER( position_r );
DECLARE_WRITE16_MEMBER( position_w );
+ DECLARE_WRITE_LINE_MEMBER( vblank );
typedef delegate<int (int)> c355_obj_code2tile_delegate;
void set_tile_callback(c355_obj_code2tile_delegate cb)
@@ -46,6 +46,20 @@ protected:
private:
+ struct c355_sprite
+ {
+ int disable;
+ int size;
+ rectangle clip;
+ int offset;
+ int color;
+ int flipx,flipy;
+ int tile[16*16];
+ int x[16*16],y[16*16];
+ int zoomx[16*16],zoomy[16*16];
+ int pri;
+ };
+
// general
void zdrawgfxzoom(screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int zpos);
void zdrawgfxzoom(screen_device &screen, bitmap_rgb32 &dest_bmp, const rectangle &clip, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int zpos);
@@ -55,23 +69,24 @@ private:
int default_code2tile(int code);
// C355 Motion Object internals
- template<class _BitmapClass>
- void draw_sprite(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, const uint16_t *pSource, int pri, int zpos);
- template<class _BitmapClass>
- void draw_list(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int pri, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable);
+ void get_single_sprite(const uint16_t *pSource, struct c355_sprite *sprite_ptr);
+ void get_list(int no, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable);
+ void get_sprites();
+ struct c355_sprite *m_spritelist[2];
+ const struct c355_sprite *m_sprite_end[2];
c355_obj_code2tile_delegate m_code2tile;
int m_gfx_region;
int m_palxor;
uint16_t m_position[4];
- uint16_t m_spriteram[0x20000/2];
+ std::vector<uint16_t> m_spriteram[2];
//std::vector<uint16_t> m_spriteram;
bool m_is_namcofl;
//uint32_t m_ramsize;
+ int m_buffer;
required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
};
// device type definition
diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp
index 12caf67a4e5..9a4f2be52e7 100644
--- a/src/mame/video/namcofl.cpp
+++ b/src/mame/video/namcofl.cpp
@@ -62,7 +62,7 @@ uint32_t namcofl_state::screen_update_namcofl(screen_device &screen, bitmap_ind1
{
int pri;
- bitmap.fill(m_palette->black_pen(), cliprect );
+ bitmap.fill(m_c116->black_pen(), cliprect );
for( pri=0; pri<16; pri++ )
{
diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp
index e04c49fd438..17705ccfaeb 100644
--- a/src/mame/video/namconb1.cpp
+++ b/src/mame/video/namconb1.cpp
@@ -123,7 +123,7 @@ uint32_t namconb1_state::screen_update_namconb1(screen_device &screen, bitmap_in
/* intersect with master clip rectangle */
clip &= cliprect;
- bitmap.fill(m_palette->black_pen(), cliprect );
+ bitmap.fill(m_c116->black_pen(), cliprect );
video_update_common( screen, bitmap, clip, 0 );
@@ -163,7 +163,7 @@ uint32_t namconb1_state::screen_update_namconb2(screen_device &screen, bitmap_in
/* intersect with master clip rectangle */
clip &= cliprect;
- bitmap.fill(m_palette->black_pen(), cliprect );
+ bitmap.fill(m_c116->black_pen(), cliprect );
if( memcmp(m_tilemap_tile_bank,m_tilebank32,sizeof(m_tilemap_tile_bank))!=0 )
{
diff --git a/src/mame/video/namcos1.cpp b/src/mame/video/namcos1.cpp
index 0caac817ce0..a87b9fc6d09 100644
--- a/src/mame/video/namcos1.cpp
+++ b/src/mame/video/namcos1.cpp
@@ -53,46 +53,18 @@ Namco System 1 Video Hardware
***************************************************************************/
-inline void namcos1_state::get_tile_info(tile_data &tileinfo,int tile_index,uint8_t *info_vram)
+template <int Offset>
+TILE_GET_INFO_MEMBER(namcos1_state::get_tile_info)
{
int code;
tile_index <<= 1;
- code = info_vram[tile_index + 1] + ((info_vram[tile_index] & 0x3f) << 8);
+ tile_index += Offset;
+ code = m_videoram[tile_index + 1] + ((m_videoram[tile_index] & 0x3f) << 8);
SET_TILE_INFO_MEMBER(0,code,0,0);
tileinfo.mask_data = &m_tilemap_maskdata[code << 3];
}
-TILE_GET_INFO_MEMBER(namcos1_state::bg_get_info0)
-{
- get_tile_info(tileinfo,tile_index,&m_videoram[0x0000]);
-}
-
-TILE_GET_INFO_MEMBER(namcos1_state::bg_get_info1)
-{
- get_tile_info(tileinfo,tile_index,&m_videoram[0x2000]);
-}
-
-TILE_GET_INFO_MEMBER(namcos1_state::bg_get_info2)
-{
- get_tile_info(tileinfo,tile_index,&m_videoram[0x4000]);
-}
-
-TILE_GET_INFO_MEMBER(namcos1_state::bg_get_info3)
-{
- get_tile_info(tileinfo,tile_index,&m_videoram[0x6000]);
-}
-
-TILE_GET_INFO_MEMBER(namcos1_state::fg_get_info4)
-{
- get_tile_info(tileinfo,tile_index,&m_videoram[0x7010]);
-}
-
-TILE_GET_INFO_MEMBER(namcos1_state::fg_get_info5)
-{
- get_tile_info(tileinfo,tile_index,&m_videoram[0x7810]);
-}
-
/***************************************************************************
@@ -105,15 +77,13 @@ void namcos1_state::video_start()
{
int i;
- m_tilemap_maskdata = (uint8_t *)memregion("gfx1")->base();
-
/* initialize playfields */
- m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::bg_get_info0),this),TILEMAP_SCAN_ROWS,8,8,64,64);
- m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::bg_get_info1),this),TILEMAP_SCAN_ROWS,8,8,64,64);
- m_bg_tilemap[2] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::bg_get_info2),this),TILEMAP_SCAN_ROWS,8,8,64,64);
- m_bg_tilemap[3] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::bg_get_info3),this),TILEMAP_SCAN_ROWS,8,8,64,32);
- m_bg_tilemap[4] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::fg_get_info4),this),TILEMAP_SCAN_ROWS,8,8,36,28);
- m_bg_tilemap[5] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::fg_get_info5),this),TILEMAP_SCAN_ROWS,8,8,36,28);
+ m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::get_tile_info<0x0000>),this),TILEMAP_SCAN_ROWS,8,8,64,64);
+ m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::get_tile_info<0x2000>),this),TILEMAP_SCAN_ROWS,8,8,64,64);
+ m_bg_tilemap[2] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::get_tile_info<0x4000>),this),TILEMAP_SCAN_ROWS,8,8,64,64);
+ m_bg_tilemap[3] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::get_tile_info<0x6000>),this),TILEMAP_SCAN_ROWS,8,8,64,32);
+ m_bg_tilemap[4] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::get_tile_info<0x7010>),this),TILEMAP_SCAN_ROWS,8,8,36,28);
+ m_bg_tilemap[5] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos1_state::get_tile_info<0x7810>),this),TILEMAP_SCAN_ROWS,8,8,36,28);
for (i = 0; i < 4; i++)
{
@@ -135,10 +105,10 @@ void namcos1_state::video_start()
/* all palette entries are not affected by shadow sprites... */
for (i = 0;i < 0x2000;i++)
- m_palette->shadow_table()[i] = i;
+ m_c116->shadow_table()[i] = i;
/* ... except for tilemap colors */
for (i = 0x0800;i < 0x1000;i++)
- m_palette->shadow_table()[i] = i + 0x0800;
+ m_c116->shadow_table()[i] = i + 0x0800;
memset(m_playfield_control, 0, sizeof(m_playfield_control));
m_copy_sprites = 0;
@@ -292,7 +262,7 @@ uint32_t namcos1_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
flip_screen_set(m_spriteram[0x0ff6] & 1);
/* background color */
- bitmap.fill(m_palette->black_pen(), cliprect);
+ bitmap.fill(m_c116->black_pen(), cliprect);
/* berabohm uses asymmetrical visibility windows to iris on the character */
i = m_c116->get_reg(0) - 1; // min x
diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp
index 5d639517b8a..fae1c18fd5c 100644
--- a/src/mame/video/namcos2.cpp
+++ b/src/mame/video/namcos2.cpp
@@ -61,7 +61,7 @@ void namcos2_state::create_shadow_table()
/* set table for sprite color == 0x0f */
for (int i = 0; i < 16 * 256; i++)
{
- m_palette->shadow_table()[i] = i + 0x2000;
+ m_c116->shadow_table()[i] = i + 0x2000;
}
}
@@ -87,7 +87,7 @@ uint32_t namcos2_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
rectangle clip;
int pri;
- bitmap.fill(m_palette->black_pen(), cliprect);
+ bitmap.fill(m_c116->black_pen(), cliprect);
apply_clip(clip, cliprect);
/* HACK: enable ROZ layer only if it has priority > 0 */
@@ -114,22 +114,12 @@ uint32_t namcos2_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
/**************************************************************************/
-void namcos2_state::video_start_finallap()
-{
- create_shadow_table();
-}
-
-void namcos2_state::video_start_finalap2()
-{
- create_shadow_table();
-}
-
uint32_t namcos2_state::screen_update_finallap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
rectangle clip;
int pri;
- bitmap.fill(m_palette->black_pen(), cliprect);
+ bitmap.fill(m_c116->black_pen(), cliprect);
apply_clip(clip, cliprect);
for (pri = 0; pri < 16; pri++)
@@ -171,7 +161,7 @@ uint32_t namcos2_state::screen_update_luckywld(screen_device &screen, bitmap_ind
rectangle clip;
int pri;
- bitmap.fill(m_palette->black_pen(), cliprect);
+ bitmap.fill(m_c116->black_pen(), cliprect);
apply_clip(clip, cliprect);
for (pri = 0; pri < 16; pri++)
@@ -201,7 +191,7 @@ uint32_t namcos2_state::screen_update_sgunner(screen_device &screen, bitmap_ind1
rectangle clip;
int pri;
- bitmap.fill(m_palette->black_pen(), cliprect);
+ bitmap.fill(m_c116->black_pen(), cliprect);
apply_clip(clip, cliprect);
for (pri = 0; pri < 8; pri++)
@@ -230,7 +220,7 @@ uint32_t namcos2_state::screen_update_metlhawk(screen_device &screen, bitmap_ind
rectangle clip;
int pri;
- bitmap.fill(m_palette->black_pen(), cliprect);
+ bitmap.fill(m_c116->black_pen(), cliprect);
apply_clip(clip, cliprect);
for (pri = 0; pri < 16; pri++)
diff --git a/src/mame/video/namcos2_roz.cpp b/src/mame/video/namcos2_roz.cpp
index 17ef6fb5aa0..7f2b40f73d0 100644
--- a/src/mame/video/namcos2_roz.cpp
+++ b/src/mame/video/namcos2_roz.cpp
@@ -17,20 +17,34 @@
#include "emu.h"
#include "namcos2_roz.h"
+static const gfx_layout layout =
+{
+ 8,8,
+ RGN_FRAC(1,1),
+ 8,
+ { STEP8(0,1) },
+ { STEP8(0,8) },
+ { STEP8(0,8*8) },
+ 8*8*8
+};
+
+GFXDECODE_START( namcos2_roz_device::gfxinfo )
+ GFXDECODE_DEVICE( DEVICE_SELF, 0, layout, 0, 16 )
+GFXDECODE_END
+
DEFINE_DEVICE_TYPE(NAMCOS2_ROZ, namcos2_roz_device, "namcos2_roz", "Namco Sysem 2 ROZ (C102)")
namcos2_roz_device::namcos2_roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
device_t(mconfig, NAMCOS2_ROZ, tag, owner, clock),
+ device_gfx_interface(mconfig, *this, gfxinfo),
m_rozram(*this, finder_base::DUMMY_TAG),
- m_roz_ctrl(*this, finder_base::DUMMY_TAG),
- m_gfxdecode(*this, finder_base::DUMMY_TAG),
- m_palette(*this, finder_base::DUMMY_TAG)
+ m_roz_ctrl(*this, finder_base::DUMMY_TAG)
{
}
void namcos2_roz_device::device_start()
{
- m_tilemap_roz = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos2_roz_device::roz_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 256, 256);
+ m_tilemap_roz = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(namcos2_roz_device::roz_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 256, 256);
m_tilemap_roz->set_transparent_pen(0xff);
}
@@ -38,7 +52,7 @@ void namcos2_roz_device::device_start()
TILE_GET_INFO_MEMBER(namcos2_roz_device::roz_tile_info)
{
int tile = m_rozram[tile_index];
- SET_TILE_INFO_MEMBER(3, tile, 0/*color*/, 0);
+ SET_TILE_INFO_MEMBER(0, tile, 0/*color*/, 0);
}
struct roz_param
diff --git a/src/mame/video/namcos2_roz.h b/src/mame/video/namcos2_roz.h
index 9a80a416e71..e513251fa5a 100644
--- a/src/mame/video/namcos2_roz.h
+++ b/src/mame/video/namcos2_roz.h
@@ -7,10 +7,9 @@
#pragma once
#include "screen.h"
-#include "emupal.h"
-class namcos2_roz_device : public device_t
+class namcos2_roz_device : public device_t, public device_gfx_interface
{
public:
// construction/destruction
@@ -18,8 +17,6 @@ public:
template <typename T> void set_rozram_tag(T &&tag) { m_rozram.set_tag(std::forward<T>(tag)); }
template <typename T> void set_rozctrl_tag(T &&tag) { m_roz_ctrl.set_tag(std::forward<T>(tag)); }
- template <typename T> void set_palette_tag(T &&tag) { m_palette.set_tag(std::forward<T>(tag)); }
- template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); }
DECLARE_WRITE16_MEMBER( rozram_word_w );
@@ -39,8 +36,7 @@ private:
required_shared_ptr<uint16_t> m_rozram;
required_shared_ptr<uint16_t> m_roz_ctrl;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
+ DECLARE_GFXDECODE_MEMBER(gfxinfo);
};
// device type definition
diff --git a/src/mame/video/namcos2_sprite.cpp b/src/mame/video/namcos2_sprite.cpp
index 808b81c0ebc..9c9bca2546b 100644
--- a/src/mame/video/namcos2_sprite.cpp
+++ b/src/mame/video/namcos2_sprite.cpp
@@ -26,7 +26,6 @@ DEFINE_DEVICE_TYPE(NAMCOS2_SPRITE, namcos2_sprite_device, "namcos2_sprite", "Nam
namcos2_sprite_device::namcos2_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
device_t(mconfig, NAMCOS2_SPRITE, tag, owner, clock),
m_gfxdecode(*this, finder_base::DUMMY_TAG),
- m_palette(*this, finder_base::DUMMY_TAG),
m_spriteram(*this, finder_base::DUMMY_TAG)
{
}
@@ -50,8 +49,9 @@ void namcos2_sprite_device::zdrawgfxzoom(
{
if( gfx )
{
- int shadow_offset = (m_palette->shadows_enabled())?m_palette->entries():0;
- const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors()));
+ device_palette_interface &palette = m_gfxdecode->palette();
+ int shadow_offset = (palette.shadows_enabled())?palette.entries():0;
+ const pen_t *pal = &palette.pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors()));
const uint8_t *source_base = gfx->get_data(code % gfx->elements());
int sprite_screen_height = (scaley*gfx->height()+0x8000)>>16;
int sprite_screen_width = (scalex*gfx->width()+0x8000)>>16;
@@ -343,7 +343,7 @@ void namcos2_sprite_device::draw_sprites_metalhawk(screen_device &screen, bitmap
int scaley = (sizey<<16)/(bBigSprite?0x20:0x10);
/* swap xy */
- int rgn = (flags&0x01) ? 3 : 0;
+ int rgn = (flags&0x01);
gfx_element *gfx = m_gfxdecode->gfx(rgn);
diff --git a/src/mame/video/namcos2_sprite.h b/src/mame/video/namcos2_sprite.h
index ccbe4b1d806..03fe3796293 100644
--- a/src/mame/video/namcos2_sprite.h
+++ b/src/mame/video/namcos2_sprite.h
@@ -15,7 +15,6 @@ public:
// construction/destruction
namcos2_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- template <typename T> void set_palette_tag(T &&tag) { m_palette.set_tag(std::forward<T>(tag)); }
template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); }
template <typename T> void set_spriteram_tag(T &&tag) { m_spriteram.set_tag(std::forward<T>(tag)); }
@@ -32,7 +31,6 @@ private:
void zdrawgfxzoom(screen_device &screen, bitmap_rgb32 &dest_bmp, const rectangle &clip, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int zpos);
required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
required_shared_ptr<uint16_t> m_spriteram;
};