1 files changed, 64 insertions, 22 deletions

diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index b2466fff2c9..6da9e985cd6 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -6,6 +6,10 @@
     Yun Sung 16 Bit Games
 
 *************************************************************************/
+#ifndef MAME_INCLUDES_YUNSUN16_H
+#define MAME_INCLUDES_YUNSUN16_H
+
+#pragma once
 
 #include "machine/gen_latch.h"
 #include "screen.h"
@@ -13,62 +17,100 @@
 
 class yunsun16_state : public driver_device
 {
-public:
-	yunsun16_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+protected:
+	yunsun16_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_audiocpu(*this, "audiocpu"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_screen(*this, "screen"),
 		m_palette(*this, "palette"),
-		m_soundlatch(*this, "soundlatch"),
 		m_vram(*this, "vram_%u", 0U),
 		m_scrollram(*this, "scrollram_%u", 0U),
 		m_priorityram(*this, "priorityram"),
-		m_spriteram(*this, "spriteram"),
-		m_okibank(*this, "okibank") { }
+		m_spriteram(*this, "spriteram")
+	{ }
 
-	void magicbub(machine_config &config);
-	void shocking(machine_config &config);
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
 
-	void init_magicbub();
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	void main_map(address_map &map);
 
-private:
 	/* devices */
 	required_device<cpu_device> m_maincpu;
-	optional_device<cpu_device> m_audiocpu;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<screen_device> m_screen;
 	required_device<palette_device> m_palette;
-	optional_device<generic_latch_8_device> m_soundlatch; // magicbub
 
+private:
 	/* memory pointers */
 	required_shared_ptr_array<uint16_t, 2> m_vram;
 	required_shared_ptr_array<uint16_t, 2> m_scrollram;
 	required_shared_ptr<uint16_t> m_priorityram;
 	required_shared_ptr<uint16_t> m_spriteram;
 
-	optional_memory_bank m_okibank;
-
 	/* other video-related elements */
 	tilemap_t     *m_tilemap[2];
 	int         m_sprites_scrolldx;
 	int         m_sprites_scrolldy;
 
-	DECLARE_WRITE8_MEMBER(sound_bank_w);
-	DECLARE_WRITE16_MEMBER(magicbub_sound_command_w);
 	template<int Layer> DECLARE_WRITE16_MEMBER(vram_w);
 
 	TILEMAP_MAPPER_MEMBER(tilemap_scan_pages);
 	template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info);
+	void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+};
+
+
+class magicbub_state : public yunsun16_state
+{
+public:
+	magicbub_state(const machine_config &mconfig, device_type type, const char *tag) :
+		yunsun16_state(mconfig, type, tag),
+		m_audiocpu(*this, "audiocpu"),
+		m_soundlatch(*this, "soundlatch")
+	{ }
+
+	void magicbub(machine_config &config);
+
+protected:
+	void main_map(address_map &map);
+
+private:
+	DECLARE_WRITE8_MEMBER(magicbub_sound_command_w);
+
+	void sound_map(address_map &map);
+	void sound_port_map(address_map &map);
+
+	required_device<cpu_device> m_audiocpu;
+	required_device<generic_latch_8_device> m_soundlatch;
+};
+
+
+class shocking_state : public yunsun16_state
+{
+public:
+	shocking_state(const machine_config &mconfig, device_type type, const char *tag) :
+		yunsun16_state(mconfig, type, tag),
+		m_okibank(*this, "okibank")
+	{ }
+
+	void shocking(machine_config &config);
+
+protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
 
 	void main_map(address_map &map);
+
+private:
+	DECLARE_WRITE8_MEMBER(sound_bank_w);
+
 	void oki_map(address_map &map);
-	void sound_map(address_map &map);
-	void sound_port_map(address_map &map);
+
+	required_memory_bank m_okibank;
 };
+
+#endif // MAME_INCLUDES_YUNSUN16_H