summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/deco32.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/deco32.c')
-rw-r--r--src/mame/drivers/deco32.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 86a114042e5..a8568b6eb24 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1645,17 +1645,17 @@ INTERRUPT_GEN_MEMBER(deco32_state::deco32_vbl_interrupt)
device.execute().set_input_line(ARM_IRQ_LINE, HOLD_LINE);
}
-UINT16 captaven_pri_callback(UINT16 x)
+DECOSPR_PRIORITY_CB_MEMBER(deco32_state::captaven_pri_callback)
{
- if ((x&0x60)==0x00)
+ if ((pri & 0x60) == 0x00)
{
return 0; // above everything
}
- else if ((x&0x60)==0x20)
+ else if ((pri & 0x60) == 0x20)
{
return 0xfff0; // above the 2nd playfield
}
- else if ((x&0x60)==0x40)
+ else if ((pri & 0x60) == 0x40)
{
return 0xfffc; // above the 1st playfield
}
@@ -1729,8 +1729,8 @@ static MACHINE_CONFIG_START( captaven, deco32_state )
MCFG_DECO16IC_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 3);
- decospr_device::set_pri_callback(*device, captaven_pri_callback);
+ MCFG_DECO_SPRITE_GFX_REGION(3)
+ MCFG_DECO_SPRITE_PRIORITY_CB(deco32_state, captaven_pri_callback)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
@@ -1835,7 +1835,7 @@ static MACHINE_CONFIG_START( fghthist, deco32_state ) /* DE-0380-2 PCB */
MCFG_DECO16IC_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 3);
+ MCFG_DECO_SPRITE_GFX_REGION(3)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
@@ -1921,7 +1921,7 @@ static MACHINE_CONFIG_START( fghthsta, deco32_state ) /* DE-0395-1 PCB */
MCFG_DECO16IC_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 3);
+ MCFG_DECO_SPRITE_GFX_REGION(3)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
@@ -2225,12 +2225,12 @@ static MACHINE_CONFIG_START( tattass, deco32_state )
MCFG_DECO16IC_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen1", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 3);
+ MCFG_DECO_SPRITE_GFX_REGION(3)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen2", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 4);
+ MCFG_DECO_SPRITE_GFX_REGION(4)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
@@ -2302,12 +2302,12 @@ static MACHINE_CONFIG_START( nslasher, deco32_state )
MCFG_DECO16IC_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen1", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 3);
+ MCFG_DECO_SPRITE_GFX_REGION(3)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")
MCFG_DEVICE_ADD("spritegen2", DECO_SPRITE, 0)
- decospr_device::set_gfx_region(*device, 4);
+ MCFG_DECO_SPRITE_GFX_REGION(4)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
MCFG_DECO_SPRITE_PALETTE("palette")