Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-08 11:21:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

lastduel.cpp : Minor cleanups, Fix naming

Browse Source 
Cleanup duplicates, PALETTE_DECODER for palette, Reduce runtime tag lookups
This commit is contained in:
cam900 2018-06-25 21:00:28 +09:00 committed by Vas Crabb
parent 2ce57abcf9
commit 3e9f4d91b6
3 changed files with 124 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/mame/drivers/lastduel.cpp
View File

@ -133,10 +133,18 @@ Notes:
/******************************************************************************/ /******************************************************************************/
WRITE16_MEMBER(lastduel_state::lastduel_sound_w) template<int Layer>
WRITE16_MEMBER(lastduel_state::lastduel_vram_w)
{ {
if (ACCESSING_BITS_0_7) COMBINE_DATA(&m_vram[Layer][offset]);
m_soundlatch->write(space, 0, data & 0xff); m_tilemap[Layer]->mark_tile_dirty(offset / 2);
}
template<int Layer>
WRITE16_MEMBER(lastduel_state::madgear_vram_w)
{
COMBINE_DATA(&m_vram[Layer][offset]);
m_tilemap[Layer]->mark_tile_dirty(offset & 0x7ff);
} }
/******************************************************************************/ /******************************************************************************/
@ -146,15 +154,17 @@ void lastduel_state::lastduel_map(address_map &map)
map(0x000000, 0x05ffff).rom(); map(0x000000, 0x05ffff).rom();
map(0xfc0000, 0xfc0003).nopw(); /* Written rarely */ map(0xfc0000, 0xfc0003).nopw(); /* Written rarely */
map(0xfc0800, 0xfc0fff).ram().share("spriteram"); map(0xfc0800, 0xfc0fff).ram().share("spriteram");
map(0xfc4000, 0xfc4001).portr("P1_P2").w(FUNC(lastduel_state::lastduel_flip_w)); map(0xfc4000, 0xfc4001).portr("P1_P2");
map(0xfc4002, 0xfc4003).portr("SYSTEM").w(FUNC(lastduel_state::lastduel_sound_w)); map(0xfc4001, 0xfc4001).w(FUNC(lastduel_state::flip_w));
map(0xfc4002, 0xfc4003).portr("SYSTEM");
map(0xfc4003, 0xfc4003).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0xfc4004, 0xfc4005).portr("DSW1"); map(0xfc4004, 0xfc4005).portr("DSW1");
map(0xfc4006, 0xfc4007).portr("DSW2"); map(0xfc4006, 0xfc4007).portr("DSW2");
map(0xfc8000, 0xfc800f).w(FUNC(lastduel_state::lastduel_scroll_w)); map(0xfc8000, 0xfc800f).w(FUNC(lastduel_state::vctrl_w));
map(0xfcc000, 0xfcdfff).ram().w(FUNC(lastduel_state::lastduel_vram_w)).share("vram"); map(0xfcc000, 0xfcdfff).ram().w(FUNC(lastduel_state::txram_w)).share("txram");
map(0xfd0000, 0xfd3fff).ram().w(FUNC(lastduel_state::lastduel_scroll1_w)).share("scroll1"); map(0xfd0000, 0xfd3fff).ram().w(FUNC(lastduel_state::lastduel_vram_w<0>)).share("vram_0");
map(0xfd4000, 0xfd7fff).ram().w(FUNC(lastduel_state::lastduel_scroll2_w)).share("scroll2"); map(0xfd4000, 0xfd7fff).ram().w(FUNC(lastduel_state::lastduel_vram_w<1>)).share("vram_1");
map(0xfd8000, 0xfd87ff).ram().w(FUNC(lastduel_state::lastduel_palette_word_w)).share("paletteram"); map(0xfd8000, 0xfd87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfe0000, 0xffffff).ram(); map(0xfe0000, 0xffffff).ram();
} }
@ -162,15 +172,17 @@ void lastduel_state::madgear_map(address_map &map)
{ {
map(0x000000, 0x07ffff).rom(); map(0x000000, 0x07ffff).rom();
map(0xfc1800, 0xfc1fff).ram().share("spriteram"); map(0xfc1800, 0xfc1fff).ram().share("spriteram");
map(0xfc4000, 0xfc4001).portr("DSW1").w(FUNC(lastduel_state::lastduel_flip_w)); map(0xfc4000, 0xfc4001).portr("DSW1");
map(0xfc4002, 0xfc4003).portr("DSW2").w(FUNC(lastduel_state::lastduel_sound_w)); map(0xfc4001, 0xfc4001).w(FUNC(lastduel_state::flip_w));
map(0xfc4002, 0xfc4003).portr("DSW2");
map(0xfc4003, 0xfc4003).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0xfc4004, 0xfc4005).portr("P1_P2"); map(0xfc4004, 0xfc4005).portr("P1_P2");
map(0xfc4006, 0xfc4007).portr("SYSTEM"); map(0xfc4006, 0xfc4007).portr("SYSTEM");
map(0xfc8000, 0xfc9fff).ram().w(FUNC(lastduel_state::lastduel_vram_w)).share("vram"); map(0xfc8000, 0xfc9fff).ram().w(FUNC(lastduel_state::txram_w)).share("txram");
map(0xfcc000, 0xfcc7ff).ram().w(FUNC(lastduel_state::lastduel_palette_word_w)).share("paletteram"); map(0xfcc000, 0xfcc7ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0xfd0000, 0xfd000f).w(FUNC(lastduel_state::lastduel_scroll_w)); map(0xfd0000, 0xfd000f).w(FUNC(lastduel_state::vctrl_w));
map(0xfd4000, 0xfd7fff).ram().w(FUNC(lastduel_state::madgear_scroll1_w)).share("scroll1"); map(0xfd4000, 0xfd7fff).ram().w(FUNC(lastduel_state::madgear_vram_w<0>)).share("vram_0");
map(0xfd8000, 0xfdffff).ram().w(FUNC(lastduel_state::madgear_scroll2_w)).share("scroll2"); map(0xfd8000, 0xfdffff).ram().w(FUNC(lastduel_state::madgear_vram_w<1>)).share("vram_1");
map(0xff0000, 0xffffff).ram(); map(0xff0000, 0xffffff).ram();
} }
@ -187,13 +199,13 @@ void lastduel_state::sound_map(address_map &map)
WRITE8_MEMBER(lastduel_state::mg_bankswitch_w) WRITE8_MEMBER(lastduel_state::mg_bankswitch_w)
{ {
membank("bank1")->set_entry(data & 0x01); m_audiobank->set_entry(data & 0x01);
} }
void lastduel_state::madgear_sound_map(address_map &map) void lastduel_state::madgear_sound_map(address_map &map)
{ {
map(0x0000, 0x7fff).rom(); map(0x0000, 0x7fff).rom();
map(0x8000, 0xcfff).bankr("bank1"); map(0x8000, 0xcfff).bankr("audiobank");
map(0xd000, 0xd7ff).ram(); map(0xd000, 0xd7ff).ram();
map(0xf000, 0xf001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf000, 0xf001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
map(0xf002, 0xf003).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); map(0xf002, 0xf003).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
@ -391,10 +403,8 @@ static const gfx_layout sprite_layout =
RGN_FRAC(1,1), RGN_FRAC(1,1),
4, 4,
{ 16, 0, 24, 8 }, { 16, 0, 24, 8 },
{ 0, 1, 2, 3, 4, 5, 6, 7, { STEP8(0,1), STEP8(8*4*16,1) },
512+0,512+1,512+2,512+3,512+4,512+5,512+6,512+7 }, { STEP16(0,8*4) },
{ 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 },
128*8 128*8
}; };
@ -405,8 +415,8 @@ static const gfx_layout text_layout =
RGN_FRAC(1,1), RGN_FRAC(1,1),
2, 2,
{ 4, 0 }, { 4, 0 },
{ 0, 1, 2, 3, 8+0, 8+1, 8+2, 8+3 }, { STEP4(0,1), STEP4(4*2,1) },
{ 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16 }, { STEP8(0,4*2*2) },
16*8 16*8
}; };
@ -416,23 +426,8 @@ static const gfx_layout madgear_tile =
RGN_FRAC(1,1), RGN_FRAC(1,1),
4, 4,
{ 3*4, 2*4, 1*4, 0*4 }, { 3*4, 2*4, 1*4, 0*4 },
{ 0, 1, 2, 3, 16+0, 16+1, 16+2, 16+3, { STEP4(0,1), STEP4(4*4,1), STEP4(8*4*16,1), STEP4(8*4*16+4*4,1) },
32*16+0, 32*16+1, 32*16+2, 32*16+3, 32*16+16+0, 32*16+16+1, 32*16+16+2, 32*16+16+3 }, { STEP16(0,8*4) },
{ 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 },
64*16
};
static const gfx_layout madgear_tile2 =
{
16,16,
RGN_FRAC(1,1),
4,
{ 1*4, 0*4, 3*4, 2*4 },
{ 0, 1, 2, 3, 16+0, 16+1, 16+2, 16+3,
32*16+0, 32*16+1, 32*16+2, 32*16+3, 32*16+16+0, 32*16+16+1, 32*16+16+2, 32*16+16+3 },
{ 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 },
64*16 64*16
}; };
@ -443,13 +438,6 @@ static GFXDECODE_START( gfx_lastduel )
GFXDECODE_ENTRY( "gfx4", 0, madgear_tile, 0x100, 16 ) /* colors 0x100-0x1ff */ GFXDECODE_ENTRY( "gfx4", 0, madgear_tile, 0x100, 16 ) /* colors 0x100-0x1ff */
GFXDECODE_END GFXDECODE_END
static GFXDECODE_START( gfx_madgear )
GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 ) /* colors 0x200-0x2ff */
GFXDECODE_ENTRY( "gfx2", 0, text_layout, 0x300, 16 ) /* colors 0x300-0x33f */
GFXDECODE_ENTRY( "gfx3", 0, madgear_tile, 0x000, 16 ) /* colors 0x000-0x0ff */
GFXDECODE_ENTRY( "gfx4", 0, madgear_tile2, 0x100, 16 ) /* colors 0x100-0x1ff */
GFXDECODE_END
/******************************************************************************/ /******************************************************************************/
TIMER_DEVICE_CALLBACK_MEMBER(lastduel_state::lastduel_timer_cb) TIMER_DEVICE_CALLBACK_MEMBER(lastduel_state::lastduel_timer_cb)
@ -465,14 +453,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(lastduel_state::madgear_timer_cb)
MACHINE_START_MEMBER(lastduel_state,lastduel) MACHINE_START_MEMBER(lastduel_state,lastduel)
{ {
save_item(NAME(m_tilemap_priority)); save_item(NAME(m_tilemap_priority));
save_item(NAME(m_scroll)); save_item(NAME(m_vctrl));
} }
MACHINE_START_MEMBER(lastduel_state,madgear) MACHINE_START_MEMBER(lastduel_state,madgear)
{ {
uint8_t *ROM = memregion("audiocpu")->base(); uint8_t *ROM = memregion("audiocpu")->base();
membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x4000); m_audiobank->configure_entries(0, 2, &ROM[0x8000], 0x4000);
MACHINE_START_CALL_MEMBER(lastduel); MACHINE_START_CALL_MEMBER(lastduel);
} }
@ -484,7 +472,7 @@ void lastduel_state::machine_reset()
m_tilemap_priority = 0; m_tilemap_priority = 0;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
m_scroll[i] = 0; m_vctrl[i] = 0;
} }
MACHINE_CONFIG_START(lastduel_state::lastduel) MACHINE_CONFIG_START(lastduel_state::lastduel)
@ -515,6 +503,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel)
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastduel) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastduel)
MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT_CLASS(2, lastduel_state, lastduel_RRRRGGGGBBBBIIII)
MCFG_VIDEO_START_OVERRIDE(lastduel_state,lastduel) MCFG_VIDEO_START_OVERRIDE(lastduel_state,lastduel)
@ -558,8 +547,9 @@ MACHINE_CONFIG_START(lastduel_state::madgear)
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_madgear) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastduel)
MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT_CLASS(2, lastduel_state, lastduel_RRRRGGGGBBBBIIII)
MCFG_VIDEO_START_OVERRIDE(lastduel_state,madgear) MCFG_VIDEO_START_OVERRIDE(lastduel_state,madgear)
@ -724,8 +714,7 @@ ROM_START( madgear )
ROM_LOAD16_BYTE( "mg_01.5b", 0x40001, 0x20000, CRC(1cea2af0) SHA1(9f4642ed2d21fa525e9fecaac6235a3653df3030) ) ROM_LOAD16_BYTE( "mg_01.5b", 0x40001, 0x20000, CRC(1cea2af0) SHA1(9f4642ed2d21fa525e9fecaac6235a3653df3030) )
ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */ ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */
ROM_LOAD( "mg_05.14j", 0x00000, 0x08000, CRC(2fbfc945) SHA1(8066516dcf9261abee1edd103bdbe0cc18913ed3) ) ROM_LOAD( "mg_05.14j", 0x00000, 0x10000, CRC(2fbfc945) SHA1(8066516dcf9261abee1edd103bdbe0cc18913ed3) )
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x80000, "sprites", 0 ) /* CN-SUB daughter cards replace unused NEC 23C2000 mask ROMS (QFP52) at 5A & 13A */ ROM_REGION( 0x80000, "sprites", 0 ) /* CN-SUB daughter cards replace unused NEC 23C2000 mask ROMS (QFP52) at 5A & 13A */
ROM_LOAD32_BYTE( "mg_m11.rom0", 0x000002, 0x10000, CRC(ee319a64) SHA1(ce8d65fdac3ec1009b22764807c03dd96b340660) ) /* Interleaved sprites */ ROM_LOAD32_BYTE( "mg_m11.rom0", 0x000002, 0x10000, CRC(ee319a64) SHA1(ce8d65fdac3ec1009b22764807c03dd96b340660) ) /* Interleaved sprites */
@ -744,7 +733,7 @@ ROM_START( madgear )
ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
ROM_REGION( 0x80000, "gfx4", 0 ) ROM_REGION( 0x80000, "gfx4", 0 )
ROM_LOAD( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */ ROM_LOAD16_WORD_SWAP( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */
ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */
ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) ) ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) )
@ -762,8 +751,7 @@ ROM_START( madgearj )
ROM_LOAD16_BYTE( "mg_01.5b", 0x40001, 0x20000, CRC(1cea2af0) SHA1(9f4642ed2d21fa525e9fecaac6235a3653df3030) ) ROM_LOAD16_BYTE( "mg_01.5b", 0x40001, 0x20000, CRC(1cea2af0) SHA1(9f4642ed2d21fa525e9fecaac6235a3653df3030) )
ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */ ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */
ROM_LOAD( "mg_05.14j", 0x00000, 0x08000, CRC(2fbfc945) SHA1(8066516dcf9261abee1edd103bdbe0cc18913ed3) ) ROM_LOAD( "mg_05.14j", 0x00000, 0x10000, CRC(2fbfc945) SHA1(8066516dcf9261abee1edd103bdbe0cc18913ed3) )
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x80000, "sprites", 0 ) /* CN-SUB daughter cards replace unused NEC 23C2000 mask ROMS (QFP52) at 5A & 13A */ ROM_REGION( 0x80000, "sprites", 0 ) /* CN-SUB daughter cards replace unused NEC 23C2000 mask ROMS (QFP52) at 5A & 13A */
ROM_LOAD32_BYTE( "mg_m11.rom0", 0x000002, 0x10000, CRC(ee319a64) SHA1(ce8d65fdac3ec1009b22764807c03dd96b340660) ) /* Interleaved sprites */ ROM_LOAD32_BYTE( "mg_m11.rom0", 0x000002, 0x10000, CRC(ee319a64) SHA1(ce8d65fdac3ec1009b22764807c03dd96b340660) ) /* Interleaved sprites */
@ -782,7 +770,7 @@ ROM_START( madgearj )
ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
ROM_REGION( 0x80000, "gfx4", 0 ) ROM_REGION( 0x80000, "gfx4", 0 )
ROM_LOAD( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */ ROM_LOAD16_WORD_SWAP( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */
ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */
ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) ) ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) )
@ -800,8 +788,7 @@ ROM_START( ledstorm )
ROM_LOAD16_BYTE( "mde_01.5b", 0x40001, 0x20000, CRC(1cea2af0) SHA1(9f4642ed2d21fa525e9fecaac6235a3653df3030) ) ROM_LOAD16_BYTE( "mde_01.5b", 0x40001, 0x20000, CRC(1cea2af0) SHA1(9f4642ed2d21fa525e9fecaac6235a3653df3030) )
ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */ ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */
ROM_LOAD( "mde_05.14j", 0x00000, 0x08000, CRC(2fbfc945) SHA1(8066516dcf9261abee1edd103bdbe0cc18913ed3) ) ROM_LOAD( "mde_05.14j", 0x00000, 0x10000, CRC(2fbfc945) SHA1(8066516dcf9261abee1edd103bdbe0cc18913ed3) )
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x80000, "sprites", 0 ) /* CN-SUB daughter cards replace unused NEC 23C2000 mask ROMS (QFP52) at 5A & 13A */ ROM_REGION( 0x80000, "sprites", 0 ) /* CN-SUB daughter cards replace unused NEC 23C2000 mask ROMS (QFP52) at 5A & 13A */
ROM_LOAD32_BYTE( "11.rom0", 0x000002, 0x10000, CRC(ee319a64) SHA1(ce8d65fdac3ec1009b22764807c03dd96b340660) ) /* Interleaved sprites */ ROM_LOAD32_BYTE( "11.rom0", 0x000002, 0x10000, CRC(ee319a64) SHA1(ce8d65fdac3ec1009b22764807c03dd96b340660) ) /* Interleaved sprites */
@ -820,7 +807,7 @@ ROM_START( ledstorm )
ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
ROM_REGION( 0x80000, "gfx4", 0 ) ROM_REGION( 0x80000, "gfx4", 0 )
ROM_LOAD( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */ ROM_LOAD16_WORD_SWAP( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */
ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */
ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) ) ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) )
@ -838,8 +825,7 @@ ROM_START( leds2011 )
ROM_LOAD16_BYTE( "ls-01.5b", 0x40001, 0x20000, CRC(8bf934dd) SHA1(f2287a4361af4986eb010dfbfb6de3a3d4124937) ) ROM_LOAD16_BYTE( "ls-01.5b", 0x40001, 0x20000, CRC(8bf934dd) SHA1(f2287a4361af4986eb010dfbfb6de3a3d4124937) )
ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */ ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */
ROM_LOAD( "ls-07.14j", 0x00000, 0x08000, CRC(98af7838) SHA1(a0b87b9ce3c1b0e5d7696ffaab9cea483b9ee928) ) ROM_LOAD( "ls-07.14j", 0x00000, 0x10000, CRC(98af7838) SHA1(a0b87b9ce3c1b0e5d7696ffaab9cea483b9ee928) )
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x80000, "sprites", 0 ) ROM_REGION( 0x80000, "sprites", 0 )
ROM_LOAD16_BYTE( "ls-10.13a", 0x00001, 0x40000, CRC(db2c5883) SHA1(00899f96e2cbf6930c107a53f660a944fa9a2682) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD16_BYTE( "ls-10.13a", 0x00001, 0x40000, CRC(db2c5883) SHA1(00899f96e2cbf6930c107a53f660a944fa9a2682) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
@ -852,7 +838,7 @@ ROM_START( leds2011 )
ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
ROM_REGION( 0x80000, "gfx4", 0 ) ROM_REGION( 0x80000, "gfx4", 0 )
ROM_LOAD( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */ ROM_LOAD16_WORD_SWAP( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */
ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */
ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) ) ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) )
@ -870,8 +856,7 @@ ROM_START( leds2011u )
ROM_LOAD16_BYTE( "ls-01.5b", 0x40001, 0x20000, CRC(8bf934dd) SHA1(f2287a4361af4986eb010dfbfb6de3a3d4124937) ) ROM_LOAD16_BYTE( "ls-01.5b", 0x40001, 0x20000, CRC(8bf934dd) SHA1(f2287a4361af4986eb010dfbfb6de3a3d4124937) )
ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */ ROM_REGION( 0x18000 , "audiocpu", 0 ) /* audio CPU */
ROM_LOAD( "ls-07.14j", 0x00000, 0x08000, CRC(98af7838) SHA1(a0b87b9ce3c1b0e5d7696ffaab9cea483b9ee928) ) ROM_LOAD( "ls-07.14j", 0x00000, 0x10000, CRC(98af7838) SHA1(a0b87b9ce3c1b0e5d7696ffaab9cea483b9ee928) )
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x80000, "sprites", 0 ) ROM_REGION( 0x80000, "sprites", 0 )
ROM_LOAD16_BYTE( "ls-10.13a", 0x00001, 0x40000, CRC(db2c5883) SHA1(00899f96e2cbf6930c107a53f660a944fa9a2682) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD16_BYTE( "ls-10.13a", 0x00001, 0x40000, CRC(db2c5883) SHA1(00899f96e2cbf6930c107a53f660a944fa9a2682) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
@ -884,7 +869,7 @@ ROM_START( leds2011u )
ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */ ROM_LOAD( "ls-12.7l", 0x000000, 0x40000, CRC(6c1b2c6c) SHA1(18f22129f13c6bfa7e285f0e09a35644272f6ecb) ) /* NEC 23C2000 256kx8 mask ROM (QFP52) */
ROM_REGION( 0x80000, "gfx4", 0 ) ROM_REGION( 0x80000, "gfx4", 0 )
ROM_LOAD( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */ ROM_LOAD16_WORD_SWAP( "ls-11.2l", 0x000000, 0x80000, CRC(6bf81c64) SHA1(2289978c6bdb6e4f86e7094e861df147e757e249) ) /* NEC 23C4000 512kx8 mask ROM (QFP64) */
ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM */
ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) ) ROM_LOAD( "ls-06.10e", 0x00000, 0x20000, CRC(88d39a5b) SHA1(8fb2d1d26e2ffb93dfc9cf8f23bb81eb64496c2b) )

40
src/mame/includes/lastduel.h
View File

@ -14,18 +14,18 @@
class lastduel_state : public driver_device class lastduel_state : public driver_device
{ {
public: public:
lastduel_state(const machine_config &mconfig, device_type type, const char *tag) lastduel_state(const machine_config &mconfig, device_type type, const char *tag) :
: driver_device(mconfig, type, tag), driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"), m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"), m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"), m_soundlatch(*this, "soundlatch"),
m_spriteram(*this, "spriteram"), m_spriteram(*this, "spriteram"),
m_vram(*this, "vram"), m_txram(*this, "txram"),
m_scroll1(*this, "scroll1"), m_vram(*this, "vram_%u", 0U),
m_scroll2(*this, "scroll2"), m_audiobank(*this, "audiobank")
m_paletteram(*this, "paletteram") { } { }
/* devices */ /* devices */
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
@ -36,30 +36,26 @@ public:
/* memory pointers */ /* memory pointers */
required_device<buffered_spriteram16_device> m_spriteram; required_device<buffered_spriteram16_device> m_spriteram;
required_shared_ptr<uint16_t> m_vram; required_shared_ptr<uint16_t> m_txram;
required_shared_ptr<uint16_t> m_scroll1; required_shared_ptr_array<uint16_t, 2> m_vram;
required_shared_ptr<uint16_t> m_scroll2;
required_shared_ptr<uint16_t> m_paletteram; optional_memory_bank m_audiobank;
/* video-related */ /* video-related */
tilemap_t *m_bg_tilemap; tilemap_t *m_tilemap[2];
tilemap_t *m_fg_tilemap;
tilemap_t *m_tx_tilemap; tilemap_t *m_tx_tilemap;
uint16_t m_scroll[8]; uint16_t m_vctrl[8];
int m_sprite_flipy_mask; int m_sprite_flipy_mask;
int m_sprite_pri_mask; int m_sprite_pri_mask;
int m_tilemap_priority; int m_tilemap_priority;
DECLARE_WRITE16_MEMBER(lastduel_sound_w);
DECLARE_WRITE8_MEMBER(mg_bankswitch_w); DECLARE_WRITE8_MEMBER(mg_bankswitch_w);
DECLARE_WRITE16_MEMBER(lastduel_flip_w); DECLARE_WRITE8_MEMBER(flip_w);
DECLARE_WRITE16_MEMBER(lastduel_scroll_w); DECLARE_WRITE16_MEMBER(vctrl_w);
DECLARE_WRITE16_MEMBER(lastduel_scroll1_w); template<int Layer> DECLARE_WRITE16_MEMBER(lastduel_vram_w);
DECLARE_WRITE16_MEMBER(lastduel_scroll2_w); DECLARE_WRITE16_MEMBER(txram_w);
DECLARE_WRITE16_MEMBER(lastduel_vram_w); template<int Layer> DECLARE_WRITE16_MEMBER(madgear_vram_w);
DECLARE_WRITE16_MEMBER(madgear_scroll1_w); DECLARE_PALETTE_DECODER(lastduel_RRRRGGGGBBBBIIII);
DECLARE_WRITE16_MEMBER(madgear_scroll2_w);
DECLARE_WRITE16_MEMBER(lastduel_palette_word_w);
TILE_GET_INFO_MEMBER(ld_get_bg_tile_info); TILE_GET_INFO_MEMBER(ld_get_bg_tile_info);
TILE_GET_INFO_MEMBER(ld_get_fg_tile_info); TILE_GET_INFO_MEMBER(ld_get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info);

117
src/mame/video/lastduel.cpp
View File

@ -20,8 +20,8 @@
TILE_GET_INFO_MEMBER(lastduel_state::ld_get_bg_tile_info) TILE_GET_INFO_MEMBER(lastduel_state::ld_get_bg_tile_info)
{ {
int tile = m_scroll2[2 * tile_index] & 0x1fff; int const tile = m_vram[1][2 * tile_index] & 0x1fff;
int color = m_scroll2[2 * tile_index + 1]; int const color = m_vram[1][2 * tile_index + 1];
SET_TILE_INFO_MEMBER(2, SET_TILE_INFO_MEMBER(2,
tile,color & 0xf, tile,color & 0xf,
TILE_FLIPYX((color & 0x60) >> 5)); TILE_FLIPYX((color & 0x60) >> 5));
@ -29,8 +29,8 @@ TILE_GET_INFO_MEMBER(lastduel_state::ld_get_bg_tile_info)
TILE_GET_INFO_MEMBER(lastduel_state::ld_get_fg_tile_info) TILE_GET_INFO_MEMBER(lastduel_state::ld_get_fg_tile_info)
{ {
int tile = m_scroll1[2 * tile_index] & 0x1fff; int const tile = m_vram[0][2 * tile_index] & 0x1fff;
int color = m_scroll1[2 * tile_index + 1]; int const color = m_vram[0][2 * tile_index + 1];
SET_TILE_INFO_MEMBER(3, SET_TILE_INFO_MEMBER(3,
tile, tile,
color & 0xf, color & 0xf,
@ -40,8 +40,8 @@ TILE_GET_INFO_MEMBER(lastduel_state::ld_get_fg_tile_info)
TILE_GET_INFO_MEMBER(lastduel_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(lastduel_state::get_bg_tile_info)
{ {
int tile = m_scroll2[tile_index] & 0x1fff; int const tile = m_vram[1][tile_index] & 0x1fff;
int color = m_scroll2[tile_index + 0x0800]; int const color = m_vram[1][tile_index + 0x0800];
SET_TILE_INFO_MEMBER(2, SET_TILE_INFO_MEMBER(2,
tile, tile,
color & 0xf, color & 0xf,
@ -50,8 +50,8 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info)
{ {
int tile = m_scroll1[tile_index] & 0x1fff; int const tile = m_vram[0][tile_index] & 0x1fff;
int color = m_scroll1[tile_index + 0x0800]; int const color = m_vram[0][tile_index + 0x0800];
SET_TILE_INFO_MEMBER(3, SET_TILE_INFO_MEMBER(3,
tile, tile,
color & 0xf, color & 0xf,
@ -61,7 +61,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info) TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info)
{ {
int tile = m_vram[tile_index]; int const tile = m_txram[tile_index];
SET_TILE_INFO_MEMBER(1, SET_TILE_INFO_MEMBER(1,
tile & 0x7ff, tile & 0x7ff,
tile>>12, tile>>12,
@ -78,12 +78,12 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info)
VIDEO_START_MEMBER(lastduel_state,lastduel) VIDEO_START_MEMBER(lastduel_state,lastduel)
{ {
m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64);
m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64);
m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_fg_tilemap->set_transmask(0, 0xffff, 0x0001); m_tilemap[0]->set_transmask(0, 0xffff, 0x0001);
m_fg_tilemap->set_transmask(1, 0xf07f, 0x0f81); m_tilemap[0]->set_transmask(1, 0xf07f, 0x0f81);
m_tx_tilemap->set_transparent_pen(3); m_tx_tilemap->set_transparent_pen(3);
m_sprite_flipy_mask = 0x40; m_sprite_flipy_mask = 0x40;
@ -93,14 +93,14 @@ VIDEO_START_MEMBER(lastduel_state,lastduel)
VIDEO_START_MEMBER(lastduel_state,madgear) VIDEO_START_MEMBER(lastduel_state,madgear)
{ {
m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32);
m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32);
m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fix_info),this),TILEMAP_SCAN_ROWS,8,8,64,32);
m_fg_tilemap->set_transmask(0, 0xffff, 0x8000); m_tilemap[0]->set_transmask(0, 0xffff, 0x8000);
m_fg_tilemap->set_transmask(1, 0x80ff, 0xff00); m_tilemap[0]->set_transmask(1, 0x80ff, 0xff00);
m_tx_tilemap->set_transparent_pen(3); m_tx_tilemap->set_transparent_pen(3);
m_bg_tilemap->set_transparent_pen(15); m_tilemap[1]->set_transparent_pen(15);
m_sprite_flipy_mask = 0x80; m_sprite_flipy_mask = 0x80;
m_sprite_pri_mask = 0x10; m_sprite_pri_mask = 0x10;
@ -114,28 +114,25 @@ VIDEO_START_MEMBER(lastduel_state,madgear)
***************************************************************************/ ***************************************************************************/
WRITE16_MEMBER(lastduel_state::lastduel_flip_w) WRITE8_MEMBER(lastduel_state::flip_w)
{ {
if (ACCESSING_BITS_0_7)
{
flip_screen_set(data & 0x01); flip_screen_set(data & 0x01);
machine().bookkeeping().coin_lockout_w(0, ~data & 0x10); machine().bookkeeping().coin_lockout_w(0, ~data & 0x10);
machine().bookkeeping().coin_lockout_w(1, ~data & 0x20); machine().bookkeeping().coin_lockout_w(1, ~data & 0x20);
machine().bookkeeping().coin_counter_w(0, data & 0x40); machine().bookkeeping().coin_counter_w(0, data & 0x40);
machine().bookkeeping().coin_counter_w(1, data & 0x80); machine().bookkeeping().coin_counter_w(1, data & 0x80);
}
} }
WRITE16_MEMBER(lastduel_state::lastduel_scroll_w) WRITE16_MEMBER(lastduel_state::vctrl_w)
{ {
data = COMBINE_DATA(&m_scroll[offset]); data = COMBINE_DATA(&m_vctrl[offset]);
switch (offset) switch (offset)
{ {
case 0: m_fg_tilemap->set_scrolly(0, data); break; case 0: m_tilemap[0]->set_scrolly(0, data); break;
case 1: m_fg_tilemap->set_scrollx(0, data); break; case 1: m_tilemap[0]->set_scrollx(0, data); break;
case 2: m_bg_tilemap->set_scrolly(0, data); break; case 2: m_tilemap[1]->set_scrolly(0, data); break;
case 3: m_bg_tilemap->set_scrollx(0, data); break; case 3: m_tilemap[1]->set_scrollx(0, data); break;
case 7: m_tilemap_priority = data; break; case 7: m_tilemap_priority = data; break;
default: default:
logerror("Unmapped video write %d %04x\n", offset, data); logerror("Unmapped video write %d %04x\n", offset, data);
@ -143,49 +140,22 @@ WRITE16_MEMBER(lastduel_state::lastduel_scroll_w)
} }
} }
WRITE16_MEMBER(lastduel_state::lastduel_scroll1_w) WRITE16_MEMBER(lastduel_state::txram_w)
{ {
COMBINE_DATA(&m_scroll1[offset]); COMBINE_DATA(&m_txram[offset]);
m_fg_tilemap->mark_tile_dirty(offset / 2);
}
WRITE16_MEMBER(lastduel_state::lastduel_scroll2_w)
{
COMBINE_DATA(&m_scroll2[offset]);
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
WRITE16_MEMBER(lastduel_state::lastduel_vram_w)
{
COMBINE_DATA(&m_vram[offset]);
m_tx_tilemap->mark_tile_dirty(offset); m_tx_tilemap->mark_tile_dirty(offset);
} }
WRITE16_MEMBER(lastduel_state::madgear_scroll1_w) PALETTE_DECODER_MEMBER(lastduel_state, lastduel_RRRRGGGGBBBBIIII)
{ {
COMBINE_DATA(&m_scroll1[offset]);
m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
WRITE16_MEMBER(lastduel_state::madgear_scroll2_w)
{
COMBINE_DATA(&m_scroll2[offset]);
m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
WRITE16_MEMBER(lastduel_state::lastduel_palette_word_w)
{
int red, green, blue, bright;
data = COMBINE_DATA(&m_paletteram[offset]);
// Brightness parameter interpreted same way as CPS1 // Brightness parameter interpreted same way as CPS1
bright = 0x10 + (data & 0x0f); int const bright = 0x10 + (raw & 0x0f);
red = ((data >> 12) & 0x0f) * bright * 0x11 / 0x1f; int const red = ((raw >> 12) & 0x0f) * bright * 0x11 / 0x1f;
green = ((data >> 8) & 0x0f) * bright * 0x11 / 0x1f; int const green = ((raw >> 8) & 0x0f) * bright * 0x11 / 0x1f;
blue = ((data >> 4) & 0x0f) * bright * 0x11 / 0x1f; int const blue = ((raw >> 4) & 0x0f) * bright * 0x11 / 0x1f;
m_palette->set_pen_color (offset, rgb_t(red, green, blue)); return rgb_t(red, green, blue);
} }
/*************************************************************************** /***************************************************************************
@ -196,7 +166,7 @@ WRITE16_MEMBER(lastduel_state::lastduel_palette_word_w)
void lastduel_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ) void lastduel_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri )
{ {
uint16_t *buffered_spriteram16 = m_spriteram->buffer(); const uint16_t *buffered_spriteram16 = m_spriteram->buffer();
int offs; int offs;
if (!m_sprite_pri_mask) if (!m_sprite_pri_mask)
@ -234,7 +204,6 @@ void lastduel_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre
flipy = !flipy; flipy = !flipy;
} }
m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,
code, code,
color, color,
@ -245,10 +214,10 @@ void lastduel_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre
uint32_t lastduel_state::screen_update_lastduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) uint32_t lastduel_state::screen_update_lastduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); m_tilemap[0]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
draw_sprites(bitmap, cliprect, 0); draw_sprites(bitmap, cliprect, 0);
m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); m_tilemap[0]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
draw_sprites(bitmap, cliprect, 1); draw_sprites(bitmap, cliprect, 1);
m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0); m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0);
return 0; return 0;
@ -258,18 +227,18 @@ uint32_t lastduel_state::screen_update_madgear(screen_device &screen, bitmap_ind
{ {
if (m_tilemap_priority) if (m_tilemap_priority)
{ {
m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1 | TILEMAP_DRAW_OPAQUE, 0); m_tilemap[0]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1 | TILEMAP_DRAW_OPAQUE, 0);
draw_sprites(bitmap, cliprect, 0); draw_sprites(bitmap, cliprect, 0);
m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); m_tilemap[0]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0);
draw_sprites(bitmap, cliprect, 1); draw_sprites(bitmap, cliprect, 1);
} }
else else
{ {
m_bg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); m_tilemap[1]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); m_tilemap[0]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
draw_sprites(bitmap, cliprect, 0); draw_sprites(bitmap, cliprect, 0);
m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); m_tilemap[0]->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
draw_sprites(bitmap, cliprect, 1); draw_sprites(bitmap, cliprect, 1);
} }
m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0); m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0);