From c47f8c417ca0a0cafa652e3f50963f88c89c2ec9 Mon Sep 17 00:00:00 2001 From: cam900 Date: Wed, 8 May 2019 15:35:25 +0900 Subject: taito_x.cpp : Updates Simplify handlers, Simplify gfxdecodes, Reduce duplicates, Fix naming --- src/mame/drivers/taito_x.cpp | 137 ++++++++++++++++++------------------------- src/mame/includes/taito_x.h | 12 ++-- 2 files changed, 63 insertions(+), 86 deletions(-) diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index e794e250ef1..ad85b76df94 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -328,7 +328,7 @@ Stephh's notes (based on the game M68000 code and some tests) : #include "screen.h" #include "speaker.h" -WRITE8_MEMBER(taitox_state::superman_counters_w) +void taitox_state::superman_counters_w(u8 data) { machine().bookkeeping().coin_lockout_w(1, data & 0x08); machine().bookkeeping().coin_lockout_w(0, data & 0x04); @@ -336,7 +336,7 @@ WRITE8_MEMBER(taitox_state::superman_counters_w) machine().bookkeeping().coin_counter_w(0, data & 0x01); } -READ16_MEMBER(taitox_state::superman_dsw_input_r) +u16 taitox_state::superman_dsw_input_r(offs_t offset) { switch (offset) { @@ -354,7 +354,7 @@ READ16_MEMBER(taitox_state::superman_dsw_input_r) } } -READ16_MEMBER(taitox_state::daisenpu_input_r) +u16 taitox_state::daisenpu_input_r(offs_t offset) { switch (offset) { @@ -371,7 +371,7 @@ READ16_MEMBER(taitox_state::daisenpu_input_r) } } -WRITE16_MEMBER(taitox_state::daisenpu_input_w) +void taitox_state::daisenpu_input_w(offs_t offset, u16 data) { switch (offset) { @@ -389,7 +389,7 @@ WRITE16_MEMBER(taitox_state::daisenpu_input_w) } -WRITE16_MEMBER(taitox_state::kyustrkr_input_w) +void taitox_state::kyustrkr_input_w(offs_t offset, u16 data) { switch (offset) { @@ -409,7 +409,7 @@ WRITE16_MEMBER(taitox_state::kyustrkr_input_w) /**************************************************************************/ -WRITE8_MEMBER(taitox_state::sound_bankswitch_w) +void taitox_state::sound_bankswitch_w(u8 data) { m_z80bank->set_entry(data & 3); } @@ -764,42 +764,19 @@ INPUT_PORTS_END /**************************************************************************/ -#define NUM_TILES 16384 static const gfx_layout tilelayout = { 16,16, /* 16*16 sprites */ - NUM_TILES, /* 16384 of them */ + RGN_FRAC(1,1), /* 16384 of them */ 4, /* 4 bits per pixel */ - { 64*8*NUM_TILES + 8, 64*8*NUM_TILES + 0, 8, 0 }, - { 0, 1, 2, 3, 4, 5, 6, 7, - 8*16, 8*16+1, 8*16+2, 8*16+3, 8*16+4, 8*16+5, 8*16+6, 8*16+7 }, - { 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16, - 16*16, 17*16, 18*16, 19*16, 20*16, 21*16, 22*16, 23*16 }, - - 64*8 /* every sprite takes 64 consecutive bytes */ + { STEP4(0,8) }, + { STEP8(0,1), STEP8(8*4*8,1) }, + { STEP8(0,8*4), STEP8(8*4*8*2,8*4) }, + 16*16*4 /* every sprite takes 64 consecutive bytes */ }; -#undef NUM_TILES - -static const gfx_layout ballbros_tilelayout = -{ - 16,16, /* 16*16 sprites */ - 4096, /* 4096 of them */ - 4, /* 4 bits per pixel */ - { 0x20000*3*8, 0x20000*2*8, 0x20000*1*8, 0 }, - { 0, 1, 2, 3, 4, 5, 6, 7, - 8*8, 8*8+1, 8*8+2, 8*8+3, 8*8+4, 8*8+5, 8*8+6, 8*8+7 }, - { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, - 16*8, 17*8, 18*8, 19*8, 20*8, 21*8, 22*8, 23*8 }, - - 32*8 /* every sprite takes 64 consecutive bytes */ -}; - -static GFXDECODE_START( gfx_superman ) - GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout, 0, 256 ) /* sprites & playfield */ -GFXDECODE_END -static GFXDECODE_START( gfx_ballbros ) - GFXDECODE_ENTRY( "gfx1", 0x000000, ballbros_tilelayout, 0, 256 ) /* sprites & playfield */ +static GFXDECODE_START( gfx_taito_x ) + GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout, 0, 128 ) /* sprites & playfield */ GFXDECODE_END @@ -861,7 +838,7 @@ void taitox_state::superman(machine_config &config) screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); screen.set_palette(m_palette); - GFXDECODE(config, m_gfxdecode, m_palette, gfx_superman); + GFXDECODE(config, m_gfxdecode, m_palette, gfx_taito_x); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); MCFG_VIDEO_START_OVERRIDE(taitox_state,seta_no_layers) @@ -908,7 +885,7 @@ void taitox_state::daisenpu(machine_config &config) screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); screen.set_palette(m_palette); - GFXDECODE(config, m_gfxdecode, m_palette, gfx_superman); + GFXDECODE(config, m_gfxdecode, m_palette, gfx_taito_x); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); MCFG_VIDEO_START_OVERRIDE(taitox_state,seta_no_layers) @@ -953,7 +930,7 @@ void taitox_state::gigandes(machine_config &config) screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); screen.set_palette(m_palette); - GFXDECODE(config, m_gfxdecode, m_palette, gfx_superman); + GFXDECODE(config, m_gfxdecode, m_palette, gfx_taito_x); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); MCFG_VIDEO_START_OVERRIDE(taitox_state,seta_no_layers) @@ -1000,7 +977,7 @@ void taitox_state::ballbros(machine_config &config) screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); screen.set_palette(m_palette); - GFXDECODE(config, m_gfxdecode, m_palette, gfx_ballbros); + GFXDECODE(config, m_gfxdecode, m_palette, gfx_taito_x); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); MCFG_VIDEO_START_OVERRIDE(taitox_state, kyustrkr_no_layers) @@ -1092,10 +1069,10 @@ ROM_START( superman ) ROM_LOAD( "b61_10.d18", 0x00000, 0x10000, CRC(6efe79e8) SHA1(7a76efaaeab71473f4b0b23a89141f203488ce1d) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "b61-14.f1", 0x000000, 0x80000, CRC(89368c3e) SHA1(8d227439ab321fd5d432d860544daea0e78ce588) ) /* Plane 0, 1 */ - ROM_LOAD( "b61-15.h1", 0x080000, 0x80000, CRC(910cc4f9) SHA1(9ecfa84123a8f9d048f0a689647e92f25af73899) ) - ROM_LOAD( "b61-16.j1", 0x100000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ - ROM_LOAD( "b61-17.k1", 0x180000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) + ROM_LOAD32_WORD_SWAP( "b61-14.f1", 0x000002, 0x80000, CRC(89368c3e) SHA1(8d227439ab321fd5d432d860544daea0e78ce588) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "b61-15.h1", 0x100002, 0x80000, CRC(910cc4f9) SHA1(9ecfa84123a8f9d048f0a689647e92f25af73899) ) + ROM_LOAD32_WORD_SWAP( "b61-16.j1", 0x000000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "b61-17.k1", 0x100000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b61-01.e18", 0x00000, 0x80000, CRC(3cf99786) SHA1(f6febf9bda87ca04f0a5890d0e8001c26dfa6c81) ) @@ -1115,10 +1092,10 @@ ROM_START( supermanu ) /* No US copyright notice or FBI logo - Just a coinage di ROM_LOAD( "b61_10.d18", 0x00000, 0x10000, CRC(6efe79e8) SHA1(7a76efaaeab71473f4b0b23a89141f203488ce1d) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "b61-14.f1", 0x000000, 0x80000, CRC(89368c3e) SHA1(8d227439ab321fd5d432d860544daea0e78ce588) ) /* Plane 0, 1 */ - ROM_LOAD( "b61-15.h1", 0x080000, 0x80000, CRC(910cc4f9) SHA1(9ecfa84123a8f9d048f0a689647e92f25af73899) ) - ROM_LOAD( "b61-16.j1", 0x100000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ - ROM_LOAD( "b61-17.k1", 0x180000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) + ROM_LOAD32_WORD_SWAP( "b61-14.f1", 0x000002, 0x80000, CRC(89368c3e) SHA1(8d227439ab321fd5d432d860544daea0e78ce588) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "b61-15.h1", 0x100002, 0x80000, CRC(910cc4f9) SHA1(9ecfa84123a8f9d048f0a689647e92f25af73899) ) + ROM_LOAD32_WORD_SWAP( "b61-16.j1", 0x000000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "b61-17.k1", 0x100000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b61-01.e18", 0x00000, 0x80000, CRC(3cf99786) SHA1(f6febf9bda87ca04f0a5890d0e8001c26dfa6c81) ) @@ -1138,10 +1115,10 @@ ROM_START( supermanj ) /* Shows a Japan copyright notice */ ROM_LOAD( "b61_10.d18", 0x00000, 0x10000, CRC(6efe79e8) SHA1(7a76efaaeab71473f4b0b23a89141f203488ce1d) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "b61-14.f1", 0x000000, 0x80000, CRC(89368c3e) SHA1(8d227439ab321fd5d432d860544daea0e78ce588) ) /* Plane 0, 1 */ - ROM_LOAD( "b61-15.h1", 0x080000, 0x80000, CRC(910cc4f9) SHA1(9ecfa84123a8f9d048f0a689647e92f25af73899) ) - ROM_LOAD( "b61-16.j1", 0x100000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ - ROM_LOAD( "b61-17.k1", 0x180000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) + ROM_LOAD32_WORD_SWAP( "b61-14.f1", 0x000002, 0x80000, CRC(89368c3e) SHA1(8d227439ab321fd5d432d860544daea0e78ce588) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "b61-15.h1", 0x100002, 0x80000, CRC(910cc4f9) SHA1(9ecfa84123a8f9d048f0a689647e92f25af73899) ) + ROM_LOAD32_WORD_SWAP( "b61-16.j1", 0x000000, 0x80000, CRC(3622ed2f) SHA1(03f4383f6ff8b5f1e26bc6bbef2fb1855d3bb93f) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "b61-17.k1", 0x100000, 0x80000, CRC(c34f27e0) SHA1(07ee02c18ce29f35e8ae87d0c1ed80b726c246a6) ) ROM_REGION( 0x80000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b61-01.e18", 0x00000, 0x80000, CRC(3cf99786) SHA1(f6febf9bda87ca04f0a5890d0e8001c26dfa6c81) ) @@ -1169,10 +1146,10 @@ ROM_START( twinhawk ) ROM_LOAD( "b87-07.13e", 0x00000, 0x8000, CRC(e2e0efa0) SHA1(4f1435ba738895996f26a64c2237e8349337df4a) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "b87-02.3h", 0x000000, 0x80000, CRC(89ad43a0) SHA1(6ff6ee085c1c06a05f4f8743d979d3552b7475a0) ) /* Plane 0, 1 */ - ROM_LOAD( "b87-01.3f", 0x080000, 0x80000, CRC(81e82ae1) SHA1(d4dbdbf9ae0af69bbeccafb3cc2f67dadda72432) ) - ROM_LOAD( "b87-04.3k", 0x100000, 0x80000, CRC(958434b6) SHA1(cf5912c4468cb2079ff180203045a436175c037c) ) /* Plane 2, 3 */ - ROM_LOAD( "b87-03.3j", 0x180000, 0x80000, CRC(ce155ae0) SHA1(7293125fc23f2411c4edd427a2576c145b3f2dd4) ) + ROM_LOAD32_WORD_SWAP( "b87-02.3h", 0x000002, 0x80000, CRC(89ad43a0) SHA1(6ff6ee085c1c06a05f4f8743d979d3552b7475a0) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "b87-01.3f", 0x100002, 0x80000, CRC(81e82ae1) SHA1(d4dbdbf9ae0af69bbeccafb3cc2f67dadda72432) ) + ROM_LOAD32_WORD_SWAP( "b87-04.3k", 0x000000, 0x80000, CRC(958434b6) SHA1(cf5912c4468cb2079ff180203045a436175c037c) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "b87-03.3j", 0x100000, 0x80000, CRC(ce155ae0) SHA1(7293125fc23f2411c4edd427a2576c145b3f2dd4) ) ROM_END ROM_START( twinhawku ) @@ -1184,10 +1161,10 @@ ROM_START( twinhawku ) ROM_LOAD( "b87-07.13e", 0x00000, 0x8000, CRC(e2e0efa0) SHA1(4f1435ba738895996f26a64c2237e8349337df4a) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "b87-02.3h", 0x000000, 0x80000, CRC(89ad43a0) SHA1(6ff6ee085c1c06a05f4f8743d979d3552b7475a0) ) /* Plane 0, 1 */ - ROM_LOAD( "b87-01.3f", 0x080000, 0x80000, CRC(81e82ae1) SHA1(d4dbdbf9ae0af69bbeccafb3cc2f67dadda72432) ) - ROM_LOAD( "b87-04.3k", 0x100000, 0x80000, CRC(958434b6) SHA1(cf5912c4468cb2079ff180203045a436175c037c) ) /* Plane 2, 3 */ - ROM_LOAD( "b87-03.3j", 0x180000, 0x80000, CRC(ce155ae0) SHA1(7293125fc23f2411c4edd427a2576c145b3f2dd4) ) + ROM_LOAD32_WORD_SWAP( "b87-02.3h", 0x000002, 0x80000, CRC(89ad43a0) SHA1(6ff6ee085c1c06a05f4f8743d979d3552b7475a0) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "b87-01.3f", 0x100002, 0x80000, CRC(81e82ae1) SHA1(d4dbdbf9ae0af69bbeccafb3cc2f67dadda72432) ) + ROM_LOAD32_WORD_SWAP( "b87-04.3k", 0x000000, 0x80000, CRC(958434b6) SHA1(cf5912c4468cb2079ff180203045a436175c037c) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "b87-03.3j", 0x100000, 0x80000, CRC(ce155ae0) SHA1(7293125fc23f2411c4edd427a2576c145b3f2dd4) ) ROM_END ROM_START( daisenpu ) @@ -1199,10 +1176,10 @@ ROM_START( daisenpu ) ROM_LOAD( "b87-07.13e", 0x00000, 0x8000, CRC(e2e0efa0) SHA1(4f1435ba738895996f26a64c2237e8349337df4a) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "b87-02.3h", 0x000000, 0x80000, CRC(89ad43a0) SHA1(6ff6ee085c1c06a05f4f8743d979d3552b7475a0) ) /* Plane 0, 1 */ - ROM_LOAD( "b87-01.3f", 0x080000, 0x80000, CRC(81e82ae1) SHA1(d4dbdbf9ae0af69bbeccafb3cc2f67dadda72432) ) - ROM_LOAD( "b87-04.3k", 0x100000, 0x80000, CRC(958434b6) SHA1(cf5912c4468cb2079ff180203045a436175c037c) ) /* Plane 2, 3 */ - ROM_LOAD( "b87-03.3j", 0x180000, 0x80000, CRC(ce155ae0) SHA1(7293125fc23f2411c4edd427a2576c145b3f2dd4) ) + ROM_LOAD32_WORD_SWAP( "b87-02.3h", 0x000002, 0x80000, CRC(89ad43a0) SHA1(6ff6ee085c1c06a05f4f8743d979d3552b7475a0) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "b87-01.3f", 0x100002, 0x80000, CRC(81e82ae1) SHA1(d4dbdbf9ae0af69bbeccafb3cc2f67dadda72432) ) + ROM_LOAD32_WORD_SWAP( "b87-04.3k", 0x000000, 0x80000, CRC(958434b6) SHA1(cf5912c4468cb2079ff180203045a436175c037c) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "b87-03.3j", 0x100000, 0x80000, CRC(ce155ae0) SHA1(7293125fc23f2411c4edd427a2576c145b3f2dd4) ) ROM_END ROM_START( gigandes ) @@ -1216,10 +1193,10 @@ ROM_START( gigandes ) ROM_LOAD( "east_5.17d", 0x00000, 0x10000, CRC(b24ab5f4) SHA1(e4730df984e9686c538df5fc626b795bda1db939) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "east_8.3f", 0x000000, 0x80000, CRC(75eece28) SHA1(7ce66cd8bca7dd214367beae067727c8735c0f7e) ) /* Plane 0, 1 */ - ROM_LOAD( "east_7.3h", 0x080000, 0x80000, CRC(b179a76a) SHA1(cff2caf1eb0dda8a1b8283b9950b908b102f61de) ) - ROM_LOAD( "east_9.3j", 0x100000, 0x80000, CRC(5c5e6898) SHA1(f348ac752a571902c55f36e21aa3fb9ef97528e3) ) /* Plane 2, 3 */ - ROM_LOAD( "east_6.3k", 0x180000, 0x80000, CRC(52db30e9) SHA1(0b6d73f2c6e6c1ad5fcb2a9edf50069cd0691483) ) + ROM_LOAD32_WORD_SWAP( "east_8.3f", 0x000002, 0x80000, CRC(75eece28) SHA1(7ce66cd8bca7dd214367beae067727c8735c0f7e) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "east_7.3h", 0x100002, 0x80000, CRC(b179a76a) SHA1(cff2caf1eb0dda8a1b8283b9950b908b102f61de) ) + ROM_LOAD32_WORD_SWAP( "east_9.3j", 0x000000, 0x80000, CRC(5c5e6898) SHA1(f348ac752a571902c55f36e21aa3fb9ef97528e3) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "east_6.3k", 0x100000, 0x80000, CRC(52db30e9) SHA1(0b6d73f2c6e6c1ad5fcb2a9edf50069cd0691483) ) ROM_REGION( 0x80000, "ymsnd.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "east-11.16f", 0x00000, 0x80000, CRC(92111f96) SHA1(e781f24761b7a923388f4cda64c7b31388fd64c5) ) @@ -1239,10 +1216,10 @@ ROM_START( gigandesa ) ROM_LOAD( "east_5.17d", 0x00000, 0x10000, CRC(b24ab5f4) SHA1(e4730df984e9686c538df5fc626b795bda1db939) ) ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "east_8.3f", 0x000000, 0x80000, CRC(75eece28) SHA1(7ce66cd8bca7dd214367beae067727c8735c0f7e) ) /* Plane 0, 1 */ - ROM_LOAD( "east_7.3h", 0x080000, 0x80000, CRC(b179a76a) SHA1(cff2caf1eb0dda8a1b8283b9950b908b102f61de) ) - ROM_LOAD( "east_9.3j", 0x100000, 0x80000, CRC(5c5e6898) SHA1(f348ac752a571902c55f36e21aa3fb9ef97528e3) ) /* Plane 2, 3 */ - ROM_LOAD( "east_6.3k", 0x180000, 0x80000, CRC(52db30e9) SHA1(0b6d73f2c6e6c1ad5fcb2a9edf50069cd0691483) ) + ROM_LOAD32_WORD_SWAP( "east_8.3f", 0x000002, 0x80000, CRC(75eece28) SHA1(7ce66cd8bca7dd214367beae067727c8735c0f7e) ) /* Plane 0, 1 */ + ROM_LOAD32_WORD_SWAP( "east_7.3h", 0x100002, 0x80000, CRC(b179a76a) SHA1(cff2caf1eb0dda8a1b8283b9950b908b102f61de) ) + ROM_LOAD32_WORD_SWAP( "east_9.3j", 0x000000, 0x80000, CRC(5c5e6898) SHA1(f348ac752a571902c55f36e21aa3fb9ef97528e3) ) /* Plane 2, 3 */ + ROM_LOAD32_WORD_SWAP( "east_6.3k", 0x100000, 0x80000, CRC(52db30e9) SHA1(0b6d73f2c6e6c1ad5fcb2a9edf50069cd0691483) ) ROM_REGION( 0x80000, "ymsnd.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "east-11.16f", 0x00000, 0x80000, CRC(92111f96) SHA1(e781f24761b7a923388f4cda64c7b31388fd64c5) ) @@ -1260,10 +1237,10 @@ ROM_START( kyustrkr ) ROM_LOAD( "ic.18d", 0x00000, 0x10000, CRC(92cfb788) SHA1(41cd5433584df05652bd0ce8c5a35dc38262d6f2) ) ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "m-8-3.u3", 0x00000, 0x20000, CRC(1c4084e6) SHA1(addea2ba07bddb41fbe7f0fc859e744990bb9ff5) ) - ROM_LOAD( "m-8-2.u4", 0x20000, 0x20000, CRC(ada21c4d) SHA1(a683c8d798370c50d9bd5e67e91d7ed0f1659c20) ) - ROM_LOAD( "m-8-1.u5", 0x40000, 0x20000, CRC(9d95aad6) SHA1(3391b14196fea12223ab247d909791bc68fc8d56) ) - ROM_LOAD( "m-8-0.u6", 0x60000, 0x20000, CRC(0dfb6ed3) SHA1(0937614c8f97040d0216363bfb2bc21161128a3c) ) + ROM_LOAD32_BYTE( "m-8-3.u3", 0x00003, 0x20000, CRC(1c4084e6) SHA1(addea2ba07bddb41fbe7f0fc859e744990bb9ff5) ) + ROM_LOAD32_BYTE( "m-8-2.u4", 0x00002, 0x20000, CRC(ada21c4d) SHA1(a683c8d798370c50d9bd5e67e91d7ed0f1659c20) ) + ROM_LOAD32_BYTE( "m-8-1.u5", 0x00001, 0x20000, CRC(9d95aad6) SHA1(3391b14196fea12223ab247d909791bc68fc8d56) ) + ROM_LOAD32_BYTE( "m-8-0.u6", 0x00000, 0x20000, CRC(0dfb6ed3) SHA1(0937614c8f97040d0216363bfb2bc21161128a3c) ) ROM_REGION( 0x80000, "ymsnd.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "m-8-5.u2", 0x00000, 0x20000, CRC(d9d90e0a) SHA1(1011548b4fb5f1a194c93ded512e74cda2c06ceb) ) @@ -1281,10 +1258,10 @@ ROM_START( ballbros ) ROM_LOAD( "8d", 0x00000, 0x10000, CRC(d1c515af) SHA1(00451991b4c793487b156f9be2b2e4688325ff24) ) ROM_REGION( 0x080000, "gfx1", 0 ) - ROM_LOAD( "3", 0x000000, 0x20000, CRC(ec3e0537) SHA1(51fe5c6ef007c188b2f51ad2225753d2b403e35a) ) /* Plane 0, 1 */ - ROM_LOAD( "2", 0x020000, 0x20000, CRC(bb441717) SHA1(205ae0aa3ded11766ae8f6fe7d08fefff17a9b73) ) - ROM_LOAD( "1", 0x040000, 0x20000, CRC(8196d624) SHA1(c859e3b1d3b481f38cfe47576efc1dcdbe6cde28) ) - ROM_LOAD( "0", 0x060000, 0x20000, CRC(1cc584e5) SHA1(18cf607fa06c095d088b80cea2a1e507d19c7126) ) + ROM_LOAD32_BYTE( "3", 0x000003, 0x20000, CRC(ec3e0537) SHA1(51fe5c6ef007c188b2f51ad2225753d2b403e35a) ) /* Plane 0 */ + ROM_LOAD32_BYTE( "2", 0x000002, 0x20000, CRC(bb441717) SHA1(205ae0aa3ded11766ae8f6fe7d08fefff17a9b73) ) /* Plane 1 */ + ROM_LOAD32_BYTE( "1", 0x000001, 0x20000, CRC(8196d624) SHA1(c859e3b1d3b481f38cfe47576efc1dcdbe6cde28) ) /* Plane 2 */ + ROM_LOAD32_BYTE( "0", 0x000000, 0x20000, CRC(1cc584e5) SHA1(18cf607fa06c095d088b80cea2a1e507d19c7126) ) /* Plane 3 */ ROM_REGION( 0x80000, "ymsnd.deltat", 0 ) /* Delta-T samples */ ROM_LOAD( "east-11", 0x00000, 0x80000, CRC(92111f96) SHA1(e781f24761b7a923388f4cda64c7b31388fd64c5) ) diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h index 216a759c194..fc92475a048 100644 --- a/src/mame/includes/taito_x.h +++ b/src/mame/includes/taito_x.h @@ -30,12 +30,12 @@ public: void daisenpu(machine_config &config); private: - DECLARE_READ16_MEMBER(superman_dsw_input_r); - DECLARE_WRITE8_MEMBER(superman_counters_w); - DECLARE_READ16_MEMBER(daisenpu_input_r); - DECLARE_WRITE16_MEMBER(daisenpu_input_w); - DECLARE_WRITE16_MEMBER(kyustrkr_input_w); - DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + u16 superman_dsw_input_r(offs_t offset); + void superman_counters_w(u8 data); + u16 daisenpu_input_r(offs_t offset); + void daisenpu_input_w(offs_t offset, u16 data); + void kyustrkr_input_w(offs_t offset, u16 data); + void sound_bankswitch_w(u8 data); DECLARE_MACHINE_START(taitox); INTERRUPT_GEN_MEMBER(interrupt); -- cgit v1.2.3