diff --git a/src/mame/toaplan/toaplan1.cpp b/src/mame/toaplan/toaplan1.cpp index 81d01a704b0a9..7305d0bcae5ed 100644 --- a/src/mame/toaplan/toaplan1.cpp +++ b/src/mame/toaplan/toaplan1.cpp @@ -631,8 +631,8 @@ void toaplan1_rallybik_state::rallybik_main_map(address_map &map) // map(0x140000, 0x140001).w(?? video frame related ??) map(0x140003, 0x140003).w(FUNC(toaplan1_rallybik_state::intenable_w)); map(0x140008, 0x14000f).w(FUNC(toaplan1_rallybik_state::bcu_control_w)); - map(0x144000, 0x1447ff).ram().w(FUNC(toaplan1_rallybik_state::bgpalette_w)).share("bgpalette"); - map(0x146000, 0x1467ff).ram().w(FUNC(toaplan1_rallybik_state::fgpalette_w)).share("fgpalette"); + map(0x144000, 0x1447ff).ram().w(FUNC(toaplan1_rallybik_state::bgpalette_w)).share(m_bgpaletteram); + map(0x146000, 0x1467ff).ram().w(FUNC(toaplan1_rallybik_state::fgpalette_w)).share(m_fgpaletteram); map(0x180000, 0x180fff).rw(FUNC(toaplan1_rallybik_state::shared_r), FUNC(toaplan1_rallybik_state::shared_w)).umask16(0x00ff); map(0x1c0000, 0x1c0003).w(FUNC(toaplan1_rallybik_state::tile_offsets_w)); map(0x1c8001, 0x1c8001).w(FUNC(toaplan1_rallybik_state::reset_sound_w)); @@ -654,8 +654,8 @@ void toaplan1_state::truxton_main_map(address_map &map) // map(0x140000, 0x140001).w(?? video frame related ??) map(0x140003, 0x140003).w(FUNC(toaplan1_state::intenable_w)); map(0x140008, 0x14000f).w(FUNC(toaplan1_state::bcu_control_w)); - map(0x144000, 0x1447ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share("bgpalette"); - map(0x146000, 0x1467ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share("fgpalette"); + map(0x144000, 0x1447ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share(m_bgpaletteram); + map(0x146000, 0x1467ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share(m_fgpaletteram); map(0x180000, 0x180fff).rw(FUNC(toaplan1_state::shared_r), FUNC(toaplan1_state::shared_w)).umask16(0x00ff); map(0x1c0000, 0x1c0003).w(FUNC(toaplan1_state::tile_offsets_w)); map(0x1c0006, 0x1c0006).w(FUNC(toaplan1_state::fcu_flipscreen_w)); @@ -670,8 +670,8 @@ void toaplan1_state::hellfire_main_map(address_map &map) // map(0x080000, 0x080001).w(?? video frame related ??) map(0x080003, 0x080003).w(FUNC(toaplan1_state::intenable_w)); map(0x080008, 0x08000f).w(FUNC(toaplan1_state::bcu_control_w)); - map(0x084000, 0x0847ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share("bgpalette"); - map(0x086000, 0x0867ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share("fgpalette"); + map(0x084000, 0x0847ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share(m_bgpaletteram); + map(0x086000, 0x0867ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share(m_fgpaletteram); map(0x0c0000, 0x0c0fff).rw(FUNC(toaplan1_state::shared_r), FUNC(toaplan1_state::shared_w)).umask16(0x00ff); map(0x100001, 0x100001).w(FUNC(toaplan1_state::bcu_flipscreen_w)); map(0x100002, 0x100003).rw(FUNC(toaplan1_state::tileram_offs_r), FUNC(toaplan1_state::tileram_offs_w)); @@ -697,8 +697,8 @@ void toaplan1_state::zerowing_main_map(address_map &map) // map(0x400000, 0x400001).w(?? video frame related ??) map(0x400003, 0x400003).w(FUNC(toaplan1_state::intenable_w)); map(0x400008, 0x40000f).w(FUNC(toaplan1_state::bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share("fgpalette"); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share(m_bgpaletteram); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share(m_fgpaletteram); map(0x440000, 0x440fff).rw(FUNC(toaplan1_state::shared_r), FUNC(toaplan1_state::shared_w)).umask16(0x00ff); map(0x480001, 0x480001).w(FUNC(toaplan1_state::bcu_flipscreen_w)); map(0x480002, 0x480003).rw(FUNC(toaplan1_state::tileram_offs_r), FUNC(toaplan1_state::tileram_offs_w)); @@ -717,8 +717,8 @@ void toaplan1_demonwld_state::main_map(address_map &map) // map(0x400000, 0x400001).w(?? video frame related ??) map(0x400003, 0x400003).w(FUNC(toaplan1_demonwld_state::intenable_w)); map(0x400008, 0x40000f).w(FUNC(toaplan1_demonwld_state::bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_demonwld_state::bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_demonwld_state::fgpalette_w)).share("fgpalette"); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_demonwld_state::bgpalette_w)).share(m_bgpaletteram); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_demonwld_state::fgpalette_w)).share(m_fgpaletteram); map(0x600000, 0x600fff).rw(FUNC(toaplan1_demonwld_state::shared_r), FUNC(toaplan1_demonwld_state::shared_w)).umask16(0x00ff); map(0x800001, 0x800001).w(FUNC(toaplan1_demonwld_state::bcu_flipscreen_w)); map(0x800002, 0x800003).rw(FUNC(toaplan1_demonwld_state::tileram_offs_r), FUNC(toaplan1_demonwld_state::tileram_offs_w)); @@ -746,8 +746,8 @@ void toaplan1_samesame_state::main_map(address_map &map) // map(0x100000, 0x100001).w(?? video frame related ??) map(0x100003, 0x100003).w(FUNC(toaplan1_samesame_state::intenable_w)); map(0x100008, 0x10000f).w(FUNC(toaplan1_samesame_state::bcu_control_w)); - map(0x104000, 0x1047ff).ram().w(FUNC(toaplan1_samesame_state::bgpalette_w)).share("bgpalette"); - map(0x106000, 0x1067ff).ram().w(FUNC(toaplan1_samesame_state::fgpalette_w)).share("fgpalette"); + map(0x104000, 0x1047ff).ram().w(FUNC(toaplan1_samesame_state::bgpalette_w)).share(m_bgpaletteram); + map(0x106000, 0x1067ff).ram().w(FUNC(toaplan1_samesame_state::fgpalette_w)).share(m_fgpaletteram); map(0x140000, 0x140001).portr("P1"); map(0x140002, 0x140003).portr("P2"); map(0x140004, 0x140005).portr("DSWA"); @@ -785,8 +785,8 @@ void toaplan1_state::outzone_main_map(address_map &map) // map(0x300000, 0x300001).w(?? video frame related ??) map(0x300003, 0x300003).w(FUNC(toaplan1_state::intenable_w)); map(0x300008, 0x30000f).w(FUNC(toaplan1_state::bcu_control_w)); - map(0x304000, 0x3047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share("bgpalette"); - map(0x306000, 0x3067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share("fgpalette"); + map(0x304000, 0x3047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share(m_bgpaletteram); + map(0x306000, 0x3067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share(m_fgpaletteram); map(0x340000, 0x340003).w(FUNC(toaplan1_state::tile_offsets_w)); map(0x340006, 0x340006).w(FUNC(toaplan1_state::fcu_flipscreen_w)); } @@ -802,8 +802,8 @@ void toaplan1_state::outzonecv_main_map(address_map &map) // map(0x400000, 0x400001).w(?? video frame related ??) map(0x400003, 0x400003).w(FUNC(toaplan1_state::intenable_w)); map(0x400008, 0x40000f).w(FUNC(toaplan1_state::bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share("fgpalette"); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share(m_bgpaletteram); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share(m_fgpaletteram); map(0x440000, 0x440fff).rw(FUNC(toaplan1_state::shared_r), FUNC(toaplan1_state::shared_w)).umask16(0x00ff); map(0x480001, 0x480001).w(FUNC(toaplan1_state::bcu_flipscreen_w)); map(0x480002, 0x480003).rw(FUNC(toaplan1_state::tileram_offs_r), FUNC(toaplan1_state::tileram_offs_w)); @@ -828,8 +828,8 @@ void toaplan1_state::vimana_main_map(address_map &map) // map(0x400000, 0x400001).w(?? video frame related ??) map(0x400003, 0x400003).w(FUNC(toaplan1_state::intenable_w)); map(0x400008, 0x40000f).w(FUNC(toaplan1_state::bcu_control_w)); - map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share("bgpalette"); - map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share("fgpalette"); + map(0x404000, 0x4047ff).ram().w(FUNC(toaplan1_state::bgpalette_w)).share(m_bgpaletteram); + map(0x406000, 0x4067ff).ram().w(FUNC(toaplan1_state::fgpalette_w)).share(m_fgpaletteram); map(0x440000, 0x4407ff).rw(FUNC(toaplan1_state::shared_r), FUNC(toaplan1_state::shared_w)).umask16(0x00ff); /* inputs, coins and sound handled by 647180 MCU via this space */ map(0x480000, 0x487fff).ram(); map(0x4c0001, 0x4c0001).w(FUNC(toaplan1_state::bcu_flipscreen_w)); @@ -844,7 +844,7 @@ void toaplan1_state::vimana_main_map(address_map &map) void toaplan1_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram().share("sharedram"); + map(0x8000, 0x87ff).ram().share(m_sharedram); } void toaplan1_rallybik_state::rallybik_sound_io_map(address_map &map) @@ -856,7 +856,7 @@ void toaplan1_rallybik_state::rallybik_sound_io_map(address_map &map) map(0x30, 0x30).w("coinlatch", FUNC(ls259_device::write_nibble_d0)); /* Coin counter/lockout */ map(0x40, 0x40).portr("DSWA"); map(0x50, 0x50).portr("DSWB"); - map(0x60, 0x61).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x60, 0x61).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); } void toaplan1_state::truxton_sound_io_map(address_map &map) @@ -868,7 +868,7 @@ void toaplan1_state::truxton_sound_io_map(address_map &map) map(0x30, 0x30).w(FUNC(toaplan1_state::coin_w)); /* Coin counter/lockout */ map(0x40, 0x40).portr("DSWA"); map(0x50, 0x50).portr("DSWB"); - map(0x60, 0x61).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x60, 0x61).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x70, 0x70).portr("TJUMP"); } @@ -882,7 +882,7 @@ void toaplan1_state::hellfire_sound_io_map(address_map &map) map(0x40, 0x40).portr("P1"); map(0x50, 0x50).portr("P2"); map(0x60, 0x60).portr("SYSTEM"); - map(0x70, 0x71).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x70, 0x71).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); } void toaplan1_state::zerowing_sound_io_map(address_map &map) @@ -895,13 +895,13 @@ void toaplan1_state::zerowing_sound_io_map(address_map &map) map(0x80, 0x80).portr("SYSTEM"); map(0x88, 0x88).portr("TJUMP"); map(0xa0, 0xa0).w(FUNC(toaplan1_state::coin_w)); /* Coin counter/lockout */ - map(0xa8, 0xa9).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0xa8, 0xa9).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); } void toaplan1_demonwld_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x00, 0x01).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x20, 0x20).portr("TJUMP"); map(0x40, 0x40).w(FUNC(toaplan1_demonwld_state::coin_w)); /* Coin counter/lockout */ map(0x60, 0x60).portr("SYSTEM"); @@ -914,7 +914,7 @@ void toaplan1_demonwld_state::sound_io_map(address_map &map) void toaplan1_state::outzone_sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x01).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x00, 0x01).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0x04, 0x04).w(FUNC(toaplan1_state::coin_w)); /* Coin counter/lockout */ map(0x08, 0x08).portr("DSWA"); map(0x0c, 0x0c).portr("DSWB"); @@ -946,7 +946,7 @@ void toaplan1_demonwld_state::dsp_io_map(address_map &map) void toaplan1_state::vimana_hd647180_mem_map(address_map &map) { - map(0x08000, 0x087ff).ram().share("sharedram"); /* 2048 bytes of shared ram w/maincpu */ + map(0x08000, 0x087ff).ram().share(m_sharedram); /* 2048 bytes of shared ram w/maincpu */ } void toaplan1_state::vimana_hd647180_io_map(address_map &map) @@ -974,8 +974,8 @@ void toaplan1_state::vimana_hd647180_io_map(address_map &map) map(0x82, 0x82).portr("DSWA"); map(0x83, 0x83).portr("SYSTEM"); map(0x84, 0x84).w(FUNC(toaplan1_state::coin_w)); // Coin counter/lockout // needs verify - map(0x87, 0x87).rw("ymsnd", FUNC(ym3812_device::status_r), FUNC(ym3812_device::address_w)); - map(0x8f, 0x8f).w("ymsnd", FUNC(ym3812_device::data_w)); + map(0x87, 0x87).rw(m_ymsnd, FUNC(ym3812_device::status_r), FUNC(ym3812_device::address_w)); + map(0x8f, 0x8f).w(m_ymsnd, FUNC(ym3812_device::data_w)); } u8 toaplan1_state::vimana_dswb_invert_r() @@ -999,10 +999,9 @@ void toaplan1_samesame_state::hd647180_io_map(address_map &map) map.global_mask(0xff); map(0x63, 0x63).nopr(); // read port D + map(0x80, 0x81).rw(m_ymsnd, FUNC(ym3812_device::read), FUNC(ym3812_device::write)); map(0xa0, 0xa0).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0xb0, 0xb0).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w)); - - map(0x80, 0x81).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); } /***************************************************************************** @@ -1902,29 +1901,29 @@ static const gfx_layout tilelayout = static GFXDECODE_START( gfx_toaplan1 ) - GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 64 ) - GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 64*16, 64 ) + GFXDECODE_ENTRY( "tiles", 0, tilelayout, 0, 64 ) + GFXDECODE_ENTRY( "sprites", 0, tilelayout, 64*16, 64 ) GFXDECODE_END static GFXDECODE_START( gfx_rallybik ) - GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 64 ) + GFXDECODE_ENTRY( "tiles", 0, tilelayout, 0, 64 ) GFXDECODE_END -#define PIXEL_CLOCK (XTAL(28'000'000) / 4) +static constexpr XTAL PIXEL_CLOCK = XTAL(28'000'000) / 4; // HTOTAL and VTOTAL taken from CRTC registers (bcu_control_w) // rallybik, demonwld and outzone program a larger VTOTAL than the other // games, giving them a lower frame rate -#define HTOTAL ((224+1)*2) -#define HBEND (0) -#define HBSTART (320) +static constexpr unsigned HTOTAL = ((224+1)*2); +static constexpr unsigned HBEND = (0); +static constexpr unsigned HBSTART = (320); -#define VTOTAL ((134+1)*2) -#define VTOTAL55 ((140+1)*2) -#define VBEND (0) -#define VBSTART (240) +static constexpr unsigned VTOTAL = ((134+1)*2); +static constexpr unsigned VTOTAL55 = ((140+1)*2); +static constexpr unsigned VBEND = (0); +static constexpr unsigned VBSTART = (240); void toaplan1_rallybik_state::rallybik(machine_config &config) @@ -2243,7 +2242,7 @@ ROM_START( rallybik ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "b45-05.rom", 0x0000, 0x4000, CRC(10814601) SHA1(bad7a834d8849752a7f3000bb5154ec0fa50d695) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "b45-09.bin", 0x00000, 0x20000, CRC(1dc7b010) SHA1(67e8633bd787ffcae0e7867e7e591c492c4f2d63) ) ROM_LOAD16_BYTE( "b45-08.bin", 0x00001, 0x20000, CRC(fab661ba) SHA1(acc43cd6d979b1c6a348727f315643d7b8f1496a) ) ROM_LOAD16_BYTE( "b45-07.bin", 0x40000, 0x20000, CRC(cd3748b4) SHA1(a20eb19a0f813112b4e5d9cd91db29de9b37af17) ) @@ -2327,13 +2326,13 @@ ROM_START( truxton ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "b65_09.2f", 0x0000, 0x4000, CRC(1bdd4ddc) SHA1(6bf7e3a7ca42f79082503ef471f30f271e2f0f99) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "b65_08.13e", 0x00000, 0x20000, CRC(d2315b37) SHA1(eb42a884df319728c830c067c2423043ed4536ee) ) ROM_LOAD16_BYTE( "b65_07.11e", 0x00001, 0x20000, CRC(fb83252a) SHA1(48a38584d223f56286137f7acdfaec86ee6588e7) ) ROM_LOAD16_BYTE( "b65_06.10e", 0x40000, 0x20000, CRC(36cedcbe) SHA1(f79d4b1e98b3c9091ae907fb671ad201d3698b42) ) ROM_LOAD16_BYTE( "b65_05.8e", 0x40001, 0x20000, CRC(81cd95f1) SHA1(526a437fbe033ac21054ee5c3bf1ba2fed354c7a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "b65_04.20c", 0x00000, 0x20000, CRC(8c6ff461) SHA1(5199e31f4eb23bad01f7d1079f3618fe39d8a32e) ) ROM_LOAD16_BYTE( "b65_03.20b", 0x00001, 0x20000, CRC(58b1350b) SHA1(7eb2fe329579a6f651d3c1aed9155ac6ffefbc4b) ) ROM_LOAD16_BYTE( "b65_02.20ab", 0x40000, 0x20000, CRC(1dd55161) SHA1(c537456ac56801dea0ac48fb1389228530d00a61) ) @@ -2352,13 +2351,13 @@ ROM_START( hellfire ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "b90_03.11e", 0x0000, 0x8000, CRC(4058fa67) SHA1(155c364273c270cd74955f447efc804bb4c9b560) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "b90_04.7x", 0x00000, 0x20000, CRC(ea6150fc) SHA1(1116947d10ce14fbc6a3b86368fc2024c6f51803) ) ROM_LOAD16_BYTE( "b90_05.7v", 0x00001, 0x20000, CRC(bb52c507) SHA1(b0b1821476647f10c7023f92a66a7f54b92f50c3) ) ROM_LOAD16_BYTE( "b90_06.7t", 0x40000, 0x20000, CRC(cf5b0252) SHA1(e2102967af61afb11d2290a40d13d2faf9ef1e12) ) ROM_LOAD16_BYTE( "b90_07.7r", 0x40001, 0x20000, CRC(b98af263) SHA1(54d636a50a41dbb58b54c22dfab3eabfdb452575) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "b90_11.3a", 0x00000, 0x20000, CRC(c33e543c) SHA1(b85cba30cc651f820aeedd41e04584df92078ed9) ) ROM_LOAD16_BYTE( "b90_10.3c", 0x00001, 0x20000, CRC(35fd1092) SHA1(5e136a35eea45034ccd4aea52cc0ffeec944e27e) ) ROM_LOAD16_BYTE( "b90_09.3d", 0x40000, 0x20000, CRC(cf01009e) SHA1(e260c479fa97f23a65c220e5071aaf2dc2baf46d) ) @@ -2377,13 +2376,13 @@ ROM_START( hellfire1 ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "b90_03.11e", 0x0000, 0x8000, CRC(4058fa67) SHA1(155c364273c270cd74955f447efc804bb4c9b560) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "b90_04.7x", 0x00000, 0x20000, CRC(ea6150fc) SHA1(1116947d10ce14fbc6a3b86368fc2024c6f51803) ) ROM_LOAD16_BYTE( "b90_05.7v", 0x00001, 0x20000, CRC(bb52c507) SHA1(b0b1821476647f10c7023f92a66a7f54b92f50c3) ) ROM_LOAD16_BYTE( "b90_06.7t", 0x40000, 0x20000, CRC(cf5b0252) SHA1(e2102967af61afb11d2290a40d13d2faf9ef1e12) ) ROM_LOAD16_BYTE( "b90_07.7r", 0x40001, 0x20000, CRC(b98af263) SHA1(54d636a50a41dbb58b54c22dfab3eabfdb452575) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "b90_11.3a", 0x00000, 0x20000, CRC(c33e543c) SHA1(b85cba30cc651f820aeedd41e04584df92078ed9) ) ROM_LOAD16_BYTE( "b90_10.3c", 0x00001, 0x20000, CRC(35fd1092) SHA1(5e136a35eea45034ccd4aea52cc0ffeec944e27e) ) ROM_LOAD16_BYTE( "b90_09.3d", 0x40000, 0x20000, CRC(cf01009e) SHA1(e260c479fa97f23a65c220e5071aaf2dc2baf46d) ) @@ -2402,13 +2401,13 @@ ROM_START( hellfire2a ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "b90_03.11e", 0x0000, 0x8000, CRC(4058fa67) SHA1(155c364273c270cd74955f447efc804bb4c9b560) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "b90_04.7x", 0x00000, 0x20000, CRC(ea6150fc) SHA1(1116947d10ce14fbc6a3b86368fc2024c6f51803) ) ROM_LOAD16_BYTE( "b90_05.7v", 0x00001, 0x20000, CRC(bb52c507) SHA1(b0b1821476647f10c7023f92a66a7f54b92f50c3) ) ROM_LOAD16_BYTE( "b90_06.7t", 0x40000, 0x20000, CRC(cf5b0252) SHA1(e2102967af61afb11d2290a40d13d2faf9ef1e12) ) ROM_LOAD16_BYTE( "b90_07.7r", 0x40001, 0x20000, CRC(b98af263) SHA1(54d636a50a41dbb58b54c22dfab3eabfdb452575) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "b90_11.3a", 0x00000, 0x20000, CRC(c33e543c) SHA1(b85cba30cc651f820aeedd41e04584df92078ed9) ) ROM_LOAD16_BYTE( "b90_10.3c", 0x00001, 0x20000, CRC(35fd1092) SHA1(5e136a35eea45034ccd4aea52cc0ffeec944e27e) ) ROM_LOAD16_BYTE( "b90_09.3d", 0x40000, 0x20000, CRC(cf01009e) SHA1(e260c479fa97f23a65c220e5071aaf2dc2baf46d) ) @@ -2427,13 +2426,13 @@ ROM_START( hellfire1a ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "b90_03x.11e", 0x0000, 0x8000, CRC(f58c368f) SHA1(2ee5396a4b70a3374f3a3bbd791b1d962f6a8a52) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "b90_04.7x", 0x00000, 0x20000, CRC(ea6150fc) SHA1(1116947d10ce14fbc6a3b86368fc2024c6f51803) ) ROM_LOAD16_BYTE( "b90_05.7v", 0x00001, 0x20000, CRC(bb52c507) SHA1(b0b1821476647f10c7023f92a66a7f54b92f50c3) ) ROM_LOAD16_BYTE( "b90_06.7t", 0x40000, 0x20000, CRC(cf5b0252) SHA1(e2102967af61afb11d2290a40d13d2faf9ef1e12) ) ROM_LOAD16_BYTE( "b90_07.7r", 0x40001, 0x20000, CRC(b98af263) SHA1(54d636a50a41dbb58b54c22dfab3eabfdb452575) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "b90_11.3a", 0x00000, 0x20000, CRC(c33e543c) SHA1(b85cba30cc651f820aeedd41e04584df92078ed9) ) ROM_LOAD16_BYTE( "b90_10.3c", 0x00001, 0x20000, CRC(35fd1092) SHA1(5e136a35eea45034ccd4aea52cc0ffeec944e27e) ) ROM_LOAD16_BYTE( "b90_09.3d", 0x40000, 0x20000, CRC(cf01009e) SHA1(e260c479fa97f23a65c220e5071aaf2dc2baf46d) ) @@ -2454,13 +2453,13 @@ ROM_START( zerowing ) // 2 player simultaneous version ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "o15-13.rom", 0x0000, 0x8000, CRC(e7b72383) SHA1(ea1f6f33a86d14d58bd396fd46081462f00177d5) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o15-05.rom", 0x00000, 0x20000, CRC(4e5dd246) SHA1(5366b4a6f3c900a4f57a6583b7399163a06f42d7) ) ROM_LOAD16_BYTE( "o15-06.rom", 0x00001, 0x20000, CRC(c8c6d428) SHA1(76ee5bcb8f10fe201fc5c32697beee3de9d8b751) ) ROM_LOAD16_BYTE( "o15-07.rom", 0x40000, 0x20000, CRC(efc40e99) SHA1(a04fad4197a7fb4787cd9bebf43e1d9b02b2f61b) ) ROM_LOAD16_BYTE( "o15-08.rom", 0x40001, 0x20000, CRC(1b019eab) SHA1(c9569ca85696825142acc5cde9ac829e82b1ca1b) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o15-03.rom", 0x00000, 0x20000, CRC(7f245fd3) SHA1(efbcb3663d4accc4f8128a8fee5475bc109bc17a) ) ROM_LOAD16_BYTE( "o15-04.rom", 0x00001, 0x20000, CRC(0b1a1289) SHA1(ce6c06342392d11952873e3b1d6aea8dc02a551c) ) ROM_LOAD16_BYTE( "o15-01.rom", 0x40000, 0x20000, CRC(70570e43) SHA1(acc9baec71b0930cb2f193677e0663efa5d5551d) ) @@ -2481,13 +2480,13 @@ ROM_START( zerowing1 ) // 1 player version ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "o15-13.rom", 0x0000, 0x8000, CRC(e7b72383) SHA1(ea1f6f33a86d14d58bd396fd46081462f00177d5) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o15-05.rom", 0x00000, 0x20000, CRC(4e5dd246) SHA1(5366b4a6f3c900a4f57a6583b7399163a06f42d7) ) ROM_LOAD16_BYTE( "o15-06.rom", 0x00001, 0x20000, CRC(c8c6d428) SHA1(76ee5bcb8f10fe201fc5c32697beee3de9d8b751) ) ROM_LOAD16_BYTE( "o15-07.rom", 0x40000, 0x20000, CRC(efc40e99) SHA1(a04fad4197a7fb4787cd9bebf43e1d9b02b2f61b) ) ROM_LOAD16_BYTE( "o15-08.rom", 0x40001, 0x20000, CRC(1b019eab) SHA1(c9569ca85696825142acc5cde9ac829e82b1ca1b) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o15-03.rom", 0x00000, 0x20000, CRC(7f245fd3) SHA1(efbcb3663d4accc4f8128a8fee5475bc109bc17a) ) ROM_LOAD16_BYTE( "o15-04.rom", 0x00001, 0x20000, CRC(0b1a1289) SHA1(ce6c06342392d11952873e3b1d6aea8dc02a551c) ) ROM_LOAD16_BYTE( "o15-01.rom", 0x40000, 0x20000, CRC(70570e43) SHA1(acc9baec71b0930cb2f193677e0663efa5d5551d) ) @@ -2508,13 +2507,13 @@ ROM_START( zerowingw ) // 2 player simultaneous version (Williams Electronics) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "o15-13.rom", 0x0000, 0x8000, CRC(e7b72383) SHA1(ea1f6f33a86d14d58bd396fd46081462f00177d5) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o15-05.rom", 0x00000, 0x20000, CRC(4e5dd246) SHA1(5366b4a6f3c900a4f57a6583b7399163a06f42d7) ) ROM_LOAD16_BYTE( "o15-06.rom", 0x00001, 0x20000, CRC(c8c6d428) SHA1(76ee5bcb8f10fe201fc5c32697beee3de9d8b751) ) ROM_LOAD16_BYTE( "o15-07.rom", 0x40000, 0x20000, CRC(efc40e99) SHA1(a04fad4197a7fb4787cd9bebf43e1d9b02b2f61b) ) ROM_LOAD16_BYTE( "o15-08.rom", 0x40001, 0x20000, CRC(1b019eab) SHA1(c9569ca85696825142acc5cde9ac829e82b1ca1b) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o15-03.rom", 0x00000, 0x20000, CRC(7f245fd3) SHA1(efbcb3663d4accc4f8128a8fee5475bc109bc17a) ) ROM_LOAD16_BYTE( "o15-04.rom", 0x00001, 0x20000, CRC(0b1a1289) SHA1(ce6c06342392d11952873e3b1d6aea8dc02a551c) ) ROM_LOAD16_BYTE( "o15-01.rom", 0x40000, 0x20000, CRC(70570e43) SHA1(acc9baec71b0930cb2f193677e0663efa5d5551d) ) @@ -2538,13 +2537,13 @@ ROM_START( demonwld ) ROM_LOAD16_BYTE( "dsp_21.bin", 0x0000, 0x0800, BAD_DUMP CRC(2d135376) SHA1(67a2cc774d272ee1cd6e6bc1c5fc33fc6968837e) ) ROM_LOAD16_BYTE( "dsp_22.bin", 0x0001, 0x0800, BAD_DUMP CRC(79389a71) SHA1(14ec4c1c9b06702319e89a7a250d0038393437f4) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "rom05", 0x00000, 0x20000, CRC(6506c982) SHA1(6d4c1ef91e5617724789ff196abb7abf23e4a7fb) ) ROM_LOAD16_BYTE( "rom07", 0x00001, 0x20000, CRC(a3a0d993) SHA1(50311b9447eb04271b17b212ca31d083ab5b2414) ) ROM_LOAD16_BYTE( "rom06", 0x40000, 0x20000, CRC(4fc5e5f3) SHA1(725d4b009d575ff8ffbe1c00df352ccf235465d7) ) ROM_LOAD16_BYTE( "rom08", 0x40001, 0x20000, CRC(eb53ab09) SHA1(d98195cc1b65b76335b5b24adb31deae1b313f3a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "rom01", 0x00000, 0x20000, CRC(1b3724e9) SHA1(3dbb0450ab1e40e6df2b7c7356352419cd3f113d) ) ROM_LOAD16_BYTE( "rom02", 0x00001, 0x20000, CRC(7b20a44d) SHA1(4dc1a2fa2058077b112c73492808ee9381060ec7) ) ROM_LOAD16_BYTE( "rom03", 0x40000, 0x20000, CRC(2cacdcd0) SHA1(92216d1c6859e05d39363c30e0beb45bc0ae4e1c) ) @@ -2569,13 +2568,13 @@ ROM_START( demonwld1 ) ROM_LOAD16_BYTE( "dsp_21.bin", 0x0000, 0x0800, BAD_DUMP CRC(2d135376) SHA1(67a2cc774d272ee1cd6e6bc1c5fc33fc6968837e) ) ROM_LOAD16_BYTE( "dsp_22.bin", 0x0001, 0x0800, BAD_DUMP CRC(79389a71) SHA1(14ec4c1c9b06702319e89a7a250d0038393437f4) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "rom05", 0x00000, 0x20000, CRC(6506c982) SHA1(6d4c1ef91e5617724789ff196abb7abf23e4a7fb) ) ROM_LOAD16_BYTE( "rom07", 0x00001, 0x20000, CRC(a3a0d993) SHA1(50311b9447eb04271b17b212ca31d083ab5b2414) ) ROM_LOAD16_BYTE( "rom06", 0x40000, 0x20000, CRC(4fc5e5f3) SHA1(725d4b009d575ff8ffbe1c00df352ccf235465d7) ) ROM_LOAD16_BYTE( "rom08", 0x40001, 0x20000, CRC(eb53ab09) SHA1(d98195cc1b65b76335b5b24adb31deae1b313f3a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "rom01", 0x00000, 0x20000, CRC(1b3724e9) SHA1(3dbb0450ab1e40e6df2b7c7356352419cd3f113d) ) ROM_LOAD16_BYTE( "rom02", 0x00001, 0x20000, CRC(7b20a44d) SHA1(4dc1a2fa2058077b112c73492808ee9381060ec7) ) ROM_LOAD16_BYTE( "rom03", 0x40000, 0x20000, CRC(2cacdcd0) SHA1(92216d1c6859e05d39363c30e0beb45bc0ae4e1c) ) @@ -2598,13 +2597,13 @@ ROM_START( demonwld2 ) ROM_LOAD16_BYTE( "dsp_21.bin", 0x0000, 0x0800, BAD_DUMP CRC(2d135376) SHA1(67a2cc774d272ee1cd6e6bc1c5fc33fc6968837e) ) ROM_LOAD16_BYTE( "dsp_22.bin", 0x0001, 0x0800, BAD_DUMP CRC(79389a71) SHA1(14ec4c1c9b06702319e89a7a250d0038393437f4) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "rom05", 0x00000, 0x20000, CRC(6506c982) SHA1(6d4c1ef91e5617724789ff196abb7abf23e4a7fb) ) ROM_LOAD16_BYTE( "rom07", 0x00001, 0x20000, CRC(a3a0d993) SHA1(50311b9447eb04271b17b212ca31d083ab5b2414) ) ROM_LOAD16_BYTE( "rom06", 0x40000, 0x20000, CRC(4fc5e5f3) SHA1(725d4b009d575ff8ffbe1c00df352ccf235465d7) ) ROM_LOAD16_BYTE( "rom08", 0x40001, 0x20000, CRC(eb53ab09) SHA1(d98195cc1b65b76335b5b24adb31deae1b313f3a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "rom01", 0x00000, 0x20000, CRC(1b3724e9) SHA1(3dbb0450ab1e40e6df2b7c7356352419cd3f113d) ) ROM_LOAD16_BYTE( "rom02", 0x00001, 0x20000, CRC(7b20a44d) SHA1(4dc1a2fa2058077b112c73492808ee9381060ec7) ) ROM_LOAD16_BYTE( "rom03", 0x40000, 0x20000, CRC(2cacdcd0) SHA1(92216d1c6859e05d39363c30e0beb45bc0ae4e1c) ) @@ -2627,13 +2626,13 @@ ROM_START( demonwld3 ) ROM_LOAD16_BYTE( "dsp_21.bin", 0x0000, 0x0800, BAD_DUMP CRC(2d135376) SHA1(67a2cc774d272ee1cd6e6bc1c5fc33fc6968837e) ) ROM_LOAD16_BYTE( "dsp_22.bin", 0x0001, 0x0800, BAD_DUMP CRC(79389a71) SHA1(14ec4c1c9b06702319e89a7a250d0038393437f4) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "rom05", 0x00000, 0x20000, CRC(6506c982) SHA1(6d4c1ef91e5617724789ff196abb7abf23e4a7fb) ) ROM_LOAD16_BYTE( "rom07", 0x00001, 0x20000, CRC(a3a0d993) SHA1(50311b9447eb04271b17b212ca31d083ab5b2414) ) ROM_LOAD16_BYTE( "rom06", 0x40000, 0x20000, CRC(4fc5e5f3) SHA1(725d4b009d575ff8ffbe1c00df352ccf235465d7) ) ROM_LOAD16_BYTE( "rom08", 0x40001, 0x20000, CRC(eb53ab09) SHA1(d98195cc1b65b76335b5b24adb31deae1b313f3a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "rom01", 0x00000, 0x20000, CRC(1b3724e9) SHA1(3dbb0450ab1e40e6df2b7c7356352419cd3f113d) ) ROM_LOAD16_BYTE( "rom02", 0x00001, 0x20000, CRC(7b20a44d) SHA1(4dc1a2fa2058077b112c73492808ee9381060ec7) ) ROM_LOAD16_BYTE( "rom03", 0x40000, 0x20000, CRC(2cacdcd0) SHA1(92216d1c6859e05d39363c30e0beb45bc0ae4e1c) ) @@ -2656,13 +2655,13 @@ ROM_START( demonwld4 ) ROM_LOAD16_BYTE( "dsp_21.bin", 0x0000, 0x0800, BAD_DUMP CRC(2d135376) SHA1(67a2cc774d272ee1cd6e6bc1c5fc33fc6968837e) ) ROM_LOAD16_BYTE( "dsp_22.bin", 0x0001, 0x0800, BAD_DUMP CRC(79389a71) SHA1(14ec4c1c9b06702319e89a7a250d0038393437f4) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "rom05", 0x00000, 0x20000, CRC(6506c982) SHA1(6d4c1ef91e5617724789ff196abb7abf23e4a7fb) ) ROM_LOAD16_BYTE( "rom07", 0x00001, 0x20000, CRC(a3a0d993) SHA1(50311b9447eb04271b17b212ca31d083ab5b2414) ) ROM_LOAD16_BYTE( "rom06", 0x40000, 0x20000, CRC(4fc5e5f3) SHA1(725d4b009d575ff8ffbe1c00df352ccf235465d7) ) ROM_LOAD16_BYTE( "rom08", 0x40001, 0x20000, CRC(eb53ab09) SHA1(d98195cc1b65b76335b5b24adb31deae1b313f3a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "rom01", 0x00000, 0x20000, CRC(1b3724e9) SHA1(3dbb0450ab1e40e6df2b7c7356352419cd3f113d) ) ROM_LOAD16_BYTE( "rom02", 0x00001, 0x20000, CRC(7b20a44d) SHA1(4dc1a2fa2058077b112c73492808ee9381060ec7) ) ROM_LOAD16_BYTE( "rom03", 0x40000, 0x20000, CRC(2cacdcd0) SHA1(92216d1c6859e05d39363c30e0beb45bc0ae4e1c) ) @@ -2685,13 +2684,13 @@ ROM_START( demonwld5 ) // standard TP-O16 PCB ROM_LOAD16_BYTE( "dsp_21.bin", 0x0000, 0x0800, BAD_DUMP CRC(2d135376) SHA1(67a2cc774d272ee1cd6e6bc1c5fc33fc6968837e) ) ROM_LOAD16_BYTE( "dsp_22.bin", 0x0001, 0x0800, BAD_DUMP CRC(79389a71) SHA1(14ec4c1c9b06702319e89a7a250d0038393437f4) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "rom05", 0x00000, 0x20000, CRC(6506c982) SHA1(6d4c1ef91e5617724789ff196abb7abf23e4a7fb) ) ROM_LOAD16_BYTE( "rom07", 0x00001, 0x20000, CRC(a3a0d993) SHA1(50311b9447eb04271b17b212ca31d083ab5b2414) ) ROM_LOAD16_BYTE( "rom06", 0x40000, 0x20000, CRC(4fc5e5f3) SHA1(725d4b009d575ff8ffbe1c00df352ccf235465d7) ) ROM_LOAD16_BYTE( "rom08", 0x40001, 0x20000, CRC(eb53ab09) SHA1(d98195cc1b65b76335b5b24adb31deae1b313f3a) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "rom01", 0x00000, 0x20000, CRC(1b3724e9) SHA1(3dbb0450ab1e40e6df2b7c7356352419cd3f113d) ) ROM_LOAD16_BYTE( "rom02", 0x00001, 0x20000, CRC(7b20a44d) SHA1(4dc1a2fa2058077b112c73492808ee9381060ec7) ) ROM_LOAD16_BYTE( "rom03", 0x40000, 0x20000, CRC(2cacdcd0) SHA1(92216d1c6859e05d39363c30e0beb45bc0ae4e1c) ) @@ -2712,13 +2711,13 @@ ROM_START( samesame ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2739,13 +2738,13 @@ ROM_START( samesame2 ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2766,13 +2765,13 @@ ROM_START( samesamenh ) /* this hack has been used on various PCBs */ ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2845,13 +2844,13 @@ ROM_START( fireshrk ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2872,13 +2871,13 @@ ROM_START( fireshrka ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2899,13 +2898,13 @@ ROM_START( fireshrkd ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2926,13 +2925,13 @@ ROM_START( fireshrkdh ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2953,13 +2952,13 @@ ROM_START( samesamecn ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-017.8m", 0x00000, 0x08000, CRC(43523032) SHA1(1b94003a00e7bf6bdf1b1b946f42ff5d04629949) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "o17_05.12j", 0x00000, 0x20000, CRC(565315f8) SHA1(6b1c5ef52359483228b329c89c2e1174e3fbf017) ) ROM_LOAD16_BYTE( "o17_06.13j", 0x00001, 0x20000, CRC(95262d4c) SHA1(16f3aabecb1c87ce7eadf4f0ff61b29a4c017614) ) ROM_LOAD16_BYTE( "o17_07.12l", 0x40000, 0x20000, CRC(4c4b735c) SHA1(812c3bf46bd7764b2bb812bd2b9eb0331ed257ae) ) ROM_LOAD16_BYTE( "o17_08.13l", 0x40001, 0x20000, CRC(95c6586c) SHA1(ff87901f79d80f73ad09664b0c0d892898570616) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "o17_01.1d", 0x00000, 0x20000, CRC(ea12e491) SHA1(02190722b7c5383471e0af9596be7039a5367240) ) ROM_LOAD16_BYTE( "o17_02.3d", 0x00001, 0x20000, CRC(32a13a9f) SHA1(1446acdfd21cd41f3d97aaf30f498c0c5d890605) ) ROM_LOAD16_BYTE( "o17_03.5d", 0x40000, 0x20000, CRC(68723dc9) SHA1(4f1b7aa2469c955e03737b611a7d2524f1e4f61e) ) @@ -2978,11 +2977,11 @@ ROM_START( outzone ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "tp_018_09.3j", 0x0000, 0x8000, CRC(73d8e235) SHA1(f37ad497259a467cdf2ec8b3e6e7d3e873087e6c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD16_WORD( "tp-018_rom5.19h", 0x00000, 0x80000, CRC(c64ec7b6) SHA1(e73b51c3713c2ea7a572a02531c15d1261ddeaa0) ) ROM_LOAD16_WORD( "tp-018_rom6.22h", 0x80000, 0x80000, CRC(64b6c5ac) SHA1(07fa20115f603445c0d51af3465c0471c09d76b1) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "tp-018_rom2.1c", 0x00000, 0x20000, CRC(6bb72d16) SHA1(a127b10d9c255542bd09fcb5df057c12fd28c0d1) ) ROM_LOAD16_BYTE( "tp-018_rom1.1e", 0x00001, 0x20000, CRC(0934782d) SHA1(e4a775ead23227d7d6e76aea23aa3103b511d031) ) ROM_LOAD16_BYTE( "tp-018_rom3.1d", 0x40000, 0x20000, CRC(ec903c07) SHA1(75906f31200877fc8f6e78c2606ad5be49778165) ) @@ -3001,11 +3000,11 @@ ROM_START( outzoneh ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "tp_018_09.3j", 0x0000, 0x8000, CRC(73d8e235) SHA1(f37ad497259a467cdf2ec8b3e6e7d3e873087e6c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD16_WORD( "tp-018_rom5.19h", 0x00000, 0x80000, CRC(c64ec7b6) SHA1(e73b51c3713c2ea7a572a02531c15d1261ddeaa0) ) ROM_LOAD16_WORD( "tp-018_rom6.22h", 0x80000, 0x80000, CRC(64b6c5ac) SHA1(07fa20115f603445c0d51af3465c0471c09d76b1) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "tp-018_rom2.1c", 0x00000, 0x20000, CRC(6bb72d16) SHA1(a127b10d9c255542bd09fcb5df057c12fd28c0d1) ) ROM_LOAD16_BYTE( "tp-018_rom1.1e", 0x00001, 0x20000, CRC(0934782d) SHA1(e4a775ead23227d7d6e76aea23aa3103b511d031) ) ROM_LOAD16_BYTE( "tp-018_rom3.1d", 0x40000, 0x20000, CRC(ec903c07) SHA1(75906f31200877fc8f6e78c2606ad5be49778165) ) @@ -3024,7 +3023,7 @@ ROM_START( outzonea ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "tp_018_09.3j", 0x0000, 0x8000, CRC(73d8e235) SHA1(f37ad497259a467cdf2ec8b3e6e7d3e873087e6c) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD16_WORD( "tp-018_rom5.19h", 0x00000, 0x80000, CRC(c64ec7b6) SHA1(e73b51c3713c2ea7a572a02531c15d1261ddeaa0) ) ROM_LOAD16_WORD( "tp-018_rom6.22h", 0x80000, 0x80000, CRC(64b6c5ac) SHA1(07fa20115f603445c0d51af3465c0471c09d76b1) ) /* a bootleg board exists using the same data in a different layout @@ -3046,7 +3045,7 @@ ROM_START( outzonea ) ROM_LOAD16_BYTE( "12.bin", 0x0e0001, 0x10000, CRC(90d37ded) SHA1(6a4d1d2a8e548fce953833b6ad3658bff85b6c73) ) */ - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "tp-018_rom2.1c", 0x00000, 0x20000, CRC(6bb72d16) SHA1(a127b10d9c255542bd09fcb5df057c12fd28c0d1) ) ROM_LOAD16_BYTE( "tp-018_rom1.1e", 0x00001, 0x20000, CRC(0934782d) SHA1(e4a775ead23227d7d6e76aea23aa3103b511d031) ) ROM_LOAD16_BYTE( "tp-018_rom3.1d", 0x40000, 0x20000, CRC(ec903c07) SHA1(75906f31200877fc8f6e78c2606ad5be49778165) ) @@ -3065,11 +3064,11 @@ ROM_START( outzoneb ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "tp09.3j", 0x0000, 0x8000, CRC(dd56041f) SHA1(a481b8959b349761624166906175f8efcbebb7e7) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD16_WORD( "tp-018_rom5.19h", 0x00000, 0x80000, CRC(c64ec7b6) SHA1(e73b51c3713c2ea7a572a02531c15d1261ddeaa0) ) ROM_LOAD16_WORD( "tp-018_rom6.22h", 0x80000, 0x80000, CRC(64b6c5ac) SHA1(07fa20115f603445c0d51af3465c0471c09d76b1) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "tp-018_rom2.1c", 0x00000, 0x20000, CRC(6bb72d16) SHA1(a127b10d9c255542bd09fcb5df057c12fd28c0d1) ) ROM_LOAD16_BYTE( "tp-018_rom1.1e", 0x00001, 0x20000, CRC(0934782d) SHA1(e4a775ead23227d7d6e76aea23aa3103b511d031) ) ROM_LOAD16_BYTE( "tp-018_rom3.1d", 0x40000, 0x20000, CRC(ec903c07) SHA1(75906f31200877fc8f6e78c2606ad5be49778165) ) @@ -3088,11 +3087,11 @@ ROM_START( outzonec ) // From board serial number 2122, is this a prototype? ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "tp_018_09.3j", 0x0000, 0x8000, BAD_DUMP CRC(73d8e235) SHA1(f37ad497259a467cdf2ec8b3e6e7d3e873087e6c) ) // see notes - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD16_WORD( "tp-018_rom5.19h", 0x00000, 0x80000, CRC(c64ec7b6) SHA1(e73b51c3713c2ea7a572a02531c15d1261ddeaa0) ) ROM_LOAD16_WORD( "tp-018_rom6.22h", 0x80000, 0x80000, CRC(64b6c5ac) SHA1(07fa20115f603445c0d51af3465c0471c09d76b1) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "tp-018_rom2.1c", 0x00000, 0x20000, CRC(6bb72d16) SHA1(a127b10d9c255542bd09fcb5df057c12fd28c0d1) ) ROM_LOAD16_BYTE( "tp-018_rom1.1e", 0x00001, 0x20000, CRC(0934782d) SHA1(e4a775ead23227d7d6e76aea23aa3103b511d031) ) ROM_LOAD16_BYTE( "tp-018_rom3.1d", 0x40000, 0x20000, CRC(ec903c07) SHA1(75906f31200877fc8f6e78c2606ad5be49778165) ) @@ -3112,11 +3111,11 @@ ROM_START( outzonecv ) // This is a factory conversion of a Zero Wing (TP-015 ha ROM_REGION( 0x8000, "audiocpu", 0 ) // Sound Z80 code ROM_LOAD( "tp_018_09+.9l", 0x0000, 0x8000, CRC(b7201606) SHA1(d413074b59f25eb2136c1bc98189550410658493) ) // The actual label has a black dot instead of the "+" - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD16_WORD( "tp-018_rom5.bin", 0x00000, 0x80000, CRC(c64ec7b6) SHA1(e73b51c3713c2ea7a572a02531c15d1261ddeaa0) ) // Located on a SUB 015 daughter card ROM_LOAD16_WORD( "tp-018_rom6.bin", 0x80000, 0x80000, CRC(64b6c5ac) SHA1(07fa20115f603445c0d51af3465c0471c09d76b1) ) // Located on a SUB 015 daughter card - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD16_BYTE( "tp-018_rom2.22a", 0x00000, 0x20000, CRC(6bb72d16) SHA1(a127b10d9c255542bd09fcb5df057c12fd28c0d1) ) ROM_LOAD16_BYTE( "tp-018_rom1.20a", 0x00001, 0x20000, CRC(0934782d) SHA1(e4a775ead23227d7d6e76aea23aa3103b511d031) ) ROM_LOAD16_BYTE( "tp-018_rom3.25a", 0x40000, 0x20000, CRC(ec903c07) SHA1(75906f31200877fc8f6e78c2606ad5be49778165) ) @@ -3135,13 +3134,13 @@ ROM_START( vimana ) // From board serial number 1547.04 (July '94) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-019.4m", 0x00000, 0x08000, CRC(41a97ebe) SHA1(9b377086e4d9b8de6e3c8c7d2dd099b80ab88934) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "tp-019_rom6.24f", 0x00000, 0x20000, CRC(2886878d) SHA1(f44933d87bbcd3bd58f46e0f0f89b05c409b713b) ) ROM_LOAD16_BYTE( "tp-019_rom5.22f", 0x00001, 0x20000, CRC(61a63d7a) SHA1(5cdebc03110252cc43d31b6f87f9a23556892977) ) ROM_LOAD16_BYTE( "tp-019_rom4.20f", 0x40000, 0x20000, CRC(b0515768) SHA1(9907b52b4d30ce5324270a12c40250068adafca8) ) ROM_LOAD16_BYTE( "tp-019_rom3.18f", 0x40001, 0x20000, CRC(0b539131) SHA1(07f3e3b9b28c8218e36668c24d16dbb6e9a66889) ) - ROM_REGION( 0x100000, "gfx2", 0 ) + ROM_REGION( 0x100000, "sprites", 0 ) ROM_LOAD16_WORD( "tp-019_rom1.20a", 0x00000, 0x80000, CRC(cdde26cd) SHA1(27893af4692ec7bcbaac9e790c0707c98df84e62) ) ROM_LOAD16_WORD( "tp-019_rom2.20b", 0x80000, 0x80000, CRC(1dbfc118) SHA1(4fd039a3172f73ad910349b2d360e8ae77ccddb2) ) @@ -3158,13 +3157,13 @@ ROM_START( vimanan ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-019.4m", 0x00000, 0x08000, CRC(41a97ebe) SHA1(9b377086e4d9b8de6e3c8c7d2dd099b80ab88934) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "tp-019_rom6.24f", 0x00000, 0x20000, CRC(2886878d) SHA1(f44933d87bbcd3bd58f46e0f0f89b05c409b713b) ) ROM_LOAD16_BYTE( "tp-019_rom5.22f", 0x00001, 0x20000, CRC(61a63d7a) SHA1(5cdebc03110252cc43d31b6f87f9a23556892977) ) ROM_LOAD16_BYTE( "tp-019_rom4.20f", 0x40000, 0x20000, CRC(b0515768) SHA1(9907b52b4d30ce5324270a12c40250068adafca8) ) ROM_LOAD16_BYTE( "tp-019_rom3.18f", 0x40001, 0x20000, CRC(0b539131) SHA1(07f3e3b9b28c8218e36668c24d16dbb6e9a66889) ) - ROM_REGION( 0x100000, "gfx2", 0 ) + ROM_REGION( 0x100000, "sprites", 0 ) ROM_LOAD16_WORD( "tp-019_rom1.20a", 0x00000, 0x80000, CRC(cdde26cd) SHA1(27893af4692ec7bcbaac9e790c0707c98df84e62) ) ROM_LOAD16_WORD( "tp-019_rom2.20b", 0x80000, 0x80000, CRC(1dbfc118) SHA1(4fd039a3172f73ad910349b2d360e8ae77ccddb2) ) @@ -3181,13 +3180,13 @@ ROM_START( vimanaj ) ROM_REGION( 0x8000, "audiocpu", 0 ) // HD647180 (Z180) with internal ROM ROM_LOAD( "hd647180_tp-019.4m", 0x00000, 0x08000, CRC(41a97ebe) SHA1(9b377086e4d9b8de6e3c8c7d2dd099b80ab88934) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD16_BYTE( "tp-019_rom6.24f", 0x00000, 0x20000, CRC(2886878d) SHA1(f44933d87bbcd3bd58f46e0f0f89b05c409b713b) ) ROM_LOAD16_BYTE( "tp-019_rom5.22f", 0x00001, 0x20000, CRC(61a63d7a) SHA1(5cdebc03110252cc43d31b6f87f9a23556892977) ) ROM_LOAD16_BYTE( "tp-019_rom4.20f", 0x40000, 0x20000, CRC(b0515768) SHA1(9907b52b4d30ce5324270a12c40250068adafca8) ) ROM_LOAD16_BYTE( "tp-019_rom3.18f", 0x40001, 0x20000, CRC(0b539131) SHA1(07f3e3b9b28c8218e36668c24d16dbb6e9a66889) ) - ROM_REGION( 0x100000, "gfx2", 0 ) + ROM_REGION( 0x100000, "sprites", 0 ) ROM_LOAD16_WORD( "tp-019_rom1.20a", 0x00000, 0x80000, CRC(cdde26cd) SHA1(27893af4692ec7bcbaac9e790c0707c98df84e62) ) ROM_LOAD16_WORD( "tp-019_rom2.20b", 0x80000, 0x80000, CRC(1dbfc118) SHA1(4fd039a3172f73ad910349b2d360e8ae77ccddb2) ) @@ -3198,9 +3197,9 @@ ROM_END // YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS -GAME( 1988, rallybik, 0, rallybik, rallybik, toaplan1_rallybik_state, empty_init, ROT270, "Toaplan / Taito Corporation", "Rally Bike / Dash Yarou", 0 ) +GAME( 1988, rallybik, 0, rallybik, rallybik, toaplan1_rallybik_state, empty_init, ROT270, "Toaplan / Taito Corporation", "Rally Bike (Europe, US) / Dash Yarou (Japan)", 0 ) -GAME( 1988, truxton, 0, truxton, truxton, toaplan1_state, empty_init, ROT270, "Toaplan / Taito Corporation", "Truxton / Tatsujin", 0 ) +GAME( 1988, truxton, 0, truxton, truxton, toaplan1_state, empty_init, ROT270, "Toaplan / Taito Corporation", "Truxton (Europe, US) / Tatsujin (Japan)", 0 ) GAME( 1989, hellfire, 0, hellfire, hellfire, toaplan1_state, empty_init, ROT0, "Toaplan (Taito license)", "Hellfire (2P set)", 0 ) GAME( 1989, hellfire1, hellfire, hellfire, hellfire1, toaplan1_state, empty_init, ROT0, "Toaplan (Taito license)", "Hellfire (1P set)", 0 ) @@ -3211,21 +3210,21 @@ GAME( 1989, zerowing, 0, zerowing, zerowing2, toaplan1_state, GAME( 1989, zerowing1, zerowing, zerowing, zerowing, toaplan1_state, empty_init, ROT0, "Toaplan", "Zero Wing (1P set)", 0 ) GAME( 1989, zerowingw, zerowing, zerowing, zerowing2, toaplan1_state, empty_init, ROT0, "Toaplan (Williams license)", "Zero Wing (2P set, Williams license)", 0 ) -GAME( 1990, demonwld, 0, demonwld, demonwld, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World / Horror Story (set 1)", 0 ) -GAME( 1989, demonwld1, demonwld, demonwld, demonwld, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World / Horror Story (set 2)", 0 ) -GAME( 1989, demonwld2, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World / Horror Story (set 3)", 0 ) -GAME( 1989, demonwld3, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World / Horror Story (set 4)", 0 ) -GAME( 1989, demonwld4, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World / Horror Story (set 5)", 0 ) -GAME( 1989, demonwld5, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan (APM Electronics license)", "Demon's World / Horror Story (set 6)", 0 ) - -GAME( 1990, fireshrk, 0, samesame, fireshrk, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Fire Shark", 0 ) -GAME( 1989, fireshrka, fireshrk, samesame, fireshrka, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Fire Shark (earlier)", 0 ) -GAME( 1990, fireshrkd, fireshrk, samesame, samesame2, toaplan1_samesame_state, empty_init, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 1, easier)", 0 ) -GAME( 1990, fireshrkdh, fireshrk, samesame, samesame2, toaplan1_samesame_state, empty_init, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 2, harder)", 0 ) -GAME( 1989, samesame, fireshrk, samesame, samesame, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Same! Same! Same! (1P set)", 0 ) -GAME( 1989, samesame2, fireshrk, samesame, samesame2, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Same! Same! Same! (2P set)", 0 ) -GAME( 1990, samesamecn, fireshrk, samesame, jiaojiao, toaplan1_samesame_state, empty_init, ROT270, "Toaplan (Hong Kong Honest Trading license)", "Jiao! Jiao! Jiao! (China, 2P set)", 0 ) -GAME( 2015, samesamenh, fireshrk, samesame, samesame, toaplan1_samesame_state, empty_init, ROT270, "hack (trap15)", "Same! Same! Same! (1P set, NEW VER! hack)", 0 ) +GAME( 1990, demonwld, 0, demonwld, demonwld, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World (World) / Horror Story (Japan) (set 1)", 0 ) +GAME( 1989, demonwld1, demonwld, demonwld, demonwld, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World (World) / Horror Story (Japan) (set 2)", 0 ) +GAME( 1989, demonwld2, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World (World) / Horror Story (Japan) (set 3)", 0 ) +GAME( 1989, demonwld3, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World (World) / Horror Story (Japan) (set 4)", 0 ) +GAME( 1989, demonwld4, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan", "Demon's World (World) / Horror Story (Japan) (set 5)", 0 ) +GAME( 1989, demonwld5, demonwld, demonwld, demonwld1, toaplan1_demonwld_state, empty_init, ROT0, "Toaplan (APM Electronics license)", "Demon's World (World) / Horror Story (Japan) (set 6)", 0 ) + +GAME( 1990, fireshrk, 0, samesame, fireshrk, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Fire Shark", 0 ) +GAME( 1989, fireshrka, fireshrk, samesame, fireshrka, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Fire Shark (earlier)", 0 ) +GAME( 1990, fireshrkd, fireshrk, samesame, samesame2, toaplan1_samesame_state, empty_init, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 1, easier)", 0 ) +GAME( 1990, fireshrkdh, fireshrk, samesame, samesame2, toaplan1_samesame_state, empty_init, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 2, harder)", 0 ) +GAME( 1989, samesame, fireshrk, samesame, samesame, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Same! Same! Same! (Japan, 1P set)", 0 ) +GAME( 1989, samesame2, fireshrk, samesame, samesame2, toaplan1_samesame_state, empty_init, ROT270, "Toaplan", "Same! Same! Same! (Japan, 2P set)", 0 ) +GAME( 1990, samesamecn, fireshrk, samesame, jiaojiao, toaplan1_samesame_state, empty_init, ROT270, "Toaplan (Hong Kong Honest Trading license)", "Jiao! Jiao! Jiao! (China, 2P set)", 0 ) +GAME( 2015, samesamenh, fireshrk, samesame, samesame, toaplan1_samesame_state, empty_init, ROT270, "hack (trap15)", "Same! Same! Same! (Japan, 1P set, NEW VER! hack)", 0 ) GAME( 1990, outzone, 0, outzone, outzone, toaplan1_state, empty_init, ROT270, "Toaplan", "Out Zone", 0 ) GAME( 1990, outzoneh, outzone, outzone, outzone, toaplan1_state, empty_init, ROT270, "Toaplan", "Out Zone (harder)", 0 ) diff --git a/src/mame/toaplan/toaplan1.h b/src/mame/toaplan/toaplan1.h index 79a547be778f3..87c2b21f82885 100644 --- a/src/mame/toaplan/toaplan1.h +++ b/src/mame/toaplan/toaplan1.h @@ -23,18 +23,18 @@ class toaplan1_state : public driver_device public: toaplan1_state(const machine_config &mconfig, device_type type, const char *tag, bool large = false) : driver_device(mconfig, type, tag), - m_bgpaletteram(*this, "bgpalette"), - m_fgpaletteram(*this, "fgpalette"), - m_sharedram(*this, "sharedram"), - m_dswb_io(*this, "DSWB"), - m_tjump_io(*this, "TJUMP"), - m_spriteram(*this, "spriteram", large ? 0x1000 : 0x800, ENDIANNESS_BIG), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_ymsnd(*this, "ymsnd"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") + m_palette(*this, "palette"), + m_bgpaletteram(*this, "bgpalette"), + m_fgpaletteram(*this, "fgpalette"), + m_sharedram(*this, "sharedram"), + m_spriteram(*this, "spriteram", large ? 0x1000 : 0x800, ENDIANNESS_BIG), + m_dswb_io(*this, "DSWB"), + m_tjump_io(*this, "TJUMP") { } void truxton(machine_config &config); @@ -49,16 +49,22 @@ class toaplan1_state : public driver_device virtual void machine_reset() override ATTR_COLD; virtual void video_start() override ATTR_COLD; + required_device m_maincpu; + required_device m_audiocpu; + required_device m_ymsnd; + required_device m_gfxdecode; + required_device m_screen; + required_device m_palette; + required_shared_ptr m_bgpaletteram; required_shared_ptr m_fgpaletteram; optional_shared_ptr m_sharedram; + memory_share_creator m_spriteram; optional_ioport m_dswb_io; optional_ioport m_tjump_io; - u8 m_intenable = 0; - std::unique_ptr m_tilevram[4]; /* std::unique_ptr m_tilevram[3]; // || Drawn in this order @@ -67,13 +73,14 @@ class toaplan1_state : public driver_device std::unique_ptr m_tilevram[0]; // \/ */ - memory_share_creator m_spriteram; std::unique_ptr m_buffered_spriteram; std::unique_ptr m_spritesizeram; std::unique_ptr m_buffered_spritesizeram; + u8 m_intenable = 0; + s32 m_bcu_flipscreen; /* Tile controller flip flag */ - s32 m_fcu_flipscreen; /* Sprite controller flip flag */ + bool m_fcu_flipscreen; /* Sprite controller flip flag */ s32 m_pf_voffs = 0; s32 m_spriteram_offs = 0; @@ -82,8 +89,8 @@ class toaplan1_state : public driver_device s32 m_scrolly[4]{}; #ifdef MAME_DEBUG - int m_display_pf[4]{}; - int m_displog = 0; + bool m_display_pf[4]{}; + bool m_displog = false; #endif s32 m_tiles_offsetx = 0; @@ -137,12 +144,6 @@ class toaplan1_state : public driver_device void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void reset_sound(); void reset_callback(int state); - required_device m_maincpu; - required_device m_audiocpu; - required_device m_ymsnd; - required_device m_gfxdecode; - required_device m_screen; - required_device m_palette; void hellfire_main_map(address_map &map) ATTR_COLD; void hellfire_sound_io_map(address_map &map) ATTR_COLD; @@ -174,6 +175,8 @@ class toaplan1_rallybik_state : public toaplan1_state virtual void video_start() override ATTR_COLD; private: + required_device m_spritegen; + void coin_counter_1_w(int state); void coin_counter_2_w(int state); void coin_lockout_1_w(int state); @@ -183,7 +186,6 @@ class toaplan1_rallybik_state : public toaplan1_state u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_vblank(int state); - required_device m_spritegen; void rallybik_main_map(address_map &map) ATTR_COLD; void rallybik_sound_io_map(address_map &map) ATTR_COLD; }; @@ -205,10 +207,12 @@ class toaplan1_demonwld_state : public toaplan1_state virtual void machine_reset() override ATTR_COLD; private: + required_device m_dsp; + /* Demon world */ - int m_dsp_on = 0; - int m_dsp_bio = 0; - int m_dsp_execute = 0; + s32 m_dsp_on = 0; + s32 m_dsp_bio = 0; + bool m_dsp_execute = false; u32 m_dsp_addr_w = 0; u32 m_main_ram_seg = 0; @@ -220,7 +224,6 @@ class toaplan1_demonwld_state : public toaplan1_state void dsp_ctrl_w(u8 data); void dsp_int_w(int enable); - required_device m_dsp; void dsp_io_map(address_map &map) ATTR_COLD; void dsp_program_map(address_map &map) ATTR_COLD; void main_map(address_map &map) ATTR_COLD; diff --git a/src/mame/toaplan/toaplan1_m.cpp b/src/mame/toaplan/toaplan1_m.cpp index b66509583bab1..2a205b93a2017 100644 --- a/src/mame/toaplan/toaplan1_m.cpp +++ b/src/mame/toaplan/toaplan1_m.cpp @@ -50,19 +50,23 @@ u16 toaplan1_demonwld_state::dsp_r() case 0xc00000: {address_space &mainspace = m_maincpu->space(AS_PROGRAM); input_data = mainspace.read_word(m_main_ram_seg + m_dsp_addr_w); break;} - default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", m_dsp->pcbase(), m_main_ram_seg + m_dsp_addr_w); + default: + if (!machine().side_effects_disabled()) + logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", m_dsp->pcbase(), m_main_ram_seg + m_dsp_addr_w); + break; } - logerror("DSP PC:%04x IO read %04x at %08x (port 1)\n", m_dsp->pcbase(), input_data, m_main_ram_seg + m_dsp_addr_w); + if (!machine().side_effects_disabled()) + logerror("DSP PC:%04x IO read %04x at %08x (port 1)\n", m_dsp->pcbase(), input_data, m_main_ram_seg + m_dsp_addr_w); return input_data; } void toaplan1_demonwld_state::dsp_w(u16 data) { /* Data written to main CPU RAM via DSP IO port 1 */ - m_dsp_execute = 0; + m_dsp_execute = false; switch (m_main_ram_seg) { - case 0xc00000: {if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1; + case 0xc00000: {if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = true; address_space &mainspace = m_maincpu->space(AS_PROGRAM); mainspace.write_word(m_main_ram_seg + m_dsp_addr_w, data); break;} @@ -80,7 +84,7 @@ void toaplan1_demonwld_state::dsp_bio_w(u16 data) /* communication to main processor*/ logerror("DSP PC:%04x IO write %04x at port 3\n", m_dsp->pcbase(), data); - if (data & 0x8000) + if (BIT(data, 15)) m_dsp_bio = CLEAR_LINE; if (data == 0) @@ -89,7 +93,7 @@ void toaplan1_demonwld_state::dsp_bio_w(u16 data) { logerror("Turning 68000 on\n"); m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); - m_dsp_execute = 0; + m_dsp_execute = false; } m_dsp_bio = ASSERT_LINE; } @@ -127,14 +131,14 @@ void toaplan1_demonwld_state::device_post_load() void toaplan1_demonwld_state::dsp_ctrl_w(u8 data) { #if 0 - logerror("68000:%08x Writing %02x to $e0000b.\n",m_maincpu->pc() ,data); + logerror("68000:%08x Writing %02x to $e0000b.\n", m_maincpu->pc(), data); #endif switch (data) { case 0x00: dsp_int_w(1); break; /* Enable the INT line to the DSP */ case 0x01: dsp_int_w(0); break; /* Inhibit the INT line to the DSP */ - default: logerror("68000:%08x Writing unknown command %02x to $e0000b\n",m_maincpu->pcbase() ,data); break; + default: logerror("68000:%08x Writing unknown command %02x to $e0000b\n", m_maincpu->pcbase(), data); break; } } @@ -223,7 +227,7 @@ void toaplan1_demonwld_state::machine_reset() toaplan1_state::machine_reset(); m_dsp_addr_w = 0; m_main_ram_seg = 0; - m_dsp_execute = 0; + m_dsp_execute = false; } diff --git a/src/mame/toaplan/toaplan1_v.cpp b/src/mame/toaplan/toaplan1_v.cpp index 28b175656bb73..173025824c77d 100644 --- a/src/mame/toaplan/toaplan1_v.cpp +++ b/src/mame/toaplan/toaplan1_v.cpp @@ -126,9 +126,9 @@ sprite. #include "toaplan1.h" -#define TOAPLAN1_TILEVRAM_SIZE 0x4000 /* 4 tile layers each this RAM size */ -#define TOAPLAN1_SPRITERAM_SIZE 0x800 /* sprite ram */ -#define TOAPLAN1_SPRITESIZERAM_SIZE 0x80 /* sprite size ram */ +static constexpr u32 TOAPLAN1_TILEVRAM_SIZE = 0x4000; /* 4 tile layers each this RAM size */ +static constexpr u32 TOAPLAN1_SPRITERAM_SIZE = 0x800; /* sprite ram */ +static constexpr u32 TOAPLAN1_SPRITESIZERAM_SIZE = 0x80; /* sprite size ram */ /*************************************************************************** @@ -140,18 +140,16 @@ sprite. template TILE_GET_INFO_MEMBER(toaplan1_state::get_tile_info) { - int color, tile_number, attrib; - - tile_number = m_tilevram[Layer][2 * tile_index + 1] & 0x7fff; - attrib = m_tilevram[Layer][2 * tile_index]; - color = attrib & 0x3f; + const u16 tile_number = m_tilevram[Layer][2 * tile_index + 1] & 0x7fff; + const u16 attrib = m_tilevram[Layer][2 * tile_index]; + const u16 color = attrib & 0x3f; tileinfo.set(0, tile_number, color, 0); // "disabled" tiles are behind everything else - if (m_tilevram[Layer][2 * tile_index + 1] & 0x8000) tileinfo.category = 16; - else tileinfo.category = (attrib & 0xf000) >> 12; + if (BIT(m_tilevram[Layer][2 * tile_index + 1], 15)) tileinfo.category = 16; + else tileinfo.category = (attrib & 0xf000) >> 12; } /*************************************************************************** @@ -182,11 +180,11 @@ void toaplan1_state::vram_alloc() } #ifdef MAME_DEBUG - m_display_pf[0] = 1; - m_display_pf[1] = 1; - m_display_pf[2] = 1; - m_display_pf[3] = 1; - m_displog = 0; + m_display_pf[0] = true; + m_display_pf[1] = true; + m_display_pf[2] = true; + m_display_pf[3] = true; + m_displog = false; #endif } @@ -229,7 +227,7 @@ void toaplan1_state::register_common() void toaplan1_rallybik_state::video_start() { - m_spritegen->gfx(0)->set_colorbase(64*16); + m_spritegen->gfx(0)->set_colorbase(64 * 16); create_tilemaps(); vram_alloc(); @@ -247,7 +245,7 @@ void toaplan1_rallybik_state::video_start() m_tilemap[3]->set_scrolldy(-0x111, 0x8); m_bcu_flipscreen = -1; - m_fcu_flipscreen = 0; + m_fcu_flipscreen = false; register_common(); } @@ -268,7 +266,7 @@ void toaplan1_state::video_start() m_tilemap[3]->set_scrolldy(-0x101, -0xff); m_bcu_flipscreen = -1; - m_fcu_flipscreen = 0; + m_fcu_flipscreen = false; register_common(); } @@ -304,8 +302,8 @@ void toaplan1_state::bcu_flipscreen_w(u8 data) { if (data != m_bcu_flipscreen) { - logerror("Setting BCU controller flipscreen port to %02x\n",data); - m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */ + logerror("Setting BCU controller flipscreen port to %02x\n", data); + m_bcu_flipscreen = BIT(data, 0); /* 0x0001 = flip, 0x0000 = no flip */ machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); set_scrolls(); @@ -314,8 +312,8 @@ void toaplan1_state::bcu_flipscreen_w(u8 data) void toaplan1_state::fcu_flipscreen_w(u8 data) { - logerror("Setting FCU controller flipscreen port to %02x\n",data); - m_fcu_flipscreen = data & 0x80; /* 0x80 = flip, 0x00 = no flip */ + logerror("Setting FCU controller flipscreen port to %02x\n", data); + m_fcu_flipscreen = BIT(data, 7); /* 0x80 = flip, 0x00 = no flip */ } u16 toaplan1_state::spriteram_offs_r() // this aint really needed ? @@ -333,25 +331,25 @@ void toaplan1_state::bgpalette_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_bgpaletteram[offset]); data = m_bgpaletteram[offset]; - m_palette->set_pen_color(offset, pal5bit(data>>0), pal5bit(data>>5), pal5bit(data>>10)); + m_palette->set_pen_color(offset, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10)); } void toaplan1_state::fgpalette_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_fgpaletteram[offset]); data = m_fgpaletteram[offset]; - m_palette->set_pen_color(offset + 64*16, pal5bit(data>>0), pal5bit(data>>5), pal5bit(data>>10)); + m_palette->set_pen_color(offset + 64 * 16, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10)); } u16 toaplan1_state::spriteram_r() { - return m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE / 2)-1)]; + return m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE / 2) - 1)]; } void toaplan1_state::spriteram_w(offs_t offset, u16 data, u16 mem_mask) { - COMBINE_DATA(&m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE / 2)-1)]); + COMBINE_DATA(&m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE / 2) - 1)]); #ifdef MAME_DEBUG if (m_spriteram_offs >= (TOAPLAN1_SPRITERAM_SIZE / 2)) @@ -366,12 +364,12 @@ void toaplan1_state::spriteram_w(offs_t offset, u16 data, u16 mem_mask) u16 toaplan1_state::spritesizeram_r() { - return m_spritesizeram[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE / 2)-1)]; + return m_spritesizeram[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE / 2) - 1)]; } void toaplan1_state::spritesizeram_w(offs_t offset, u16 data, u16 mem_mask) { - COMBINE_DATA(&m_spritesizeram[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE / 2)-1)]); + COMBINE_DATA(&m_spritesizeram[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE / 2) - 1)]); #ifdef MAME_DEBUG if (m_spriteram_offs >= (TOAPLAN1_SPRITESIZERAM_SIZE / 2)) @@ -388,7 +386,7 @@ void toaplan1_state::spritesizeram_w(offs_t offset, u16 data, u16 mem_mask) void toaplan1_state::bcu_control_w(offs_t offset, u16 data) { - logerror("BCU tile controller register:%02x now = %04x\n",offset,data); + logerror("BCU tile controller register:%02x now = %04x\n", offset, data); } u16 toaplan1_state::tileram_offs_r() @@ -399,7 +397,7 @@ u16 toaplan1_state::tileram_offs_r() void toaplan1_state::tileram_offs_w(offs_t offset, u16 data, u16 mem_mask) { if (data >= 0x4000) - logerror("Hmmm, unknown video layer being selected (%08x)\n",data); + logerror("Hmmm, unknown video layer being selected (%08x)\n", data); COMBINE_DATA(&m_pf_voffs); } @@ -408,7 +406,6 @@ u16 toaplan1_state::tileram_r(offs_t offset) { const int layer = m_pf_voffs >> 12; const int offs = m_pf_voffs & 0xfff; - offs_t vram_offset; u16 video_data = 0; switch (layer) /* Locate Layer (PlayField) */ @@ -417,12 +414,15 @@ u16 toaplan1_state::tileram_r(offs_t offset) case 0x1: case 0x2: case 0x3: - vram_offset = ((offs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE / 2)-1); - video_data = m_tilevram[layer][vram_offset]; - break; + { + offs_t vram_offset = ((offs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE / 2) - 1); + video_data = m_tilevram[layer][vram_offset]; + break; + } default: + if (!machine().side_effects_disabled()) logerror("Hmmm, reading %04x from unknown playfield layer address %06x Offset:%01x !!!\n", video_data, m_pf_voffs, offset); - break; + break; } return video_data; @@ -444,7 +444,6 @@ void toaplan1_state::tileram_w(offs_t offset, u16 data, u16 mem_mask) { const int layer = m_pf_voffs >> 12; const int offs = m_pf_voffs & 0xfff; - offs_t vram_offset; switch (layer) /* Locate Layer (PlayField) */ { @@ -452,13 +451,15 @@ void toaplan1_state::tileram_w(offs_t offset, u16 data, u16 mem_mask) case 0x1: case 0x2: case 0x3: - vram_offset = ((offs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE / 2)-1); - COMBINE_DATA(&m_tilevram[layer][vram_offset]); - m_tilemap[layer]->mark_tile_dirty(vram_offset / 2); - break; + { + offs_t vram_offset = ((offs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE / 2) - 1); + COMBINE_DATA(&m_tilevram[layer][vram_offset]); + m_tilemap[layer]->mark_tile_dirty(vram_offset / 2); + break; + } default: - logerror("Hmmm, writing %04x to unknown playfield layer address %06x Offset:%01x\n", data, m_pf_voffs, offset); - break; + logerror("Hmmm, writing %04x to unknown playfield layer address %06x Offset:%01x\n", data, m_pf_voffs, offset); + break; } } @@ -479,8 +480,10 @@ u16 toaplan1_state::scroll_regs_r(offs_t offset) case 03: case 05: case 07: scroll = m_scrolly[layer]; break; - default: logerror("Hmmm, reading unknown video scroll register (%02x) !!!\n",offset); - break; + default: + if (!machine().side_effects_disabled()) + logerror("Hmmm, reading unknown video scroll register (%02x) !!!\n",offset); + break; } return scroll; } @@ -495,18 +498,18 @@ void toaplan1_state::scroll_regs_w(offs_t offset, u16 data, u16 mem_mask) case 02: /* 1D5h */ case 04: /* 1D7h */ case 06: /* 1D9h */ - COMBINE_DATA(&m_scrollx[layer]); - m_tilemap[layer]->set_scrollx(0, (m_scrollx[layer] >> 7) - m_tiles_offsetx); - break; + COMBINE_DATA(&m_scrollx[layer]); + m_tilemap[layer]->set_scrollx(0, (m_scrollx[layer] >> 7) - m_tiles_offsetx); + break; case 01: /* 1EBh */ case 03: /* 1EBh */ case 05: /* 1EBh */ case 07: /* 1EBh */ - COMBINE_DATA(&m_scrolly[layer]); - m_tilemap[layer]->set_scrolly(0, (m_scrolly[layer] >> 7) - m_tiles_offsety); - break; + COMBINE_DATA(&m_scrolly[layer]); + m_tilemap[layer]->set_scrolly(0, (m_scrolly[layer] >> 7) - m_tiles_offsety); + break; default: logerror("Hmmm, writing %04x to unknown video scroll register (%02x) !!!\n",data ,offset); - break; + break; } } @@ -519,28 +522,26 @@ void toaplan1_state::log_vram() if (machine().input().code_pressed(KEYCODE_M)) { - u16 *spriteram = m_spriteram; - u16 *buffered_spriteram = m_buffered_spriteram.get(); - offs_t sprite_voffs; + u16 const *const spriteram = m_spriteram; + u16 const *const buffered_spriteram = m_buffered_spriteram.get(); while (machine().input().code_pressed(KEYCODE_M)) ; if (m_spritesizeram) /* FCU controller */ { - int schar,sattr,sxpos,sypos,bschar,bsattr,bsxpos,bsypos; - u16 *size = (u16 *)(m_spritesizeram.get()); - u16 *bsize = (u16 *)(m_buffered_spritesizeram.get()); + u16 const *const size = (u16 *)(m_spritesizeram.get()); + u16 const *const bsize = (u16 *)(m_buffered_spritesizeram.get()); logerror("Scrolls PF1-X PF1-Y PF2-X PF2-Y PF3-X PF3-Y PF4-X PF4-Y\n"); logerror("------> #%04x #%04x #%04x #%04x #%04x #%04x #%04x #%04x\n", m_scrollx[0], m_scrolly[0], m_scrollx[1], m_scrolly[1], m_scrollx[2], m_scrolly[2], m_scrollx[3], m_scrolly[3]); - for (sprite_voffs = 0; sprite_voffs < m_spriteram.bytes() / 2; sprite_voffs += 4) + for (offs_t sprite_voffs = 0; sprite_voffs < m_spriteram.bytes() / 2; sprite_voffs += 4) { - bschar = buffered_spriteram[sprite_voffs]; - bsattr = buffered_spriteram[sprite_voffs + 1]; - bsxpos = buffered_spriteram[sprite_voffs + 2]; - bsypos = buffered_spriteram[sprite_voffs + 3]; - schar = spriteram[sprite_voffs]; - sattr = spriteram[sprite_voffs + 1]; - sxpos = spriteram[sprite_voffs + 2]; - sypos = spriteram[sprite_voffs + 3]; + const int bschar = buffered_spriteram[sprite_voffs]; + const int bsattr = buffered_spriteram[sprite_voffs + 1]; + const int bsxpos = buffered_spriteram[sprite_voffs + 2]; + const int bsypos = buffered_spriteram[sprite_voffs + 3]; + const int schar = spriteram[sprite_voffs]; + const int sattr = spriteram[sprite_voffs + 1]; + const int sxpos = spriteram[sprite_voffs + 2]; + const int sypos = spriteram[sprite_voffs + 3]; logerror("$(%04x) Tile-Attr-Xpos-Ypos Now:%04x %04x %04x.%01x %04x.%01x nxt:%04x %04x %04x.%01x %04x.%01x\n", sprite_voffs, schar, sattr, sxpos, size[( sattr >> 6) & 0x3f] & 0xf, sypos,( size[( sattr >> 6) & 0x3f] >> 4) & 0xf, bschar,bsattr,bsxpos,bsize[(bsattr >> 6) & 0x3f] & 0xf,bsypos,(bsize[(bsattr >> 6) & 0x3f] >> 4) & 0xf); @@ -548,20 +549,19 @@ void toaplan1_state::log_vram() } else /* SCU controller */ { - int schar,sattr,sxpos,sypos,bschar,bsattr,bsxpos,bsypos; logerror("Scrolls PF1-X PF1-Y PF2-X PF2-Y PF3-X PF3-Y PF4-X PF4-Y\n"); logerror("------> #%04x #%04x #%04x #%04x #%04x #%04x #%04x #%04x\n", m_scrollx[0], m_scrolly[0], m_scrollx[1], m_scrolly[1], m_scrollx[2], m_scrolly[2], m_scrollx[3], m_scrolly[3]); - for (sprite_voffs = 0; sprite_voffs < m_spriteram.bytes() / 2; sprite_voffs += 4) + for (offs_t sprite_voffs = 0; sprite_voffs < m_spriteram.bytes() / 2; sprite_voffs += 4) { - bschar = buffered_spriteram[sprite_voffs]; - bsattr = buffered_spriteram[sprite_voffs + 1]; - bsypos = buffered_spriteram[sprite_voffs + 2]; - bsxpos = buffered_spriteram[sprite_voffs + 3]; - schar = spriteram[sprite_voffs]; - sattr = spriteram[sprite_voffs + 1]; - sypos = spriteram[sprite_voffs + 2]; - sxpos = spriteram[sprite_voffs + 3]; + const int bschar = buffered_spriteram[sprite_voffs]; + const int bsattr = buffered_spriteram[sprite_voffs + 1]; + const int bsypos = buffered_spriteram[sprite_voffs + 2]; + const int bsxpos = buffered_spriteram[sprite_voffs + 3]; + const int schar = spriteram[sprite_voffs]; + const int sattr = spriteram[sprite_voffs + 1]; + const int sypos = spriteram[sprite_voffs + 2]; + const int sxpos = spriteram[sprite_voffs + 3]; logerror("$(%04x) Tile-Attr-Xpos-Ypos Now:%04x %04x %04x %04x nxt:%04x %04x %04x %04x\n", sprite_voffs, schar, sattr, sxpos, sypos, bschar,bsattr,bsxpos, bsypos); @@ -571,16 +571,15 @@ void toaplan1_state::log_vram() if (machine().input().code_pressed(KEYCODE_SLASH)) { - u16 *size = (u16 *)(m_spritesizeram.get()); - u16 *bsize = (u16 *)(m_buffered_spritesizeram.get()); - offs_t offs; while (machine().input().code_pressed(KEYCODE_SLASH)) ; if (m_spritesizeram) /* FCU controller */ { + u16 const *const size = (u16 *)(m_spritesizeram.get()); + u16 const *const bsize = (u16 *)(m_buffered_spritesizeram.get()); logerror("Scrolls PF1-X PF1-Y PF2-X PF2-Y PF3-X PF3-Y PF4-X PF4-Y\n"); logerror("------> #%04x #%04x #%04x #%04x #%04x #%04x #%04x #%04x\n", m_scrollx[0], m_scrolly[0], m_scrollx[1], m_scrolly[1], m_scrollx[2], m_scrolly[2], m_scrollx[3], m_scrolly[3]); - for (offs = 0; offs < (TOAPLAN1_SPRITESIZERAM_SIZE / 2); offs += 4) + for (offs_t offs = 0; offs < (TOAPLAN1_SPRITESIZERAM_SIZE / 2); offs += 4) { logerror("SizeOffs:%04x now:%04x %04x %04x %04x next: %04x %04x %04x %04x\n", offs, bsize[offs + 0], bsize[offs + 1], @@ -593,13 +592,12 @@ void toaplan1_state::log_vram() if (machine().input().code_pressed(KEYCODE_N)) { - offs_t tile_voffs; - int tchar[4], tattr[4]; + int tchar[4]{}, tattr[4]{}; while (machine().input().code_pressed(KEYCODE_N)) ; /* BCU controller */ logerror("Scrolls PF1-X PF1-Y PF2-X PF2-Y PF3-X PF3-Y PF4-X PF4-Y\n"); logerror("------> #%04x #%04x #%04x #%04x #%04x #%04x #%04x #%04x\n", m_scrollx[0], m_scrolly[0], m_scrollx[1], m_scrolly[1], m_scrollx[2], m_scrolly[2], m_scrollx[3], m_scrolly[3]); - for (tile_voffs = 0; tile_voffs < (TOAPLAN1_TILEVRAM_SIZE / 2); tile_voffs += 2) + for (offs_t tile_voffs = 0; tile_voffs < (TOAPLAN1_TILEVRAM_SIZE / 2); tile_voffs += 2) { tchar[0] = m_tilevram[0][tile_voffs + 1]; tattr[0] = m_tilevram[0][tile_voffs]; @@ -624,8 +622,7 @@ void toaplan1_state::log_vram() if (machine().input().code_pressed(KEYCODE_E)) { while (machine().input().code_pressed(KEYCODE_E)) ; - m_displog += 1; - m_displog &= 1; + m_displog = !m_displog; } if (m_displog) { @@ -636,29 +633,25 @@ void toaplan1_state::log_vram() if (machine().input().code_pressed(KEYCODE_L)) /* Turn Playfield 4 on/off */ { while (machine().input().code_pressed(KEYCODE_L)) ; - m_display_pf[3] += 1; - m_display_pf[3] &= 1; + m_display_pf[3] = !m_display_pf[3]; m_tilemap[3]->enable(m_display_pf[3]); } if (machine().input().code_pressed(KEYCODE_K)) /* Turn Playfield 3 on/off */ { while (machine().input().code_pressed(KEYCODE_K)) ; - m_display_pf[2] += 1; - m_display_pf[2] &= 1; + m_display_pf[2] = !m_display_pf[2]; m_tilemap[2]->enable(m_display_pf[2]); } if (machine().input().code_pressed(KEYCODE_J)) /* Turn Playfield 2 on/off */ { while (machine().input().code_pressed(KEYCODE_J)) ; - m_display_pf[1] += 1; - m_display_pf[1] &= 1; + m_display_pf[1] = !m_display_pf[1]; m_tilemap[1]->enable(m_display_pf[1]); } if (machine().input().code_pressed(KEYCODE_H)) /* Turn Playfield 1 on/off */ { while (machine().input().code_pressed(KEYCODE_H)) ; - m_display_pf[0] += 1; - m_display_pf[0] &= 1; + m_display_pf[0] = !m_display_pf[0]; m_tilemap[0]->enable(m_display_pf[0]); } #endif @@ -684,21 +677,19 @@ void toaplan1_rallybik_state::pri_cb(u8 priority, u32 &pri_mask) void toaplan1_state::draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - u16 *source = (u16 *)m_buffered_spriteram.get(); - u16 *size = (u16 *)m_buffered_spritesizeram.get(); - int fcu_flipscreen = m_fcu_flipscreen; + u16 const *const source = (u16 *)m_buffered_spriteram.get(); + u16 const *const size = (u16 *)m_buffered_spritesizeram.get(); + const bool fcu_flipscreen = m_fcu_flipscreen; for (int offs = m_spriteram.bytes() / 2 - 4; offs >= 0; offs -= 4) { - if (!(source[offs] & 0x8000)) + if (BIT(~source[offs], 15)) { - int sx, sy; - const u16 attrib = source[offs + 1]; const u8 priority = (attrib & 0xf000) >> 12; u32 sprite = source[offs] & 0x7fff; - u32 color = attrib & 0x3f; + const u32 color = attrib & 0x3f; /****** find sprite dimension ******/ const u32 sizeram_ptr = (attrib >> 6) & 0x3f; @@ -724,11 +715,13 @@ void toaplan1_state::draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, c for (int dim_y = 0; dim_y < sprite_sizey; dim_y += 8) { + int sy; if (fcu_flipscreen) sy = sy_base - dim_y; else sy = sy_base + dim_y; for (int dim_x = 0; dim_x < sprite_sizex; dim_x += 8) { + int sx; if (fcu_flipscreen) sx = sx_base - dim_x; else sx = sx_base + dim_x; @@ -765,7 +758,7 @@ u32 toaplan1_rallybik_state::screen_update(screen_device &screen, bitmap_rgb32 & { // get priority mask // value: 0x1 (tilemap priority 0x0~0x4), 0x2 (tilemap priority 0x5~0x8), 0x4 (tilemap priority 0x9~0xc), 0x8 (tilemap priority 0xd~) - int primask = 1 << (((priority - 1) >> 2)); + const u32 primask = 1 << (((priority - 1) >> 2)); m_tilemap[3]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_CATEGORY(priority), primask); m_tilemap[2]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_CATEGORY(priority), primask); m_tilemap[1]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_CATEGORY(priority), primask);