summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/mario.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/mario.c')
-rw-r--r--src/mame/video/mario.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c
index 76011da0c3c..b62a964c5ff 100644
--- a/src/mame/video/mario.c
+++ b/src/mame/video/mario.c
@@ -62,20 +62,20 @@ static const res_net_info mario_net_info_std =
bit 0 -- 470 ohm resistor -- inverter -- BLUE
***************************************************************************/
-void mario_state::palette_init()
+PALETTE_INIT_MEMBER(mario_state, mario)
{
const UINT8 *color_prom = memregion("proms")->base();
rgb_t *rgb;
rgb = compute_res_net_all(machine(), color_prom, &mario_decode_info, &mario_net_info);
- palette_set_colors(machine(), 0, rgb, 256);
+ palette.set_pen_colors(0, rgb, 256);
auto_free(machine(), rgb);
rgb = compute_res_net_all(machine(), color_prom+256, &mario_decode_info, &mario_net_info_std);
- palette_set_colors(machine(), 256, rgb, 256);
+ palette.set_pen_colors(256, rgb, 256);
auto_free(machine(), rgb);
- machine().palette->normalize_range(0, 255);
- machine().palette->normalize_range(256, 511);
+ palette.palette()->normalize_range(0, 255);
+ palette.palette()->normalize_range(256, 511);
}
WRITE8_MEMBER(mario_state::mario_videoram_w)
@@ -175,7 +175,7 @@ void mario_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
y -= 14;
x -= 7;
- m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect,
m_spriteram[offs + 2],
(m_spriteram[offs + 1] & 0x0f) + 16 * m_palette_bank + 32 * m_monitor,
!(m_spriteram[offs + 1] & 0x80),!(m_spriteram[offs + 1] & 0x40),
@@ -185,7 +185,7 @@ void mario_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
y += 1;
x -= 8;
- m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,
+ m_gfxdecode->gfx(1)->transpen(m_palette,bitmap,cliprect,
m_spriteram[offs + 2],
(m_spriteram[offs + 1] & 0x0f) + 16 * m_palette_bank + 32 * m_monitor,
(m_spriteram[offs + 1] & 0x80),(m_spriteram[offs + 1] & 0x40),