diff options
Diffstat (limited to 'src/mame/drivers/konamigx.cpp')
-rw-r--r-- | src/mame/drivers/konamigx.cpp | 62 |
1 files changed, 25 insertions, 37 deletions
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 5c4d0adc95c..1e5328ad6dd 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1660,17 +1660,17 @@ MACHINE_CONFIG_START(konamigx_state::konamigx) MCFG_K056832_CONFIG("gfx1", K056832_BPP_5, 0, 0) MCFG_K056832_PALETTE("palette") - MCFG_K055555_ADD("k055555") + K055555(config, m_k055555, 0); K054338(config, m_k054338, 0, m_k055555); m_k054338->set_screen(m_screen); m_k054338->set_alpha_invert(1); - MCFG_DEVICE_ADD("k055673", K055673, 0) - MCFG_K055673_CB(konamigx_state, type2_sprite_callback) - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -26, -23) - MCFG_K055673_SET_SCREEN("screen") - MCFG_K055673_PALETTE("palette") + K055673(config, m_k055673, 0); + m_k055673->set_sprite_callback(FUNC(konamigx_state::type2_sprite_callback), this); + m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -26, -23); + m_k055673->set_screen(m_screen); + m_k055673->set_palette(m_palette); MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_5bpp) @@ -1710,19 +1710,18 @@ MACHINE_CONFIG_START(konamigx_state::konamigx_bios) MCFG_K056832_CONFIG("gfx1", K056832_BPP_4, 0, 0) MACHINE_CONFIG_END -MACHINE_CONFIG_START(konamigx_state::gokuparo) +void konamigx_state::gokuparo(machine_config &config) +{ konamigx(config); - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -46, -23) -MACHINE_CONFIG_END + m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -46, -23); +} MACHINE_CONFIG_START(konamigx_state::sexyparo) konamigx(config); MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CB(konamigx_state, alpha_tile_callback) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -42, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -42, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::tbyahhoo) @@ -1741,9 +1740,8 @@ MACHINE_CONFIG_START(konamigx_state::dragoonj) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_5, 1, 0) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CB(konamigx_state, dragoonj_sprite_callback) - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_RNG, -53, -23) + m_k055673->set_sprite_callback(FUNC(konamigx_state::dragoonj_sprite_callback), this); + m_k055673->set_config("gfx2", K055673_LAYOUT_RNG, -53, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::le2) @@ -1754,9 +1752,8 @@ MACHINE_CONFIG_START(konamigx_state::le2) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_8, 1, 0) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CB(konamigx_state, le2_sprite_callback) - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_LE2, -46, -23) + m_k055673->set_sprite_callback(FUNC(konamigx_state::le2_sprite_callback), this); + m_k055673->set_config("gfx2", K055673_LAYOUT_LE2, -46, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::konamigx_6bpp) @@ -1766,8 +1763,7 @@ MACHINE_CONFIG_START(konamigx_state::konamigx_6bpp) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_6, 0, 0) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -46, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -46, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::salmndr2) @@ -1775,9 +1771,8 @@ MACHINE_CONFIG_START(konamigx_state::salmndr2) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_6, 1, 0) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CB(konamigx_state, salmndr2_sprite_callback) - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -48, -23) + m_k055673->set_sprite_callback(FUNC(konamigx_state::salmndr2_sprite_callback), this); + m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -48, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::opengolf) @@ -1789,8 +1784,7 @@ MACHINE_CONFIG_START(konamigx_state::opengolf) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_opengolf) MCFG_VIDEO_START_OVERRIDE(konamigx_state, opengolf) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -53, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -53, -23); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(gx_type1_map) @@ -1813,8 +1807,7 @@ MACHINE_CONFIG_START(konamigx_state::racinfrc) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_6, 0, 0) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -53, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX, -53, -23); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(gx_type1_map) @@ -1841,8 +1834,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype3) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_6, 0, 2) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -132, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -132, -23); MCFG_DEVICE_REMOVE("palette") MCFG_PALETTE_ADD("palette", 16384) @@ -1899,8 +1891,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_8, 0, 0) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -79, -24) // -23 looks better in intro + m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -79, -24); // -23 looks better in intro MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::gxtype4_vsn) @@ -1922,16 +1913,14 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4_vsn) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_8, 0, 2) // set djmain_hack to 2 to kill layer association or half the tilemaps vanish on screen 0 - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -132, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -132, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::gxtype4sd2) gxtype4(config); MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4_sd2) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -81, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_GX6, -81, -23); MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::winspike) @@ -1945,8 +1934,7 @@ MACHINE_CONFIG_START(konamigx_state::winspike) MCFG_K056832_CB(konamigx_state, alpha_tile_callback) MCFG_K056832_CONFIG("gfx1", K056832_BPP_8, 0, 2) - MCFG_DEVICE_MODIFY("k055673") - MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_LE2, -53, -23) + m_k055673->set_config("gfx2", K055673_LAYOUT_LE2, -53, -23); MACHINE_CONFIG_END |