summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/nmk16.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/nmk16.cpp')
-rw-r--r--src/mame/drivers/nmk16.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index d4c53f5ecb3..29447b50129 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -3717,25 +3717,25 @@ static const gfx_layout tilelayout =
32*32
};
-static GFXDECODE_START( tharrier )
+static GFXDECODE_START( gfx_tharrier )
GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x000, 16 ) /* color 0x200-0x2ff */
GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */
GFXDECODE_END
-static GFXDECODE_START( macross )
+static GFXDECODE_START( gfx_macross )
GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x200, 16 ) /* color 0x200-0x2ff */
GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */
GFXDECODE_END
-static GFXDECODE_START( macross2 )
+static GFXDECODE_START( gfx_macross2 )
GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x300, 16 ) /* color 0x300-0x3ff */
GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 32 ) /* color 0x100-0x2ff */
GFXDECODE_END
-static GFXDECODE_START( bjtwin )
+static GFXDECODE_START( gfx_bjtwin )
GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_ENTRY( "bgtile", 0, charlayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */
@@ -3744,14 +3744,14 @@ GFXDECODE_END
-static GFXDECODE_START( bioship )
+static GFXDECODE_START( gfx_bioship )
GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x300, 16 ) /* color 0x300-0x3ff */
GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x200, 16 ) /* color 0x200-0x2ff */
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_END
-static GFXDECODE_START( strahl )
+static GFXDECODE_START( gfx_strahl )
GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x000, 16 ) /* color 0x000-0x0ff */
GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x300, 16 ) /* color 0x300-0x3ff */
GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */
@@ -3858,7 +3858,7 @@ MACHINE_CONFIG_START(nmk16_state::tharrier)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_tharrier)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", tharrier)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tharrier)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross)
@@ -3897,7 +3897,7 @@ MACHINE_CONFIG_START(nmk16_state::mustang)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -3940,7 +3940,7 @@ MACHINE_CONFIG_START(nmk16_state::mustangb)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -3978,7 +3978,7 @@ MACHINE_CONFIG_START(nmk16_state::bioship)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_bioship)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bioship)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bioship)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4018,7 +4018,7 @@ MACHINE_CONFIG_START(nmk16_state::vandyke)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4061,7 +4061,7 @@ MACHINE_CONFIG_START(nmk16_state::vandykeb)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4087,7 +4087,7 @@ MACHINE_CONFIG_START(nmk16_state::acrobatm)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
@@ -4131,7 +4131,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound har
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4166,7 +4166,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4214,7 +4214,7 @@ MACHINE_CONFIG_START(nmk16_state::ssmissin)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4243,7 +4243,7 @@ MACHINE_CONFIG_START(nmk16_state::strahl)
NMK_HACKY_SCREEN_LOWRES
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_strahl)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", strahl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_strahl)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
@@ -4283,7 +4283,7 @@ MACHINE_CONFIG_START(nmk16_state::hachamf)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4329,7 +4329,7 @@ MACHINE_CONFIG_START(nmk16_state::macross)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4369,7 +4369,7 @@ MACHINE_CONFIG_START(nmk16_state::blkheart)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4408,7 +4408,7 @@ MACHINE_CONFIG_START(nmk16_state::gunnail)
NMK_HACKY_SCREEN_HIRES
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_gunnail)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4452,7 +4452,7 @@ MACHINE_CONFIG_START(nmk16_state::macross2)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_gunnail)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross2)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4498,7 +4498,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon2)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_tdragon2)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross2)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4551,7 +4551,7 @@ MACHINE_CONFIG_START(nmk16_state::raphero)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_tdragon2)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross2)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4593,7 +4593,7 @@ MACHINE_CONFIG_START(nmk16_state::bjtwin)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_bjtwin)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bjtwin)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bjtwin)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -4655,7 +4655,7 @@ MACHINE_CONFIG_START(nmk16_state::manybloc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", tharrier)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tharrier)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -5125,19 +5125,19 @@ static const gfx_layout layout_16x16x4_swapped =
16*16*4
};
-static GFXDECODE_START( grdnstrm )
+static GFXDECODE_START( gfx_grdnstrm )
GFXDECODE_ENTRY( "fgtile", 0, layout_8x8x4, 256*2, 16 ) // [2] Layer 1
GFXDECODE_ENTRY( "bgtile", 0, layout_16x16x8, 256*0, 1 ) // [1] Layer 0
GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4, 256*1, 16 ) // [0] Sprites
GFXDECODE_END
-static GFXDECODE_START( stagger1 )
+static GFXDECODE_START( gfx_stagger1 )
GFXDECODE_ENTRY( "fgtile", 0, layout_8x8x4, 256*2, 16 ) // [2] Layer 1
GFXDECODE_ENTRY( "bgtile", 0, layout_16x16x4, 256*0, 16 ) // [1] Layer 0
GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4, 256*1, 16 ) // [0] Sprites
GFXDECODE_END
-static GFXDECODE_START( redhawkb )
+static GFXDECODE_START( gfx_redhawkb )
GFXDECODE_ENTRY( "fgtile", 0, layout_8x8x4, 256*2, 16 ) // [2] Layer 1
GFXDECODE_ENTRY( "bgtile", 0, layout_16x16x4_swapped, 256*0, 16 ) // [1] Layer 0
GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4_swapped, 256*1, 16 ) // [0] Sprites
@@ -5167,7 +5167,7 @@ MACHINE_CONFIG_START(nmk16_state::stagger1)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_afega)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", stagger1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stagger1)
MCFG_PALETTE_ADD("palette", 768)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -5204,7 +5204,7 @@ MACHINE_CONFIG_START(nmk16_state::redhawkb)
/* basic machine hardware */
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", redhawkb)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_redhawkb)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_redhawkb)
MACHINE_CONFIG_END
@@ -5215,7 +5215,7 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrm)
/* basic machine hardware */
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", grdnstrm)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm)
MCFG_VIDEO_START_OVERRIDE(nmk16_state,firehawk)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_firehawk)
@@ -5229,7 +5229,7 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrmk) /* Side by side with PCB, the music
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(57) /* Side by side with PCB, MAME is too fast at 56 */
- MCFG_GFXDECODE_MODIFY("gfxdecode", grdnstrm)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm)
MCFG_VIDEO_START_OVERRIDE(nmk16_state,grdnstrm)
MACHINE_CONFIG_END
@@ -5258,7 +5258,7 @@ MACHINE_CONFIG_START(nmk16_state::firehawk)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_firehawk)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", grdnstrm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_grdnstrm)
MCFG_PALETTE_ADD("palette", 768)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -5299,7 +5299,7 @@ MACHINE_CONFIG_START(nmk16_state::twinactn)
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)