misc/istellar.cpp: convert fg layer to tilemap, implement sprites, hookup NMI to coins

src/mame/misc/istellar.cpp

@@ -12,12 +12,12 @@ Notes:
                                         6-pin dip switches with odd handling
                                         inverted DIP logic?
                                         CPU2 maps RAM over where its ROM lives
+    To skip LD boot: bp 4458,1,{pc=0x447a;g}
+    Then fill $a074 with 1 to go in attract mode
 
 Todo:
     How does one best make one DIP switch bit from address 0x02 tie to two bits from address 0x03?
     Get real ROM labels!  The current labels are unfortunately a bit odd.
-    Add sprite drawing.
-    Convert to tilemaps.
     Make it work - this one should be close right now :/.
     istellar2 fails test for all the main CPU ROMs. Maybe because it's a prototype?
 */
@@ -30,7 +30,7 @@ Todo:
 
 #include "emupal.h"
 #include "speaker.h"
-
+#include "tilemap.h"
 
 // configurable logging
 #define LOG_CPU2     (1U << 1)
@@ -61,8 +61,11 @@ public:
 	void init_istellar();
 	void istellar(machine_config &config);
 
+	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
 protected:
 	virtual void machine_start() override;
+	virtual void video_start() override;
 
 private:
 	required_device<cpu_device> m_maincpu;
@@ -75,6 +78,12 @@ private:
 	required_shared_ptr<uint8_t> m_tile_control_ram;
 	required_shared_ptr<uint8_t> m_sprite_ram;
 
+	tilemap_t *m_fg_tilemap = nullptr;
+	TILE_GET_INFO_MEMBER(get_tile_info);
+
+	void tile_w(offs_t offset, uint8_t data);
+	void attr_w(offs_t offset, uint8_t data);
+
 	uint8_t z80_2_ldp_read();
 	uint8_t z80_2_unknown_read();
 	void z80_2_ldp_write(uint8_t data);
@@ -88,26 +97,60 @@ private:
 	void z80_2_mem(address_map &map);
 };
 
+void istellar_state::tile_w(offs_t offset, uint8_t data)
+{
+	m_tile_ram[offset] = data;
+	m_fg_tilemap->mark_tile_dirty(offset);
+}
+
+void istellar_state::attr_w(offs_t offset, uint8_t data)
+{
+	m_tile_control_ram[offset] = data;
+	m_fg_tilemap->mark_tile_dirty(offset);
+}
+
+
+TILE_GET_INFO_MEMBER(istellar_state::get_tile_info)
+{
+	const u8 code = m_tile_ram[tile_index];
+	const u8 color = m_tile_control_ram[tile_index] & 0xf;
+	tileinfo.set(0, code, color, 0);
+}
+
+void istellar_state::video_start()
+{
+	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(istellar_state::get_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
+
+	m_fg_tilemap->set_transparent_pen(0);
+}
 
-// VIDEO GOODS
 uint32_t istellar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	// clear
 	bitmap.fill(0, cliprect);
 
-	// Draw tiles
+	// sprites, below tilemap according to ref
-	for (int y = 0; y < 32; y++)
+	for (int i = 0; i < m_sprite_ram.bytes(); i += 4)
 	{
-		for (int x = 0; x < 32; x++)
+		u8 const attr = m_sprite_ram[i + 2];
-		{
+		// FIXME: any of the unused bits disables drawing
-			int tile = m_tile_ram[x + y * 32];
+		if (attr == 0xff)
-			int attr = m_tile_control_ram[x + y * 32];
+			continue;
+		int y = 0xf0 - m_sprite_ram[i + 0];
+		int x = m_sprite_ram[i + 3];
+		u8 const code = m_sprite_ram[i + 1];
+		u8 const color = attr & 0x1f;
+		int flipx = attr & 0x40;
 
-			m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, tile, attr & 0x0f, 0, 0, x * 8, y * 8, 0);
+		m_gfxdecode->gfx(1)->transpen(
-		}
+			bitmap, cliprect,
+			code, color,
+			flipx, 0,
+			x, y,
+			0
+		);
 	}
 
-	// TODO: Draw sprites
+	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
 
 	return 0;
 }
@@ -152,9 +195,9 @@ void istellar_state::z80_0_mem(address_map &map)
 {
 	map(0x0000, 0x9fff).rom();
 	map(0xa000, 0xa7ff).ram();
-	map(0xa800, 0xabff).ram().share(m_tile_ram);
+	map(0xa800, 0xabff).ram().w(FUNC(istellar_state::tile_w)).share(m_tile_ram);
-	map(0xac00, 0xafff).ram().share(m_tile_control_ram);
+	map(0xac00, 0xafff).ram().w(FUNC(istellar_state::attr_w)).share(m_tile_control_ram);
-	map(0xb000, 0xb3ff).ram().share(m_sprite_ram);
+	map(0xb000, 0xb1ff).ram().share(m_sprite_ram);
 }
 
 void istellar_state::z80_1_mem(address_map &map)
@@ -199,6 +242,10 @@ void istellar_state::z80_2_io(address_map &map)
 //  map(0x03, 0x03).w(FUNC(istellar_state::z80_2_ldtrans_write));
 }
 
+INPUT_CHANGED_MEMBER(istellar_state::coin_inserted)
+{
+	m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE);
+}
 
 // PORTS
 static INPUT_PORTS_START( istellar )
@@ -241,8 +288,8 @@ static INPUT_PORTS_START( istellar )
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_HIGH )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, istellar_state, coin_inserted, 0)
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, istellar_state, coin_inserted, 0)
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
 
@@ -256,19 +303,31 @@ static INPUT_PORTS_START( istellar )
 	// SERVICE might be hanging out back here
 INPUT_PORTS_END
 
-static const gfx_layout istellar_gfx_layout =
+static const gfx_layout layout_8x8 =
 {
 	8,8,
 	RGN_FRAC(1,3),
 	3,
 	{ RGN_FRAC(0,3), RGN_FRAC(1,3), RGN_FRAC(2,3) },
-	{ 0,1,2,3,4,5,6,7 },
+	{ STEP8(0, 1) },
-	{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
+	{ STEP8(0, 8) },
 	8*8
 };
 
+static const gfx_layout layout_16x16 =
+{
+	16, 16,
+	RGN_FRAC(1,3),
+	3,
+	{ RGN_FRAC(0,3), RGN_FRAC(1,3), RGN_FRAC(2,3) },
+	{ STEP8(0, 1), STEP8(8*8, 1) },
+	{ STEP8(0, 8), STEP8(8*8*2, 8) },
+	16*16
+};
+
 static GFXDECODE_START( gfx_istellar )
-	GFXDECODE_ENTRY( "tiles", 0, istellar_gfx_layout, 0x0, 0x20 )
+	GFXDECODE_ENTRY( "tiles", 0, layout_8x8, 0x0, 0x20 )
+	GFXDECODE_ENTRY( "tiles", 0, layout_16x16, 0x0, 0x20 )
 GFXDECODE_END
 
 void istellar_state::vblank_irq(int state)