diff options
author | Firehawke <Firehawke@users.noreply.github.com> | 2017-12-13 21:31:27 -0700 |
---|---|---|
committer | Firehawke <Firehawke@users.noreply.github.com> | 2017-12-13 21:31:27 -0700 |
commit | 9ece34eb218c5c1960468294c733fd00ac7fa696 (patch) | |
tree | 7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /src/mame/drivers/konmedal.cpp | |
parent | 54155441e9ba9941e85d80c4834a66376a11e791 (diff) |
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
Diffstat (limited to 'src/mame/drivers/konmedal.cpp')
-rw-r--r-- | src/mame/drivers/konmedal.cpp | 102 |
1 files changed, 88 insertions, 14 deletions
diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index a79997e6686..65751aec191 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -47,13 +47,8 @@ public: m_oki(*this, "oki") { } - required_device<cpu_device> m_maincpu; - required_device<k056832_device> m_k056832; - required_device<palette_device> m_palette; - optional_device<ymz280b_device> m_ymz; - optional_device<okim6295_device> m_oki; - DECLARE_PALETTE_INIT(konmedal); + DECLARE_MACHINE_START(shuriboy); READ8_MEMBER(vram_r); WRITE8_MEMBER(vram_w); @@ -65,16 +60,24 @@ public: return 0xff; } -private: - u8 m_control, m_control2; + uint32_t screen_update_konmedal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_shuriboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + INTERRUPT_GEN_MEMBER(konmedal_interrupt); + K056832_CB_MEMBER(tile_callback); -public: +protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - uint32_t screen_update_konmedal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(konmedal_interrupt); - K056832_CB_MEMBER(tile_callback); + +private: + required_device<cpu_device> m_maincpu; + optional_device<k056832_device> m_k056832; + required_device<palette_device> m_palette; + optional_device<ymz280b_device> m_ymz; + optional_device<okim6295_device> m_oki; + + u8 m_control, m_control2; }; WRITE8_MEMBER(konmedal_state::control2_w) @@ -154,6 +157,11 @@ uint32_t konmedal_state::screen_update_konmedal(screen_device &screen, bitmap_in return 0; } +uint32_t konmedal_state::screen_update_shuriboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + return 0; +} + PALETTE_INIT_MEMBER(konmedal_state, konmedal) { int i; @@ -223,6 +231,10 @@ static ADDRESS_MAP_START( ddboy_main, AS_PROGRAM, 8, konmedal_state ) AM_RANGE(0xe000, 0xffff) AM_READWRITE(vram_r, vram_w) ADDRESS_MAP_END +static ADDRESS_MAP_START( shuriboy_main, AS_PROGRAM, 8, konmedal_state ) + AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0) +ADDRESS_MAP_END + static INPUT_PORTS_START( konmedal ) PORT_START("DSW1") PORT_DIPNAME( 0x07, 0x00, "Coin Slot 1" ) PORT_DIPLOCATION("SW1:1,2,3") @@ -306,6 +318,11 @@ void konmedal_state::machine_start() membank("bank1")->set_entry(4); } +MACHINE_START_MEMBER(konmedal_state, shuriboy) +{ + +} + void konmedal_state::machine_reset() { } @@ -378,6 +395,48 @@ static MACHINE_CONFIG_START( ddboy ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END +/* +Shuriken Boy +While being a Z80 medal game, it runs on fairly different hardware. It might merit a new driver when emulation will be fleshed out. + +PCB: Konami PWB 452039A +Main CPU: Z80B +OSC: 24.000 MHz +Custom video chips: 051962 + 052109 +Sound chips: NEC UPD7759C + 051649 +Other custom chip: 051550 +Dips: 2 x 8 dips bank +*/ + +static MACHINE_CONFIG_START( shuriboy ) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 3) // divisor unknown + MCFG_CPU_PROGRAM_MAP(shuriboy_main) + + /* video hardware */ + MCFG_SCREEN_ADD("screen", RASTER) // everything not verified, just a placeholder + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(64*8, 32*8) + MCFG_SCREEN_VISIBLE_AREA(80, 400-1, 16, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(konmedal_state, screen_update_shuriboy) + MCFG_SCREEN_PALETTE("palette") + + MCFG_PALETTE_ADD("palette", 8192) // not verified + + // 051962 + 052109 + + MCFG_MACHINE_START_OVERRIDE(konmedal_state, shuriboy) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_K051649_ADD("k051649", XTAL_24MHz / 12) // divisor unknown + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) + + // upd7759c +MACHINE_CONFIG_END + ROM_START( tsukande ) ROM_REGION( 0x20000, "maincpu", 0 ) /* main program */ ROM_LOAD( "441-d02.4g", 0x000000, 0x020000, CRC(6ed17227) SHA1(4e3f5219cbf6f42c60df38a99f3009fe49f78fc1) ) @@ -419,5 +478,20 @@ ROM_START( ddboy ) ROM_LOAD( "342_a10.82s129.14g", 0x000300, 0x000100, CRC(1fa443f9) SHA1(84b0a36a4e49bf75bda1871bf52090ee5a75cd03) ) ROM_END -GAME( 1995, tsukande, 0, tsukande, konmedal, konmedal_state, 0, ROT0, "Konami", "Tsukande Toru Chicchi", MACHINE_NOT_WORKING) -GAME( 1995, ddboy, 0, ddboy, konmedal, konmedal_state, 0, ROT0, "Konami", "Dam Dam Boy", MACHINE_NOT_WORKING) +ROM_START( shuriboy ) + ROM_REGION( 0x10000, "maincpu", 0 ) /* main program */ + ROM_LOAD( "gs-341-b01.13g", 0x000000, 0x010000, CRC(3c0f36b6) SHA1(1d3838f45969228a8b2054cd5baf8892db68b644) ) + + ROM_REGION( 0x40000, "gfx1", 0 ) /* tilemaps */ + ROM_LOAD32_BYTE( "341-A03.2H", 0x000002, 0x010000, CRC(8e9e9835) SHA1(f8dc4579f238d91c0aef59167be7e5de87dc4ba7) ) + ROM_LOAD32_BYTE( "341-A04.4H", 0x000003, 0x010000, CRC(ac82d67b) SHA1(65869adfbb67cf10c92e50239fd747fc5ad4714d) ) + ROM_LOAD32_BYTE( "341-A05.5H", 0x000000, 0x010000, CRC(31403832) SHA1(d13c54d3768a0c2d60a3751db8980199f60db243) ) + ROM_LOAD32_BYTE( "341-A06.7H", 0x000001, 0x010000, CRC(361e26eb) SHA1(7b5ad6a6067afb3350d85a3f2026e4d685429e20) ) + + ROM_REGION( 0x200000, "upd", 0 ) + ROM_LOAD( "341-A02.13C", 0x000000, 0x020000, CRC(e1f5c8f1) SHA1(323a078720e09a7326e82cb623b6c90e2674e800) ) +ROM_END + +GAME( 1995, tsukande, 0, tsukande, konmedal, konmedal_state, 0, ROT0, "Konami", "Tsukande Toru Chicchi", MACHINE_NOT_WORKING) +GAME( 1995, ddboy, 0, ddboy, konmedal, konmedal_state, 0, ROT0, "Konami", "Dam Dam Boy", MACHINE_NOT_WORKING) +GAME( 1993, shuriboy, 0, shuriboy, konmedal, konmedal_state, 0, ROT0, "Konami", "Shuriken Boy", MACHINE_IS_SKELETON) |