summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ninjaw.cpp
diff options
context:
space:
mode:
author cam900 <dbtlrchl@naver.com>2019-05-05 14:02:37 +0900
committer cam900 <dbtlrchl@naver.com>2019-05-05 14:02:37 +0900
commit326a87dc2b576603c363ae961748bbde64f3559e (patch)
tree4a5238ea61965e8b7548099428d79a309ac610c7 /src/mame/drivers/ninjaw.cpp
parent50d7af6b866b3a9bda6e8b37f316aecee301180e (diff)
tc0110pcr.cpp : Updates
device_palette_interface'd palette,Simplify handlers, Reduce defines, Use shorter / correct type values ninjaw.cpp, warriorb.cpp : Split gfxdecode per each screens, Fix spacings taito_f2.cpp : Reduce duplicate in config when tc0110pcr is present
Diffstat (limited to 'src/mame/drivers/ninjaw.cpp')
-rw-r--r--src/mame/drivers/ninjaw.cpp76
1 files changed, 39 insertions, 37 deletions
diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp
index 06dac881efc..8318edb6ad4 100644
--- a/src/mame/drivers/ninjaw.cpp
+++ b/src/mame/drivers/ninjaw.cpp
@@ -610,9 +610,13 @@ static const gfx_layout charlayout =
32*8 /* every sprite takes 32 consecutive bytes */
};
-static GFXDECODE_START( gfx_ninjaw )
+static GFXDECODE_START( gfx_ninjaw_1 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites */
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* scr tiles (screen 1) */
+GFXDECODE_END
+
+static GFXDECODE_START( gfx_ninjaw_23 )
+ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites */
GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 256 ) /* scr tiles (screens 2+) */
GFXDECODE_END
@@ -743,10 +747,9 @@ void ninjaw_state::ninjaw(machine_config &config)
tc0040ioc.read_7_callback().set_ioport("IN2");
/* video hardware */
- GFXDECODE(config, m_gfxdecode, m_palette, gfx_ninjaw);
- PALETTE(config, m_palette).set_entries(4096);
- PALETTE(config, "palette2").set_entries(4096);
- PALETTE(config, "palette3").set_entries(4096);
+ GFXDECODE(config, m_gfxdecode[0], m_tc0110pcr[0], gfx_ninjaw_1);
+ GFXDECODE(config, m_gfxdecode[1], m_tc0110pcr[1], gfx_ninjaw_23);
+ GFXDECODE(config, m_gfxdecode[2], m_tc0110pcr[2], gfx_ninjaw_23);
config.set_default_layout(layout_ninjaw);
@@ -756,7 +759,7 @@ void ninjaw_state::ninjaw(machine_config &config)
lscreen.set_size(36*8, 32*8);
lscreen.set_visarea(0*8, 36*8-1, 3*8, 31*8-1);
lscreen.set_screen_update(FUNC(ninjaw_state::screen_update_left));
- lscreen.set_palette(m_palette);
+ lscreen.set_palette(m_tc0110pcr[0]);
screen_device &mscreen(SCREEN(config, "mscreen", SCREEN_TYPE_RASTER));
mscreen.set_refresh_hz(60);
@@ -764,7 +767,7 @@ void ninjaw_state::ninjaw(machine_config &config)
mscreen.set_size(36*8, 32*8);
mscreen.set_visarea(0*8, 36*8-1, 3*8, 31*8-1);
mscreen.set_screen_update(FUNC(ninjaw_state::screen_update_middle));
- mscreen.set_palette("palette2");
+ mscreen.set_palette(m_tc0110pcr[1]);
screen_device &rscreen(SCREEN(config, "rscreen", SCREEN_TYPE_RASTER));
rscreen.set_refresh_hz(60);
@@ -772,37 +775,37 @@ void ninjaw_state::ninjaw(machine_config &config)
rscreen.set_size(36*8, 32*8);
rscreen.set_visarea(0*8, 36*8-1, 3*8, 31*8-1);
rscreen.set_screen_update(FUNC(ninjaw_state::screen_update_right));
- rscreen.set_palette("palette3");
+ rscreen.set_palette(m_tc0110pcr[2]);
TC0100SCN(config, m_tc0100scn[0], 0);
m_tc0100scn[0]->set_gfx_region(1);
m_tc0100scn[0]->set_offsets(22, 0);
m_tc0100scn[0]->set_multiscr_xoffs(0);
m_tc0100scn[0]->set_multiscr_hack(0);
- m_tc0100scn[0]->set_gfxdecode_tag(m_gfxdecode);
- m_tc0100scn[0]->set_palette(m_palette);
+ m_tc0100scn[0]->set_gfxdecode_tag(m_gfxdecode[0]);
+ m_tc0100scn[0]->set_palette(m_tc0110pcr[0]);
- TC0110PCR(config, m_tc0110pcr[0], 0, m_palette);
+ TC0110PCR(config, m_tc0110pcr[0], 0);
TC0100SCN(config, m_tc0100scn[1], 0);
- m_tc0100scn[1]->set_gfx_region(2);
+ m_tc0100scn[1]->set_gfx_region(1);
m_tc0100scn[1]->set_offsets(22, 0);
m_tc0100scn[1]->set_multiscr_xoffs(2);
m_tc0100scn[1]->set_multiscr_hack(1);
- m_tc0100scn[1]->set_gfxdecode_tag(m_gfxdecode);
- m_tc0100scn[1]->set_palette("palette2");
+ m_tc0100scn[1]->set_gfxdecode_tag(m_gfxdecode[1]);
+ m_tc0100scn[1]->set_palette(m_tc0110pcr[1]);
- TC0110PCR(config, m_tc0110pcr[1], 0, "palette2");
+ TC0110PCR(config, m_tc0110pcr[1], 0);
TC0100SCN(config, m_tc0100scn[2], 0);
- m_tc0100scn[2]->set_gfx_region(2);
+ m_tc0100scn[2]->set_gfx_region(1);
m_tc0100scn[2]->set_offsets(22, 0);
m_tc0100scn[2]->set_multiscr_xoffs(4);
m_tc0100scn[2]->set_multiscr_hack(1);
- m_tc0100scn[2]->set_gfxdecode_tag(m_gfxdecode);
- m_tc0100scn[2]->set_palette("palette3");
+ m_tc0100scn[2]->set_gfxdecode_tag(m_gfxdecode[2]);
+ m_tc0100scn[2]->set_palette(m_tc0110pcr[2]);
- TC0110PCR(config, m_tc0110pcr[2], 0, "palette3");
+ TC0110PCR(config, m_tc0110pcr[2], 0);
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
@@ -856,10 +859,9 @@ void ninjaw_state::darius2(machine_config &config)
tc0040ioc.read_7_callback().set_ioport("IN2");
/* video hardware */
- GFXDECODE(config, m_gfxdecode, m_palette, gfx_ninjaw);
- PALETTE(config, m_palette).set_entries(4096);
- PALETTE(config, "palette2").set_entries(4096);
- PALETTE(config, "palette3").set_entries(4096);
+ GFXDECODE(config, m_gfxdecode[0], m_tc0110pcr[0], gfx_ninjaw_1);
+ GFXDECODE(config, m_gfxdecode[1], m_tc0110pcr[1], gfx_ninjaw_23);
+ GFXDECODE(config, m_gfxdecode[2], m_tc0110pcr[2], gfx_ninjaw_23);
config.set_default_layout(layout_ninjaw);
@@ -869,7 +871,7 @@ void ninjaw_state::darius2(machine_config &config)
lscreen.set_size(36*8, 32*8);
lscreen.set_visarea(0*8, 36*8-1, 3*8, 31*8-1);
lscreen.set_screen_update(FUNC(ninjaw_state::screen_update_left));
- lscreen.set_palette(m_palette);
+ lscreen.set_palette(m_tc0110pcr[0]);
screen_device &mscreen(SCREEN(config, "mscreen", SCREEN_TYPE_RASTER));
mscreen.set_refresh_hz(60);
@@ -877,7 +879,7 @@ void ninjaw_state::darius2(machine_config &config)
mscreen.set_size(36*8, 32*8);
mscreen.set_visarea(0*8, 36*8-1, 3*8, 31*8-1);
mscreen.set_screen_update(FUNC(ninjaw_state::screen_update_middle));
- mscreen.set_palette("palette2");
+ mscreen.set_palette(m_tc0110pcr[1]);
screen_device &rscreen(SCREEN(config, "rscreen", SCREEN_TYPE_RASTER));
rscreen.set_refresh_hz(60);
@@ -885,37 +887,37 @@ void ninjaw_state::darius2(machine_config &config)
rscreen.set_size(36*8, 32*8);
rscreen.set_visarea(0*8, 36*8-1, 3*8, 31*8-1);
rscreen.set_screen_update(FUNC(ninjaw_state::screen_update_right));
- rscreen.set_palette("palette3");
+ rscreen.set_palette(m_tc0110pcr[2]);
TC0100SCN(config, m_tc0100scn[0], 0);
m_tc0100scn[0]->set_gfx_region(1);
m_tc0100scn[0]->set_offsets(22, 0);
m_tc0100scn[0]->set_multiscr_xoffs(0);
m_tc0100scn[0]->set_multiscr_hack(0);
- m_tc0100scn[0]->set_gfxdecode_tag(m_gfxdecode);
- m_tc0100scn[0]->set_palette(m_palette);
+ m_tc0100scn[0]->set_gfxdecode_tag(m_gfxdecode[0]);
+ m_tc0100scn[0]->set_palette(m_tc0110pcr[0]);
- TC0110PCR(config, m_tc0110pcr[0], 0, m_palette);
+ TC0110PCR(config, m_tc0110pcr[0], 0);
TC0100SCN(config, m_tc0100scn[1], 0);
- m_tc0100scn[1]->set_gfx_region(2);
+ m_tc0100scn[1]->set_gfx_region(1);
m_tc0100scn[1]->set_offsets(22, 0);
m_tc0100scn[1]->set_multiscr_xoffs(2);
m_tc0100scn[1]->set_multiscr_hack(1);
- m_tc0100scn[1]->set_gfxdecode_tag(m_gfxdecode);
- m_tc0100scn[1]->set_palette("palette2");
+ m_tc0100scn[1]->set_gfxdecode_tag(m_gfxdecode[1]);
+ m_tc0100scn[1]->set_palette(m_tc0110pcr[1]);
- TC0110PCR(config, m_tc0110pcr[1], 0, "palette2");
+ TC0110PCR(config, m_tc0110pcr[1], 0);
TC0100SCN(config, m_tc0100scn[2], 0);
- m_tc0100scn[2]->set_gfx_region(2);
+ m_tc0100scn[2]->set_gfx_region(1);
m_tc0100scn[2]->set_offsets(22, 0);
m_tc0100scn[2]->set_multiscr_xoffs(4);
m_tc0100scn[2]->set_multiscr_hack(1);
- m_tc0100scn[2]->set_gfxdecode_tag(m_gfxdecode);
- m_tc0100scn[2]->set_palette("palette3");
+ m_tc0100scn[2]->set_gfxdecode_tag(m_gfxdecode[2]);
+ m_tc0100scn[2]->set_palette(m_tc0110pcr[2]);
- TC0110PCR(config, m_tc0110pcr[2], 0, "palette3");
+ TC0110PCR(config, m_tc0110pcr[2], 0);
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();