From cc6a7108801ae9917edc58654a1e202302358dc8 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Fri, 2 Aug 2024 21:25:02 +0300 Subject: nokia/mikromikko2: Fixed palette and added disk labels. [Curt Coder] --- hash/mm2_flop.xml | 18 ++++++++++++++++++ src/mame/nokia/mikromikko2.cpp | 11 +++++++++-- src/mame/nokia/mikromikko2.h | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/hash/mm2_flop.xml b/hash/mm2_flop.xml index 47d1851d9f9..44d088c0e6d 100644 --- a/hash/mm2_flop.xml +++ b/hash/mm2_flop.xml @@ -12,12 +12,30 @@ license:CC0-1.0 Nokia Data + + diff --git a/src/mame/nokia/mikromikko2.cpp b/src/mame/nokia/mikromikko2.cpp index cf6739f1c65..7e4c6cf9ac6 100644 --- a/src/mame/nokia/mikromikko2.cpp +++ b/src/mame/nokia/mikromikko2.cpp @@ -289,6 +289,13 @@ static GFXDECODE_START( gfx_mm2 ) GFXDECODE_ENTRY( "chargen", 0, gfxlayout, 0, 1 ) GFXDECODE_END +void mm2_state::palette(palette_device &palette) const +{ + palette.set_pen_color(0, rgb_t(0xff, 0xff, 0xff)); // white + palette.set_pen_color(1, rgb_t(0x00, 0x00, 0x00)); // black (normal color) + palette.set_pen_color(2, rgb_t(0x7f, 0x7f, 0x7f)); // grey ("highlight" mode color) +} + uint32_t mm2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { if (!m_blc) @@ -312,7 +319,7 @@ uint32_t mm2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c for (int bit = 0; bit < 8; bit++) { - bool pixel = BIT(char_data, 0) ^ !m_cpl; + bool pixel = BIT(char_data, 0) ^ m_cpl; char_data >>= 1; bitmap.pix((sy * 12) + y, (sx * 8) + bit) = pixel; @@ -400,7 +407,7 @@ void mm2_state::mm2(machine_config &config) screen.set_palette(m_palette); GFXDECODE(config, "gfxdecode", m_palette, gfx_mm2); - PALETTE(config, m_palette, palette_device::MONOCHROME); + PALETTE(config, m_palette, FUNC(mm2_state::palette), 3); CRT9007(config, m_vpac, 35.4525_MHz_XTAL/8); m_vpac->set_addrmap(0, &mm2_state::vpac_mem); diff --git a/src/mame/nokia/mikromikko2.h b/src/mame/nokia/mikromikko2.h index 51c5b77c7e3..1d5cbfab77e 100644 --- a/src/mame/nokia/mikromikko2.h +++ b/src/mame/nokia/mikromikko2.h @@ -85,6 +85,7 @@ private: void mm2_io_map(address_map &map); void vpac_mem(address_map &map); + void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static void floppy_formats(format_registration &fr); -- cgit v1.2.3