From ee771ac3e6113fad002162778ed0318226e33a2c Mon Sep 17 00:00:00 2001 From: cam900 Date: Sat, 11 May 2019 09:24:01 +0900 Subject: [PATCH] namco_c355spr.cpp : Updates (#5031) * namco_c355spr.cpp : Updates Internalize gfxdecode, initialize values, Simplify handlers, Reduce unnecessary lines, Fix spacings, Use shorter / correct type values * gal3.cpp : Fix notes --- src/mame/drivers/gal3.cpp | 61 ++------ src/mame/drivers/namcofl.cpp | 73 +++------ src/mame/drivers/namconb1.cpp | 250 +++++++++++++----------------- src/mame/drivers/namcos2.cpp | 227 ++++++++++++--------------- src/mame/drivers/namcos21_c67.cpp | 143 +++++++---------- src/mame/drivers/namcos21_de.cpp | 87 ++++------- src/mame/includes/namcofl.h | 2 - src/mame/includes/namconb1.h | 3 - src/mame/video/namco_c355spr.cpp | 237 ++++++++++++++-------------- src/mame/video/namco_c355spr.h | 39 +++-- 10 files changed, 464 insertions(+), 658 deletions(-) diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 45ed3935b97..0248d00eb97 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -579,37 +579,6 @@ static INPUT_PORTS_START( gal3 ) PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) INPUT_PORTS_END -static const gfx_layout tile_layout = -{ - 16,16, - RGN_FRAC(1,4), /* number of tiles */ - 8, /* bits per pixel */ - { /* plane offsets */ - 0,1,2,3,4,5,6,7 - }, - { /* x offsets */ - 0*8,RGN_FRAC(1,4)+0*8,RGN_FRAC(2,4)+0*8,RGN_FRAC(3,4)+0*8, - 1*8,RGN_FRAC(1,4)+1*8,RGN_FRAC(2,4)+1*8,RGN_FRAC(3,4)+1*8, - 2*8,RGN_FRAC(1,4)+2*8,RGN_FRAC(2,4)+2*8,RGN_FRAC(3,4)+2*8, - 3*8,RGN_FRAC(1,4)+3*8,RGN_FRAC(2,4)+3*8,RGN_FRAC(3,4)+3*8 - }, - { /* y offsets */ - 0*32,1*32,2*32,3*32, - 4*32,5*32,6*32,7*32, - 8*32,9*32,10*32,11*32, - 12*32,13*32,14*32,15*32 - }, - 8*64 /* sprite offset */ -}; - -static GFXDECODE_START( gfx_gal3_l ) - GFXDECODE_ENTRY( "obj_board1", 0x000000, tile_layout, 0x000, 0x20 ) -GFXDECODE_END - -static GFXDECODE_START( gfx_gal3_r ) - GFXDECODE_ENTRY( "obj_board2", 0x000000, tile_layout, 0x000, 0x20 ) -GFXDECODE_END - void gal3_state::gal3(machine_config &config) { m68020_device &maincpu(M68020(config, "maincpu", 49152000/2)); @@ -650,17 +619,16 @@ void gal3_state::gal3(machine_config &config) lscreen.set_screen_update(FUNC(gal3_state::screen_update_left)); lscreen.set_palette(m_palette[0]); - GFXDECODE(config, "gfxdecode_1", m_palette[0], gfx_gal3_l); PALETTE(config, m_palette[0]).set_format(palette_device::xBRG_888, NAMCOS21_NUM_COLORS); m_palette[0]->set_membits(16); NAMCO_C355SPR(config, m_c355spr[0], 0); m_c355spr[0]->set_screen("lscreen"); - m_c355spr[0]->set_gfxdecode_tag("gfxdecode_1"); + m_c355spr[0]->set_palette(m_palette[0]); m_c355spr[0]->set_scroll_offsets(0x26, 0x19); m_c355spr[0]->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr[0]->set_palxor(0xf); // reverse mapping - m_c355spr[0]->set_gfxregion(0); + m_c355spr[0]->set_color_base(0x1000); // TODO : verify palette offset NAMCOS21_3D(config, m_namcos21_3d[0], 0); m_namcos21_3d[0]->set_zz_shift_mult(11, 0x200); @@ -680,17 +648,16 @@ void gal3_state::gal3(machine_config &config) rscreen.set_screen_update(FUNC(gal3_state::screen_update_right)); rscreen.set_palette(m_palette[1]); - GFXDECODE(config, "gfxdecode_2", m_palette[1], gfx_gal3_r); PALETTE(config, m_palette[1]).set_format(palette_device::xBRG_888, NAMCOS21_NUM_COLORS); m_palette[1]->set_membits(16); NAMCO_C355SPR(config, m_c355spr[1], 0); m_c355spr[1]->set_screen("rscreen"); - m_c355spr[1]->set_gfxdecode_tag("gfxdecode_2"); + m_c355spr[1]->set_palette(m_palette[1]); m_c355spr[1]->set_scroll_offsets(0x26, 0x19); m_c355spr[1]->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr[1]->set_palxor(0xf); // reverse mapping - m_c355spr[1]->set_gfxregion(0); + m_c355spr[1]->set_color_base(0x1000); // TODO : verify palette offset NAMCOS21_3D(config, m_namcos21_3d[1], 0); m_namcos21_3d[1]->set_zz_shift_mult(11, 0x200); @@ -865,17 +832,17 @@ ROM_START( gal3 ) ROM_LOAD32_BYTE( "glc1-dsp-ptol.2n", 0x000003, 0x80000, CRC(b318534a) SHA1(6fcf2ead6dd0d5a6f22438520588ba4e33ca39a8) ) /* least significant */ /********* OBJ board x2 *********/ - ROM_REGION( 0x200000, "obj_board1", 0 ) - ROM_LOAD( "glc1-obj-obj0.9t", 0x000000, 0x80000, CRC(0fe98d33) SHA1(5cfefa342fe2fa278d010927d761cb51105a4a60) ) - ROM_LOAD( "glc1-obj-obj1.9w", 0x080000, 0x80000, CRC(660a4f6d) SHA1(c3c3525f51280e71f2d607649a6b5434cbd862c8) ) - ROM_LOAD( "glc1-obj-obj2.9y", 0x100000, 0x80000, CRC(90bcc5a3) SHA1(76cb23e295bb15279e046e83f8e4ab9f85f68243) ) - ROM_LOAD( "glc1-obj-obj3.9z", 0x180000, 0x80000, CRC(65244f07) SHA1(fd876ca5f198914f15864397b358e56fcaa41e90) ) + ROM_REGION( 0x200000, "c355spr_1", 0 ) + ROM_LOAD32_BYTE( "glc1-obj-obj0.9t", 0x000000, 0x80000, CRC(0fe98d33) SHA1(5cfefa342fe2fa278d010927d761cb51105a4a60) ) + ROM_LOAD32_BYTE( "glc1-obj-obj1.9w", 0x000001, 0x80000, CRC(660a4f6d) SHA1(c3c3525f51280e71f2d607649a6b5434cbd862c8) ) + ROM_LOAD32_BYTE( "glc1-obj-obj2.9y", 0x000002, 0x80000, CRC(90bcc5a3) SHA1(76cb23e295bb15279e046e83f8e4ab9f85f68243) ) + ROM_LOAD32_BYTE( "glc1-obj-obj3.9z", 0x000003, 0x80000, CRC(65244f07) SHA1(fd876ca5f198914f15864397b358e56fcaa41e90) ) - ROM_REGION( 0x200000, "obj_board2", 0 ) - ROM_LOAD( "glc1-obj-obj0.9t", 0x000000, 0x80000, CRC(0fe98d33) SHA1(5cfefa342fe2fa278d010927d761cb51105a4a60) ) - ROM_LOAD( "glc1-obj-obj1.9w", 0x080000, 0x80000, CRC(660a4f6d) SHA1(c3c3525f51280e71f2d607649a6b5434cbd862c8) ) - ROM_LOAD( "glc1-obj-obj2.9y", 0x100000, 0x80000, CRC(90bcc5a3) SHA1(76cb23e295bb15279e046e83f8e4ab9f85f68243) ) - ROM_LOAD( "glc1-obj-obj3.9z", 0x180000, 0x80000, CRC(65244f07) SHA1(fd876ca5f198914f15864397b358e56fcaa41e90) ) + ROM_REGION( 0x200000, "c355spr_2", 0 ) + ROM_LOAD32_BYTE( "glc1-obj-obj0.9t", 0x000000, 0x80000, CRC(0fe98d33) SHA1(5cfefa342fe2fa278d010927d761cb51105a4a60) ) + ROM_LOAD32_BYTE( "glc1-obj-obj1.9w", 0x000001, 0x80000, CRC(660a4f6d) SHA1(c3c3525f51280e71f2d607649a6b5434cbd862c8) ) + ROM_LOAD32_BYTE( "glc1-obj-obj2.9y", 0x000002, 0x80000, CRC(90bcc5a3) SHA1(76cb23e295bb15279e046e83f8e4ab9f85f68243) ) + ROM_LOAD32_BYTE( "glc1-obj-obj3.9z", 0x000003, 0x80000, CRC(65244f07) SHA1(fd876ca5f198914f15864397b358e56fcaa41e90) ) /********* PSN board x3 *********/ ROM_REGION( 0x040000, "psn_b1_cpu", 0 ) diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index 608c64d4639..72b1c78d44c 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -446,33 +446,6 @@ static INPUT_PORTS_START( finalapr ) INPUT_PORTS_END -static const gfx_layout obj_layout = -{ - 16,16, - RGN_FRAC(1,1), - 8, /* bits per pixel */ - { - /* plane offsets */ - 0,1,2,3,4,5,6,7, - }, - { - 0*16+8,1*16+8,0*16,1*16, - 2*16+8,3*16+8,2*16,3*16, - 4*16+8,5*16+8,4*16,5*16, - 6*16+8,7*16+8,6*16,7*16 - }, - { - 0x0*128,0x1*128,0x2*128,0x3*128,0x4*128,0x5*128,0x6*128,0x7*128, - 0x8*128,0x9*128,0xa*128,0xb*128,0xc*128,0xd*128,0xe*128,0xf*128 - }, - 16*128 -}; - -static GFXDECODE_START( gfx_namcofl ) - GFXDECODE_ENTRY( "sprite", 0, obj_layout, 0x0000, 0x10 ) -GFXDECODE_END - - TIMER_CALLBACK_MEMBER(namcofl_state::network_interrupt_callback) { m_maincpu->set_input_line(I960_IRQ0, ASSERT_LINE); @@ -572,8 +545,6 @@ void namcofl_state::namcofl(machine_config &config) m_screen->set_screen_update(FUNC(namcofl_state::screen_update_namcofl)); m_screen->set_palette(m_c116); - GFXDECODE(config, "gfxdecode", m_c116, gfx_namcofl); - NAMCO_C169ROZ(config, m_c169roz, 0); m_c169roz->set_palette(m_c116); m_c169roz->set_is_namcofl(true); @@ -583,11 +554,11 @@ void namcofl_state::namcofl(machine_config &config) NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_c116); m_c355spr->set_scroll_offsets(0, 0); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate(&namcofl_state::FLobjcode2tile, this)); m_c355spr->set_palxor(0x0); - m_c355spr->set_gfxregion(NAMCOFL_SPRITEGFX); + m_c355spr->set_color_base(0); NAMCO_C123TMAP(config, m_c123tmap, 0); m_c123tmap->set_palette(m_c116); @@ -632,11 +603,11 @@ ROM_START( speedrcr ) ROM_LOAD("se1_sch2.19p", 0x200000, 0x100000, CRC(e59a731e) SHA1(3fed72e9bb485d4d689ab51490360c4c6f1dc5cb) ) ROM_LOAD("se1_sch3.18p", 0x300000, 0x100000, CRC(f817027a) SHA1(71745476f496c60d89c8563b3e46bc85eebc79ce) ) - ROM_REGION( 0x800000, "sprite", 0 ) // OBJ - ROM_LOAD16_BYTE("se1obj0l.ic1", 0x000001, 0x200000, CRC(17585218) SHA1(3332afa9bd194ac37b8d6f352507c523a0f2e2b3) ) - ROM_LOAD16_BYTE("se1obj0u.ic2", 0x000000, 0x200000, CRC(d14b1236) SHA1(e5447732ef3acec88fb7a00e0deca3e71a40ae65) ) - ROM_LOAD16_BYTE("se1obj1l.ic3", 0x400001, 0x200000, CRC(c4809fd5) SHA1(e0b80fccc17c83fb9d08f7f1cf2cd2f0f3a510b4) ) - ROM_LOAD16_BYTE("se1obj1u.ic4", 0x400000, 0x200000, CRC(0beefa56) SHA1(012fb7b330dbf851ab2217da0a0e7136ddc3d23f) ) + ROM_REGION( 0x800000, "c355spr", 0 ) // OBJ + ROM_LOAD32_WORD("se1obj0l.ic1", 0x000000, 0x200000, CRC(17585218) SHA1(3332afa9bd194ac37b8d6f352507c523a0f2e2b3) ) + ROM_LOAD32_WORD("se1obj0u.ic2", 0x000002, 0x200000, CRC(d14b1236) SHA1(e5447732ef3acec88fb7a00e0deca3e71a40ae65) ) + ROM_LOAD32_WORD("se1obj1l.ic3", 0x400000, 0x200000, CRC(c4809fd5) SHA1(e0b80fccc17c83fb9d08f7f1cf2cd2f0f3a510b4) ) + ROM_LOAD32_WORD("se1obj1u.ic4", 0x400002, 0x200000, CRC(0beefa56) SHA1(012fb7b330dbf851ab2217da0a0e7136ddc3d23f) ) ROM_REGION( 0x100000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?) ROM_LOAD("se1_rsh.14k", 0x000000, 0x100000, CRC(7aa5a962) SHA1(ff936dfcfcc4ee1f5f2232df62def76ff99e671e) ) @@ -681,11 +652,11 @@ ROM_START( finalapr ) ROM_LOAD("flr1sch2.19p", 0x200000, 0x100000, CRC(9b6b7abd) SHA1(5cdec70db1b46bc5d0866ca155b520157fef3adf) ) ROM_LOAD("flr1sch3.18p", 0x300000, 0x100000, CRC(50a14f54) SHA1(ab9c2f2e11f006a9dc7e5aedd5788d7d67166d36) ) - ROM_REGION( 0x800000, "sprite", 0 ) // OBJ - ROM_LOAD16_BYTE("flr1obj0l.ic1", 0x000001, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) ) - ROM_LOAD16_BYTE("flr1obj0u.ic2", 0x000000, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) ) - ROM_LOAD16_BYTE("flr1obj1l.ic3", 0x400001, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) ) - ROM_LOAD16_BYTE("flr1obj1u.ic4", 0x400000, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) ) + ROM_REGION( 0x800000, "c355spr", 0 ) // OBJ + ROM_LOAD32_WORD("flr1obj0l.ic1", 0x000000, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) ) + ROM_LOAD32_WORD("flr1obj0u.ic2", 0x000002, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) ) + ROM_LOAD32_WORD("flr1obj1l.ic3", 0x400000, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) ) + ROM_LOAD32_WORD("flr1obj1u.ic4", 0x400002, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) ) ROM_REGION( 0x80000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?) ROM_LOAD("flr1rsh.14k", 0x000000, 0x080000, CRC(037c0983) SHA1(c48574a8ad125cedfaf2538c5ff824e121204629) ) @@ -720,11 +691,11 @@ ROM_START( finalapro ) ROM_LOAD("flr1sch2.19p", 0x200000, 0x100000, CRC(9b6b7abd) SHA1(5cdec70db1b46bc5d0866ca155b520157fef3adf) ) ROM_LOAD("flr1sch3.18p", 0x300000, 0x100000, CRC(50a14f54) SHA1(ab9c2f2e11f006a9dc7e5aedd5788d7d67166d36) ) - ROM_REGION( 0x800000, "sprite", 0 ) // OBJ - ROM_LOAD16_BYTE("flr1obj0l.ic1", 0x000001, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) ) - ROM_LOAD16_BYTE("flr1obj0u.ic2", 0x000000, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) ) - ROM_LOAD16_BYTE("flr1obj1l.ic3", 0x400001, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) ) - ROM_LOAD16_BYTE("flr1obj1u.ic4", 0x400000, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) ) + ROM_REGION( 0x800000, "c355spr", 0 ) // OBJ + ROM_LOAD32_WORD("flr1obj0l.ic1", 0x000000, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) ) + ROM_LOAD32_WORD("flr1obj0u.ic2", 0x000002, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) ) + ROM_LOAD32_WORD("flr1obj1l.ic3", 0x400000, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) ) + ROM_LOAD32_WORD("flr1obj1u.ic4", 0x400002, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) ) ROM_REGION( 0x80000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?) ROM_LOAD("flr1rsh.14k", 0x000000, 0x080000, CRC(037c0983) SHA1(c48574a8ad125cedfaf2538c5ff824e121204629) ) @@ -760,11 +731,11 @@ ROM_START( finalaprj ) ROM_LOAD("flr1sch2.19p", 0x200000, 0x100000, CRC(9b6b7abd) SHA1(5cdec70db1b46bc5d0866ca155b520157fef3adf) ) ROM_LOAD("flr1sch3.18p", 0x300000, 0x100000, CRC(50a14f54) SHA1(ab9c2f2e11f006a9dc7e5aedd5788d7d67166d36) ) - ROM_REGION( 0x800000, "sprite", 0 ) // OBJ - ROM_LOAD16_BYTE("flr1obj0l.ic1", 0x000001, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) ) - ROM_LOAD16_BYTE("flr1obj0u.ic2", 0x000000, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) ) - ROM_LOAD16_BYTE("flr1obj1l.ic3", 0x400001, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) ) - ROM_LOAD16_BYTE("flr1obj1u.ic4", 0x400000, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) ) + ROM_REGION( 0x800000, "c355spr", 0 ) // OBJ + ROM_LOAD32_WORD("flr1obj0l.ic1", 0x000000, 0x200000, CRC(364a902c) SHA1(4a1ea48eee86d410e36096cc100b4c9a5a645034) ) + ROM_LOAD32_WORD("flr1obj0u.ic2", 0x000002, 0x200000, CRC(a5c7b80e) SHA1(4e0e863cfdd8c051c3c4594bb21e11fb93c28f0c) ) + ROM_LOAD32_WORD("flr1obj1l.ic3", 0x400000, 0x200000, CRC(51fd8de7) SHA1(b1571c45e8c33d746716fd790c704a3361d02bdc) ) + ROM_LOAD32_WORD("flr1obj1u.ic4", 0x400002, 0x200000, CRC(1737aa3c) SHA1(8eaf0dc5d60a270d2c1626f54f5edbddbb0a59c8) ) ROM_REGION( 0x80000, "c169roz:mask", 0 ) // "RSHAPE" (roz mask like NB-1?) ROM_LOAD("flr1rsh.14k", 0x000000, 0x080000, CRC(037c0983) SHA1(c48574a8ad125cedfaf2538c5ff824e121204629) ) diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index bbe8b3421be..6302af1a95c 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -946,35 +946,6 @@ void namconb1_state::init_outfxies() m_gametype = NAMCONB2_OUTFOXIES; } -/***************************************************************/ - -static const gfx_layout obj_layout = -{ - 16,16, - RGN_FRAC(1,1), - 8, /* bits per pixel */ - { - /* plane offsets */ - 0,1,2,3,4,5,6,7, - }, - { - 0*16+8,1*16+8,0*16,1*16, - 2*16+8,3*16+8,2*16,3*16, - 4*16+8,5*16+8,4*16,5*16, - 6*16+8,7*16+8,6*16,7*16 - }, - { - 0x0*128,0x1*128,0x2*128,0x3*128,0x4*128,0x5*128,0x6*128,0x7*128, - 0x8*128,0x9*128,0xa*128,0xb*128,0xc*128,0xd*128,0xe*128,0xf*128 - }, - 16*128 -}; /* obj_layout */ - -static GFXDECODE_START( gfx_namconb1 ) - GFXDECODE_ENTRY( "sprite", 0, obj_layout, 0x0000, 0x10 ) -GFXDECODE_END /* gfx_namconb1 */ - - /***************************************************************/ void namconb1_state::machine_reset() @@ -1021,16 +992,14 @@ void namconb1_state::namconb1(machine_config &config) m_screen->screen_vblank().set(m_c355spr, FUNC(namco_c355spr_device::vblank)); m_screen->set_palette(m_c116); - GFXDECODE(config, "gfxdecode", m_c116, gfx_namconb1); - NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_c116); m_c355spr->set_scroll_offsets(0x26, 0x19); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate(&namconb1_state::NB1objcode2tile, this)); m_c355spr->set_palxor(0x0); m_c355spr->set_buffer(2); // triple buffered - m_c355spr->set_gfxregion(NAMCONB1_SPRITEGFX); + m_c355spr->set_color_base(0); NAMCO_C123TMAP(config, m_c123tmap, 0); m_c123tmap->set_palette(m_c116); @@ -1108,11 +1077,11 @@ ROM_START( ptblank ) /* World set using 4Mb sound data ROM (verified) */ ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "gn1-voi0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) ) - ROM_REGION( 0x800000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ - ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) - ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) - ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) + ROM_REGION( 0x800000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gn1obj0l.ic1", 0x000000, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ + ROM_LOAD32_WORD( "gn1obj0u.ic2", 0x000002, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) + ROM_LOAD32_WORD( "gn1obj1l.ic3", 0x400000, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) + ROM_LOAD32_WORD( "gn1obj1u.ic4", 0x400002, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "gn1-chr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) ) @@ -1139,11 +1108,11 @@ ROM_START( ptblanka ) /* World set using non standard ROM labels (NR is Namco's ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "nr4_spr0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) ) // == gn1-voi0.5j - ROM_REGION( 0x800000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ - ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) - ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) - ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) + ROM_REGION( 0x800000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gn1obj0l.ic1", 0x000000, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ + ROM_LOAD32_WORD( "gn1obj0u.ic2", 0x000002, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) + ROM_LOAD32_WORD( "gn1obj1l.ic3", 0x400000, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) + ROM_LOAD32_WORD( "gn1obj1u.ic4", 0x400002, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "nr5_spr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) ) // == gn1_chr0.8j @@ -1170,11 +1139,11 @@ ROM_START( gunbuletw ) /* World set using 4Mb sound data ROM (verified) */ ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "gn1-voi0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) ) - ROM_REGION( 0x800000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ - ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) - ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) - ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) + ROM_REGION( 0x800000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gn1obj0l.ic1", 0x000000, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ + ROM_LOAD32_WORD( "gn1obj0u.ic2", 0x000002, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) + ROM_LOAD32_WORD( "gn1obj1l.ic3", 0x400000, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) + ROM_LOAD32_WORD( "gn1obj1u.ic4", 0x400002, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "gn1-chr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) ) @@ -1201,11 +1170,11 @@ ROM_START( gunbuletj ) /* Japanese set using 1Mb sound data ROM (verified) */ ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "gn1-voi0.5j", 0, 0x200000, CRC(05477eb7) SHA1(f2eaacb5dbac06c37c56b9b131230c9cf6602221) ) - ROM_REGION( 0x800000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gn1obj0l.ic1", 0x000001, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ - ROM_LOAD16_BYTE( "gn1obj0u.ic2", 0x000000, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) - ROM_LOAD16_BYTE( "gn1obj1l.ic3", 0x400001, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) - ROM_LOAD16_BYTE( "gn1obj1u.ic4", 0x400000, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) + ROM_REGION( 0x800000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gn1obj0l.ic1", 0x000000, 0x200000, CRC(06722dc8) SHA1(56fee4e17ed707fa6dbc6bad0d0281fc8cdf72d1) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ + ROM_LOAD32_WORD( "gn1obj0u.ic2", 0x000002, 0x200000, CRC(fcefc909) SHA1(48c19b6032096dd80777aa6d5eb5f90463095cbe) ) + ROM_LOAD32_WORD( "gn1obj1l.ic3", 0x400000, 0x200000, CRC(48468df7) SHA1(c5fb9082c84ac2ffceb6f5f4cbc1d40047c55e3d) ) + ROM_LOAD32_WORD( "gn1obj1u.ic4", 0x400002, 0x200000, CRC(3109a071) SHA1(4bb16df5a3aecdf37baf843edfc82952d46f5227) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "gn1-chr0.8j", 0x000000, 0x100000, CRC(a5c61246) SHA1(d1d9f286b93b5b9880160029c53384d13c08dd8a) ) @@ -1231,15 +1200,15 @@ ROM_START( nebulray ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "nr1-voi0", 0, 0x200000, CRC(332d5e26) SHA1(9daddac3fbe0709e25ed8e0b456bac15bfae20d7) ) - ROM_REGION( 0x1000000, "sprite", 0 ) - ROM_LOAD16_BYTE( "nr1obj0u", 0x000000, 0x200000, CRC(fb82a881) SHA1(c9fa0728a37376a5c85bff1f6e8400c13ce15769) ) - ROM_LOAD16_BYTE( "nr1obj0l", 0x000001, 0x200000, CRC(0e99ef46) SHA1(450fe61e448270b633f312361bd5ca89bb9684dd) ) - ROM_LOAD16_BYTE( "nr1obj1u", 0x400000, 0x200000, CRC(49d9dbd7) SHA1(2dbd842c192d65888f931cdb5c9387127b1ab632) ) - ROM_LOAD16_BYTE( "nr1obj1l", 0x400001, 0x200000, CRC(f7a898f0) SHA1(a25a134a42adeb9088019bde42a96d120f20407e) ) - ROM_LOAD16_BYTE( "nr1obj2u", 0x800000, 0x200000, CRC(8c8205b1) SHA1(2c5fb9392d8cd5f8d1f9aba6ddbbafd061271cd4) ) - ROM_LOAD16_BYTE( "nr1obj2l", 0x800001, 0x200000, CRC(b39871d1) SHA1(a8f910702bb88a001f2bfd1b33ad355aa3b0f429) ) - ROM_LOAD16_BYTE( "nr1obj3u", 0xc00000, 0x200000, CRC(d5918c9e) SHA1(530781fb44d7bbf01669bb265b658cb60e27bcd7) ) - ROM_LOAD16_BYTE( "nr1obj3l", 0xc00001, 0x200000, CRC(c90d13ae) SHA1(675f7b8b3325aac91b2bae1cbebe274a65aedc43) ) + ROM_REGION( 0x1000000, "c355spr", 0 ) + ROM_LOAD32_WORD( "nr1obj0l", 0x000000, 0x200000, CRC(0e99ef46) SHA1(450fe61e448270b633f312361bd5ca89bb9684dd) ) + ROM_LOAD32_WORD( "nr1obj0u", 0x000002, 0x200000, CRC(fb82a881) SHA1(c9fa0728a37376a5c85bff1f6e8400c13ce15769) ) + ROM_LOAD32_WORD( "nr1obj1l", 0x400000, 0x200000, CRC(f7a898f0) SHA1(a25a134a42adeb9088019bde42a96d120f20407e) ) + ROM_LOAD32_WORD( "nr1obj1u", 0x400002, 0x200000, CRC(49d9dbd7) SHA1(2dbd842c192d65888f931cdb5c9387127b1ab632) ) + ROM_LOAD32_WORD( "nr1obj2l", 0x800000, 0x200000, CRC(b39871d1) SHA1(a8f910702bb88a001f2bfd1b33ad355aa3b0f429) ) + ROM_LOAD32_WORD( "nr1obj2u", 0x800002, 0x200000, CRC(8c8205b1) SHA1(2c5fb9392d8cd5f8d1f9aba6ddbbafd061271cd4) ) + ROM_LOAD32_WORD( "nr1obj3l", 0xc00000, 0x200000, CRC(c90d13ae) SHA1(675f7b8b3325aac91b2bae1cbebe274a65aedc43) ) + ROM_LOAD32_WORD( "nr1obj3u", 0xc00002, 0x200000, CRC(d5918c9e) SHA1(530781fb44d7bbf01669bb265b658cb60e27bcd7) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "nr1-chr0", 0x000000, 0x100000,CRC(8d5b54ea) SHA1(616d5729f474da91da19a8246066280652da998c) ) @@ -1265,15 +1234,15 @@ ROM_START( nebulrayj ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "nr1-voi0", 0, 0x200000, CRC(332d5e26) SHA1(9daddac3fbe0709e25ed8e0b456bac15bfae20d7) ) - ROM_REGION( 0x1000000, "sprite", 0 ) - ROM_LOAD16_BYTE( "nr1obj0u", 0x000000, 0x200000, CRC(fb82a881) SHA1(c9fa0728a37376a5c85bff1f6e8400c13ce15769) ) - ROM_LOAD16_BYTE( "nr1obj0l", 0x000001, 0x200000, CRC(0e99ef46) SHA1(450fe61e448270b633f312361bd5ca89bb9684dd) ) - ROM_LOAD16_BYTE( "nr1obj1u", 0x400000, 0x200000, CRC(49d9dbd7) SHA1(2dbd842c192d65888f931cdb5c9387127b1ab632) ) - ROM_LOAD16_BYTE( "nr1obj1l", 0x400001, 0x200000, CRC(f7a898f0) SHA1(a25a134a42adeb9088019bde42a96d120f20407e) ) - ROM_LOAD16_BYTE( "nr1obj2u", 0x800000, 0x200000, CRC(8c8205b1) SHA1(2c5fb9392d8cd5f8d1f9aba6ddbbafd061271cd4) ) - ROM_LOAD16_BYTE( "nr1obj2l", 0x800001, 0x200000, CRC(b39871d1) SHA1(a8f910702bb88a001f2bfd1b33ad355aa3b0f429) ) - ROM_LOAD16_BYTE( "nr1obj3u", 0xc00000, 0x200000, CRC(d5918c9e) SHA1(530781fb44d7bbf01669bb265b658cb60e27bcd7) ) - ROM_LOAD16_BYTE( "nr1obj3l", 0xc00001, 0x200000, CRC(c90d13ae) SHA1(675f7b8b3325aac91b2bae1cbebe274a65aedc43) ) + ROM_REGION( 0x1000000, "c355spr", 0 ) + ROM_LOAD32_WORD( "nr1obj0l", 0x000000, 0x200000, CRC(0e99ef46) SHA1(450fe61e448270b633f312361bd5ca89bb9684dd) ) + ROM_LOAD32_WORD( "nr1obj0u", 0x000002, 0x200000, CRC(fb82a881) SHA1(c9fa0728a37376a5c85bff1f6e8400c13ce15769) ) + ROM_LOAD32_WORD( "nr1obj1l", 0x400000, 0x200000, CRC(f7a898f0) SHA1(a25a134a42adeb9088019bde42a96d120f20407e) ) + ROM_LOAD32_WORD( "nr1obj1u", 0x400002, 0x200000, CRC(49d9dbd7) SHA1(2dbd842c192d65888f931cdb5c9387127b1ab632) ) + ROM_LOAD32_WORD( "nr1obj2l", 0x800000, 0x200000, CRC(b39871d1) SHA1(a8f910702bb88a001f2bfd1b33ad355aa3b0f429) ) + ROM_LOAD32_WORD( "nr1obj2u", 0x800002, 0x200000, CRC(8c8205b1) SHA1(2c5fb9392d8cd5f8d1f9aba6ddbbafd061271cd4) ) + ROM_LOAD32_WORD( "nr1obj3l", 0xc00000, 0x200000, CRC(c90d13ae) SHA1(675f7b8b3325aac91b2bae1cbebe274a65aedc43) ) + ROM_LOAD32_WORD( "nr1obj3u", 0xc00002, 0x200000, CRC(d5918c9e) SHA1(530781fb44d7bbf01669bb265b658cb60e27bcd7) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "nr1-chr0", 0x000000, 0x100000,CRC(8d5b54ea) SHA1(616d5729f474da91da19a8246066280652da998c) ) @@ -1299,9 +1268,9 @@ ROM_START( gslgr94u ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "gse-voi0.bin", 0, 0x200000, CRC(d3480574) SHA1(0c468ed060769b36b7e41cf4919cb6d8691d64f6) ) - ROM_REGION( 0x400000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gseobj0l.bin", 0x000001, 0x200000, CRC(531520ca) SHA1(2a1a5282549c6f7a37d5fb8c0b342edb9dc45315) ) - ROM_LOAD16_BYTE( "gseobj0u.bin", 0x000000, 0x200000, CRC(fcc1283c) SHA1(fb44ed742f362e6737412cabf3f67d9506456a9e) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gseobj0l.bin", 0x000000, 0x200000, CRC(531520ca) SHA1(2a1a5282549c6f7a37d5fb8c0b342edb9dc45315) ) + ROM_LOAD32_WORD( "gseobj0u.bin", 0x000002, 0x200000, CRC(fcc1283c) SHA1(fb44ed742f362e6737412cabf3f67d9506456a9e) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "gse-chr0.bin", 0x000000, 0x100000, CRC(9314085d) SHA1(150e8ea908861337f9be2749aa7f9e1d52570586) ) @@ -1324,11 +1293,11 @@ ROM_START( gslgr94j ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "gs4voi0.5j", 0, 0x200000, CRC(c3053a90) SHA1(e76799b33b2457421255b03786bc24266d59c7dd) ) - ROM_REGION( 0x800000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gs4obj0l.bin", 0x000001, 0x200000, CRC(3b499da0) SHA1(91ad5f68dbda64dd07e1133eb09ee69da3da3103) ) - ROM_LOAD16_BYTE( "gs4obj0u.bin", 0x000000, 0x200000, CRC(80016b50) SHA1(9f7604c196835d31894ba4db1de43d7d2614da84) ) - ROM_LOAD16_BYTE( "gs4obj1l.bin", 0x400001, 0x200000, CRC(1f4847a7) SHA1(908e419e42fa8bd786cc3bc96d5ccb3a47c8e2dc) ) - ROM_LOAD16_BYTE( "gs4obj1u.bin", 0x400000, 0x200000, CRC(49bc48cd) SHA1(6bcc41546f3bd609e3aa962e5ce3bf5bc6b9229a) ) + ROM_REGION( 0x800000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gs4obj0l.bin", 0x000000, 0x200000, CRC(3b499da0) SHA1(91ad5f68dbda64dd07e1133eb09ee69da3da3103) ) + ROM_LOAD32_WORD( "gs4obj0u.bin", 0x000002, 0x200000, CRC(80016b50) SHA1(9f7604c196835d31894ba4db1de43d7d2614da84) ) + ROM_LOAD32_WORD( "gs4obj1l.bin", 0x400000, 0x200000, CRC(1f4847a7) SHA1(908e419e42fa8bd786cc3bc96d5ccb3a47c8e2dc) ) + ROM_LOAD32_WORD( "gs4obj1u.bin", 0x400002, 0x200000, CRC(49bc48cd) SHA1(6bcc41546f3bd609e3aa962e5ce3bf5bc6b9229a) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "gs4chr0.8j", 0x000000, 0x100000, CRC(8c6c682e) SHA1(ecf21035d5af28299c9cdb98d5d811b4d52857b8) ) @@ -1476,9 +1445,9 @@ ROM_START( gslugrsj ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "gs1voi-0.5j", 0, 0x200000, CRC(6f8262aa) SHA1(beea98d9f8b927a572eb0bfcf678e9d6e40fc68d) ) - ROM_REGION( 0x400000, "sprite", 0 ) - ROM_LOAD16_BYTE( "gs1obj-0.ic1", 0x000001, 0x200000, CRC(9a55238f) SHA1(fc3fd4b8b6322bbe343edbcad7815b597562266b) ) - ROM_LOAD16_BYTE( "gs1obj-1.ic2", 0x000000, 0x200000, CRC(31c66f76) SHA1(8903e6586dff6f34a6ffca2d7c75343c0a5bff56) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_WORD( "gs1obj-0.ic1", 0x000000, 0x200000, CRC(9a55238f) SHA1(fc3fd4b8b6322bbe343edbcad7815b597562266b) ) + ROM_LOAD32_WORD( "gs1obj-1.ic2", 0x000002, 0x200000, CRC(31c66f76) SHA1(8903e6586dff6f34a6ffca2d7c75343c0a5bff56) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "gs1chr-0.8j", 0x000000, 0x100000, CRC(e7ced86a) SHA1(de90c2e3870b317431d3910f581660681b46ff9d) ) @@ -1501,10 +1470,9 @@ ROM_START( sws95 ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "ss51voi0.bin", 0, 0x200000, CRC(2740ec72) SHA1(9694a7378ea72771d2b1d43db6d74ed347ba27d3) ) - - ROM_REGION( 0x400000, "sprite", 0 ) - ROM_LOAD16_BYTE( "ss51ob0l.bin", 0x000001, 0x200000, CRC(e0395694) SHA1(e52045a7af4c4b0f9935695cfc5ff729bf9bd7c1) ) - ROM_LOAD16_BYTE( "ss51ob0u.bin", 0x000000, 0x200000, CRC(b0745ca0) SHA1(579ea7fd7b9a181fd9d08c50c6c5941264aa0b6d) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_WORD( "ss51ob0l.bin", 0x000000, 0x200000, CRC(e0395694) SHA1(e52045a7af4c4b0f9935695cfc5ff729bf9bd7c1) ) + ROM_LOAD32_WORD( "ss51ob0u.bin", 0x000002, 0x200000, CRC(b0745ca0) SHA1(579ea7fd7b9a181fd9d08c50c6c5941264aa0b6d) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "ss51chr0.bin", 0x000000, 0x100000, CRC(86dd3280) SHA1(07ba6d3edc5c38bf82ddaf8f6de7ef0f5d0788b2) ) @@ -1527,9 +1495,9 @@ ROM_START( sws96 ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "ss61voi0.bin", 0, 0x200000, CRC(2740ec72) SHA1(9694a7378ea72771d2b1d43db6d74ed347ba27d3) ) - ROM_REGION( 0x400000, "sprite", 0 ) - ROM_LOAD16_BYTE( "ss61ob0l.bin", 0x000001, 0x200000, CRC(579b19d4) SHA1(7f18097c683d2b1c532f54ee514dd499f5965165) ) - ROM_LOAD16_BYTE( "ss61ob0u.bin", 0x000000, 0x200000, CRC(a69bbd9e) SHA1(8f4c44e2caa31d25433a04c19c51904ec9461e2f) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_WORD( "ss61ob0l.bin", 0x000000, 0x200000, CRC(579b19d4) SHA1(7f18097c683d2b1c532f54ee514dd499f5965165) ) + ROM_LOAD32_WORD( "ss61ob0u.bin", 0x000002, 0x200000, CRC(a69bbd9e) SHA1(8f4c44e2caa31d25433a04c19c51904ec9461e2f) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "ss61chr0.bin", 0x000000, 0x100000, CRC(9d2ae07b) SHA1(7d268f6c7d8145c913f80049369ae3106d69e939) ) @@ -1552,9 +1520,9 @@ ROM_START( sws97 ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "ss71voi0.bin", 0, 0x200000, CRC(2740ec72) SHA1(9694a7378ea72771d2b1d43db6d74ed347ba27d3) ) - ROM_REGION( 0x400000, "sprite", 0 ) - ROM_LOAD16_BYTE( "ss71ob0l.bin", 0x000001, 0x200000, CRC(9559ad44) SHA1(fd56a8620f6958cc090f783d74cb38bba46d2423) ) - ROM_LOAD16_BYTE( "ss71ob0u.bin", 0x000000, 0x200000, CRC(4df4a722) SHA1(07eb94628ceeb7cbce2d39d479f33c37583a346a) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_WORD( "ss71ob0l.bin", 0x000000, 0x200000, CRC(9559ad44) SHA1(fd56a8620f6958cc090f783d74cb38bba46d2423) ) + ROM_LOAD32_WORD( "ss71ob0u.bin", 0x000002, 0x200000, CRC(4df4a722) SHA1(07eb94628ceeb7cbce2d39d479f33c37583a346a) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "ss71chr0.bin", 0x000000, 0x100000, CRC(bd606356) SHA1(a62c55600e46f8821db0b84d79fc2588742ad7ad) ) @@ -1577,11 +1545,11 @@ ROM_START( vshoot ) ROM_REGION( 0x1000000, "c352", 0 ) // Samples ROM_LOAD( "vsjvoi-0.5j", 0, 0x200000, CRC(0528c9ed) SHA1(52b67978fdeb97b77065575774a7ddeb49fe1d81) ) - ROM_REGION( 0x800000, "sprite", 0 ) - ROM_LOAD16_BYTE( "vsjobj0l.ic1", 0x000001, 0x200000, CRC(e134faa7) SHA1(a844c8a5bd6d8907f9e5c7ba9e2ee8e9a886cd1e) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ - ROM_LOAD16_BYTE( "vsjobj0u.ic2", 0x000000, 0x200000, CRC(974d0714) SHA1(976050eaf82d4b66e13c1c579e5521eb867527fb) ) - ROM_LOAD16_BYTE( "vsjobj1l.ic3", 0x400001, 0x200000, CRC(ba46f967) SHA1(ddfb0ac7fba7369869e4df9a66d465a662eba2e6) ) - ROM_LOAD16_BYTE( "vsjobj1u.ic4", 0x400000, 0x200000, CRC(09da7e9c) SHA1(e98e07a886a4fe369748fc97f3cee6a4bb668385) ) + ROM_REGION( 0x800000, "c355spr", 0 ) + ROM_LOAD32_WORD( "vsjobj0l.ic1", 0x000000, 0x200000, CRC(e134faa7) SHA1(a844c8a5bd6d8907f9e5c7ba9e2ee8e9a886cd1e) ) /* These four located on MEMEXT OBJ8 PCB daughter-card */ + ROM_LOAD32_WORD( "vsjobj0u.ic2", 0x000002, 0x200000, CRC(974d0714) SHA1(976050eaf82d4b66e13c1c579e5521eb867527fb) ) + ROM_LOAD32_WORD( "vsjobj1l.ic3", 0x400000, 0x200000, CRC(ba46f967) SHA1(ddfb0ac7fba7369869e4df9a66d465a662eba2e6) ) + ROM_LOAD32_WORD( "vsjobj1u.ic4", 0x400002, 0x200000, CRC(09da7e9c) SHA1(e98e07a886a4fe369748fc97f3cee6a4bb668385) ) ROM_REGION( 0x400000, "c123tmap", 0 ) ROM_LOAD( "vsjchr-0.8j", 0x000000, 0x100000, CRC(2af8ba7c) SHA1(74f5a382425974a9b2167bb01672dd13dea882f5) ) @@ -1768,17 +1736,17 @@ ROM_START( outfxies ) ROM_REGION( 0x200000, "c169roz:mask", 0 ) ROM_LOAD( "ou1shar.18s", 0, 0x200000, CRC(fbb48194) SHA1(2d3ec5bc519fad2b755018f83fadfe0cba13c292) ) - ROM_REGION( 0x2000000, "sprite", 0 ) - ROM_LOAD16_BYTE( "ou1obj0l.4c", 0x0000001, 0x200000, CRC(1b4f7184) SHA1(a05d67842fce92f321d1fdd3bd30aa3427775a0c) ) - ROM_LOAD16_BYTE( "ou1obj0u.8c", 0x0000000, 0x200000, CRC(d0a69794) SHA1(07d449e54e9971abeb9cd5bb7b372270fafa8bac) ) - ROM_LOAD16_BYTE( "ou1obj1l.4b", 0x0400001, 0x200000, CRC(48a93e84) SHA1(6935ec161a12237d4cec732d42070f381c23b47c) ) - ROM_LOAD16_BYTE( "ou1obj1u.8b", 0x0400000, 0x200000, CRC(999de386) SHA1(d4780ab1929a3e2c2df464363d6451a2bcecb2a2) ) - ROM_LOAD16_BYTE( "ou1obj2l.4a", 0x0800001, 0x200000, CRC(30386cd0) SHA1(3563c5378288da58136f102381373bd6fcaeec21) ) - ROM_LOAD16_BYTE( "ou1obj2u.8a", 0x0800000, 0x200000, CRC(ccada5f8) SHA1(75ed95bb295780126879d67bba4d0ae1da63c928) ) - ROM_LOAD16_BYTE( "ou1obj3l.6c", 0x0c00001, 0x200000, CRC(5f41b44e) SHA1(3f5376fcd3e15af772df65b8eda4d5ee07ee5664) ) - ROM_LOAD16_BYTE( "ou1obj3u.9c", 0x0c00000, 0x200000, CRC(bc852c8e) SHA1(4863302c45ee16aaf2c36dac07aceaf287959c53) ) - ROM_LOAD16_BYTE( "ou1obj4l.6b", 0x1000001, 0x200000, CRC(99a5f9d7) SHA1(b0f46f4ac357918137031a19c36a56a47b7aefd6) ) - ROM_LOAD16_BYTE( "ou1obj4u.9b", 0x1000000, 0x200000, CRC(70ecaabb) SHA1(521c6849526fb271e6447f6c4f5bfa081f96b91e) ) + ROM_REGION( 0x2000000, "c355spr", 0 ) + ROM_LOAD32_WORD( "ou1obj0l.4c", 0x0000000, 0x200000, CRC(1b4f7184) SHA1(a05d67842fce92f321d1fdd3bd30aa3427775a0c) ) + ROM_LOAD32_WORD( "ou1obj0u.8c", 0x0000002, 0x200000, CRC(d0a69794) SHA1(07d449e54e9971abeb9cd5bb7b372270fafa8bac) ) + ROM_LOAD32_WORD( "ou1obj1l.4b", 0x0400000, 0x200000, CRC(48a93e84) SHA1(6935ec161a12237d4cec732d42070f381c23b47c) ) + ROM_LOAD32_WORD( "ou1obj1u.8b", 0x0400002, 0x200000, CRC(999de386) SHA1(d4780ab1929a3e2c2df464363d6451a2bcecb2a2) ) + ROM_LOAD32_WORD( "ou1obj2l.4a", 0x0800000, 0x200000, CRC(30386cd0) SHA1(3563c5378288da58136f102381373bd6fcaeec21) ) + ROM_LOAD32_WORD( "ou1obj2u.8a", 0x0800002, 0x200000, CRC(ccada5f8) SHA1(75ed95bb295780126879d67bba4d0ae1da63c928) ) + ROM_LOAD32_WORD( "ou1obj3l.6c", 0x0c00000, 0x200000, CRC(5f41b44e) SHA1(3f5376fcd3e15af772df65b8eda4d5ee07ee5664) ) + ROM_LOAD32_WORD( "ou1obj3u.9c", 0x0c00002, 0x200000, CRC(bc852c8e) SHA1(4863302c45ee16aaf2c36dac07aceaf287959c53) ) + ROM_LOAD32_WORD( "ou1obj4l.6b", 0x1000000, 0x200000, CRC(99a5f9d7) SHA1(b0f46f4ac357918137031a19c36a56a47b7aefd6) ) + ROM_LOAD32_WORD( "ou1obj4u.9b", 0x1000002, 0x200000, CRC(70ecaabb) SHA1(521c6849526fb271e6447f6c4f5bfa081f96b91e) ) ROM_REGION( 0x600000, "c169roz", 0 ) ROM_LOAD( "ou1-rot0.3d", 0x000000, 0x200000, CRC(a50c67c8) SHA1(432b8451eb9eaa3078134fce1e5e2d58a8b64be3) ) @@ -1810,17 +1778,17 @@ ROM_START( outfxiesj ) ROM_REGION( 0x200000, "c169roz:mask", 0 ) ROM_LOAD( "ou1shar.18s", 0, 0x200000, CRC(fbb48194) SHA1(2d3ec5bc519fad2b755018f83fadfe0cba13c292) ) - ROM_REGION( 0x2000000, "sprite", 0 ) - ROM_LOAD16_BYTE( "ou1obj0l.4c", 0x0000001, 0x200000, CRC(1b4f7184) SHA1(a05d67842fce92f321d1fdd3bd30aa3427775a0c) ) - ROM_LOAD16_BYTE( "ou1obj0u.8c", 0x0000000, 0x200000, CRC(d0a69794) SHA1(07d449e54e9971abeb9cd5bb7b372270fafa8bac) ) - ROM_LOAD16_BYTE( "ou1obj1l.4b", 0x0400001, 0x200000, CRC(48a93e84) SHA1(6935ec161a12237d4cec732d42070f381c23b47c) ) - ROM_LOAD16_BYTE( "ou1obj1u.8b", 0x0400000, 0x200000, CRC(999de386) SHA1(d4780ab1929a3e2c2df464363d6451a2bcecb2a2) ) - ROM_LOAD16_BYTE( "ou1obj2l.4a", 0x0800001, 0x200000, CRC(30386cd0) SHA1(3563c5378288da58136f102381373bd6fcaeec21) ) - ROM_LOAD16_BYTE( "ou1obj2u.8a", 0x0800000, 0x200000, CRC(ccada5f8) SHA1(75ed95bb295780126879d67bba4d0ae1da63c928) ) - ROM_LOAD16_BYTE( "ou1obj3l.6c", 0x0c00001, 0x200000, CRC(5f41b44e) SHA1(3f5376fcd3e15af772df65b8eda4d5ee07ee5664) ) - ROM_LOAD16_BYTE( "ou1obj3u.9c", 0x0c00000, 0x200000, CRC(bc852c8e) SHA1(4863302c45ee16aaf2c36dac07aceaf287959c53) ) - ROM_LOAD16_BYTE( "ou1obj4l.6b", 0x1000001, 0x200000, CRC(99a5f9d7) SHA1(b0f46f4ac357918137031a19c36a56a47b7aefd6) ) - ROM_LOAD16_BYTE( "ou1obj4u.9b", 0x1000000, 0x200000, CRC(70ecaabb) SHA1(521c6849526fb271e6447f6c4f5bfa081f96b91e) ) + ROM_REGION( 0x2000000, "c355spr", 0 ) + ROM_LOAD32_WORD( "ou1obj0l.4c", 0x0000000, 0x200000, CRC(1b4f7184) SHA1(a05d67842fce92f321d1fdd3bd30aa3427775a0c) ) + ROM_LOAD32_WORD( "ou1obj0u.8c", 0x0000002, 0x200000, CRC(d0a69794) SHA1(07d449e54e9971abeb9cd5bb7b372270fafa8bac) ) + ROM_LOAD32_WORD( "ou1obj1l.4b", 0x0400000, 0x200000, CRC(48a93e84) SHA1(6935ec161a12237d4cec732d42070f381c23b47c) ) + ROM_LOAD32_WORD( "ou1obj1u.8b", 0x0400002, 0x200000, CRC(999de386) SHA1(d4780ab1929a3e2c2df464363d6451a2bcecb2a2) ) + ROM_LOAD32_WORD( "ou1obj2l.4a", 0x0800000, 0x200000, CRC(30386cd0) SHA1(3563c5378288da58136f102381373bd6fcaeec21) ) + ROM_LOAD32_WORD( "ou1obj2u.8a", 0x0800002, 0x200000, CRC(ccada5f8) SHA1(75ed95bb295780126879d67bba4d0ae1da63c928) ) + ROM_LOAD32_WORD( "ou1obj3l.6c", 0x0c00000, 0x200000, CRC(5f41b44e) SHA1(3f5376fcd3e15af772df65b8eda4d5ee07ee5664) ) + ROM_LOAD32_WORD( "ou1obj3u.9c", 0x0c00002, 0x200000, CRC(bc852c8e) SHA1(4863302c45ee16aaf2c36dac07aceaf287959c53) ) + ROM_LOAD32_WORD( "ou1obj4l.6b", 0x1000000, 0x200000, CRC(99a5f9d7) SHA1(b0f46f4ac357918137031a19c36a56a47b7aefd6) ) + ROM_LOAD32_WORD( "ou1obj4u.9b", 0x1000002, 0x200000, CRC(70ecaabb) SHA1(521c6849526fb271e6447f6c4f5bfa081f96b91e) ) ROM_REGION( 0x600000, "c169roz", 0 ) ROM_LOAD( "ou1-rot0.3d", 0x000000, 0x200000, CRC(a50c67c8) SHA1(432b8451eb9eaa3078134fce1e5e2d58a8b64be3) ) @@ -1856,17 +1824,17 @@ ROM_START( machbrkr ) /* Defaults to Asia / 4 Player cabinet */ ROM_REGION( 0x200000, "c169roz:mask", 0 ) ROM_LOAD( "mb1_shar.18s", 0, 0x080000, CRC(d9329b10) SHA1(149c8804c07350f47af36bc7902371f1dfbed272) ) - ROM_REGION( 0x2000000, "sprite", 0 ) - ROM_LOAD16_BYTE( "mb1obj0l.4c", 0x0000001, 0x200000, CRC(056e6b1c) SHA1(44e49de80c925c8fbe04bf9328a77a50a305a5a7) ) - ROM_LOAD16_BYTE( "mb1obj0u.8c", 0x0000000, 0x200000, CRC(e19b1714) SHA1(ff43bf3c8e8698934c4057c7b4c72db73929e2af) ) - ROM_LOAD16_BYTE( "mb1obj1l.4b", 0x0400001, 0x200000, CRC(af69f7f1) SHA1(414544ec1a9aaffb751beaf63d937ce78d0cf9c6) ) - ROM_LOAD16_BYTE( "mb1obj1u.8b", 0x0400000, 0x200000, CRC(e8ff9082) SHA1(a8c7feb33f6243f1f3bda00deffa695ac2b19171) ) - ROM_LOAD16_BYTE( "mb1obj2l.4a", 0x0800001, 0x200000, CRC(3a5c7379) SHA1(ffe9a229eb04a894e5f3bb8ac2fc4617b5413ac3) ) - ROM_LOAD16_BYTE( "mb1obj2u.8a", 0x0800000, 0x200000, CRC(b59cf5e0) SHA1(eee7511f117a4c1a24e4187e3f30e4d66f914a81) ) - ROM_LOAD16_BYTE( "mb1obj3l.6c", 0x0c00001, 0x200000, CRC(9a765d58) SHA1(2e9ea0f76f80383fcf093e947e1fe161743e33fb) ) - ROM_LOAD16_BYTE( "mb1obj3u.9c", 0x0c00000, 0x200000, CRC(5329c693) SHA1(955b3b8b9813826347a1211f71fa0a294b759ccd) ) - ROM_LOAD16_BYTE( "mb1obj4l.6b", 0x1000001, 0x200000, CRC(a650b05e) SHA1(b247699433c7bf4b6ae990fc06255cfd48a248dd) ) - ROM_LOAD16_BYTE( "mb1obj4u.9b", 0x1000000, 0x200000, CRC(6d0c37e9) SHA1(3a3feb74b890e0a933dcc791e5eee1fb4bdcbb69) ) + ROM_REGION( 0x2000000, "c355spr", 0 ) + ROM_LOAD32_WORD( "mb1obj0l.4c", 0x0000000, 0x200000, CRC(056e6b1c) SHA1(44e49de80c925c8fbe04bf9328a77a50a305a5a7) ) + ROM_LOAD32_WORD( "mb1obj0u.8c", 0x0000002, 0x200000, CRC(e19b1714) SHA1(ff43bf3c8e8698934c4057c7b4c72db73929e2af) ) + ROM_LOAD32_WORD( "mb1obj1l.4b", 0x0400000, 0x200000, CRC(af69f7f1) SHA1(414544ec1a9aaffb751beaf63d937ce78d0cf9c6) ) + ROM_LOAD32_WORD( "mb1obj1u.8b", 0x0400002, 0x200000, CRC(e8ff9082) SHA1(a8c7feb33f6243f1f3bda00deffa695ac2b19171) ) + ROM_LOAD32_WORD( "mb1obj2l.4a", 0x0800000, 0x200000, CRC(3a5c7379) SHA1(ffe9a229eb04a894e5f3bb8ac2fc4617b5413ac3) ) + ROM_LOAD32_WORD( "mb1obj2u.8a", 0x0800002, 0x200000, CRC(b59cf5e0) SHA1(eee7511f117a4c1a24e4187e3f30e4d66f914a81) ) + ROM_LOAD32_WORD( "mb1obj3l.6c", 0x0c00000, 0x200000, CRC(9a765d58) SHA1(2e9ea0f76f80383fcf093e947e1fe161743e33fb) ) + ROM_LOAD32_WORD( "mb1obj3u.9c", 0x0c00002, 0x200000, CRC(5329c693) SHA1(955b3b8b9813826347a1211f71fa0a294b759ccd) ) + ROM_LOAD32_WORD( "mb1obj4l.6b", 0x1000000, 0x200000, CRC(a650b05e) SHA1(b247699433c7bf4b6ae990fc06255cfd48a248dd) ) + ROM_LOAD32_WORD( "mb1obj4u.9b", 0x1000002, 0x200000, CRC(6d0c37e9) SHA1(3a3feb74b890e0a933dcc791e5eee1fb4bdcbb69) ) ROM_REGION( 0x400000, "c169roz", 0 ) ROM_LOAD( "mb1_rot0.3d", 0x000000, 0x200000, CRC(bc353630) SHA1(2bbddda632298899716394ddcfe51412576ca74a) ) @@ -1902,17 +1870,17 @@ ROM_START( machbrkrj ) ROM_REGION( 0x200000, "c169roz:mask", 0 ) ROM_LOAD( "mb1_shar.18s", 0, 0x080000, CRC(d9329b10) SHA1(149c8804c07350f47af36bc7902371f1dfbed272) ) - ROM_REGION( 0x2000000, "sprite", 0 ) - ROM_LOAD16_BYTE( "mb1obj0l.4c", 0x0000001, 0x200000, CRC(056e6b1c) SHA1(44e49de80c925c8fbe04bf9328a77a50a305a5a7) ) - ROM_LOAD16_BYTE( "mb1obj0u.8c", 0x0000000, 0x200000, CRC(e19b1714) SHA1(ff43bf3c8e8698934c4057c7b4c72db73929e2af) ) - ROM_LOAD16_BYTE( "mb1obj1l.4b", 0x0400001, 0x200000, CRC(af69f7f1) SHA1(414544ec1a9aaffb751beaf63d937ce78d0cf9c6) ) - ROM_LOAD16_BYTE( "mb1obj1u.8b", 0x0400000, 0x200000, CRC(e8ff9082) SHA1(a8c7feb33f6243f1f3bda00deffa695ac2b19171) ) - ROM_LOAD16_BYTE( "mb1obj2l.4a", 0x0800001, 0x200000, CRC(3a5c7379) SHA1(ffe9a229eb04a894e5f3bb8ac2fc4617b5413ac3) ) - ROM_LOAD16_BYTE( "mb1obj2u.8a", 0x0800000, 0x200000, CRC(b59cf5e0) SHA1(eee7511f117a4c1a24e4187e3f30e4d66f914a81) ) - ROM_LOAD16_BYTE( "mb1obj3l.6c", 0x0c00001, 0x200000, CRC(9a765d58) SHA1(2e9ea0f76f80383fcf093e947e1fe161743e33fb) ) - ROM_LOAD16_BYTE( "mb1obj3u.9c", 0x0c00000, 0x200000, CRC(5329c693) SHA1(955b3b8b9813826347a1211f71fa0a294b759ccd) ) - ROM_LOAD16_BYTE( "mb1obj4l.6b", 0x1000001, 0x200000, CRC(a650b05e) SHA1(b247699433c7bf4b6ae990fc06255cfd48a248dd) ) - ROM_LOAD16_BYTE( "mb1obj4u.9b", 0x1000000, 0x200000, CRC(6d0c37e9) SHA1(3a3feb74b890e0a933dcc791e5eee1fb4bdcbb69) ) + ROM_REGION( 0x2000000, "c355spr", 0 ) + ROM_LOAD32_WORD( "mb1obj0l.4c", 0x0000000, 0x200000, CRC(056e6b1c) SHA1(44e49de80c925c8fbe04bf9328a77a50a305a5a7) ) + ROM_LOAD32_WORD( "mb1obj0u.8c", 0x0000002, 0x200000, CRC(e19b1714) SHA1(ff43bf3c8e8698934c4057c7b4c72db73929e2af) ) + ROM_LOAD32_WORD( "mb1obj1l.4b", 0x0400000, 0x200000, CRC(af69f7f1) SHA1(414544ec1a9aaffb751beaf63d937ce78d0cf9c6) ) + ROM_LOAD32_WORD( "mb1obj1u.8b", 0x0400002, 0x200000, CRC(e8ff9082) SHA1(a8c7feb33f6243f1f3bda00deffa695ac2b19171) ) + ROM_LOAD32_WORD( "mb1obj2l.4a", 0x0800000, 0x200000, CRC(3a5c7379) SHA1(ffe9a229eb04a894e5f3bb8ac2fc4617b5413ac3) ) + ROM_LOAD32_WORD( "mb1obj2u.8a", 0x0800002, 0x200000, CRC(b59cf5e0) SHA1(eee7511f117a4c1a24e4187e3f30e4d66f914a81) ) + ROM_LOAD32_WORD( "mb1obj3l.6c", 0x0c00000, 0x200000, CRC(9a765d58) SHA1(2e9ea0f76f80383fcf093e947e1fe161743e33fb) ) + ROM_LOAD32_WORD( "mb1obj3u.9c", 0x0c00002, 0x200000, CRC(5329c693) SHA1(955b3b8b9813826347a1211f71fa0a294b759ccd) ) + ROM_LOAD32_WORD( "mb1obj4l.6b", 0x1000000, 0x200000, CRC(a650b05e) SHA1(b247699433c7bf4b6ae990fc06255cfd48a248dd) ) + ROM_LOAD32_WORD( "mb1obj4u.9b", 0x1000002, 0x200000, CRC(6d0c37e9) SHA1(3a3feb74b890e0a933dcc791e5eee1fb4bdcbb69) ) ROM_REGION( 0x400000, "c169roz", 0 ) ROM_LOAD( "mb1_rot0.3d", 0x000000, 0x200000, CRC(bc353630) SHA1(2bbddda632298899716394ddcfe51412576ca74a) ) diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 0b03529e90e..cb5855b8e58 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -1586,29 +1586,6 @@ static const gfx_layout obj_layout = { 0x800 /* sprite offset */ }; -static const gfx_layout c355_sprite_layout = /* same as Namco System21 */ -{ - 16,16, - RGN_FRAC(1,4), /* number of tiles */ - 8, /* bits per pixel */ - { /* plane offsets */ - 0,1,2,3,4,5,6,7 - }, - { /* x offsets */ - 0*8,RGN_FRAC(1,4)+0*8,RGN_FRAC(2,4)+0*8,RGN_FRAC(3,4)+0*8, - 1*8,RGN_FRAC(1,4)+1*8,RGN_FRAC(2,4)+1*8,RGN_FRAC(3,4)+1*8, - 2*8,RGN_FRAC(1,4)+2*8,RGN_FRAC(2,4)+2*8,RGN_FRAC(3,4)+2*8, - 3*8,RGN_FRAC(1,4)+3*8,RGN_FRAC(2,4)+3*8,RGN_FRAC(3,4)+3*8 - }, - { /* y offsets */ - 0x0*32,0x1*32,0x2*32,0x3*32, - 0x4*32,0x5*32,0x6*32,0x7*32, - 0x8*32,0x9*32,0xa*32,0xb*32, - 0xc*32,0xd*32,0xe*32,0xf*32 - }, - 8*64 /* sprite offset */ -}; - static const gfx_layout metlhawk_sprite_layout = { 32,32, RGN_FRAC(1,1), /* number of sprites */ @@ -1639,10 +1616,6 @@ static GFXDECODE_START( gfx_namcos2 ) GFXDECODE_ENTRY( "sprite", 0x200000, obj_layout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( gfx_c355 ) - GFXDECODE_ENTRY( "sprite", 0x000000, c355_sprite_layout, 0, 16 ) -GFXDECODE_END - /* end */ /****************************************** @@ -2031,15 +2004,13 @@ void namcos2_state::sgunner(machine_config &config) m_screen->set_screen_update(FUNC(namcos2_state::screen_update_sgunner)); m_screen->set_palette(m_c116); - GFXDECODE(config, m_gfxdecode, m_c116, gfx_c355); - NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_c116); m_c355spr->set_scroll_offsets(0x26, 0x19); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr->set_palxor(0x0); - m_c355spr->set_gfxregion(0); + m_c355spr->set_color_base(0); configure_c123tmap_standard(config); @@ -2086,15 +2057,13 @@ void namcos2_state::sgunner2(machine_config &config) m_screen->set_screen_update(FUNC(namcos2_state::screen_update_sgunner)); m_screen->set_palette(m_c116); - GFXDECODE(config, m_gfxdecode, m_c116, gfx_c355); - NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_c116); m_c355spr->set_scroll_offsets(0x26, 0x19); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr->set_palxor(0x0); - m_c355spr->set_gfxregion(0); + m_c355spr->set_color_base(0); configure_c123tmap_standard(config); @@ -2141,15 +2110,13 @@ void namcos2_state::suzuka8h(machine_config &config) m_screen->set_screen_update(FUNC(namcos2_state::screen_update_luckywld)); m_screen->set_palette(m_c116); - GFXDECODE(config, m_gfxdecode, m_c116, gfx_c355); - NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_c116); m_c355spr->set_scroll_offsets(0x26, 0x19); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr->set_palxor(0x0); - m_c355spr->set_gfxregion(0); + m_c355spr->set_color_base(0); configure_c123tmap_standard(config); @@ -4548,15 +4515,15 @@ ROM_START( sgunner ) ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */ ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) ) - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "sn_obj0.8c", 0x000000, 0x80000, CRC(bbae38f7) SHA1(7a40ade13307791f5c5d300882f9a38e18c411d6) ) - ROM_LOAD( "sn_obj1.12c", 0x100000, 0x80000, CRC(4dfacb51) SHA1(1b5ae37f7ee12b791ce80422bd7472aa38c41ddd) ) - ROM_LOAD( "sn_obj2.10c", 0x200000, 0x80000, CRC(313a308f) SHA1(0773a567cf649394cd6fcdd6fba0c4575220a582) ) - ROM_LOAD( "sn_obj3.14c", 0x300000, 0x80000, CRC(d7c340f6) SHA1(4215d9ef38aea2dbf14febedfadd658ce03bbcdf) ) - ROM_LOAD( "sn_obj4.9c", 0x080000, 0x80000, CRC(82fdaa06) SHA1(494cc639bbf4032bb83fc9ad5a1db9dae0d8714b) ) - ROM_LOAD( "sn_obj5.13c", 0x180000, 0x80000, CRC(8700a8a4) SHA1(90909e089405546e9634183969974af4a8cdc9eb) ) - ROM_LOAD( "sn_obj6.11c", 0x280000, 0x80000, CRC(9c6504f7) SHA1(0dc2960ec5b5ce75e06d0f84917286f360e98316) ) - ROM_LOAD( "sn_obj7.15c", 0x380000, 0x80000, CRC(cd1356c0) SHA1(7a21f315442857716eac813adc29cc4f7e28bee8) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "sn_obj0.8c", 0x000000, 0x80000, CRC(bbae38f7) SHA1(7a40ade13307791f5c5d300882f9a38e18c411d6) ) + ROM_LOAD32_BYTE( "sn_obj1.12c", 0x000001, 0x80000, CRC(4dfacb51) SHA1(1b5ae37f7ee12b791ce80422bd7472aa38c41ddd) ) + ROM_LOAD32_BYTE( "sn_obj2.10c", 0x000002, 0x80000, CRC(313a308f) SHA1(0773a567cf649394cd6fcdd6fba0c4575220a582) ) + ROM_LOAD32_BYTE( "sn_obj3.14c", 0x000003, 0x80000, CRC(d7c340f6) SHA1(4215d9ef38aea2dbf14febedfadd658ce03bbcdf) ) + ROM_LOAD32_BYTE( "sn_obj4.9c", 0x200000, 0x80000, CRC(82fdaa06) SHA1(494cc639bbf4032bb83fc9ad5a1db9dae0d8714b) ) + ROM_LOAD32_BYTE( "sn_obj5.13c", 0x200001, 0x80000, CRC(8700a8a4) SHA1(90909e089405546e9634183969974af4a8cdc9eb) ) + ROM_LOAD32_BYTE( "sn_obj6.11c", 0x200002, 0x80000, CRC(9c6504f7) SHA1(0dc2960ec5b5ce75e06d0f84917286f360e98316) ) + ROM_LOAD32_BYTE( "sn_obj7.15c", 0x200003, 0x80000, CRC(cd1356c0) SHA1(7a21f315442857716eac813adc29cc4f7e28bee8) ) ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "sn_chr0.11n", 0x000000, 0x80000, CRC(b433c37b) SHA1(514dcffd0f20faae0f5297b68d8946cfbc54e493) ) @@ -4596,15 +4563,15 @@ ROM_START( sgunnerj ) ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */ ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) ) - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "sn_obj0.8c", 0x000000, 0x80000, CRC(bbae38f7) SHA1(7a40ade13307791f5c5d300882f9a38e18c411d6) ) - ROM_LOAD( "sn_obj1.12c", 0x100000, 0x80000, CRC(4dfacb51) SHA1(1b5ae37f7ee12b791ce80422bd7472aa38c41ddd) ) - ROM_LOAD( "sn_obj2.10c", 0x200000, 0x80000, CRC(313a308f) SHA1(0773a567cf649394cd6fcdd6fba0c4575220a582) ) - ROM_LOAD( "sn_obj3.14c", 0x300000, 0x80000, CRC(d7c340f6) SHA1(4215d9ef38aea2dbf14febedfadd658ce03bbcdf) ) - ROM_LOAD( "sn_obj4.9c", 0x080000, 0x80000, CRC(82fdaa06) SHA1(494cc639bbf4032bb83fc9ad5a1db9dae0d8714b) ) - ROM_LOAD( "sn_obj5.13c", 0x180000, 0x80000, CRC(8700a8a4) SHA1(90909e089405546e9634183969974af4a8cdc9eb) ) - ROM_LOAD( "sn_obj6.11c", 0x280000, 0x80000, CRC(9c6504f7) SHA1(0dc2960ec5b5ce75e06d0f84917286f360e98316) ) - ROM_LOAD( "sn_obj7.15c", 0x380000, 0x80000, CRC(cd1356c0) SHA1(7a21f315442857716eac813adc29cc4f7e28bee8) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "sn_obj0.8c", 0x000000, 0x80000, CRC(bbae38f7) SHA1(7a40ade13307791f5c5d300882f9a38e18c411d6) ) + ROM_LOAD32_BYTE( "sn_obj1.12c", 0x000001, 0x80000, CRC(4dfacb51) SHA1(1b5ae37f7ee12b791ce80422bd7472aa38c41ddd) ) + ROM_LOAD32_BYTE( "sn_obj2.10c", 0x000002, 0x80000, CRC(313a308f) SHA1(0773a567cf649394cd6fcdd6fba0c4575220a582) ) + ROM_LOAD32_BYTE( "sn_obj3.14c", 0x000003, 0x80000, CRC(d7c340f6) SHA1(4215d9ef38aea2dbf14febedfadd658ce03bbcdf) ) + ROM_LOAD32_BYTE( "sn_obj4.9c", 0x200000, 0x80000, CRC(82fdaa06) SHA1(494cc639bbf4032bb83fc9ad5a1db9dae0d8714b) ) + ROM_LOAD32_BYTE( "sn_obj5.13c", 0x200001, 0x80000, CRC(8700a8a4) SHA1(90909e089405546e9634183969974af4a8cdc9eb) ) + ROM_LOAD32_BYTE( "sn_obj6.11c", 0x200002, 0x80000, CRC(9c6504f7) SHA1(0dc2960ec5b5ce75e06d0f84917286f360e98316) ) + ROM_LOAD32_BYTE( "sn_obj7.15c", 0x200003, 0x80000, CRC(cd1356c0) SHA1(7a21f315442857716eac813adc29cc4f7e28bee8) ) ROM_REGION( 0x200000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "sn_chr0.11n", 0x000000, 0x80000, CRC(b433c37b) SHA1(514dcffd0f20faae0f5297b68d8946cfbc54e493) ) @@ -4644,15 +4611,15 @@ ROM_START( sgunner2 ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "sns_obj0.bin", 0x000000, 0x80000, CRC(c762445c) SHA1(108170c9a5c82c23c1ac09f91195137ca05989f4) ) - ROM_LOAD( "sns_obj1.bin", 0x100000, 0x80000, CRC(e9e379d8) SHA1(01b5f5946e746a5265d230273c99a41910fd9e6f) ) - ROM_LOAD( "sns_obj2.bin", 0x200000, 0x80000, CRC(0d076f6c) SHA1(247da0514c3809350ce308334e601f1689a7449f) ) - ROM_LOAD( "sns_obj3.bin", 0x300000, 0x80000, CRC(0fb01e8b) SHA1(50190313da2ab673364e9d94e1b5b03e3c84f57c) ) - ROM_LOAD( "sns_obj4.bin", 0x080000, 0x80000, CRC(0b1be894) SHA1(aaa9fb2f11610458bf685a9124c4889acc63fdc5) ) - ROM_LOAD( "sns_obj5.bin", 0x180000, 0x80000, CRC(416b14e1) SHA1(bb4bc871a9c5ebc28e15a16267dd446f494c922e) ) - ROM_LOAD( "sns_obj6.bin", 0x280000, 0x80000, CRC(c2e94ed2) SHA1(213f57e1a4c8e8ba3c8cbd212431ff7a44d0ffc1) ) - ROM_LOAD( "sns_obj7.bin", 0x380000, 0x80000, CRC(fc1f26af) SHA1(1f0c36587bc9f80a39b49b6fd43d1773b2f49361) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "sns_obj0.bin", 0x000000, 0x80000, CRC(c762445c) SHA1(108170c9a5c82c23c1ac09f91195137ca05989f4) ) + ROM_LOAD32_BYTE( "sns_obj1.bin", 0x000001, 0x80000, CRC(e9e379d8) SHA1(01b5f5946e746a5265d230273c99a41910fd9e6f) ) + ROM_LOAD32_BYTE( "sns_obj2.bin", 0x000002, 0x80000, CRC(0d076f6c) SHA1(247da0514c3809350ce308334e601f1689a7449f) ) + ROM_LOAD32_BYTE( "sns_obj3.bin", 0x000003, 0x80000, CRC(0fb01e8b) SHA1(50190313da2ab673364e9d94e1b5b03e3c84f57c) ) + ROM_LOAD32_BYTE( "sns_obj4.bin", 0x200000, 0x80000, CRC(0b1be894) SHA1(aaa9fb2f11610458bf685a9124c4889acc63fdc5) ) + ROM_LOAD32_BYTE( "sns_obj5.bin", 0x200001, 0x80000, CRC(416b14e1) SHA1(bb4bc871a9c5ebc28e15a16267dd446f494c922e) ) + ROM_LOAD32_BYTE( "sns_obj6.bin", 0x200002, 0x80000, CRC(c2e94ed2) SHA1(213f57e1a4c8e8ba3c8cbd212431ff7a44d0ffc1) ) + ROM_LOAD32_BYTE( "sns_obj7.bin", 0x200003, 0x80000, CRC(fc1f26af) SHA1(1f0c36587bc9f80a39b49b6fd43d1773b2f49361) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "sns_chr0.bin", 0x000000, 0x80000, CRC(cdc42b61) SHA1(20cdd5a81ce4612f9eecd8f057d2e22e5baeb216) ) @@ -4696,15 +4663,15 @@ ROM_START( sgunner2j ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "sns_obj0.bin", 0x000000, 0x80000, CRC(c762445c) SHA1(108170c9a5c82c23c1ac09f91195137ca05989f4) ) - ROM_LOAD( "sns_obj1.bin", 0x100000, 0x80000, CRC(e9e379d8) SHA1(01b5f5946e746a5265d230273c99a41910fd9e6f) ) - ROM_LOAD( "sns_obj2.bin", 0x200000, 0x80000, CRC(0d076f6c) SHA1(247da0514c3809350ce308334e601f1689a7449f) ) - ROM_LOAD( "sns_obj3.bin", 0x300000, 0x80000, CRC(0fb01e8b) SHA1(50190313da2ab673364e9d94e1b5b03e3c84f57c) ) - ROM_LOAD( "sns_obj4.bin", 0x080000, 0x80000, CRC(0b1be894) SHA1(aaa9fb2f11610458bf685a9124c4889acc63fdc5) ) - ROM_LOAD( "sns_obj5.bin", 0x180000, 0x80000, CRC(416b14e1) SHA1(bb4bc871a9c5ebc28e15a16267dd446f494c922e) ) - ROM_LOAD( "sns_obj6.bin", 0x280000, 0x80000, CRC(c2e94ed2) SHA1(213f57e1a4c8e8ba3c8cbd212431ff7a44d0ffc1) ) - ROM_LOAD( "sns_obj7.bin", 0x380000, 0x80000, CRC(fc1f26af) SHA1(1f0c36587bc9f80a39b49b6fd43d1773b2f49361) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "sns_obj0.bin", 0x000000, 0x80000, CRC(c762445c) SHA1(108170c9a5c82c23c1ac09f91195137ca05989f4) ) + ROM_LOAD32_BYTE( "sns_obj1.bin", 0x000001, 0x80000, CRC(e9e379d8) SHA1(01b5f5946e746a5265d230273c99a41910fd9e6f) ) + ROM_LOAD32_BYTE( "sns_obj2.bin", 0x000002, 0x80000, CRC(0d076f6c) SHA1(247da0514c3809350ce308334e601f1689a7449f) ) + ROM_LOAD32_BYTE( "sns_obj3.bin", 0x000003, 0x80000, CRC(0fb01e8b) SHA1(50190313da2ab673364e9d94e1b5b03e3c84f57c) ) + ROM_LOAD32_BYTE( "sns_obj4.bin", 0x200000, 0x80000, CRC(0b1be894) SHA1(aaa9fb2f11610458bf685a9124c4889acc63fdc5) ) + ROM_LOAD32_BYTE( "sns_obj5.bin", 0x200001, 0x80000, CRC(416b14e1) SHA1(bb4bc871a9c5ebc28e15a16267dd446f494c922e) ) + ROM_LOAD32_BYTE( "sns_obj6.bin", 0x200002, 0x80000, CRC(c2e94ed2) SHA1(213f57e1a4c8e8ba3c8cbd212431ff7a44d0ffc1) ) + ROM_LOAD32_BYTE( "sns_obj7.bin", 0x200003, 0x80000, CRC(fc1f26af) SHA1(1f0c36587bc9f80a39b49b6fd43d1773b2f49361) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "sns_chr0.bin", 0x000000, 0x80000, CRC(cdc42b61) SHA1(20cdd5a81ce4612f9eecd8f057d2e22e5baeb216) ) @@ -4920,15 +4887,15 @@ ROM_START( suzuka8h ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "eh1-obj0.bin", 0x000000, 0x80000, CRC(864b6816) SHA1(72d831b631afb2848578bd49cd7d3e12a78644b4) ) - ROM_LOAD( "eh1-obj1.bin", 0x100000, 0x80000, CRC(d4921c35) SHA1(fe1b3997c3298e58919fa5602b94bd121439d5bc) ) - ROM_LOAD( "eh1-obj2.bin", 0x200000, 0x80000, CRC(966d3f19) SHA1(997669cce56350cd7ed02eec0a88696469435490) ) - ROM_LOAD( "eh1-obj3.bin", 0x300000, 0x80000, CRC(7d253cbe) SHA1(8ff32b7807e233dd6ea6454e744bf6efacd27181) ) - ROM_LOAD( "eh1-obj4.bin", 0x080000, 0x80000, CRC(cde13867) SHA1(071d5ea4b11c78d671e30f43d8d09e9b8314a4db) ) - ROM_LOAD( "eh1-obj5.bin", 0x180000, 0x80000, CRC(9f210546) SHA1(a86cb90788a0cf381b73771a9a95b5d876b43f83) ) - ROM_LOAD( "eh1-obj6.bin", 0x280000, 0x80000, CRC(6019fc8c) SHA1(f3eb74fe0df2efbfeeaf4f8b43c93f104009da0b) ) - ROM_LOAD( "eh1-obj7.bin", 0x380000, 0x80000, CRC(0bd966b8) SHA1(70d6b12139b2563a646da7d11c554f2f6ffb3559) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "eh1-obj0.bin", 0x000000, 0x80000, CRC(864b6816) SHA1(72d831b631afb2848578bd49cd7d3e12a78644b4) ) + ROM_LOAD32_BYTE( "eh1-obj1.bin", 0x000001, 0x80000, CRC(d4921c35) SHA1(fe1b3997c3298e58919fa5602b94bd121439d5bc) ) + ROM_LOAD32_BYTE( "eh1-obj2.bin", 0x000002, 0x80000, CRC(966d3f19) SHA1(997669cce56350cd7ed02eec0a88696469435490) ) + ROM_LOAD32_BYTE( "eh1-obj3.bin", 0x000003, 0x80000, CRC(7d253cbe) SHA1(8ff32b7807e233dd6ea6454e744bf6efacd27181) ) + ROM_LOAD32_BYTE( "eh1-obj4.bin", 0x200000, 0x80000, CRC(cde13867) SHA1(071d5ea4b11c78d671e30f43d8d09e9b8314a4db) ) + ROM_LOAD32_BYTE( "eh1-obj5.bin", 0x200001, 0x80000, CRC(9f210546) SHA1(a86cb90788a0cf381b73771a9a95b5d876b43f83) ) + ROM_LOAD32_BYTE( "eh1-obj6.bin", 0x200002, 0x80000, CRC(6019fc8c) SHA1(f3eb74fe0df2efbfeeaf4f8b43c93f104009da0b) ) + ROM_LOAD32_BYTE( "eh1-obj7.bin", 0x200003, 0x80000, CRC(0bd966b8) SHA1(70d6b12139b2563a646da7d11c554f2f6ffb3559) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "eh2-chr0.bin", 0x000000, 0x80000, CRC(b2450fd2) SHA1(4aafb2c96b15e01364eb61ad0a71929c730e30a4) ) @@ -4967,15 +4934,15 @@ ROM_START( suzuka8hj ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "eh1-obj0.bin", 0x000000, 0x80000, CRC(864b6816) SHA1(72d831b631afb2848578bd49cd7d3e12a78644b4) ) - ROM_LOAD( "eh1-obj1.bin", 0x100000, 0x80000, CRC(d4921c35) SHA1(fe1b3997c3298e58919fa5602b94bd121439d5bc) ) - ROM_LOAD( "eh1-obj2.bin", 0x200000, 0x80000, CRC(966d3f19) SHA1(997669cce56350cd7ed02eec0a88696469435490) ) - ROM_LOAD( "eh1-obj3.bin", 0x300000, 0x80000, CRC(7d253cbe) SHA1(8ff32b7807e233dd6ea6454e744bf6efacd27181) ) - ROM_LOAD( "eh1-obj4.bin", 0x080000, 0x80000, CRC(cde13867) SHA1(071d5ea4b11c78d671e30f43d8d09e9b8314a4db) ) - ROM_LOAD( "eh1-obj5.bin", 0x180000, 0x80000, CRC(9f210546) SHA1(a86cb90788a0cf381b73771a9a95b5d876b43f83) ) - ROM_LOAD( "eh1-obj6.bin", 0x280000, 0x80000, CRC(6019fc8c) SHA1(f3eb74fe0df2efbfeeaf4f8b43c93f104009da0b) ) - ROM_LOAD( "eh1-obj7.bin", 0x380000, 0x80000, CRC(0bd966b8) SHA1(70d6b12139b2563a646da7d11c554f2f6ffb3559) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "eh1-obj0.bin", 0x000000, 0x80000, CRC(864b6816) SHA1(72d831b631afb2848578bd49cd7d3e12a78644b4) ) + ROM_LOAD32_BYTE( "eh1-obj1.bin", 0x000001, 0x80000, CRC(d4921c35) SHA1(fe1b3997c3298e58919fa5602b94bd121439d5bc) ) + ROM_LOAD32_BYTE( "eh1-obj2.bin", 0x000002, 0x80000, CRC(966d3f19) SHA1(997669cce56350cd7ed02eec0a88696469435490) ) + ROM_LOAD32_BYTE( "eh1-obj3.bin", 0x000003, 0x80000, CRC(7d253cbe) SHA1(8ff32b7807e233dd6ea6454e744bf6efacd27181) ) + ROM_LOAD32_BYTE( "eh1-obj4.bin", 0x200000, 0x80000, CRC(cde13867) SHA1(071d5ea4b11c78d671e30f43d8d09e9b8314a4db) ) + ROM_LOAD32_BYTE( "eh1-obj5.bin", 0x200001, 0x80000, CRC(9f210546) SHA1(a86cb90788a0cf381b73771a9a95b5d876b43f83) ) + ROM_LOAD32_BYTE( "eh1-obj6.bin", 0x200002, 0x80000, CRC(6019fc8c) SHA1(f3eb74fe0df2efbfeeaf4f8b43c93f104009da0b) ) + ROM_LOAD32_BYTE( "eh1-obj7.bin", 0x200003, 0x80000, CRC(0bd966b8) SHA1(70d6b12139b2563a646da7d11c554f2f6ffb3559) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "eh1-chr0.bin", 0x000000, 0x80000, CRC(bc90ebef) SHA1(592ca134cc018e87214f72a97979cbf9425cfffd) ) @@ -5014,15 +4981,15 @@ ROM_START( suzuk8h2 ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "ehs1-obj0.3p", 0x000000, 0x80000, CRC(a0acf307) SHA1(6d79d2dd00da4f8f0462245f42a9d88b6ad632b1) ) - ROM_LOAD( "ehs1-obj1.3w", 0x100000, 0x80000, CRC(ca780b44) SHA1(d16263851c165f5958b0a2ad1ba199058a8d56d5) ) - ROM_LOAD( "ehs1-obj2.3t", 0x200000, 0x80000, CRC(83b45afe) SHA1(10a4b88b36f8d037cbb611cb273613b1d45e8eb5) ) - ROM_LOAD( "ehs1-obj3.3y", 0x300000, 0x80000, CRC(360c03a8) SHA1(969b1a96833ab2db3d610a2b3793fc1e038b24d8) ) - ROM_LOAD( "ehs1-obj4.3s", 0x080000, 0x80000, CRC(4e503ca5) SHA1(248af1cba2cad2b6e3c53c7c7673165789c5f4d5) ) - ROM_LOAD( "ehs1-obj5.3x", 0x180000, 0x80000, CRC(5405f2d9) SHA1(c2b592abf72f4de22a3863909be579820c8fe5b1) ) - ROM_LOAD( "ehs1-obj6.3j", 0x280000, 0x80000, CRC(f5fc8b23) SHA1(d7cd4596cd6991db72c371d835051cc8001f30b3) ) - ROM_LOAD( "ehs1-obj7.3z", 0x380000, 0x80000, CRC(da6bf51b) SHA1(b9b49b983f76989067c4763fd88bfa11bbf5d064) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "ehs1-obj0.3p", 0x000000, 0x80000, CRC(a0acf307) SHA1(6d79d2dd00da4f8f0462245f42a9d88b6ad632b1) ) + ROM_LOAD32_BYTE( "ehs1-obj1.3w", 0x000001, 0x80000, CRC(ca780b44) SHA1(d16263851c165f5958b0a2ad1ba199058a8d56d5) ) + ROM_LOAD32_BYTE( "ehs1-obj2.3t", 0x000002, 0x80000, CRC(83b45afe) SHA1(10a4b88b36f8d037cbb611cb273613b1d45e8eb5) ) + ROM_LOAD32_BYTE( "ehs1-obj3.3y", 0x000003, 0x80000, CRC(360c03a8) SHA1(969b1a96833ab2db3d610a2b3793fc1e038b24d8) ) + ROM_LOAD32_BYTE( "ehs1-obj4.3s", 0x200000, 0x80000, CRC(4e503ca5) SHA1(248af1cba2cad2b6e3c53c7c7673165789c5f4d5) ) + ROM_LOAD32_BYTE( "ehs1-obj5.3x", 0x200001, 0x80000, CRC(5405f2d9) SHA1(c2b592abf72f4de22a3863909be579820c8fe5b1) ) + ROM_LOAD32_BYTE( "ehs1-obj6.3j", 0x200002, 0x80000, CRC(f5fc8b23) SHA1(d7cd4596cd6991db72c371d835051cc8001f30b3) ) + ROM_LOAD32_BYTE( "ehs1-obj7.3z", 0x200003, 0x80000, CRC(da6bf51b) SHA1(b9b49b983f76989067c4763fd88bfa11bbf5d064) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "ehs1-chr0.11n", 0x000000, 0x80000, CRC(844efe0d) SHA1(032a2d268bbab60706d911ab42206b5329e1abba) ) @@ -5067,15 +5034,15 @@ ROM_START( suzuk8h2j ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "ehs1-obj0.3p", 0x000000, 0x80000, CRC(a0acf307) SHA1(6d79d2dd00da4f8f0462245f42a9d88b6ad632b1) ) - ROM_LOAD( "ehs1-obj1.3w", 0x100000, 0x80000, CRC(ca780b44) SHA1(d16263851c165f5958b0a2ad1ba199058a8d56d5) ) - ROM_LOAD( "ehs1-obj2.3t", 0x200000, 0x80000, CRC(83b45afe) SHA1(10a4b88b36f8d037cbb611cb273613b1d45e8eb5) ) - ROM_LOAD( "ehs1-obj3.3y", 0x300000, 0x80000, CRC(360c03a8) SHA1(969b1a96833ab2db3d610a2b3793fc1e038b24d8) ) - ROM_LOAD( "ehs1-obj4.3s", 0x080000, 0x80000, CRC(4e503ca5) SHA1(248af1cba2cad2b6e3c53c7c7673165789c5f4d5) ) - ROM_LOAD( "ehs1-obj5.3x", 0x180000, 0x80000, CRC(5405f2d9) SHA1(c2b592abf72f4de22a3863909be579820c8fe5b1) ) - ROM_LOAD( "ehs1-obj6.3j", 0x280000, 0x80000, CRC(f5fc8b23) SHA1(d7cd4596cd6991db72c371d835051cc8001f30b3) ) - ROM_LOAD( "ehs1-obj7.3z", 0x380000, 0x80000, CRC(da6bf51b) SHA1(b9b49b983f76989067c4763fd88bfa11bbf5d064) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "ehs1-obj0.3p", 0x000000, 0x80000, CRC(a0acf307) SHA1(6d79d2dd00da4f8f0462245f42a9d88b6ad632b1) ) + ROM_LOAD32_BYTE( "ehs1-obj1.3w", 0x000001, 0x80000, CRC(ca780b44) SHA1(d16263851c165f5958b0a2ad1ba199058a8d56d5) ) + ROM_LOAD32_BYTE( "ehs1-obj2.3t", 0x000002, 0x80000, CRC(83b45afe) SHA1(10a4b88b36f8d037cbb611cb273613b1d45e8eb5) ) + ROM_LOAD32_BYTE( "ehs1-obj3.3y", 0x000003, 0x80000, CRC(360c03a8) SHA1(969b1a96833ab2db3d610a2b3793fc1e038b24d8) ) + ROM_LOAD32_BYTE( "ehs1-obj4.3s", 0x200000, 0x80000, CRC(4e503ca5) SHA1(248af1cba2cad2b6e3c53c7c7673165789c5f4d5) ) + ROM_LOAD32_BYTE( "ehs1-obj5.3x", 0x200001, 0x80000, CRC(5405f2d9) SHA1(c2b592abf72f4de22a3863909be579820c8fe5b1) ) + ROM_LOAD32_BYTE( "ehs1-obj6.3j", 0x200002, 0x80000, CRC(f5fc8b23) SHA1(d7cd4596cd6991db72c371d835051cc8001f30b3) ) + ROM_LOAD32_BYTE( "ehs1-obj7.3z", 0x200003, 0x80000, CRC(da6bf51b) SHA1(b9b49b983f76989067c4763fd88bfa11bbf5d064) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */ ROM_LOAD( "ehs1-chr0.11n", 0x000000, 0x80000, CRC(844efe0d) SHA1(032a2d268bbab60706d911ab42206b5329e1abba) ) @@ -5516,16 +5483,15 @@ ROM_START( luckywld ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "lw1obj0.3p", 0x000000, 0x80000, CRC(21485830) SHA1(e55a1f6df90c17b9c49e2b08c423b9be86996659) ) - ROM_LOAD( "lw1obj1.3w", 0x100000, 0x80000, CRC(d6437a82) SHA1(0aad3242828ed7dce65db75cad196c44ddd55ba8) ) - ROM_LOAD( "lw1obj2.3t", 0x200000, 0x80000, CRC(ceb6f516) SHA1(943dfe3bcf71a4885ce0ff33aaf81b2a49cf0b70) ) - ROM_LOAD( "lw1obj3.3y", 0x300000, 0x80000, CRC(5d32c7e9) SHA1(d684b68afaeacbbc734d55c1a970dc94f3459972) ) - - ROM_LOAD( "lw1obj4.3s", 0x080000, 0x80000, CRC(0050458a) SHA1(605ea055b1934f83ca5ffaa532d0ae85ca56aefa) ) - ROM_LOAD( "lw1obj5.3x", 0x180000, 0x80000, CRC(cbc08f46) SHA1(2ece63a0544b39439255f0e0866a8675b3466643) ) - ROM_LOAD( "lw1obj6.3u", 0x280000, 0x80000, CRC(29740c88) SHA1(4078a5084256653a9c8ff72a7e2c652b0fbca425) ) - ROM_LOAD( "lw1obj7.3z", 0x380000, 0x80000, CRC(8cbd62b4) SHA1(c6605ae2629b34f036e440573b2bb68e26aced9b) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "lw1obj0.3p", 0x000000, 0x80000, CRC(21485830) SHA1(e55a1f6df90c17b9c49e2b08c423b9be86996659) ) + ROM_LOAD32_BYTE( "lw1obj1.3w", 0x000001, 0x80000, CRC(d6437a82) SHA1(0aad3242828ed7dce65db75cad196c44ddd55ba8) ) + ROM_LOAD32_BYTE( "lw1obj2.3t", 0x000002, 0x80000, CRC(ceb6f516) SHA1(943dfe3bcf71a4885ce0ff33aaf81b2a49cf0b70) ) + ROM_LOAD32_BYTE( "lw1obj3.3y", 0x000003, 0x80000, CRC(5d32c7e9) SHA1(d684b68afaeacbbc734d55c1a970dc94f3459972) ) + ROM_LOAD32_BYTE( "lw1obj4.3s", 0x200000, 0x80000, CRC(0050458a) SHA1(605ea055b1934f83ca5ffaa532d0ae85ca56aefa) ) + ROM_LOAD32_BYTE( "lw1obj5.3x", 0x200001, 0x80000, CRC(cbc08f46) SHA1(2ece63a0544b39439255f0e0866a8675b3466643) ) + ROM_LOAD32_BYTE( "lw1obj6.3u", 0x200002, 0x80000, CRC(29740c88) SHA1(4078a5084256653a9c8ff72a7e2c652b0fbca425) ) + ROM_LOAD32_BYTE( "lw1obj7.3z", 0x200003, 0x80000, CRC(8cbd62b4) SHA1(c6605ae2629b34f036e440573b2bb68e26aced9b) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* 8x8 Tiles */ ROM_LOAD( "lw1chr0.11n", 0x000000, 0x80000, CRC(a0da15fd) SHA1(d772f712f0c150fdeb5aafb84f27a1495ad3492c) ) @@ -5579,16 +5545,15 @@ ROM_START( luckywldj ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */ - ROM_LOAD( "lw1obj0.3p", 0x000000, 0x80000, CRC(21485830) SHA1(e55a1f6df90c17b9c49e2b08c423b9be86996659) ) - ROM_LOAD( "lw1obj1.3w", 0x100000, 0x80000, CRC(d6437a82) SHA1(0aad3242828ed7dce65db75cad196c44ddd55ba8) ) - ROM_LOAD( "lw1obj2.3t", 0x200000, 0x80000, CRC(ceb6f516) SHA1(943dfe3bcf71a4885ce0ff33aaf81b2a49cf0b70) ) - ROM_LOAD( "lw1obj3.3y", 0x300000, 0x80000, CRC(5d32c7e9) SHA1(d684b68afaeacbbc734d55c1a970dc94f3459972) ) - - ROM_LOAD( "lw1obj4.3s", 0x080000, 0x80000, CRC(0050458a) SHA1(605ea055b1934f83ca5ffaa532d0ae85ca56aefa) ) - ROM_LOAD( "lw1obj5.3x", 0x180000, 0x80000, CRC(cbc08f46) SHA1(2ece63a0544b39439255f0e0866a8675b3466643) ) - ROM_LOAD( "lw1obj6.3u", 0x280000, 0x80000, CRC(29740c88) SHA1(4078a5084256653a9c8ff72a7e2c652b0fbca425) ) - ROM_LOAD( "lw1obj7.3z", 0x380000, 0x80000, CRC(8cbd62b4) SHA1(c6605ae2629b34f036e440573b2bb68e26aced9b) ) + ROM_REGION( 0x400000, "c355spr", 0 ) /* Sprites */ + ROM_LOAD32_BYTE( "lw1obj0.3p", 0x000000, 0x80000, CRC(21485830) SHA1(e55a1f6df90c17b9c49e2b08c423b9be86996659) ) + ROM_LOAD32_BYTE( "lw1obj1.3w", 0x000001, 0x80000, CRC(d6437a82) SHA1(0aad3242828ed7dce65db75cad196c44ddd55ba8) ) + ROM_LOAD32_BYTE( "lw1obj2.3t", 0x000002, 0x80000, CRC(ceb6f516) SHA1(943dfe3bcf71a4885ce0ff33aaf81b2a49cf0b70) ) + ROM_LOAD32_BYTE( "lw1obj3.3y", 0x000003, 0x80000, CRC(5d32c7e9) SHA1(d684b68afaeacbbc734d55c1a970dc94f3459972) ) + ROM_LOAD32_BYTE( "lw1obj4.3s", 0x200000, 0x80000, CRC(0050458a) SHA1(605ea055b1934f83ca5ffaa532d0ae85ca56aefa) ) + ROM_LOAD32_BYTE( "lw1obj5.3x", 0x200001, 0x80000, CRC(cbc08f46) SHA1(2ece63a0544b39439255f0e0866a8675b3466643) ) + ROM_LOAD32_BYTE( "lw1obj6.3u", 0x200002, 0x80000, CRC(29740c88) SHA1(4078a5084256653a9c8ff72a7e2c652b0fbca425) ) + ROM_LOAD32_BYTE( "lw1obj7.3z", 0x200003, 0x80000, CRC(8cbd62b4) SHA1(c6605ae2629b34f036e440573b2bb68e26aced9b) ) ROM_REGION( 0x400000, "c123tmap", 0 ) /* 8x8 Tiles */ ROM_LOAD( "lw1chr0.11n", 0x000000, 0x80000, CRC(a0da15fd) SHA1(d772f712f0c150fdeb5aafb84f27a1495ad3492c) ) diff --git a/src/mame/drivers/namcos21_c67.cpp b/src/mame/drivers/namcos21_c67.cpp index 51cee217c0c..7002266c248 100644 --- a/src/mame/drivers/namcos21_c67.cpp +++ b/src/mame/drivers/namcos21_c67.cpp @@ -678,34 +678,6 @@ static INPUT_PORTS_START( aircomb ) INPUT_PORTS_END -static const gfx_layout tile_layout = -{ - 16,16, - RGN_FRAC(1,4), /* number of tiles */ - 8, /* bits per pixel */ - { /* plane offsets */ - 0,1,2,3,4,5,6,7 - }, - { /* x offsets */ - 0*8,RGN_FRAC(1,4)+0*8,RGN_FRAC(2,4)+0*8,RGN_FRAC(3,4)+0*8, - 1*8,RGN_FRAC(1,4)+1*8,RGN_FRAC(2,4)+1*8,RGN_FRAC(3,4)+1*8, - 2*8,RGN_FRAC(1,4)+2*8,RGN_FRAC(2,4)+2*8,RGN_FRAC(3,4)+2*8, - 3*8,RGN_FRAC(1,4)+3*8,RGN_FRAC(2,4)+3*8,RGN_FRAC(3,4)+3*8 - }, - { /* y offsets */ - 0*32,1*32,2*32,3*32, - 4*32,5*32,6*32,7*32, - 8*32,9*32,10*32,11*32, - 12*32,13*32,14*32,15*32 - }, - 8*64 /* sprite offset */ -}; - -static GFXDECODE_START( gfx_namcos21 ) - GFXDECODE_ENTRY( "gfx1", 0x000000, tile_layout, 0x1000, 0x10 ) -GFXDECODE_END - - WRITE8_MEMBER( namcos21_c67_state::sound_bankselect_w ) { m_audiobank->set_entry(data>>4); @@ -843,16 +815,15 @@ void namcos21_c67_state::namcos21(machine_config &config) configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - GFXDECODE(config, "gfxdecode", m_palette, gfx_namcos21); PALETTE(config, m_palette).set_format(palette_device::xBRG_888, NAMCOS21_NUM_COLORS); NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_palette); m_c355spr->set_scroll_offsets(0x26, 0x19); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr->set_palxor(0xf); // reverse mapping - m_c355spr->set_gfxregion(0); + m_c355spr->set_color_base(0x1000); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -911,11 +882,11 @@ ROM_START( starblad ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x200000, "gfx1", 0 ) /* sprites */ - ROM_LOAD( "st1-obj0.bin", 0x000000, 0x80000, CRC(5d42c71e) SHA1(f1aa2bb31bbbcdcac8e94334b1c78238cac1a0e7) ) - ROM_LOAD( "st1-obj1.bin", 0x080000, 0x80000, CRC(c98011ad) SHA1(bc34c21428e0ef5887051c0eb0fdef5397823a82) ) - ROM_LOAD( "st1-obj2.bin", 0x100000, 0x80000, CRC(6cf5b608) SHA1(c8537fbe97677c4c8a365b1cf86c4645db7a7d6b) ) - ROM_LOAD( "st1-obj3.bin", 0x180000, 0x80000, CRC(cdc195bb) SHA1(91443917a6982c286b6f15381d441d061aefb138) ) + ROM_REGION( 0x200000, "c355spr", 0 ) /* sprites */ + ROM_LOAD32_BYTE( "st1-obj0.bin", 0x000000, 0x80000, CRC(5d42c71e) SHA1(f1aa2bb31bbbcdcac8e94334b1c78238cac1a0e7) ) + ROM_LOAD32_BYTE( "st1-obj1.bin", 0x000001, 0x80000, CRC(c98011ad) SHA1(bc34c21428e0ef5887051c0eb0fdef5397823a82) ) + ROM_LOAD32_BYTE( "st1-obj2.bin", 0x000002, 0x80000, CRC(6cf5b608) SHA1(c8537fbe97677c4c8a365b1cf86c4645db7a7d6b) ) + ROM_LOAD32_BYTE( "st1-obj3.bin", 0x000003, 0x80000, CRC(cdc195bb) SHA1(91443917a6982c286b6f15381d441d061aefb138) ) ROM_REGION16_BE( 0x100000, "data", 0 ) ROM_LOAD16_BYTE( "st1-data-u.bin", 0x000000, 0x20000, CRC(2433e911) SHA1(95f5f00d3bacda4996e055a443311fb9f9a5fe2f) ) @@ -956,11 +927,11 @@ ROM_START( starbladj ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x200000, "gfx1", 0 ) /* sprites */ - ROM_LOAD( "st1-obj0.bin", 0x000000, 0x80000, CRC(5d42c71e) SHA1(f1aa2bb31bbbcdcac8e94334b1c78238cac1a0e7) ) - ROM_LOAD( "st1-obj1.bin", 0x080000, 0x80000, CRC(c98011ad) SHA1(bc34c21428e0ef5887051c0eb0fdef5397823a82) ) - ROM_LOAD( "st1-obj2.bin", 0x100000, 0x80000, CRC(6cf5b608) SHA1(c8537fbe97677c4c8a365b1cf86c4645db7a7d6b) ) - ROM_LOAD( "st1-obj3.bin", 0x180000, 0x80000, CRC(cdc195bb) SHA1(91443917a6982c286b6f15381d441d061aefb138) ) + ROM_REGION( 0x200000, "c355spr", 0 ) /* sprites */ + ROM_LOAD32_BYTE( "st1-obj0.bin", 0x000000, 0x80000, CRC(5d42c71e) SHA1(f1aa2bb31bbbcdcac8e94334b1c78238cac1a0e7) ) + ROM_LOAD32_BYTE( "st1-obj1.bin", 0x000001, 0x80000, CRC(c98011ad) SHA1(bc34c21428e0ef5887051c0eb0fdef5397823a82) ) + ROM_LOAD32_BYTE( "st1-obj2.bin", 0x000002, 0x80000, CRC(6cf5b608) SHA1(c8537fbe97677c4c8a365b1cf86c4645db7a7d6b) ) + ROM_LOAD32_BYTE( "st1-obj3.bin", 0x000003, 0x80000, CRC(cdc195bb) SHA1(91443917a6982c286b6f15381d441d061aefb138) ) ROM_REGION16_BE( 0x100000, "data", 0 ) ROM_LOAD16_BYTE( "st1-data-u.bin", 0x000000, 0x20000, CRC(2433e911) SHA1(95f5f00d3bacda4996e055a443311fb9f9a5fe2f) ) @@ -1001,15 +972,15 @@ ROM_START( solvalou ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "gfx1", 0 ) - ROM_LOAD( "sv1-obj0.bin", 0x000000, 0x80000, CRC(773798bb) SHA1(51ab76c95030bab834f1a74ae677b2f0afc18c52) ) - ROM_LOAD( "sv1-obj4.bin", 0x080000, 0x80000, CRC(33a008a7) SHA1(4959a0ac24ad64f1367e2d8d63d39a0273c60f3e) ) - ROM_LOAD( "sv1-obj1.bin", 0x100000, 0x80000, CRC(a36d9e79) SHA1(928d9995e97ee7509e23e6cc64f5e7bfb5c02d42) ) - ROM_LOAD( "sv1-obj5.bin", 0x180000, 0x80000, CRC(31551245) SHA1(385452ea4830c466263ad5241313ac850dfef756) ) - ROM_LOAD( "sv1-obj2.bin", 0x200000, 0x80000, CRC(c8672b8a) SHA1(8da037b27d2c2b178aab202781f162371458f788) ) - ROM_LOAD( "sv1-obj6.bin", 0x280000, 0x80000, CRC(fe319530) SHA1(8f7e46c8f0b86c7515f6d763b795ce07d11c77bc) ) - ROM_LOAD( "sv1-obj3.bin", 0x300000, 0x80000, CRC(293ef1c5) SHA1(f677883bfec16bbaeb0a01ac565d0e6cac679174) ) - ROM_LOAD( "sv1-obj7.bin", 0x380000, 0x80000, CRC(95ed6dcb) SHA1(931706ce3fea630823ce0c79febec5eec0cc623d) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_BYTE( "sv1-obj0.bin", 0x000000, 0x80000, CRC(773798bb) SHA1(51ab76c95030bab834f1a74ae677b2f0afc18c52) ) + ROM_LOAD32_BYTE( "sv1-obj1.bin", 0x000001, 0x80000, CRC(a36d9e79) SHA1(928d9995e97ee7509e23e6cc64f5e7bfb5c02d42) ) + ROM_LOAD32_BYTE( "sv1-obj2.bin", 0x000002, 0x80000, CRC(c8672b8a) SHA1(8da037b27d2c2b178aab202781f162371458f788) ) + ROM_LOAD32_BYTE( "sv1-obj3.bin", 0x000003, 0x80000, CRC(293ef1c5) SHA1(f677883bfec16bbaeb0a01ac565d0e6cac679174) ) + ROM_LOAD32_BYTE( "sv1-obj4.bin", 0x200000, 0x80000, CRC(33a008a7) SHA1(4959a0ac24ad64f1367e2d8d63d39a0273c60f3e) ) + ROM_LOAD32_BYTE( "sv1-obj5.bin", 0x200001, 0x80000, CRC(31551245) SHA1(385452ea4830c466263ad5241313ac850dfef756) ) + ROM_LOAD32_BYTE( "sv1-obj6.bin", 0x200002, 0x80000, CRC(fe319530) SHA1(8f7e46c8f0b86c7515f6d763b795ce07d11c77bc) ) + ROM_LOAD32_BYTE( "sv1-obj7.bin", 0x200003, 0x80000, CRC(95ed6dcb) SHA1(931706ce3fea630823ce0c79febec5eec0cc623d) ) ROM_REGION16_BE( 0x100000, "data", 0 ) ROM_LOAD16_BYTE( "sv1-data-u.bin", 0x000000, 0x80000, CRC(2e561996) SHA1(982158481e5649f21d5c2816fdc80cb725ed1419) ) @@ -1045,15 +1016,15 @@ ROM_START( aircomb ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "gfx1", 0 ) - ROM_LOAD( "ac2-obj0.5s", 0x000000, 0x80000, CRC(8327ff22) SHA1(16f6022dedb7a74590898bc8ed3e8a97993c4635) ) - ROM_LOAD( "ac2-obj4.4s", 0x080000, 0x80000, CRC(e433e344) SHA1(98ade550cf066fcb5c09fa905f441a1464d4d625) ) - ROM_LOAD( "ac2-obj1.5x", 0x100000, 0x80000, CRC(43af566d) SHA1(99f0d9f005e28040f5cc10de2198893946a31d09) ) - ROM_LOAD( "ac2-obj5.4x", 0x180000, 0x80000, CRC(ecb19199) SHA1(8e0aa1bc1141c4b09576ab08970d0c7629560643) ) - ROM_LOAD( "ac2-obj2.3s", 0x200000, 0x80000, CRC(dafbf489) SHA1(c53ccb3e1b4a6a660bd28c8abe52ccc3f85d111f) ) - ROM_LOAD( "ac2-obj6.2s", 0x280000, 0x80000, CRC(24cc3f36) SHA1(e50af176eb3034c9cab7613ca614f5cc2c62f95e) ) - ROM_LOAD( "ac2-obj3.3x", 0x300000, 0x80000, CRC(bd555a1d) SHA1(96e432b30da6f5f7ccb768c516b1f7186bc0d4c9) ) - ROM_LOAD( "ac2-obj7.2x", 0x380000, 0x80000, CRC(d561fbe3) SHA1(a23976e10bddf74d4a6b292f044dfd0affbab101) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_BYTE( "ac2-obj0.5s", 0x000000, 0x80000, CRC(8327ff22) SHA1(16f6022dedb7a74590898bc8ed3e8a97993c4635) ) + ROM_LOAD32_BYTE( "ac2-obj1.5x", 0x000001, 0x80000, CRC(43af566d) SHA1(99f0d9f005e28040f5cc10de2198893946a31d09) ) + ROM_LOAD32_BYTE( "ac2-obj2.3s", 0x000002, 0x80000, CRC(dafbf489) SHA1(c53ccb3e1b4a6a660bd28c8abe52ccc3f85d111f) ) + ROM_LOAD32_BYTE( "ac2-obj3.3x", 0x000003, 0x80000, CRC(bd555a1d) SHA1(96e432b30da6f5f7ccb768c516b1f7186bc0d4c9) ) + ROM_LOAD32_BYTE( "ac2-obj4.4s", 0x200000, 0x80000, CRC(e433e344) SHA1(98ade550cf066fcb5c09fa905f441a1464d4d625) ) + ROM_LOAD32_BYTE( "ac2-obj5.4x", 0x200001, 0x80000, CRC(ecb19199) SHA1(8e0aa1bc1141c4b09576ab08970d0c7629560643) ) + ROM_LOAD32_BYTE( "ac2-obj6.2s", 0x200002, 0x80000, CRC(24cc3f36) SHA1(e50af176eb3034c9cab7613ca614f5cc2c62f95e) ) + ROM_LOAD32_BYTE( "ac2-obj7.2x", 0x200003, 0x80000, CRC(d561fbe3) SHA1(a23976e10bddf74d4a6b292f044dfd0affbab101) ) ROM_REGION16_BE( 0x100000, "data", 0 ) /* collision */ ROM_LOAD16_BYTE( "ac1-data-u.3a", 0x000000, 0x80000, CRC(82320c71) SHA1(2be98d46853febb46e1cc728af2735c0e00ce303) ) @@ -1098,15 +1069,15 @@ ROM_START( aircombj ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "gfx1", 0 ) - ROM_LOAD( "ac1-obj0.5s", 0x000000, 0x80000, CRC(d2310c6a) SHA1(9bb8fdfc2c232574777248f4959975f9a20e3105) ) - ROM_LOAD( "ac1-obj4.4s", 0x080000, 0x80000, CRC(0c93b478) SHA1(a92ffbcf04b64e0eee5bcf37008e247700641b25) ) - ROM_LOAD( "ac1-obj1.5x", 0x100000, 0x80000, CRC(f5783a77) SHA1(0be1815ceb4ce4fa7ab75ba588e090f20ee0cac9) ) - ROM_LOAD( "ac1-obj5.4x", 0x180000, 0x80000, CRC(476aed15) SHA1(0e53fdf02e8ffe7852a1fa8bd2f64d0e58f3dc09) ) - ROM_LOAD( "ac1-obj2.3s", 0x200000, 0x80000, CRC(01343d5c) SHA1(64171fed1d1f8682b3d70d3233ea017719f4cc63) ) - ROM_LOAD( "ac1-obj6.2s", 0x280000, 0x80000, CRC(c67607b1) SHA1(df64ea7920cf64271fe742d3d0a57f842ee61e8d) ) - ROM_LOAD( "ac1-obj3.3x", 0x300000, 0x80000, CRC(7717f52e) SHA1(be1df3f4d0fdcaa5d3c81a724e5eb9d14136c6f5) ) - ROM_LOAD( "ac1-obj7.2x", 0x380000, 0x80000, CRC(cfa9fe5f) SHA1(0da25663b89d653c87ed32d15f7c82f3035702ab) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_BYTE( "ac1-obj0.5s", 0x000000, 0x80000, CRC(d2310c6a) SHA1(9bb8fdfc2c232574777248f4959975f9a20e3105) ) + ROM_LOAD32_BYTE( "ac1-obj1.5x", 0x000001, 0x80000, CRC(f5783a77) SHA1(0be1815ceb4ce4fa7ab75ba588e090f20ee0cac9) ) + ROM_LOAD32_BYTE( "ac1-obj2.3s", 0x000002, 0x80000, CRC(01343d5c) SHA1(64171fed1d1f8682b3d70d3233ea017719f4cc63) ) + ROM_LOAD32_BYTE( "ac1-obj3.3x", 0x000003, 0x80000, CRC(7717f52e) SHA1(be1df3f4d0fdcaa5d3c81a724e5eb9d14136c6f5) ) + ROM_LOAD32_BYTE( "ac1-obj4.4s", 0x200000, 0x80000, CRC(0c93b478) SHA1(a92ffbcf04b64e0eee5bcf37008e247700641b25) ) + ROM_LOAD32_BYTE( "ac1-obj5.4x", 0x200001, 0x80000, CRC(476aed15) SHA1(0e53fdf02e8ffe7852a1fa8bd2f64d0e58f3dc09) ) + ROM_LOAD32_BYTE( "ac1-obj6.2s", 0x200002, 0x80000, CRC(c67607b1) SHA1(df64ea7920cf64271fe742d3d0a57f842ee61e8d) ) + ROM_LOAD32_BYTE( "ac1-obj7.2x", 0x200003, 0x80000, CRC(cfa9fe5f) SHA1(0da25663b89d653c87ed32d15f7c82f3035702ab) ) ROM_REGION16_BE( 0x100000, "data", 0 ) ROM_LOAD16_BYTE( "ac1-data-u.3a", 0x000000, 0x80000, CRC(82320c71) SHA1(2be98d46853febb46e1cc728af2735c0e00ce303) ) @@ -1151,15 +1122,15 @@ ROM_START( cybsled ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "gfx1", 0 ) - ROM_LOAD( "cy1-obj0.5s", 0x000000, 0x80000, CRC(5ae542d5) SHA1(99b1a3ed476da4a97cb864538909d7b831f0fd3b) ) - ROM_LOAD( "cy1-obj4.4s", 0x080000, 0x80000, CRC(57904076) SHA1(b1dc0d99543bc4b9584b37ffc12c6ebc59e30e3b) ) - ROM_LOAD( "cy1-obj1.5x", 0x100000, 0x80000, CRC(4aae3eff) SHA1(c80240bd2f4228a0261a14adb6b10560b31b5aa0) ) - ROM_LOAD( "cy1-obj5.4x", 0x180000, 0x80000, CRC(0e11ca47) SHA1(076a9a4cfddbee2d8aaa06110333090d8fdbefeb) ) - ROM_LOAD( "cy1-obj2.3s", 0x200000, 0x80000, CRC(d64ec4c3) SHA1(0bed1cafc21ed8cef3850fb81e30076977086eb0) ) - ROM_LOAD( "cy1-obj6.2s", 0x280000, 0x80000, CRC(7748b485) SHA1(adb4da419a6cdbefd0fef182d866a3479be379af) ) - ROM_LOAD( "cy1-obj3.3x", 0x300000, 0x80000, CRC(3d1f7168) SHA1(392dddcc79fe61dcc6514a91ac27b5e36825d8b7) ) - ROM_LOAD( "cy1-obj7.2x", 0x380000, 0x80000, CRC(b6eb6ad2) SHA1(85a660c5e44012491be7d4e783cce6ba12c135cb) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_BYTE( "cy1-obj0.5s", 0x000000, 0x80000, CRC(5ae542d5) SHA1(99b1a3ed476da4a97cb864538909d7b831f0fd3b) ) + ROM_LOAD32_BYTE( "cy1-obj1.5x", 0x000001, 0x80000, CRC(4aae3eff) SHA1(c80240bd2f4228a0261a14adb6b10560b31b5aa0) ) + ROM_LOAD32_BYTE( "cy1-obj2.3s", 0x000002, 0x80000, CRC(d64ec4c3) SHA1(0bed1cafc21ed8cef3850fb81e30076977086eb0) ) + ROM_LOAD32_BYTE( "cy1-obj3.3x", 0x000003, 0x80000, CRC(3d1f7168) SHA1(392dddcc79fe61dcc6514a91ac27b5e36825d8b7) ) + ROM_LOAD32_BYTE( "cy1-obj4.4s", 0x200000, 0x80000, CRC(57904076) SHA1(b1dc0d99543bc4b9584b37ffc12c6ebc59e30e3b) ) + ROM_LOAD32_BYTE( "cy1-obj5.4x", 0x200001, 0x80000, CRC(0e11ca47) SHA1(076a9a4cfddbee2d8aaa06110333090d8fdbefeb) ) + ROM_LOAD32_BYTE( "cy1-obj6.2s", 0x200002, 0x80000, CRC(7748b485) SHA1(adb4da419a6cdbefd0fef182d866a3479be379af) ) + ROM_LOAD32_BYTE( "cy1-obj7.2x", 0x200003, 0x80000, CRC(b6eb6ad2) SHA1(85a660c5e44012491be7d4e783cce6ba12c135cb) ) ROM_REGION16_BE( 0x100000, "data", 0 ) ROM_LOAD16_BYTE( "cy1-data-u.3a", 0x000000, 0x80000, CRC(570da15d) SHA1(9ebe756f10756c079a92fb522332e9e52ff715c3) ) @@ -1202,15 +1173,15 @@ ROM_START( cybsleda ) ROM_REGION( 0x8000, "c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x400000, "gfx1", 0 ) - ROM_LOAD( "cy1-obj0.5s", 0x000000, 0x80000, CRC(5ae542d5) SHA1(99b1a3ed476da4a97cb864538909d7b831f0fd3b) ) - ROM_LOAD( "cy1-obj4.4s", 0x080000, 0x80000, CRC(57904076) SHA1(b1dc0d99543bc4b9584b37ffc12c6ebc59e30e3b) ) - ROM_LOAD( "cy1-obj1.5x", 0x100000, 0x80000, CRC(4aae3eff) SHA1(c80240bd2f4228a0261a14adb6b10560b31b5aa0) ) - ROM_LOAD( "cy1-obj5.4x", 0x180000, 0x80000, CRC(0e11ca47) SHA1(076a9a4cfddbee2d8aaa06110333090d8fdbefeb) ) - ROM_LOAD( "cy1-obj2.3s", 0x200000, 0x80000, CRC(d64ec4c3) SHA1(0bed1cafc21ed8cef3850fb81e30076977086eb0) ) - ROM_LOAD( "cy1-obj6.2s", 0x280000, 0x80000, CRC(7748b485) SHA1(adb4da419a6cdbefd0fef182d866a3479be379af) ) - ROM_LOAD( "cy1-obj3.3x", 0x300000, 0x80000, CRC(3d1f7168) SHA1(392dddcc79fe61dcc6514a91ac27b5e36825d8b7) ) - ROM_LOAD( "cy1-obj7.2x", 0x380000, 0x80000, CRC(b6eb6ad2) SHA1(85a660c5e44012491be7d4e783cce6ba12c135cb) ) + ROM_REGION( 0x400000, "c355spr", 0 ) + ROM_LOAD32_BYTE( "cy1-obj0.5s", 0x000000, 0x80000, CRC(5ae542d5) SHA1(99b1a3ed476da4a97cb864538909d7b831f0fd3b) ) + ROM_LOAD32_BYTE( "cy1-obj1.5x", 0x000001, 0x80000, CRC(4aae3eff) SHA1(c80240bd2f4228a0261a14adb6b10560b31b5aa0) ) + ROM_LOAD32_BYTE( "cy1-obj2.3s", 0x000002, 0x80000, CRC(d64ec4c3) SHA1(0bed1cafc21ed8cef3850fb81e30076977086eb0) ) + ROM_LOAD32_BYTE( "cy1-obj3.3x", 0x000003, 0x80000, CRC(3d1f7168) SHA1(392dddcc79fe61dcc6514a91ac27b5e36825d8b7) ) + ROM_LOAD32_BYTE( "cy1-obj4.4s", 0x200000, 0x80000, CRC(57904076) SHA1(b1dc0d99543bc4b9584b37ffc12c6ebc59e30e3b) ) + ROM_LOAD32_BYTE( "cy1-obj5.4x", 0x200001, 0x80000, CRC(0e11ca47) SHA1(076a9a4cfddbee2d8aaa06110333090d8fdbefeb) ) + ROM_LOAD32_BYTE( "cy1-obj6.2s", 0x200002, 0x80000, CRC(7748b485) SHA1(adb4da419a6cdbefd0fef182d866a3479be379af) ) + ROM_LOAD32_BYTE( "cy1-obj7.2x", 0x200003, 0x80000, CRC(b6eb6ad2) SHA1(85a660c5e44012491be7d4e783cce6ba12c135cb) ) ROM_REGION16_BE( 0x100000, "data", 0 ) ROM_LOAD16_BYTE( "cy1-data-u.3a", 0x000000, 0x80000, CRC(570da15d) SHA1(9ebe756f10756c079a92fb522332e9e52ff715c3) ) diff --git a/src/mame/drivers/namcos21_de.cpp b/src/mame/drivers/namcos21_de.cpp index 7b1d98d4bcc..5b1ed9a62e8 100644 --- a/src/mame/drivers/namcos21_de.cpp +++ b/src/mame/drivers/namcos21_de.cpp @@ -152,34 +152,6 @@ INTERRUPT_GEN_MEMBER( namco_de_pcbstack_device::irq0_line_hold ) { device.exec INTERRUPT_GEN_MEMBER( namco_de_pcbstack_device::irq1_line_hold ) { device.execute().set_input_line(1, HOLD_LINE); } -static const gfx_layout tile_layout = -{ - 16,16, - RGN_FRAC(1,4), /* number of tiles */ - 8, /* bits per pixel */ - { /* plane offsets */ - 0,1,2,3,4,5,6,7 - }, - { /* x offsets */ - 0*8,RGN_FRAC(1,4)+0*8,RGN_FRAC(2,4)+0*8,RGN_FRAC(3,4)+0*8, - 1*8,RGN_FRAC(1,4)+1*8,RGN_FRAC(2,4)+1*8,RGN_FRAC(3,4)+1*8, - 2*8,RGN_FRAC(1,4)+2*8,RGN_FRAC(2,4)+2*8,RGN_FRAC(3,4)+2*8, - 3*8,RGN_FRAC(1,4)+3*8,RGN_FRAC(2,4)+3*8,RGN_FRAC(3,4)+3*8 - }, - { /* y offsets */ - 0*32,1*32,2*32,3*32, - 4*32,5*32,6*32,7*32, - 8*32,9*32,10*32,11*32, - 12*32,13*32,14*32,15*32 - }, - 8*64 /* sprite offset */ -}; - -static GFXDECODE_START( gfx_namcos21 ) - GFXDECODE_ENTRY( "gfx1", 0x000000, tile_layout, 0x1000, 0x10 ) -GFXDECODE_END - - void namco_de_pcbstack_device::device_add_mconfig(machine_config &config) { M68000(config, m_maincpu, 12288000); /* Master */ @@ -212,7 +184,6 @@ void namco_de_pcbstack_device::device_add_mconfig(machine_config &config) m_screen->set_screen_update(FUNC(namco_de_pcbstack_device::screen_update)); m_screen->set_palette(m_palette); - GFXDECODE(config, "gfxdecode", m_palette, gfx_namcos21); PALETTE(config, m_palette).set_format(palette_device::xBRG_888, NAMCOS21_NUM_COLORS); NAMCOS21_3D(config, m_namcos21_3d, 0); @@ -223,11 +194,11 @@ void namco_de_pcbstack_device::device_add_mconfig(machine_config &config) NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); - m_c355spr->set_gfxdecode_tag("gfxdecode"); + m_c355spr->set_palette(m_palette); m_c355spr->set_scroll_offsets(0x26, 0x19); m_c355spr->set_tile_callback(namco_c355spr_device::c355_obj_code2tile_delegate()); m_c355spr->set_palxor(0xf); // reverse mapping - m_c355spr->set_gfxregion(0); + m_c355spr->set_color_base(0x1000); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -733,15 +704,15 @@ ROM_START( driveyes ) ROM_REGION( 0x8000, "pcb_1:c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x200000, "pcb_1:gfx1", 0 ) /* sprites */ - ROM_LOAD( "de1-obj0.5s", 0x000000, 0x40000, CRC(7438bd53) SHA1(7619c4b56d5c466e845eb45e6157dcaf2a03ad94) ) - ROM_LOAD( "de1-obj4.4s", 0x040000, 0x40000, CRC(335f0ea4) SHA1(9ec065d99ad0874b262b372334179a7e7612558e) ) - ROM_LOAD( "de1-obj1.5x", 0x080000, 0x40000, CRC(45f2334e) SHA1(95f277a4e43d6662ae44d6b69a57f65c72978319) ) - ROM_LOAD( "de1-obj5.4x", 0x0c0000, 0x40000, CRC(9e22999c) SHA1(02624186c359b5e2c96cd3f0e2cb1598ea36dff7) ) - ROM_LOAD( "de1-obj2.3s", 0x100000, 0x40000, CRC(8f1a542c) SHA1(2cb59713607d8929815a9b28bf2a384b6a6c9db8) ) - ROM_LOAD( "de1-obj6.2s", 0x140000, 0x40000, CRC(346df4d5) SHA1(edbadb9db93b7f5a3b064c7f6acb77001cdacce2) ) - ROM_LOAD( "de1-obj3.3x", 0x180000, 0x40000, CRC(fc94544c) SHA1(6297445c64784ee253716f6438d98e5fcd4e7520) ) - ROM_LOAD( "de1-obj7.2x", 0x1c0000, 0x40000, CRC(9ce325d7) SHA1(de4d788bec14842507ed405244974b4fd4f07515) ) + ROM_REGION( 0x200000, "pcb_1:c355spr", 0 ) /* sprites */ + ROM_LOAD32_BYTE( "de1-obj0.5s", 0x000000, 0x40000, CRC(7438bd53) SHA1(7619c4b56d5c466e845eb45e6157dcaf2a03ad94) ) + ROM_LOAD32_BYTE( "de1-obj1.5x", 0x000001, 0x40000, CRC(45f2334e) SHA1(95f277a4e43d6662ae44d6b69a57f65c72978319) ) + ROM_LOAD32_BYTE( "de1-obj2.3s", 0x000002, 0x40000, CRC(8f1a542c) SHA1(2cb59713607d8929815a9b28bf2a384b6a6c9db8) ) + ROM_LOAD32_BYTE( "de1-obj3.3x", 0x000003, 0x40000, CRC(fc94544c) SHA1(6297445c64784ee253716f6438d98e5fcd4e7520) ) + ROM_LOAD32_BYTE( "de1-obj4.4s", 0x100000, 0x40000, CRC(335f0ea4) SHA1(9ec065d99ad0874b262b372334179a7e7612558e) ) + ROM_LOAD32_BYTE( "de1-obj5.4x", 0x100001, 0x40000, CRC(9e22999c) SHA1(02624186c359b5e2c96cd3f0e2cb1598ea36dff7) ) + ROM_LOAD32_BYTE( "de1-obj6.2s", 0x100002, 0x40000, CRC(346df4d5) SHA1(edbadb9db93b7f5a3b064c7f6acb77001cdacce2) ) + ROM_LOAD32_BYTE( "de1-obj7.2x", 0x100003, 0x40000, CRC(9ce325d7) SHA1(de4d788bec14842507ed405244974b4fd4f07515) ) ROM_REGION16_BE( 0x100000, "pcb_1:data", 0 ) /* 68k */ ROM_LOAD16_BYTE( "de1-data-u.3a", 0x00000, 0x80000, CRC(fe65d2ab) SHA1(dbe962dda7efa60357fa3a684a265aaad49df5b5) ) @@ -776,15 +747,15 @@ ROM_START( driveyes ) ROM_REGION( 0x8000, "pcb_0:c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x200000, "pcb_0:gfx1", 0 ) /* sprites */ - ROM_LOAD( "de1-obj0.5s", 0x000000, 0x40000, CRC(7438bd53) SHA1(7619c4b56d5c466e845eb45e6157dcaf2a03ad94) ) - ROM_LOAD( "de1-obj4.4s", 0x040000, 0x40000, CRC(335f0ea4) SHA1(9ec065d99ad0874b262b372334179a7e7612558e) ) - ROM_LOAD( "de1-obj1.5x", 0x080000, 0x40000, CRC(45f2334e) SHA1(95f277a4e43d6662ae44d6b69a57f65c72978319) ) - ROM_LOAD( "de1-obj5.4x", 0x0c0000, 0x40000, CRC(9e22999c) SHA1(02624186c359b5e2c96cd3f0e2cb1598ea36dff7) ) - ROM_LOAD( "de1-obj2.3s", 0x100000, 0x40000, CRC(8f1a542c) SHA1(2cb59713607d8929815a9b28bf2a384b6a6c9db8) ) - ROM_LOAD( "de1-obj6.2s", 0x140000, 0x40000, CRC(346df4d5) SHA1(edbadb9db93b7f5a3b064c7f6acb77001cdacce2) ) - ROM_LOAD( "de1-obj3.3x", 0x180000, 0x40000, CRC(fc94544c) SHA1(6297445c64784ee253716f6438d98e5fcd4e7520) ) - ROM_LOAD( "de1-obj7.2x", 0x1c0000, 0x40000, CRC(9ce325d7) SHA1(de4d788bec14842507ed405244974b4fd4f07515) ) + ROM_REGION( 0x200000, "pcb_0:c355spr", 0 ) /* sprites */ + ROM_LOAD32_BYTE( "de1-obj0.5s", 0x000000, 0x40000, CRC(7438bd53) SHA1(7619c4b56d5c466e845eb45e6157dcaf2a03ad94) ) + ROM_LOAD32_BYTE( "de1-obj1.5x", 0x000001, 0x40000, CRC(45f2334e) SHA1(95f277a4e43d6662ae44d6b69a57f65c72978319) ) + ROM_LOAD32_BYTE( "de1-obj2.3s", 0x000002, 0x40000, CRC(8f1a542c) SHA1(2cb59713607d8929815a9b28bf2a384b6a6c9db8) ) + ROM_LOAD32_BYTE( "de1-obj3.3x", 0x000003, 0x40000, CRC(fc94544c) SHA1(6297445c64784ee253716f6438d98e5fcd4e7520) ) + ROM_LOAD32_BYTE( "de1-obj4.4s", 0x100000, 0x40000, CRC(335f0ea4) SHA1(9ec065d99ad0874b262b372334179a7e7612558e) ) + ROM_LOAD32_BYTE( "de1-obj5.4x", 0x100001, 0x40000, CRC(9e22999c) SHA1(02624186c359b5e2c96cd3f0e2cb1598ea36dff7) ) + ROM_LOAD32_BYTE( "de1-obj6.2s", 0x100002, 0x40000, CRC(346df4d5) SHA1(edbadb9db93b7f5a3b064c7f6acb77001cdacce2) ) + ROM_LOAD32_BYTE( "de1-obj7.2x", 0x100003, 0x40000, CRC(9ce325d7) SHA1(de4d788bec14842507ed405244974b4fd4f07515) ) ROM_REGION16_BE( 0x100000, "pcb_0:data", 0 ) /* 68k */ ROM_LOAD16_BYTE( "de1-data-u.3a", 0x00000, 0x80000, CRC(fe65d2ab) SHA1(dbe962dda7efa60357fa3a684a265aaad49df5b5) ) @@ -819,15 +790,15 @@ ROM_START( driveyes ) ROM_REGION( 0x8000, "pcb_2:c68mcu:external", ROMREGION_ERASE00 ) /* C68 (M37450) I/O MCU program */ /* external ROM not populated, unclear how it would map */ - ROM_REGION( 0x200000, "pcb_2:gfx1", 0 ) /* sprites */ - ROM_LOAD( "de1-obj0.5s", 0x000000, 0x40000, CRC(7438bd53) SHA1(7619c4b56d5c466e845eb45e6157dcaf2a03ad94) ) - ROM_LOAD( "de1-obj4.4s", 0x040000, 0x40000, CRC(335f0ea4) SHA1(9ec065d99ad0874b262b372334179a7e7612558e) ) - ROM_LOAD( "de1-obj1.5x", 0x080000, 0x40000, CRC(45f2334e) SHA1(95f277a4e43d6662ae44d6b69a57f65c72978319) ) - ROM_LOAD( "de1-obj5.4x", 0x0c0000, 0x40000, CRC(9e22999c) SHA1(02624186c359b5e2c96cd3f0e2cb1598ea36dff7) ) - ROM_LOAD( "de1-obj2.3s", 0x100000, 0x40000, CRC(8f1a542c) SHA1(2cb59713607d8929815a9b28bf2a384b6a6c9db8) ) - ROM_LOAD( "de1-obj6.2s", 0x140000, 0x40000, CRC(346df4d5) SHA1(edbadb9db93b7f5a3b064c7f6acb77001cdacce2) ) - ROM_LOAD( "de1-obj3.3x", 0x180000, 0x40000, CRC(fc94544c) SHA1(6297445c64784ee253716f6438d98e5fcd4e7520) ) - ROM_LOAD( "de1-obj7.2x", 0x1c0000, 0x40000, CRC(9ce325d7) SHA1(de4d788bec14842507ed405244974b4fd4f07515) ) + ROM_REGION( 0x200000, "pcb_2:c355spr", 0 ) /* sprites */ + ROM_LOAD32_BYTE( "de1-obj0.5s", 0x000000, 0x40000, CRC(7438bd53) SHA1(7619c4b56d5c466e845eb45e6157dcaf2a03ad94) ) + ROM_LOAD32_BYTE( "de1-obj1.5x", 0x000001, 0x40000, CRC(45f2334e) SHA1(95f277a4e43d6662ae44d6b69a57f65c72978319) ) + ROM_LOAD32_BYTE( "de1-obj2.3s", 0x000002, 0x40000, CRC(8f1a542c) SHA1(2cb59713607d8929815a9b28bf2a384b6a6c9db8) ) + ROM_LOAD32_BYTE( "de1-obj3.3x", 0x000003, 0x40000, CRC(fc94544c) SHA1(6297445c64784ee253716f6438d98e5fcd4e7520) ) + ROM_LOAD32_BYTE( "de1-obj4.4s", 0x100000, 0x40000, CRC(335f0ea4) SHA1(9ec065d99ad0874b262b372334179a7e7612558e) ) + ROM_LOAD32_BYTE( "de1-obj5.4x", 0x100001, 0x40000, CRC(9e22999c) SHA1(02624186c359b5e2c96cd3f0e2cb1598ea36dff7) ) + ROM_LOAD32_BYTE( "de1-obj6.2s", 0x100002, 0x40000, CRC(346df4d5) SHA1(edbadb9db93b7f5a3b064c7f6acb77001cdacce2) ) + ROM_LOAD32_BYTE( "de1-obj7.2x", 0x100003, 0x40000, CRC(9ce325d7) SHA1(de4d788bec14842507ed405244974b4fd4f07515) ) ROM_REGION16_BE( 0x100000, "pcb_2:data", 0 ) /* 68k */ ROM_LOAD16_BYTE( "de1-data-u.3a", 0x00000, 0x80000, CRC(fe65d2ab) SHA1(dbe962dda7efa60357fa3a684a265aaad49df5b5) ) diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index bf60b71b918..e94af8f9010 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -15,8 +15,6 @@ #define NAMCOFL_VTOTAL (262) /* needs to be checked */ #define NAMCOFL_VBSTART (224) -#define NAMCOFL_SPRITEGFX 0 - class namcofl_state : public driver_device { public: diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 67942c1848c..f8fbe040e43 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -19,9 +19,6 @@ #include "video/namco_c123tmap.h" #include "video/namco_c169roz.h" -#define NAMCONB1_SPRITEGFX 0 - - class namconb1_state : public driver_device { diff --git a/src/mame/video/namco_c355spr.cpp b/src/mame/video/namco_c355spr.cpp index 13519e184ec..6a773f34af7 100644 --- a/src/mame/video/namco_c355spr.cpp +++ b/src/mame/video/namco_c355spr.cpp @@ -15,17 +15,23 @@ #include "emu.h" #include "namco_c355spr.h" +#include + DEFINE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device, "namco_c355spr", "Namco C355 (Sprites)") namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, NAMCO_C355SPR, tag, owner, clock), + device_gfx_interface(mconfig, *this, nullptr), device_video_interface(mconfig, *this), - m_gfx_region(0), m_palxor(0), - m_scrolloffs{ 0, 0 }, m_buffer(0), - m_gfxdecode(*this, finder_base::DUMMY_TAG) + m_gfx_region(*this, DEVICE_SELF), + m_colbase(0) { + std::fill(std::begin(m_position), std::end(m_position), 0); + std::fill(std::begin(m_scrolloffs), std::end(m_scrolloffs), 0); + for (int i = 0; i < 2; i++) + m_spriteram[i] = nullptr; } @@ -34,35 +40,35 @@ namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, const void namco_c355spr_device::zdrawgfxzoom( screen_device &screen, bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx, - uint32_t code,uint32_t color,int flipx,int flipy,int sx,int sy, - int scalex, int scaley, int zpos ) + u32 code,u32 color,bool flipx,bool flipy,int sx,int sy, + int scalex, int scaley, int zpos) { if (!scalex || !scaley) return; if (dest_bmp.bpp() == 16) { if (gfx) { - device_palette_interface &palette = m_gfxdecode->palette(); - int shadow_offset = (palette.shadows_enabled())?palette.entries():0; + device_palette_interface &palette = gfx->palette(); + int shadow_offset = (palette.shadows_enabled()) ? palette.entries() : 0; const pen_t *pal = &palette.pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors())); - const uint8_t *source_base = gfx->get_data(code % gfx->elements()); - int sprite_screen_height = (scaley*gfx->height()+0x8000)>>16; - int sprite_screen_width = (scalex*gfx->width()+0x8000)>>16; + const u8 *source_base = gfx->get_data(code % gfx->elements()); + int sprite_screen_height = (scaley * gfx->height() + 0x8000) >> 16; + int sprite_screen_width = (scalex * gfx->width() + 0x8000) >> 16; if (sprite_screen_width && sprite_screen_height) { /* compute sprite increment per screen pixel */ - int dx = (gfx->width()<<16)/sprite_screen_width; - int dy = (gfx->height()<<16)/sprite_screen_height; + int dx = (gfx->width() << 16) / sprite_screen_width; + int dy = (gfx->height() << 16) / sprite_screen_height; - int ex = sx+sprite_screen_width; - int ey = sy+sprite_screen_height; + int ex = sx + sprite_screen_width; + int ey = sy + sprite_screen_height; int x_index_base; int y_index; if (flipx) { - x_index_base = (sprite_screen_width-1)*dx; + x_index_base = (sprite_screen_width - 1) * dx; dx = -dx; } else @@ -72,7 +78,7 @@ void namco_c355spr_device::zdrawgfxzoom( if (flipy) { - y_index = (sprite_screen_height-1)*dy; + y_index = (sprite_screen_height - 1) * dy; dy = -dy; } else @@ -82,44 +88,43 @@ void namco_c355spr_device::zdrawgfxzoom( if (sx < clip.min_x) { /* clip left */ - int pixels = clip.min_x-sx; + int pixels = clip.min_x - sx; sx += pixels; - x_index_base += pixels*dx; + x_index_base += pixels * dx; } if (sy < clip.min_y) { /* clip top */ - int pixels = clip.min_y-sy; + int pixels = clip.min_y - sy; sy += pixels; - y_index += pixels*dy; + y_index += pixels * dy; } - if (ex > clip.max_x+1) + if (ex > clip.max_x + 1) { /* clip right */ - int pixels = ex-clip.max_x-1; + int pixels = ex - clip.max_x - 1; ex -= pixels; } - if (ey > clip.max_y+1) + if (ey > clip.max_y + 1) { /* clip bottom */ - int pixels = ey-clip.max_y-1; + int pixels = ey - clip.max_y - 1; ey -= pixels; } - if (ex>sx) + if (ex > sx) { /* skip if inner loop doesn't draw anything */ - int y; bitmap_ind8 &priority_bitmap = screen.priority(); if (priority_bitmap.valid()) { - for (y = sy; y < ey; y++) + for (int y = sy; y < ey; y++) { - const uint8_t *source = source_base + (y_index>>16) * gfx->rowbytes(); - uint16_t *dest = &dest_bmp.pix16(y); - uint8_t *pri = &priority_bitmap.pix8(y); - int x, x_index = x_index_base; + const u8 *source = source_base + (y_index>>16) * gfx->rowbytes(); + u16 *dest = &dest_bmp.pix16(y); + u8 *pri = &priority_bitmap.pix8(y); + int x_index = x_index_base; if (m_palxor) { - for (x = sx; x < ex; x++) + for (int x = sx; x < ex; x++) { - int c = source[x_index>>16]; + const u8 c = source[x_index>>16]; if (c != 0xff) { if (pri[x] <= zpos) @@ -127,10 +132,10 @@ void namco_c355spr_device::zdrawgfxzoom( switch (c) { case 0: - dest[x] = 0x4000|(dest[x]&0x1fff); + dest[x] = 0x4000|(dest[x] & 0x1fff); break; case 1: - dest[x] = 0x6000|(dest[x]&0x1fff); + dest[x] = 0x6000|(dest[x] & 0x1fff); break; default: dest[x] = pal[c]; @@ -145,12 +150,12 @@ void namco_c355spr_device::zdrawgfxzoom( } else { - for (x = sx; x < ex; x++) + for (int x = sx; x < ex; x++) { - int c = source[x_index>>16]; + const u8 c = source[x_index>>16]; if (c != 0xff) { - if (pri[x] <= zpos ) + if (pri[x] <= zpos) { if (color == 0xf && c == 0xfe && shadow_offset) { @@ -178,23 +183,36 @@ void namco_c355spr_device::zdrawgfxzoom( void namco_c355spr_device::zdrawgfxzoom( screen_device &screen, bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx, - uint32_t code,uint32_t color,int flipx,int flipy,int sx,int sy, - int scalex, int scaley, int zpos ) + u32 code,u32 color,bool flipx,bool flipy,int sx,int sy, + int scalex, int scaley, int zpos) { /* nop */ } void namco_c355spr_device::device_start() { + gfx_layout obj_layout = + { + 16,16, + RGN_FRAC(1,1), + 8, /* bits per pixel */ + { STEP8(0,1) }, + { STEP16(0,8) }, + { STEP16(0,8*16) }, + 16*16*8 + }; + obj_layout.total = m_gfx_region->bytes() / (16*16*8 / 8); + std::fill(std::begin(m_position), std::end(m_position), 0x0000); for (int i = 0; i < 2; i++) { m_spritelist[i] = std::make_unique(0x100); m_sprite_end[i] = m_spritelist[i].get(); - m_spriteram[i] = std::make_unique(0x20000/2); + m_spriteram[i] = std::make_unique(0x20000/2); std::fill_n(m_spriteram[i].get(), 0x20000/2, 0); save_pointer(NAME(m_spriteram[i]), 0x20000/2, i); } + set_gfx(0, std::make_unique(&palette(), obj_layout, m_gfx_region->base(), 0, 0x10, m_colbase)); save_item(NAME(m_position)); } @@ -212,11 +230,11 @@ void namco_c355spr_device::device_stop() /**************************************************************************************/ -WRITE16_MEMBER( namco_c355spr_device::position_w ) +void namco_c355spr_device::position_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_position[offset]); } -READ16_MEMBER( namco_c355spr_device::position_r ) +u16 namco_c355spr_device::position_r(offs_t offset) { return m_position[offset]; } @@ -233,66 +251,48 @@ READ16_MEMBER( namco_c355spr_device::position_r ) * 0x10000 sprite attr (page1) * 0x14000 sprite list (page1) */ -void namco_c355spr_device::get_single_sprite(const uint16_t *pSource, c355_sprite *sprite_ptr) +void namco_c355spr_device::get_single_sprite(const u16 *pSource, c355_sprite *sprite_ptr) { - uint16_t *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; - unsigned screen_height_remaining, screen_width_remaining; - unsigned source_height_remaining, source_width_remaining; - int hpos,vpos; - uint16_t hsize,vsize; - uint16_t palette; - uint16_t linkno; - uint16_t format; - int tile_index; - int num_cols,num_rows; - int dx,dy; - int row,col; - int sx,sy,tile; - int flipx,flipy; - uint32_t zoomx, zoomy; - int tile_screen_width; - int tile_screen_height; - const uint16_t *spriteformat16 = &spriteram16[0x4000/2]; - const uint16_t *spritetile16 = &spriteram16[0x8000/2]; - const uint16_t *pWinAttr; + u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; + const u16 *spriteformat16 = &spriteram16[0x4000 / 2]; + const u16 *spritetile16 = &spriteram16[0x8000 / 2]; rectangle clip; - int xscroll, yscroll; /** * ----xxxx-------- window select * --------xxxx---- priority * ------------xxxx palette select */ - palette = pSource[6]; - sprite_ptr->pri = ((palette>>4)&0xf); + const u16 palette = pSource[6]; + sprite_ptr->pri = ((palette >> 4) & 0xf); - linkno = pSource[0]; /* LINKNO */ + const u16 linkno = pSource[0]; /* LINKNO */ sprite_ptr->offset = pSource[1]; /* OFFSET */ - hpos = pSource[2]; /* HPOS 0x000..0x7ff (signed) */ - vpos = pSource[3]; /* VPOS 0x000..0x7ff (signed) */ - hsize = pSource[4]; /* HSIZE max 0x3ff pixels */ - vsize = pSource[5]; /* VSIZE max 0x3ff pixels */ + int hpos = pSource[2]; /* HPOS 0x000..0x7ff (signed) */ + int vpos = pSource[3]; /* VPOS 0x000..0x7ff (signed) */ + u16 hsize = pSource[4]; /* HSIZE max 0x3ff pixels */ + u16 vsize = pSource[5]; /* VSIZE max 0x3ff pixels */ /* pSource[6] contains priority/palette */ /* pSource[7] is used in Lucky & Wild, possibly for sprite-road priority */ - if (linkno*4>=0x4000/2) /* avoid garbage memory reads */ + if (linkno * 4 >= 0x4000 / 2) /* avoid garbage memory reads */ { sprite_ptr->disable = true; return; } - xscroll = (int16_t)m_position[1]; - yscroll = (int16_t)m_position[0]; + int xscroll = (s16)m_position[1]; + int yscroll = (s16)m_position[0]; -// xscroll &= 0x3ff; if (xscroll & 0x200 ) xscroll |= ~0x3ff; - xscroll &= 0x1ff; if (xscroll & 0x100 ) xscroll |= ~0x1ff; - yscroll &= 0x1ff; if (yscroll & 0x100 ) yscroll |= ~0x1ff; +// xscroll &= 0x3ff; if (xscroll & 0x200) xscroll |= ~0x3ff; + xscroll &= 0x1ff; if (xscroll & 0x100) xscroll |= ~0x1ff; + yscroll &= 0x1ff; if (yscroll & 0x100) yscroll |= ~0x1ff; if (screen().height() > 384) { /* Medium Resolution: System21 adjust */ - xscroll = (int16_t)m_position[1]; + xscroll = (s16)m_position[1]; xscroll &= 0x3ff; if (xscroll & 0x200) xscroll |= ~0x3ff; - if (yscroll<0) + if (yscroll < 0) { /* solvalou */ yscroll += 0x20; } @@ -306,29 +306,29 @@ void namco_c355spr_device::get_single_sprite(const uint16_t *pSource, c355_sprit hpos -= xscroll; vpos -= yscroll; - pWinAttr = &spriteram16[0x2400/2+((palette>>8)&0xf)*4]; + const u16 *pWinAttr = &spriteram16[0x2400 / 2 + ((palette >> 8) & 0xf) * 4]; clip.set(pWinAttr[0] - xscroll, pWinAttr[1] - xscroll, pWinAttr[2] - yscroll, pWinAttr[3] - yscroll); sprite_ptr->clip = clip; - hpos&=0x7ff; if (hpos&0x400 ) hpos |= ~0x7ff; /* sign extend */ - vpos&=0x7ff; if (vpos&0x400 ) vpos |= ~0x7ff; /* sign extend */ + hpos &= 0x7ff; if (hpos & 0x400) hpos |= ~0x7ff; /* sign extend */ + vpos &= 0x7ff; if (vpos & 0x400) vpos |= ~0x7ff; /* sign extend */ - tile_index = spriteformat16[linkno*4+0]; - format = spriteformat16[linkno*4+1]; - dx = spriteformat16[linkno*4+2]; - dy = spriteformat16[linkno*4+3]; - num_cols = (format>>4)&0xf; - num_rows = (format)&0xf; + int tile_index = spriteformat16[linkno * 4 + 0]; + const u16 format = spriteformat16[linkno * 4 + 1]; + int dx = spriteformat16[linkno * 4 + 2]; + int dy = spriteformat16[linkno * 4 + 3]; + int num_cols = (format >> 4) & 0xf; + int num_rows = (format) & 0xf; if (num_cols == 0) num_cols = 0x10; - flipx = (hsize&0x8000)?1:0; + bool flipx = (hsize & 0x8000); hsize &= 0x3ff;//0x1ff; if (hsize == 0) { sprite_ptr->disable = true; return; } - zoomx = (hsize<<16)/(num_cols*16); - dx = (dx*zoomx+0x8000)>>16; + u32 zoomx = (hsize << 16) / (num_cols * 16); + dx = (dx * zoomx + 0x8000) >> 16; if (flipx) { hpos += dx; @@ -339,15 +339,15 @@ void namco_c355spr_device::get_single_sprite(const uint16_t *pSource, c355_sprit } if (num_rows == 0) num_rows = 0x10; - flipy = (vsize&0x8000)?1:0; + bool flipy = (vsize & 0x8000); vsize &= 0x3ff; if (vsize == 0) { sprite_ptr->disable = true; return; } - zoomy = (vsize<<16)/(num_rows*16); - dy = (dy*zoomy+0x8000)>>16; + u32 zoomy = (vsize << 16) / (num_rows * 16); + dy = (dy * zoomy + 0x8000) >> 16; if (flipy) { vpos += dy; @@ -360,34 +360,34 @@ void namco_c355spr_device::get_single_sprite(const uint16_t *pSource, c355_sprit sprite_ptr->flipx = flipx; sprite_ptr->flipy = flipy; sprite_ptr->size = num_rows * num_cols; - sprite_ptr->color = (palette&0xf)^m_palxor; + sprite_ptr->color = (palette & 0xf) ^ m_palxor; - source_height_remaining = num_rows*16; - screen_height_remaining = vsize; - sy = vpos; + u32 source_height_remaining = num_rows * 16; + u32 screen_height_remaining = vsize; + int sy = vpos; int ind = 0; - for (row = 0; row < num_rows; row++) + for (int row = 0; row < num_rows; row++) { - tile_screen_height = 16*screen_height_remaining/source_height_remaining; - zoomy = (screen_height_remaining<<16)/source_height_remaining; + int tile_screen_height = 16 * screen_height_remaining / source_height_remaining; + zoomy = (screen_height_remaining << 16) / source_height_remaining; if (flipy) { sy -= tile_screen_height; } - source_width_remaining = num_cols*16; - screen_width_remaining = hsize; - sx = hpos; - for (col = 0; col < num_cols; col++) + u32 source_width_remaining = num_cols * 16; + u32 screen_width_remaining = hsize; + int sx = hpos; + for (int col = 0; col < num_cols; col++) { - tile_screen_width = 16*screen_width_remaining/source_width_remaining; - zoomx = (screen_width_remaining<<16)/source_width_remaining; + int tile_screen_width = 16 * screen_width_remaining / source_width_remaining; + zoomx = (screen_width_remaining << 16) / source_width_remaining; if (flipx) { sx -= tile_screen_width; } - tile = spritetile16[tile_index++]; + const u16 tile = spritetile16[tile_index++]; sprite_ptr->tile[ind] = tile; - if ((tile&0x8000)==0) + if ((tile & 0x8000) == 0) { sprite_ptr->x[ind] = sx; sprite_ptr->y[ind] = sy; @@ -417,17 +417,17 @@ int namco_c355spr_device::default_code2tile(int code) return code; } -void namco_c355spr_device::get_list(int no, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable) +void namco_c355spr_device::get_list(int no, const u16 *pSpriteList16, const u16 *pSpriteTable) { /* draw the sprites */ c355_sprite *sprite_ptr = m_spritelist[no].get(); for (int i = 0; i < 256; i++) { sprite_ptr->disable = false; - uint16_t which = pSpriteList16[i]; - get_single_sprite(&pSpriteTable[(which&0xff)*8], sprite_ptr); + const u16 which = pSpriteList16[i]; + get_single_sprite(&pSpriteTable[(which & 0xff) * 8], sprite_ptr); sprite_ptr++; - if (which&0x100) break; + if (which & 0x100) break; } m_sprite_end[no] = sprite_ptr; } @@ -476,7 +476,7 @@ void namco_c355spr_device::draw_sprites(screen_device &screen, BitmapClass &bitm screen, bitmap, clip, - m_gfxdecode->gfx(m_gfx_region), + gfx(0), m_code2tile(sprite_ptr->tile[ind]) + sprite_ptr->offset, sprite_ptr->color, sprite_ptr->flipx, sprite_ptr->flipy, @@ -502,17 +502,17 @@ void namco_c355spr_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, con draw_sprites(screen, bitmap, cliprect, pri); } -WRITE16_MEMBER( namco_c355spr_device::spriteram_w ) +void namco_c355spr_device::spriteram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_spriteram[0][offset]); } -READ16_MEMBER( namco_c355spr_device::spriteram_r ) +u16 namco_c355spr_device::spriteram_r(offs_t offset) { return m_spriteram[0][offset]; } -WRITE_LINE_MEMBER( namco_c355spr_device::vblank ) +WRITE_LINE_MEMBER(namco_c355spr_device::vblank) { if (state) { @@ -523,4 +523,3 @@ WRITE_LINE_MEMBER( namco_c355spr_device::vblank ) std::copy_n(m_spriteram[0].get(), 0x20000/2, m_spriteram[1].get()); } } - diff --git a/src/mame/video/namco_c355spr.h b/src/mame/video/namco_c355spr.h index 97e618596b8..1de6e07f4af 100644 --- a/src/mame/video/namco_c355spr.h +++ b/src/mame/video/namco_c355spr.h @@ -8,24 +8,23 @@ #include "screen.h" -class namco_c355spr_device : public device_t, public device_video_interface +class namco_c355spr_device : public device_t, public device_gfx_interface, public device_video_interface { public: // construction/destruction namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - template void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward(tag)); } + void set_color_base(u16 base) { m_colbase = base; } void set_scroll_offsets(int x, int y) { m_scrolloffs[0] = x; m_scrolloffs[1] = y; } - //void set_ram_words(uint32_t size) { m_ramsize = size; } + //void set_ram_words(u32 size) { m_ramsize = size; } void set_palxor(int palxor) { m_palxor = palxor; } - void set_gfxregion(int region) { m_gfx_region = region; } void set_buffer(int buffer) { m_buffer = buffer; } - DECLARE_READ16_MEMBER( spriteram_r ); - DECLARE_WRITE16_MEMBER( spriteram_w ); - DECLARE_READ16_MEMBER( position_r ); - DECLARE_WRITE16_MEMBER( position_w ); - DECLARE_WRITE_LINE_MEMBER( vblank ); + u16 spriteram_r(offs_t offset); + void spriteram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 position_r(offs_t offset); + void position_w(offs_t offset, u16 data, u16 mem_mask = ~0); + DECLARE_WRITE_LINE_MEMBER(vblank); typedef delegate c355_obj_code2tile_delegate; void set_tile_callback(c355_obj_code2tile_delegate cb) @@ -49,12 +48,12 @@ private: struct c355_sprite { - int disable; + bool disable; int size; rectangle clip; int offset; int color; - int flipx,flipy; + bool flipx,flipy; int tile[16*16]; int x[16*16],y[16*16]; int zoomx[16*16],zoomy[16*16]; @@ -62,32 +61,32 @@ private: }; // general - void zdrawgfxzoom(screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int zpos); - void zdrawgfxzoom(screen_device &screen, bitmap_rgb32 &dest_bmp, const rectangle &clip, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int zpos); + void zdrawgfxzoom(screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, gfx_element *gfx, u32 code, u32 color, bool flipx, bool flipy, int sx, int sy, int scalex, int scaley, int zpos); + void zdrawgfxzoom(screen_device &screen, bitmap_rgb32 &dest_bmp, const rectangle &clip, gfx_element *gfx, u32 code, u32 color, bool flipx, bool flipy, int sx, int sy, int scalex, int scaley, int zpos); // C355 Motion Object Emulation // for pal_xor, supply either 0x0 (normal) or 0xf (palette mapping reversed) int default_code2tile(int code); // C355 Motion Object internals - void get_single_sprite(const uint16_t *pSource, c355_sprite *sprite_ptr); - void get_list(int no, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable); + void get_single_sprite(const u16 *pSource, c355_sprite *sprite_ptr); + void get_list(int no, const u16 *pSpriteList16, const u16 *pSpriteTable); void get_sprites(); template void draw_sprites(screen_device &screen, BitmapClass &bitmap, const rectangle &cliprect, int pri); std::unique_ptr m_spritelist[2]; const c355_sprite *m_sprite_end[2]; c355_obj_code2tile_delegate m_code2tile; - int m_gfx_region; int m_palxor; - uint16_t m_position[4]; - std::unique_ptr m_spriteram[2]; + u16 m_position[4]; + std::unique_ptr m_spriteram[2]; int m_scrolloffs[2]; - //uint32_t m_ramsize; + //u32 m_ramsize; int m_buffer; - required_device m_gfxdecode; + required_memory_region m_gfx_region; + u16 m_colbase; }; // device type definition