mirror of
https://github.com/holub/mame
synced 2025-06-05 20:33:45 +03:00
various drivers: removed some custom GFX decodes in favor of the ones provided in emu/video/generic.cpp
This commit is contained in:
parent
47e836a7b1
commit
b2ea7877cd
@ -1367,17 +1367,6 @@ const gfx_layout spritelayout =
|
||||
128*8
|
||||
};
|
||||
|
||||
const gfx_layout rshark_spritelayout =
|
||||
{
|
||||
16,16,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(4*8*16,4) },
|
||||
{ STEP16(0,4*8) },
|
||||
128*8
|
||||
};
|
||||
|
||||
GFXDECODE_START( gfx_lastday )
|
||||
GFXDECODE_ENTRY( "tx", 0, lastday_charlayout, 0, 16+64 )
|
||||
GFXDECODE_ENTRY( "sprite", 0, spritelayout, 256, 16+64 )
|
||||
@ -1409,18 +1398,18 @@ GFXDECODE_END
|
||||
|
||||
GFXDECODE_START( gfx_rshark )
|
||||
/* no chars */
|
||||
GFXDECODE_ENTRY( "sprite", 0, rshark_spritelayout, 0, 16 )
|
||||
GFXDECODE_ENTRY( "fg1", 0, spritelayout, 256, 16 )
|
||||
GFXDECODE_ENTRY( "fg0", 0, spritelayout, 512, 16 )
|
||||
GFXDECODE_ENTRY( "bg1", 0, spritelayout, 768, 16 )
|
||||
GFXDECODE_ENTRY( "bg0", 0, spritelayout, 1024, 16 )
|
||||
GFXDECODE_ENTRY( "sprite", 0, gfx_8x8x4_col_2x2_group_packed_msb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "fg1", 0, spritelayout, 256, 16 )
|
||||
GFXDECODE_ENTRY( "fg0", 0, spritelayout, 512, 16 )
|
||||
GFXDECODE_ENTRY( "bg1", 0, spritelayout, 768, 16 )
|
||||
GFXDECODE_ENTRY( "bg0", 0, spritelayout, 1024, 16 )
|
||||
GFXDECODE_END
|
||||
|
||||
GFXDECODE_START( gfx_popbingo )
|
||||
/* no chars */
|
||||
GFXDECODE_ENTRY( "sprite", 0, rshark_spritelayout, 0, 16 )
|
||||
GFXDECODE_ENTRY( "bg0", 0, tilelayout, 0, 1 )
|
||||
GFXDECODE_ENTRY( "bg1", 0, tilelayout, 0, 1 )
|
||||
GFXDECODE_ENTRY( "sprite", 0, gfx_8x8x4_col_2x2_group_packed_msb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "bg0", 0, tilelayout, 0, 1 )
|
||||
GFXDECODE_ENTRY( "bg1", 0, tilelayout, 0, 1 )
|
||||
|
||||
GFXDECODE_END
|
||||
|
||||
|
@ -383,20 +383,9 @@ INPUT_PORTS_END
|
||||
|
||||
|
||||
|
||||
static const gfx_layout layout16x16x4 =
|
||||
{
|
||||
16,16,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(4*8*16,4) },
|
||||
{ STEP16(0,4*8) },
|
||||
16*16*4
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_gundealr )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0, 16 ) /* colors 0-255 */
|
||||
GFXDECODE_ENTRY( "gfx2", 0, layout16x16x4, 256, 16 ) /* colors 256-511 */
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0, 16 ) /* colors 0-255 */
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_col_2x2_group_packed_msb, 256, 16 ) /* colors 256-511 */
|
||||
GFXDECODE_END
|
||||
|
||||
|
||||
|
@ -8520,16 +8520,6 @@ static const gfx_layout tiles8x8x3_miss1bpp_layout =
|
||||
8*32
|
||||
};
|
||||
|
||||
static const gfx_layout tiles8x8x4alt_layout =
|
||||
{
|
||||
8,8,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ 0, 1, 2, 3 },
|
||||
{ 4, 0, 12, 8, 20, 16, 28, 24 },
|
||||
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
|
||||
8*32
|
||||
};
|
||||
|
||||
static const gfx_layout tiles8x32x4alt2_layout =
|
||||
{
|
||||
@ -8544,7 +8534,7 @@ static const gfx_layout tiles8x32x4alt2_layout =
|
||||
|
||||
|
||||
static GFXDECODE_START( gfx_unkch )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x4alt_layout, 0, 16 )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_lsb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4alt2_layout, 0, 16 )
|
||||
GFXDECODE_END
|
||||
|
||||
|
@ -194,22 +194,11 @@ INPUT_PORTS_END
|
||||
*/
|
||||
|
||||
|
||||
static const gfx_layout layout16x16 =
|
||||
{
|
||||
16,16,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(4*8*16,4) },
|
||||
{ STEP16(0,4*8) },
|
||||
16*16*4
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_ginganin )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 256*3, 16 ) /* [0] bg */
|
||||
GFXDECODE_ENTRY( "gfx2", 0, layout16x16, 256*2, 16 ) /* [1] fg */
|
||||
GFXDECODE_ENTRY( "gfx3", 0, gfx_8x8x4_packed_msb, 256*0, 16 ) /* [2] txt */
|
||||
GFXDECODE_ENTRY( "gfx4", 0, layout16x16, 256*1, 16 ) /* [3] sprites */
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_col_2x2_group_packed_msb, 256*3, 16 ) /* [0] bg */
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_col_2x2_group_packed_msb, 256*2, 16 ) /* [1] fg */
|
||||
GFXDECODE_ENTRY( "gfx3", 0, gfx_8x8x4_packed_msb, 256*0, 16 ) /* [2] txt */
|
||||
GFXDECODE_ENTRY( "gfx4", 0, gfx_8x8x4_col_2x2_group_packed_msb, 256*1, 16 ) /* [3] sprites */
|
||||
GFXDECODE_END
|
||||
|
||||
|
||||
|
@ -796,22 +796,8 @@ void polygonet_state::draw_poly(bitmap_rgb32 &bitmap, const u16 raw_color, const
|
||||
// Video hardware
|
||||
//-------------------------------------------------
|
||||
|
||||
static const gfx_layout bglayout =
|
||||
{
|
||||
16,16,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ 0, 1, 2, 3 },
|
||||
{ 0*4, 1*4, 2*4, 3*4, 4*4, 5*4, 6*4, 7*4, 8*4,
|
||||
9*4, 10*4, 11*4, 12*4, 13*4, 14*4, 15*4 },
|
||||
{ 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64,
|
||||
8*64, 9*64, 10*64, 11*64, 12*64, 13*64, 14*64, 15*64 },
|
||||
|
||||
128*8
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_plygonet )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0x0000, 64 )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_16x16x4_packed_msb, 0x0000, 64 )
|
||||
GFXDECODE_END
|
||||
|
||||
TILE_GET_INFO_MEMBER(polygonet_state::ttl_get_tile_info)
|
||||
|
@ -463,21 +463,10 @@ INPUT_PORTS_END
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
static const gfx_layout tilelayout =
|
||||
{
|
||||
16,16, /* 16*16 sprites */
|
||||
RGN_FRAC(1,1),
|
||||
4, /* 4 bits per pixel */
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(4*8*16,4) },
|
||||
{ STEP16(0,4*8) },
|
||||
128*8
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_bbusters )
|
||||
GFXDECODE_ENTRY( "tx_tiles", 0, gfx_8x8x4_packed_msb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 768, 16 )
|
||||
GFXDECODE_ENTRY( "gfx5", 0, tilelayout, 1024+256, 16 )
|
||||
GFXDECODE_ENTRY( "tx_tiles", 0, gfx_8x8x4_packed_msb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "gfx4", 0, gfx_8x8x4_col_2x2_group_packed_msb, 768, 16 )
|
||||
GFXDECODE_ENTRY( "gfx5", 0, gfx_8x8x4_col_2x2_group_packed_msb, 1024+256, 16 )
|
||||
GFXDECODE_END
|
||||
|
||||
/******************************************************************************/
|
||||
|
@ -475,21 +475,10 @@ INPUT_PORTS_END
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
static const gfx_layout tilelayout =
|
||||
{
|
||||
16,16, /* 16*16 sprites */
|
||||
RGN_FRAC(1,1),
|
||||
4, /* 4 bits per pixel */
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(4*8*16,4) },
|
||||
{ STEP16(0,4*8) },
|
||||
128*8
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_mechatt )
|
||||
GFXDECODE_ENTRY( "tx_tiles", 0, gfx_8x8x4_packed_msb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 16 )
|
||||
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 768, 16 )
|
||||
GFXDECODE_ENTRY( "tx_tiles", 0, gfx_8x8x4_packed_msb, 0, 16 )
|
||||
GFXDECODE_ENTRY( "gfx3", 0, gfx_8x8x4_col_2x2_group_packed_msb, 512, 16 )
|
||||
GFXDECODE_ENTRY( "gfx4", 0, gfx_8x8x4_col_2x2_group_packed_msb, 768, 16 )
|
||||
GFXDECODE_END
|
||||
|
||||
|
||||
|
@ -171,22 +171,11 @@ static const gfx_layout charlayout =
|
||||
32*8 /* every char takes 32 consecutive bytes */
|
||||
};
|
||||
|
||||
static const gfx_layout tilelayout =
|
||||
{
|
||||
16,16, /* 16*16 sprites */
|
||||
RGN_FRAC(1,1),
|
||||
4, /* 4 bits per pixel */
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(4*8*16,4) },
|
||||
{ STEP16(0,4*8) },
|
||||
128*8 /* every sprite takes 64 consecutive bytes */
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_prehisle )
|
||||
GFXDECODE_ENTRY( "chars", 0, charlayout, 0, 16 )
|
||||
GFXDECODE_ENTRY( "bgtiles", 0, tilelayout, 768, 16 )
|
||||
GFXDECODE_ENTRY( "fgtiles", 0, tilelayout, 512, 16 )
|
||||
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 256, 16 )
|
||||
GFXDECODE_ENTRY( "bgtiles", 0, gfx_8x8x4_col_2x2_group_packed_msb, 768, 16 )
|
||||
GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x4_col_2x2_group_packed_msb, 512, 16 )
|
||||
GFXDECODE_ENTRY( "sprites", 0, gfx_8x8x4_col_2x2_group_packed_msb, 256, 16 )
|
||||
GFXDECODE_END
|
||||
|
||||
/******************************************************************************/
|
||||
|
@ -511,24 +511,11 @@ static INPUT_PORTS_START( idsoccer )
|
||||
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_PLAYER(2)
|
||||
INPUT_PORTS_END
|
||||
|
||||
/* Graphics Layouts */
|
||||
|
||||
static const gfx_layout spritelayout =
|
||||
{
|
||||
16,16,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ 0, 1, 2, 3 },
|
||||
{ STEP16(0,4) },
|
||||
{ STEP16(0,64) },
|
||||
128*8
|
||||
};
|
||||
|
||||
/* Graphics Decode Information */
|
||||
|
||||
static GFXDECODE_START( gfx_docastle )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0, 64 )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 32*2 )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0, 64 )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_16x16x4_packed_msb, 0, 32*2 )
|
||||
GFXDECODE_END
|
||||
|
||||
|
||||
|
@ -597,38 +597,28 @@ static const gfx_layout layout8x8_part =
|
||||
32*8
|
||||
};
|
||||
|
||||
static const gfx_layout layout16x16 =
|
||||
{
|
||||
16,16,
|
||||
RGN_FRAC(1,1),
|
||||
4,
|
||||
{ STEP4(0,1) },
|
||||
{ STEP8(0,4), STEP8(32*8,4) },
|
||||
{ STEP8(0,32), STEP8(64*8,32) },
|
||||
128*8
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_nova2001 )
|
||||
GFXDECODE_ENTRY( "gfx1", 0x0000, layout16x16, 0x000, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0x0000, layout8x8_part, 0x000, 16 ) // fg tiles (using only 1/4th of the ROM space)
|
||||
GFXDECODE_ENTRY( "gfx1", 0x4000, layout8x8_part, 0x100, 16 ) // bg tiles (using only 1/4th of the ROM space)
|
||||
GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x4_row_2x2_group_packed_msb, 0x000, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0x0000, layout8x8_part, 0x000, 16 ) // fg tiles (using only 1/4th of the ROM space)
|
||||
GFXDECODE_ENTRY( "gfx1", 0x4000, layout8x8_part, 0x100, 16 ) // bg tiles (using only 1/4th of the ROM space)
|
||||
GFXDECODE_END
|
||||
|
||||
static GFXDECODE_START( gfx_ninjakun )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 0x200, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0x000, 16 ) // fg tiles
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_packed_msb, 0x100, 16 ) // bg tiles
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0x200, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0x000, 16 ) // fg tiles
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_packed_msb, 0x100, 16 ) // bg tiles
|
||||
GFXDECODE_END
|
||||
|
||||
static GFXDECODE_START( gfx_pkunwar )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 0x000, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0x100, 16 ) // bg tiles
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0x000, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0x100, 16 ) // bg tiles
|
||||
GFXDECODE_END
|
||||
|
||||
static GFXDECODE_START( gfx_raiders5 )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 0x200, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0, layout8x8_part, 0x000, 16 ) // fg tiles (using only 1/4th of the ROM space)
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_packed_msb, 0x100, 16 ) // bg tiles
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0x200, 16 ) // sprites
|
||||
GFXDECODE_ENTRY( "gfx1", 0, layout8x8_part, 0x000, 16 ) // fg tiles (using only 1/4th of the ROM space)
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_packed_msb, 0x100, 16 ) // bg tiles
|
||||
GFXDECODE_END
|
||||
|
||||
|
||||
|
@ -426,22 +426,11 @@ INPUT_PORTS_END
|
||||
*
|
||||
*************************************/
|
||||
|
||||
static const gfx_layout fromanc2_tilelayout =
|
||||
{
|
||||
8, 8,
|
||||
RGN_FRAC(1, 1),
|
||||
4,
|
||||
{ 0, 1, 2, 3 },
|
||||
{ 4, 0, 12, 8, 20, 16, 28, 24 },
|
||||
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
|
||||
32*8
|
||||
};
|
||||
|
||||
static GFXDECODE_START( gfx_fromanc2 )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, fromanc2_tilelayout, 0, 4 )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, fromanc2_tilelayout, 256, 4 )
|
||||
GFXDECODE_ENTRY( "gfx3", 0, fromanc2_tilelayout, 512, 4 )
|
||||
GFXDECODE_ENTRY( "gfx4", 0, fromanc2_tilelayout, 768, 4 )
|
||||
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_lsb, 0, 4 )
|
||||
GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_packed_lsb, 256, 4 )
|
||||
GFXDECODE_ENTRY( "gfx3", 0, gfx_8x8x4_packed_lsb, 512, 4 )
|
||||
GFXDECODE_ENTRY( "gfx4", 0, gfx_8x8x4_packed_lsb, 768, 4 )
|
||||
GFXDECODE_END
|
||||
|
||||
static const gfx_layout fromancr_tilelayout =
|
||||
|
Loading…
Reference in New Issue
Block a user