summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2025-08-30 10:12:40 +0200
committer hap <happppp@users.noreply.github.com>2025-08-30 11:24:45 +0200
commit30d0a985c4a4d6b8a8a7557613ff17af923aa401 (patch)
tree692597d8617448f6a9d329ea5565df3180a08b95
parent8da239f22c91ab0d7fce3dc1503e95d5985f607e (diff)
djmain: remove tag lookups
-rw-r--r--src/mame/konami/djmain.cpp146
1 files changed, 66 insertions, 80 deletions
diff --git a/src/mame/konami/djmain.cpp b/src/mame/konami/djmain.cpp
index 801409c8a89..adef53993bd 100644
--- a/src/mame/konami/djmain.cpp
+++ b/src/mame/konami/djmain.cpp
@@ -89,7 +89,6 @@ class djmain_state : public driver_device
public:
djmain_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- , m_obj_ram(*this, "obj_ram")
, m_maincpu(*this, "maincpu")
, m_k056832(*this, "k056832")
, m_k055555(*this, "k055555")
@@ -97,6 +96,10 @@ public:
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
, m_turntable(*this, "TT%u", 1U)
+ , m_inputs(*this, { "DSW3", "BTN3", "BTN2", "BTN1", "DSW1", "DSW2" })
+ , m_tilerom(*this, "k056832")
+ , m_objrom(*this, "sprites")
+ , m_objram(*this, "objram")
, m_sndram(*this, "sndram")
, m_leds(*this, "led%u", 0U)
, m_right_red_hlt(*this, "right-red-hlt")
@@ -141,8 +144,7 @@ private:
uint32_t obj_rom_r(offs_t offset, uint32_t mem_mask = ~0);
void v_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
uint32_t v_rom_r(offs_t offset, uint32_t mem_mask = ~0);
- uint8_t inp1_r(offs_t offset);
- uint8_t inp2_r(offs_t offset);
+ uint8_t input_r(offs_t offset);
uint32_t turntable_r(offs_t offset, uint32_t mem_mask = ~0);
void turntable_select_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
void light_ctrl_1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
@@ -162,7 +164,6 @@ private:
void maincpu_djmainj(address_map &map) ATTR_COLD;
void maincpu_djmainu(address_map &map) ATTR_COLD;
- required_shared_ptr<uint32_t> m_obj_ram;
required_device<cpu_device> m_maincpu;
required_device<k056832_device> m_k056832;
required_device<k055555_device> m_k055555;
@@ -170,7 +171,13 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
optional_ioport_array<2> m_turntable;
+ required_ioport_array<6> m_inputs;
+
+ required_region_ptr<uint8_t> m_tilerom;
+ required_region_ptr<uint8_t> m_objrom;
+ required_shared_ptr<uint32_t> m_objram;
required_shared_ptr<uint8_t> m_sndram;
+
output_finder<3> m_leds;
output_finder<> m_right_red_hlt;
output_finder<> m_left_red_hlt;
@@ -206,12 +213,12 @@ void djmain_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect)
/* prebuild a sorted table */
for (offs = 0; offs < NUM_SPRITES * 4; offs += 4)
{
- if (m_obj_ram[offs] & 0x00008000)
+ if (m_objram[offs] & 0x00008000)
{
- if (m_obj_ram[offs] & 0x80000000)
+ if (m_objram[offs] & 0x80000000)
continue;
- pri_code = m_obj_ram[offs] & (NUM_SPRITES - 1);
+ pri_code = m_objram[offs] & (NUM_SPRITES - 1);
sortedlist[pri_code] = offs;
}
}
@@ -232,16 +239,16 @@ void djmain_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect)
offs = sortedlist[pri_code];
if (offs == -1) continue;
- code = m_obj_ram[offs] >> 16;
- flipx = (m_obj_ram[offs] >> 10) & 1;
- flipy = (m_obj_ram[offs] >> 11) & 1;
- size = sizetab[(m_obj_ram[offs] >> 8) & 3];
+ code = m_objram[offs] >> 16;
+ flipx = (m_objram[offs] >> 10) & 1;
+ flipy = (m_objram[offs] >> 11) & 1;
+ size = sizetab[(m_objram[offs] >> 8) & 3];
- ox = (int16_t)(m_obj_ram[offs + 1] & 0xffff);
- oy = (int16_t)(m_obj_ram[offs + 1] >> 16);
+ ox = (int16_t)(m_objram[offs + 1] & 0xffff);
+ oy = (int16_t)(m_objram[offs + 1] >> 16);
- xscale = m_obj_ram[offs + 2] >> 16;
- yscale = m_obj_ram[offs + 2] & 0xffff;
+ xscale = m_objram[offs + 2] >> 16;
+ yscale = m_objram[offs + 2] & 0xffff;
if (!xscale || !yscale)
continue;
@@ -251,7 +258,7 @@ void djmain_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect)
ox -= (size * xscale) >> 13;
oy -= (size * yscale) >> 13;
- color = (m_obj_ram[offs + 3] >> 16) & 15;
+ color = (m_objram[offs + 3] >> 16) & 15;
for (x = 0; x < size; x++)
{
@@ -434,8 +441,7 @@ void djmain_state::obj_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
uint32_t djmain_state::obj_rom_r(offs_t offset, uint32_t mem_mask)
{
- uint8_t *mem8 = memregion("gfx1")->base();
- int bank = m_obj_regs[0x28/4] >> 16;
+ int bank = m_obj_regs[0x28/4] >> 16 & 0x3ff;
offset += bank * 0x200;
offset *= 4;
@@ -446,7 +452,7 @@ uint32_t djmain_state::obj_rom_r(offs_t offset, uint32_t mem_mask)
if (mem_mask & 0xff00ff00)
offset++;
- return mem8[offset] * 0x01010101;
+ return m_objrom[offset] * 0x01010101;
}
@@ -470,8 +476,7 @@ void djmain_state::v_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
uint32_t djmain_state::v_rom_r(offs_t offset, uint32_t mem_mask)
{
- uint8_t *mem8 = memregion("k056832")->base();
- int bank = m_k056832->word_r(0x34/2);
+ int bank = m_k056832->word_r(0x34/2) & 0xff;
offset *= 2;
@@ -483,22 +488,16 @@ uint32_t djmain_state::v_rom_r(offs_t offset, uint32_t mem_mask)
if (m_v_ctrl & 0x020)
offset += 0x800 * 2;
- return mem8[offset] * 0x01010000;
+ return m_tilerom[offset] * 0x01010000;
}
//---------
-uint8_t djmain_state::inp1_r(offs_t offset)
-{
- static const char *const portnames[] = { "DSW3", "BTN3", "BTN2", "BTN1" };
- return ioport(portnames[ offset & 0x03 ])->read();
-}
-
-uint8_t djmain_state::inp2_r(offs_t offset)
+uint8_t djmain_state::input_r(offs_t offset)
{
- static const char *const portnames[] = { "DSW1", "DSW2", "UNK2", "UNK1" };
- return ioport(portnames[ offset & 0x03 ])->read();
+ offset = (offset & 3) | BIT(offset, 15) << 2;
+ return (offset < 6) ? m_inputs[offset]->read() : 0xff;
}
uint32_t djmain_state::turntable_r(offs_t offset, uint32_t mem_mask)
@@ -529,7 +528,7 @@ uint32_t djmain_state::turntable_r(offs_t offset, uint32_t mem_mask)
void djmain_state::turntable_select_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_23)
- m_turntable_select = (data >> 19) & 1;
+ m_turntable_select = BIT(data, 19);
}
@@ -664,15 +663,14 @@ void djmain_state::maincpu_djmain(address_map &map)
map(0x5a0000, 0x5a005f).w(m_k055555, FUNC(k055555_device::K055555_long_w)); // 055555: priority encoder
map(0x5b0000, 0x5b04ff).rw("k054539_1", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0xff00ff00);
map(0x5b0000, 0x5b04ff).rw("k054539_2", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0x00ff00ff);
- map(0x5c0000, 0x5c0003).r(FUNC(djmain_state::inp1_r)); // DSW3,BTN3,BTN2,BTN1 // input port control (buttons and DIP switches)
- map(0x5c8000, 0x5c8003).r(FUNC(djmain_state::inp2_r)); // DSW1,DSW2,UNK2,UNK1 // input port control (DIP switches)
+ map(0x5c0000, 0x5c0003).r(FUNC(djmain_state::input_r)).select(0x008000); // input port control (buttons and DIP switches)
map(0x5d0000, 0x5d0003).w(FUNC(djmain_state::light_ctrl_1_w)); // light/coin blocker control
map(0x5d2000, 0x5d2003).w(FUNC(djmain_state::light_ctrl_2_w)); // light/coin blocker control
map(0x5d4000, 0x5d4003).w(FUNC(djmain_state::v_ctrl_w)); // VIDEO control
map(0x5d6000, 0x5d6003).w(FUNC(djmain_state::sndram_bank_w)); // SOUND RAM bank
map(0x5e0000, 0x5e0003).rw(FUNC(djmain_state::turntable_r), FUNC(djmain_state::turntable_select_w)); // input port control (turn tables)
map(0x600000, 0x601fff).r(FUNC(djmain_state::v_rom_r)); // VIDEO ROM readthrough (for POST)
- map(0x801000, 0x8017ff).ram().share("obj_ram"); // OBJECT RAM
+ map(0x801000, 0x8017ff).ram().share(m_objram); // OBJECT RAM
map(0x802000, 0x802fff).w(FUNC(djmain_state::unknown802000_w)); // ??
map(0x803000, 0x80309f).rw(FUNC(djmain_state::obj_ctrl_r), FUNC(djmain_state::obj_ctrl_w)); // OBJECT REGS
map(0x803800, 0x803fff).r(FUNC(djmain_state::obj_rom_r)); // OBJECT ROM readthrough (for POST)
@@ -742,14 +740,10 @@ static INPUT_PORTS_START( beatmania_btn ) // and turntables
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) PORT_NAME("Effect") /* EFFECT */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_START("BTN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) /* TEST SW */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service") /* SERVICE */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Reset") /* RESET SW */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("UNK1")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START("UNK2")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("TT1") /* turn table 1P */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1)
PORT_START("TT2") /* turn table 2P */
@@ -1311,14 +1305,10 @@ static INPUT_PORTS_START( popnmusic_btn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Used by beatmania as EFFECT */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_START("BTN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) /* TEST SW */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service") /* SERVICE */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Reset") /* RESET SW */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("UNK1")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START("UNK2")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
//PORT_START("TT1") /* turn table 1P */
//PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1)
//PORT_START("TT2") /* turn table 2P */
@@ -1501,14 +1491,10 @@ static INPUT_PORTS_START( popnstage )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) /* RIGHT SELECTION */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_START("BTN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) /* TEST SW */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service") /* SERVICE */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Used by beatmania as RESET SW */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("UNK1")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START("UNK2")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
//PORT_START("TT1") /* turn table 1P */
//PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1)
//PORT_START("TT2") /* turn table 2P */
@@ -1611,7 +1597,7 @@ static const gfx_layout spritelayout =
};
static GFXDECODE_START( gfx_djmain )
- GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, (0x4440/4)/16 )
+ GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0, (0x4440/4)/16 )
GFXDECODE_END
@@ -1729,7 +1715,7 @@ ROM_START( bm1stmix )
ROM_LOAD16_BYTE( "753jab01.6a", 0x000000, 0x80000, CRC(25bf8629) SHA1(2be73f9dd25cae415c6443f221cc7d38d5555ae5) )
ROM_LOAD16_BYTE( "753jab02.8a", 0x000001, 0x80000, CRC(6ab951de) SHA1(a724ede03b74e9422c120fcc263e2ebcc3a3e110) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "753jaa03.19a", 0x000000, 0x80000, CRC(f2b2bce8) SHA1(61d31b111f35e7dde89965fa43ba627c12aff11c) )
ROM_LOAD16_BYTE( "753jaa04.20a", 0x000001, 0x80000, CRC(85a18f9d) SHA1(ecd0ab4f53e882b00176dacad5fac35345fbea66) )
ROM_LOAD16_BYTE( "753jaa05.22a", 0x100000, 0x80000, CRC(749b1e87) SHA1(1c771c19f152ae95171e4fd51da561ba4ec5ea87) )
@@ -1752,7 +1738,7 @@ ROM_START( bm2ndmix )
ROM_LOAD16_BYTE( "853jab01.6a", 0x000000, 0x80000, CRC(c8df72c0) SHA1(6793b587ba0611bc3da8c4955d6a87e47a19a223) )
ROM_LOAD16_BYTE( "853jab02.8a", 0x000001, 0x80000, CRC(bf6ace08) SHA1(29d3fdf1c73a73a0a66fa5a4c4ac3f293cb82e37) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "853jaa03.19a", 0x000000, 0x80000, CRC(1462ed23) SHA1(fdfda3060c8d367ac2e8e43dedaba8ab9012cc77) )
ROM_LOAD16_BYTE( "853jaa04.20a", 0x000001, 0x80000, CRC(98c9b331) SHA1(51f24b3c3773c53ff492ed9bad17c9867fd94e28) )
ROM_LOAD16_BYTE( "853jaa05.22a", 0x100000, 0x80000, CRC(0da3fef9) SHA1(f9ef24144c00c054ecc4650bb79e74c57c6d6b3c) )
@@ -1773,7 +1759,7 @@ ROM_START( bm2ndmixa )
ROM_LOAD16_BYTE( "853jaa01.6a", 0x000000, 0x80000, CRC(4f0bf5d0) SHA1(4793bb411e85f2191eb703a170c16cf163ea79e7) )
ROM_LOAD16_BYTE( "853jaa02.8a", 0x000001, 0x80000, CRC(e323925b) SHA1(1f9f52a7ab6359b617e87f8b3d7ac4269885c621) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "853jaa03.19a", 0x000000, 0x80000, CRC(1462ed23) SHA1(fdfda3060c8d367ac2e8e43dedaba8ab9012cc77) )
ROM_LOAD16_BYTE( "853jaa04.20a", 0x000001, 0x80000, CRC(98c9b331) SHA1(51f24b3c3773c53ff492ed9bad17c9867fd94e28) )
ROM_LOAD16_BYTE( "853jaa05.22a", 0x100000, 0x80000, CRC(0da3fef9) SHA1(f9ef24144c00c054ecc4650bb79e74c57c6d6b3c) )
@@ -1794,7 +1780,7 @@ ROM_START( bm3rdmix )
ROM_LOAD16_BYTE( "825_b01.6a", 0x000000, 0x80000, CRC(934fdcb2) SHA1(b88bada065b5464c579039c2e403c061e6eeb356) )
ROM_LOAD16_BYTE( "825_b02.8a", 0x000001, 0x80000, CRC(6012c488) SHA1(df32db41942c2fe2b2aa7439900372e22ea54c3c) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "825_a03.19a", 0x000000, 0x80000, CRC(ecd62652) SHA1(bceab4052dce2c843358f0a98aacc6e1124e3068) )
ROM_LOAD16_BYTE( "825_a04.20a", 0x000001, 0x80000, CRC(437a576f) SHA1(f30fd15d4f0d776e9b29ccfcd6e26861fb42e51a) )
ROM_LOAD16_BYTE( "825_a05.22a", 0x100000, 0x80000, CRC(9f9a3369) SHA1(d8b20127336af89b9e886289fb4f5a2e0db65f9b) )
@@ -1815,7 +1801,7 @@ ROM_START( bm3rdmixa )
ROM_LOAD16_BYTE( "825jaa01.6a", 0x000000, 0x80000, CRC(cf7494a5) SHA1(994df0644817f44d135a16f04d8dae9ec73e3728) )
ROM_LOAD16_BYTE( "825jaa02.8a", 0x000001, 0x80000, CRC(5f787fe2) SHA1(5944da21141802d96594cf77880682e97d014ca1) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "825jaa03.19a", 0x000000, 0x80000, CRC(ecd62652) SHA1(bceab4052dce2c843358f0a98aacc6e1124e3068) )
ROM_LOAD16_BYTE( "825jaa04.20a", 0x000001, 0x80000, CRC(437a576f) SHA1(f30fd15d4f0d776e9b29ccfcd6e26861fb42e51a) )
ROM_LOAD16_BYTE( "825jaa05.22a", 0x100000, 0x80000, CRC(9f9a3369) SHA1(d8b20127336af89b9e886289fb4f5a2e0db65f9b) )
@@ -1836,7 +1822,7 @@ ROM_START( bm3rdmixe )
ROM_LOAD16_BYTE( "825eaa01.6a", 0x000000, 0x80000, CRC(a7303584) SHA1(222d1c469a72f17ea9316cfaf22ba965b24260d6) )
ROM_LOAD16_BYTE( "825eaa02.8a", 0x000001, 0x80000, CRC(45e65086) SHA1(0daf53379d7c64b2819a0bdc192ee4ea72160643) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "825eaa03.19a", 0x000000, 0x80000, CRC(ecd62652) SHA1(bceab4052dce2c843358f0a98aacc6e1124e3068) )
ROM_LOAD16_BYTE( "825eaa04.20a", 0x000001, 0x80000, CRC(437a576f) SHA1(f30fd15d4f0d776e9b29ccfcd6e26861fb42e51a) )
ROM_LOAD16_BYTE( "825eaa05.22a", 0x100000, 0x80000, CRC(9f9a3369) SHA1(d8b20127336af89b9e886289fb4f5a2e0db65f9b) )
@@ -1857,7 +1843,7 @@ ROM_START( bmcompmx )
ROM_LOAD16_BYTE( "858jac01.6a", 0x000000, 0x80000, CRC(b32693ca) SHA1(6518a8acbd070bb6f9039c4f9997dda2720e8e16) )
ROM_LOAD16_BYTE( "858jac02.8a", 0x000001, 0x80000, CRC(0d11d0f4) SHA1(b9fbf2ce062e1ee4a785abe021ac039857ced0d2) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "858jaa03.19a", 0x000000, 0x80000, CRC(8559f457) SHA1(133092994087864a6c29e9d51dcdbef2e2c2a123) )
ROM_LOAD16_BYTE( "858jaa04.20a", 0x000001, 0x80000, CRC(770824d3) SHA1(5c21bc39f8128957d76be85bc178c96976987f5f) )
ROM_LOAD16_BYTE( "858jaa05.22a", 0x100000, 0x80000, CRC(9ce769da) SHA1(1fe2999f786effdd5e3e74475e8431393eb9403d) )
@@ -1878,7 +1864,7 @@ ROM_START( bmcompmxb )
ROM_LOAD16_BYTE( "858jab01.6a", 0x000000, 0x80000, CRC(92841eb5) SHA1(3a9d90a9c4b16cb7118aed2cadd3ab32919efa96) )
ROM_LOAD16_BYTE( "858jab02.8a", 0x000001, 0x80000, CRC(7b19969c) SHA1(3545acabbf53bacc5afa72a3c5af3cd648bc2ae1) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "858jaa03.19a", 0x000000, 0x80000, CRC(8559f457) SHA1(133092994087864a6c29e9d51dcdbef2e2c2a123) )
ROM_LOAD16_BYTE( "858jaa04.20a", 0x000001, 0x80000, CRC(770824d3) SHA1(5c21bc39f8128957d76be85bc178c96976987f5f) )
ROM_LOAD16_BYTE( "858jaa05.22a", 0x100000, 0x80000, CRC(9ce769da) SHA1(1fe2999f786effdd5e3e74475e8431393eb9403d) )
@@ -1899,7 +1885,7 @@ ROM_START( hmcompmx )
ROM_LOAD16_BYTE( "858uab01.6a", 0x000000, 0x80000, CRC(f9c16675) SHA1(f2b50a3544f43af6fd987256a8bd4125b95749ef) )
ROM_LOAD16_BYTE( "858uab02.8a", 0x000001, 0x80000, CRC(4e8f1e78) SHA1(88d654de4377b584ff8a5e1f8bc81ffb293ec8a5) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "858uaa03.19a", 0x000000, 0x80000, CRC(52b51a5e) SHA1(9f01e2fcbe5a9d7f80b377c5e10f18da2c9dcc8e) )
ROM_LOAD16_BYTE( "858uaa04.20a", 0x000001, 0x80000, CRC(a336cee9) SHA1(0e62c0c38d86868c909b4c1790fbb7ecb2de137d) )
ROM_LOAD16_BYTE( "858uaa05.22a", 0x100000, 0x80000, CRC(2e14cf83) SHA1(799b2162f7b11678d1d260f7e1eb841abda55a60) )
@@ -1920,7 +1906,7 @@ ROM_START( bmcmxaac )
ROM_LOAD16_BYTE( "858aac01.6a", 0x000000, 0x80000, CRC(1563b021) SHA1(5b63c3f0db4704ef92ee388777611ba8d5f6a1b7) )
ROM_LOAD16_BYTE( "858aac02.8a", 0x000001, 0x80000, CRC(53ae5d66) SHA1(cfbf870cf9c2fa8270d62423a21f3a5c19382a66) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "858aac03.19a", 0x000000, 0x80000, CRC(8559f457) SHA1(133092994087864a6c29e9d51dcdbef2e2c2a123) )
ROM_LOAD16_BYTE( "858aac04.20a", 0x000001, 0x80000, CRC(770824d3) SHA1(5c21bc39f8128957d76be85bc178c96976987f5f) )
ROM_LOAD16_BYTE( "858aac05.22a", 0x100000, 0x80000, CRC(2e14cf83) SHA1(799b2162f7b11678d1d260f7e1eb841abda55a60) )
@@ -1941,7 +1927,7 @@ ROM_START( bscompmx )
ROM_LOAD16_BYTE( "858kab01.6a", 0x000000, 0x80000, CRC(47c19dcc) SHA1(3698c9d5ccaa24626d5a04b20750dc3faf423f68) )
ROM_LOAD16_BYTE( "858kab02.8a", 0x000001, 0x80000, CRC(cc848aaa) SHA1(1ebe4f8d3936dbcd0a83dadc3547951fcab39786) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "858kab03.19a", 0x000000, 0x80000, CRC(679022e9) SHA1(70026a5c5bcb8adb58e7e7246f3cc30471a844a6) )
ROM_LOAD16_BYTE( "858kab04.20a", 0x000001, 0x80000, CRC(d916d8ec) SHA1(827fcd2c3c5e0d01e4cf49820d23eef44b63cfaa) )
ROM_LOAD16_BYTE( "858kab05.22a", 0x100000, 0x80000, CRC(f59c8e83) SHA1(fe4fee34ce12afc02e709190ec3a756a0cf77e08) )
@@ -1962,7 +1948,7 @@ ROM_START( bm4thmix )
ROM_LOAD16_BYTE( "847jaa01.6a", 0x000000, 0x80000, CRC(81138a1b) SHA1(ebe211126f871e541881e1670f56d50b058dead3) )
ROM_LOAD16_BYTE( "847jaa02.8a", 0x000001, 0x80000, CRC(4eeb0010) SHA1(942303dfb19a4a78dd74ad24576031760553a661) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "847jaa03.19a", 0x000000, 0x80000, CRC(f447d140) SHA1(cc15b80419940d127a77765508f877421ed86ee2) )
ROM_LOAD16_BYTE( "847jaa04.20a", 0x000001, 0x80000, CRC(edc3e286) SHA1(341b1dc6ee1562b1ddf235a66ac96b94c482b67c) )
ROM_LOAD16_BYTE( "847jaa05.22a", 0x100000, 0x80000, CRC(da165b5e) SHA1(e46110590e6ab89b55f6abfbf6c53c99d28a75a9) )
@@ -1983,7 +1969,7 @@ ROM_START( bs4thmix )
ROM_LOAD16_BYTE( "847kaa01.6a", 0x000000, 0x80000, CRC(17c994e5) SHA1(2249d9e788029d194454dc0552246262d4131e8c) )
ROM_LOAD16_BYTE( "847kaa02.8a", 0x000001, 0x80000, CRC(25b2a690) SHA1(90216cc7fbbaa8709eec348a7dcc5e25c7638b34) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "847kaa03.19a", 0x000000, 0x80000, CRC(f447d140) SHA1(cc15b80419940d127a77765508f877421ed86ee2) )
ROM_LOAD16_BYTE( "847kaa04.20a", 0x000001, 0x80000, CRC(edc3e286) SHA1(341b1dc6ee1562b1ddf235a66ac96b94c482b67c) )
ROM_LOAD16_BYTE( "847kaa05.22a", 0x100000, 0x80000, CRC(da165b5e) SHA1(e46110590e6ab89b55f6abfbf6c53c99d28a75a9) )
@@ -2004,7 +1990,7 @@ ROM_START( bm5thmix )
ROM_LOAD16_BYTE( "981jaa01.6a", 0x000000, 0x80000, CRC(03bbe7e3) SHA1(7d4ec3bc7719a3f1b81df309b5c74afaffde42ba) )
ROM_LOAD16_BYTE( "981jaa02.8a", 0x000001, 0x80000, CRC(f4e59923) SHA1(a4983435e3f2243ea9ccc2fd5439d86c30b6f604) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "981jaa03.19a", 0x000000, 0x80000, CRC(8b7e6d72) SHA1(d470377e20e4d4935af5e57d081ce24dd9ea5793) )
ROM_LOAD16_BYTE( "981jaa04.20a", 0x000001, 0x80000, CRC(5139988a) SHA1(2b1eb97dcbfbe6bba1352a02cf0036e9a721ab39) )
ROM_LOAD16_BYTE( "981jaa05.22a", 0x100000, 0x80000, CRC(f370fdb9) SHA1(3a2bbdda984f2630e8ae505a8db259d9162e07a3) )
@@ -2025,7 +2011,7 @@ ROM_START( bmclubmx )
ROM_LOAD16_BYTE( "993jaa01.6a", 0x000000, 0x80000, CRC(b314af94) SHA1(6448554e1d565ee1558d13f484b5fa0018ac3667) )
ROM_LOAD16_BYTE( "993jaa02.8a", 0x000001, 0x80000, CRC(0aa9f16a) SHA1(508d41e141997ba07443c4ab98454cec515d731c) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "993jaa03.19a", 0x000000, 0x80000, CRC(00394778) SHA1(3631a42ed0c8ee572e7faafdaacce9fc2b372d25) )
ROM_LOAD16_BYTE( "993jaa04.20a", 0x000001, 0x80000, CRC(2522f3b0) SHA1(1ab8618b732f1402fc7bfb141630873d4c706d34) )
ROM_LOAD16_BYTE( "993jaa05.22a", 0x100000, 0x80000, CRC(4e340947) SHA1(a0a7f3b222a292b07bc5c7acd61547ea2bdbad43) )
@@ -2048,7 +2034,7 @@ ROM_START( bmcompm2 )
ROM_LOAD16_BYTE( "988jaa01.6a", 0x000000, 0x80000, CRC(31be1d4c) SHA1(ab8c2b4a2b48e3b2b549022f65afb206ab125680) )
ROM_LOAD16_BYTE( "988jaa02.8a", 0x000001, 0x80000, CRC(0413de32) SHA1(f819e8756e2000de5df61ad42ac01de14b7330f9) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "988jaa03.19a", 0x000000, 0x80000, CRC(c0ad86d4) SHA1(6aca5bf3fbc0bd69116e442053840660eeff0239) )
ROM_LOAD16_BYTE( "988jaa04.20a", 0x000001, 0x80000, CRC(84801a50) SHA1(8700e4fb56941b87f8333e72e2a1c7ac9e322312) )
ROM_LOAD16_BYTE( "988jaa05.22a", 0x100000, 0x80000, CRC(0ddf7d6d) SHA1(aa110ab64c2fbf427796dff3a817b57cf6a9440d) )
@@ -2069,7 +2055,7 @@ ROM_START( hmcompm2 )
ROM_LOAD16_BYTE( "988uaa01.6a", 0x000000, 0x80000, CRC(5e5cc6c0) SHA1(0e7cd601d4543715cbc9f65e6fd48837179c962a) )
ROM_LOAD16_BYTE( "988uaa02.8a", 0x000001, 0x80000, CRC(e262984a) SHA1(f47662e40f91f2addb1a4b649923c1d0ee017341) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "988uaa03.19a", 0x000000, 0x80000, CRC(d0f204c8) SHA1(866baac5a6d301d5b9cf0c14e9937ee5f435db77) )
ROM_LOAD16_BYTE( "988uaa04.20a", 0x000001, 0x80000, CRC(74c6b3ed) SHA1(7d9b064bab3f29fc6435f6430c71208abbf9d861) )
ROM_LOAD16_BYTE( "988uaa05.22a", 0x100000, 0x80000, CRC(6b9321cb) SHA1(449e5f85288a8c6724658050fa9521c7454a1e46) )
@@ -2090,7 +2076,7 @@ ROM_START( bmdct )
ROM_LOAD16_BYTE( "995jaa01.6a", 0x000000, 0x80000, CRC(2c224169) SHA1(0608469fa0a15026f461be5141ed29bf740144ca) )
ROM_LOAD16_BYTE( "995jaa02.8a", 0x000001, 0x80000, CRC(a2edb472) SHA1(795e44e56dfee6c5eceb28172bc20ba5b31c366b) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "995jaa03.19a", 0x000000, 0x80000, CRC(77a7030c) SHA1(8f7988ca5c248d0846ec22c0975ae008d85e8d72) )
ROM_LOAD16_BYTE( "995jaa04.20a", 0x000001, 0x80000, CRC(a12ea45d) SHA1(9bd48bc25c17f885d74e859de153ec49012a4e39) )
ROM_LOAD16_BYTE( "995jaa05.22a", 0x100000, 0x80000, CRC(1493fd98) SHA1(4cae2ebccc79b21d7e21b984dc6fe10ab3013a2d) )
@@ -2111,7 +2097,7 @@ ROM_START( bmcorerm )
ROM_LOAD16_BYTE( "a05jaa01.6a", 0x000000, 0x80000, CRC(cd6f1fc5) SHA1(237cbc17a693efb6bffffd6afb24f0944c29330c) )
ROM_LOAD16_BYTE( "a05jaa02.8a", 0x000001, 0x80000, CRC(fe07785e) SHA1(14c652008cb509b5206fb515aad7dfe36a6fe6f4) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "a05jaa03.19a", 0x000000, 0x80000, CRC(8b88932a) SHA1(df20f8323adb02d07b835da98f4a29b3142175c9) )
ROM_LOAD16_BYTE( "a05jaa04.20a", 0x000001, 0x80000, CRC(cc72629f) SHA1(f95d06f409c7d6422d66a55c0452eb3feafc6ef0) )
ROM_LOAD16_BYTE( "a05jaa05.22a", 0x100000, 0x80000, CRC(e241b22b) SHA1(941a76f6ac821e0984057ec7df7862b12fa657b8) )
@@ -2132,7 +2118,7 @@ ROM_START( bm6thmix )
ROM_LOAD16_BYTE( "a21jaa01.6a", 0x000000, 0x80000, CRC(6d7ccbe3) SHA1(633c69c14dfd70866664b94095fa5f21087428d8) )
ROM_LOAD16_BYTE( "a21jaa02.8a", 0x000001, 0x80000, CRC(f10076fa) SHA1(ab9f3e75a36fdaccec411afd77f588f040db139d) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "a21jaa03.19a", 0x000000, 0x80000, CRC(ca806266) SHA1(6b5f9d5089a992347745ab6af4dadaac4e3b0742) )
ROM_LOAD16_BYTE( "a21jaa04.20a", 0x000001, 0x80000, CRC(71124e79) SHA1(d9fd8f662ac9c29daf25acd310fd0f27051dea0b) )
ROM_LOAD16_BYTE( "a21jaa05.22a", 0x100000, 0x80000, CRC(818e34e6) SHA1(8a9093b92392a065d0cf94d56195a6f3ca611044) )
@@ -2153,7 +2139,7 @@ ROM_START( bm7thmix )
ROM_LOAD16_BYTE( "b07jab01.6a", 0x000000, 0x80000, CRC(433d0074) SHA1(5a9709ce200cbff340063469956d1c55a46810d9) )
ROM_LOAD16_BYTE( "b07jab02.8a", 0x000001, 0x80000, CRC(794773af) SHA1(c823deb077f6515d7701de84d324c3d367719819) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "b07jaa03.19a", 0x000000, 0x80000, CRC(3e30af3f) SHA1(f092c4156bc7d0a0309171fd1e00a6d4c33cb08f) )
ROM_LOAD16_BYTE( "b07jaa04.20a", 0x000001, 0x80000, CRC(190a4a83) SHA1(f7ae2d3ccd98f99fdae61c1a2145f993c4064ebd) )
ROM_LOAD16_BYTE( "b07jaa05.22a", 0x100000, 0x80000, CRC(415a6363) SHA1(b3edbcd293006c3738a10680ecfa66e105028786) )
@@ -2176,7 +2162,7 @@ ROM_START( bmfinal )
ROM_LOAD16_BYTE( "c01jaa01.6a", 0x000000, 0x80000, CRC(a64eeff7) SHA1(377eee1f41e3072f9154a7c17ec4c4f3fb63ea4a) )
ROM_LOAD16_BYTE( "c01jaa02.8a", 0x000001, 0x80000, CRC(599bdac5) SHA1(f85aff020c92fcd3c2a42036615226b54e5bee98) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "c01jaa03.19a", 0x000000, 0x80000, CRC(1c9c6eb7) SHA1(bd1a9d8ed78095328817f599f52d9d34e09e9275) )
ROM_LOAD16_BYTE( "c01jaa04.20a", 0x000001, 0x80000, CRC(4e5aa665) SHA1(22f3888a29497ff0a801cce620ca0373268e5cd9) )
ROM_LOAD16_BYTE( "c01jaa05.22a", 0x100000, 0x80000, CRC(37dab217) SHA1(66b07c36e7749a4c9d9dfaca633958a4922c4562) )
@@ -2199,7 +2185,7 @@ ROM_START( popn1 )
ROM_LOAD16_BYTE( "803t_a01.6a", 0x000000, 0x80000, CRC(e85032bc) SHA1(625ac755a77a861ecede766d77fbecb29683844b) )
ROM_LOAD16_BYTE( "803j_a02.8a", 0x000001, 0x80000, CRC(17e90be0) SHA1(8857d46d63b7cd97aed5c7a5cf804fe5311255ac) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "803t_a03.19a", 0x000000, 0x80000, CRC(a0970b32) SHA1(4bf06f977f67f13d0994e80021faaefed015ca1c) )
ROM_LOAD16_BYTE( "803t_a04.20a", 0x000001, 0x80000, CRC(a158b950) SHA1(535d994a68fe56c8a93d460e5272b1a0b081383d) )
ROM_LOAD16_BYTE( "803t_a05.22a", 0x100000, 0x80000, CRC(8a23c18d) SHA1(714b68a3112dff52feba6a50ae15c02d041b1def) )
@@ -2220,7 +2206,7 @@ ROM_START( popn1a )
ROM_LOAD16_BYTE( "803aaa01.6a", 0x000000, 0x80000, CRC(70466eff) SHA1(d59f97a6882ad65afa3b5de491d44bb4d839d286) )
ROM_LOAD16_BYTE( "803aaa02.8a", 0x000001, 0x80000, CRC(c102c909) SHA1(630a74ccec78d36adaba38a85ed6a0e45dca96a4) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "803aaa03.19a", 0x000000, 0x80000, CRC(a0970b32) SHA1(4bf06f977f67f13d0994e80021faaefed015ca1c) )
ROM_LOAD16_BYTE( "803aaa04.20a", 0x000001, 0x80000, CRC(a158b950) SHA1(535d994a68fe56c8a93d460e5272b1a0b081383d) )
ROM_LOAD16_BYTE( "803aaa05.22a", 0x100000, 0x80000, CRC(8a23c18d) SHA1(714b68a3112dff52feba6a50ae15c02d041b1def) )
@@ -2241,7 +2227,7 @@ ROM_START( popn1k )
ROM_LOAD16_BYTE( "803k_a01.bin", 0x000000, 0x80000, CRC(5037e700) SHA1(b1e4d0a69187b22706d7a744da63bf639aee9738) )
ROM_LOAD16_BYTE( "803k_a02.bin", 0x000001, 0x80000, CRC(14aff1c4) SHA1(0832c1eea7fb593245fba23bf7dc4b4495ff0cdc) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "803aaa03.19a", 0x000000, 0x80000, CRC(a0970b32) SHA1(4bf06f977f67f13d0994e80021faaefed015ca1c) )
ROM_LOAD16_BYTE( "803aaa04.20a", 0x000001, 0x80000, CRC(a158b950) SHA1(535d994a68fe56c8a93d460e5272b1a0b081383d) )
ROM_LOAD16_BYTE( "803aaa05.22a", 0x100000, 0x80000, CRC(8a23c18d) SHA1(714b68a3112dff52feba6a50ae15c02d041b1def) )
@@ -2262,7 +2248,7 @@ ROM_START( popn1j )
ROM_LOAD16_BYTE( "803jaa01.6a", 0x000000, 0x80000, CRC(469cee89) SHA1(d7c3e25e48492bceb17825db357830b08a20f09a) )
ROM_LOAD16_BYTE( "803jaa02.8a", 0x000001, 0x80000, CRC(112ff5a3) SHA1(74d7155a1b63d411a8c3f99e511fc4c331b4c62f) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "803jaa03.19a", 0x000000, 0x80000, CRC(d80315f6) SHA1(070ea8d00aeecce1e357be5a9c434ef46f57a7e9) )
ROM_LOAD16_BYTE( "803jaa04.20a", 0x000001, 0x80000, CRC(f7b9ac82) SHA1(898fbe229a3fdea5988d46359d030c3ec35eaafd) )
ROM_LOAD16_BYTE( "803jaa05.22a", 0x100000, 0x80000, CRC(2902f6df) SHA1(658ccae9a67196a310bd69870c350058d2911feb) )
@@ -2283,7 +2269,7 @@ ROM_START( popn2 )
ROM_LOAD16_BYTE( "831jaa01.8a", 0x000000, 0x80000, CRC(d6214cac) SHA1(18e74c81710228c91ab9eb554b63d9bd69b93ec8) )
ROM_LOAD16_BYTE( "831jaa02.6a", 0x000001, 0x80000, CRC(aabe8689) SHA1(d51d277e9b5d0233d1c6bdfec40c32587f84b31a) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "831jaa03.19a", 0x000000, 0x80000, CRC(a07aeb72) SHA1(4d957c15d1b989e955249c34b0aa5679fb3e4fbf) )
ROM_LOAD16_BYTE( "831jaa04.20a", 0x000001, 0x80000, CRC(9277d1d2) SHA1(6946845973f0ce15db383032343f6852873698eb) )
ROM_LOAD16_BYTE( "831jaa05.22a", 0x100000, 0x80000, CRC(f3b63033) SHA1(c3c6de0d8c749ddf4926040637f03b11c2a21b99) )
@@ -2304,7 +2290,7 @@ ROM_START( popn3 )
ROM_LOAD16_BYTE( "980a01.6a", 0x000000, 0x080000, CRC(ffd37d2c) SHA1(2a62ccfdb77a10356dbf08d6daa84faa3ff5d93a) )
ROM_LOAD16_BYTE( "980a02.8a", 0x000001, 0x080000, CRC(00b15e1b) SHA1(7725b244b2964952e52a266aff697a8632830c97) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "980a03.19a", 0x000000, 0x080000, CRC(3674ba5b) SHA1(8741a43b099936c5f8add33d487b511c1ee8d21b) )
ROM_LOAD16_BYTE( "980a04.20a", 0x000001, 0x080000, CRC(32e8ca33) SHA1(5aab1cb334e57667e146516125574f4f14676104) )
ROM_LOAD16_BYTE( "980a05.22a", 0x100000, 0x080000, CRC(d31072e4) SHA1(c23c0e21fb22fe82b9a76d28bf2896dfec6bdc9b) )
@@ -2325,7 +2311,7 @@ ROM_START( popnstex )
ROM_LOAD16_BYTE( "970jba01.6a", 0x000000, 0x80000, CRC(8fa0c957) SHA1(12d1d6f15e19955c663ebdfcb16d5f6d209c0f76) )
ROM_LOAD16_BYTE( "970jba02.8a", 0x000001, 0x80000, CRC(7adb00a0) SHA1(70a86897ab6cbc3f34be51f7f078644de697e331) )
- ROM_REGION( 0x200000, "gfx1", 0) /* SPRITE */
+ ROM_REGION( 0x200000, "sprites", 0) /* SPRITE */
ROM_LOAD16_BYTE( "970jba03.19a", 0x000000, 0x80000, CRC(e5d15d3c) SHA1(bdbd3c59e3377e071b199eea6cfb2ad84d37e971) )
ROM_LOAD16_BYTE( "970jba04.20a", 0x000001, 0x80000, CRC(687f9beb) SHA1(6baac0aa2db3af9e34469b1719ccff3643fd85f7) )
ROM_LOAD16_BYTE( "970jba05.22a", 0x100000, 0x80000, CRC(3bedc09c) SHA1(d0806bb54a3e620a987d61c6a5f04a2e1fc613a8) )