diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-07-08 05:54:38 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-07-08 05:54:38 +0200 |
commit | 3622f5477be67cad268fa5f3d35cf482bc9ebe84 (patch) | |
tree | b0c2355e4abe8edaab09022c6cd933e157a403f2 /src/mame | |
parent | 6cd7c583902ab450dd6e5d70ccd7e514fd640e04 (diff) |
bishi.cpp, konmedal68k.cpp: moved dobouchn from the former driver to the latter, GFX are mostly corrected
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/bishi.cpp | 103 | ||||
-rw-r--r-- | src/mame/drivers/konmedal68k.cpp | 29 | ||||
-rw-r--r-- | src/mame/mame.lst | 6 |
3 files changed, 27 insertions, 111 deletions
diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp index 570d7d89314..94fde314b9c 100644 --- a/src/mame/drivers/bishi.cpp +++ b/src/mame/drivers/bishi.cpp @@ -50,7 +50,7 @@ GS562 PWB(A)400625A \/ Notes: 68000 - clock 12.000MHz (24/2) YMZ280 - clock 16.9344MHz - CN3/4 - connector for ROM daugterboard + CN3/4 - connector for ROM daughterboard CN1 - large flat cable connector for power/controls 675KAA01 to 04 - 27C040 EPROMs 675KAA07 to 10 - 27C240 EPROMs @@ -362,77 +362,6 @@ static INPUT_PORTS_START( bishi2p ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // 'p2' START INPUT_PORTS_END -static INPUT_PORTS_START( dobouchn ) - PORT_INCLUDE( bishi ) - - PORT_MODIFY("IN0") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_MODIFY("INPUTS") - PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot") - PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_MODIFY("SYSTEM") - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("M. Ack") // ??? - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coin 2 (Medal)") - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_MODIFY("DSW") - PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3") - PORT_DIPSETTING( 0x00, "5 Coins / 2 Credits" ) - PORT_DIPSETTING( 0x01, DEF_STR( 4C_3C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) - PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW1:4" ) - PORT_DIPNAME( 0x70, 0x70, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7") - PORT_DIPSETTING( 0x00, "15 Medals" ) - PORT_DIPSETTING( 0x10, "13 Medals" ) - PORT_DIPSETTING( 0x20, "11 Medals" ) - PORT_DIPSETTING( 0x30, "9 Medals" ) - PORT_DIPSETTING( 0x40, "7 Medals" ) - PORT_DIPSETTING( 0x50, "5 Medals" ) - PORT_DIPSETTING( 0x60, "3 Medals" ) - PORT_DIPSETTING( 0x70, "2 Medals" ) - PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) - - PORT_DIPNAME( 0x0f00, 0x0f00, "Payout" ) PORT_DIPLOCATION("SW2:1,2,3,4") - PORT_DIPSETTING( 0x000, "90%" ) - PORT_DIPSETTING( 0x100, "85%" ) - PORT_DIPSETTING( 0x200, "80%" ) - PORT_DIPSETTING( 0x300, "75%" ) - PORT_DIPSETTING( 0x400, "70%" ) - PORT_DIPSETTING( 0x500, "65%" ) - PORT_DIPSETTING( 0x600, "60%" ) - PORT_DIPSETTING( 0x700, "55%" ) - PORT_DIPSETTING( 0x800, "50%" ) - PORT_DIPSETTING( 0x900, "45%" ) - PORT_DIPSETTING( 0xa00, "40%" ) - PORT_DIPSETTING( 0xb00, "35%" ) - PORT_DIPSETTING( 0xc00, "30%" ) - PORT_DIPSETTING( 0xd00, "25%" ) - PORT_DIPSETTING( 0xe00, "20%" ) - PORT_DIPSETTING( 0xf00, "15%" ) - PORT_DIPNAME( 0x3000, 0x3000, "Play Timer" ) PORT_DIPLOCATION("SW2:5,6") - PORT_DIPSETTING( 0x0000, "30 seconds" ) - PORT_DIPSETTING( 0x1000, "24 seconds" ) - PORT_DIPSETTING( 0x2000, "18 seconds" ) - PORT_DIPSETTING( 0x3000, "12 seconds" ) - // TODO: needs NVRAM hookup and default hookup - PORT_DIPNAME( 0x4000, 0x0000, "Backup RAM clear" ) PORT_DIPLOCATION("SW2:7") - PORT_DIPSETTING( 0x4000, DEF_STR( No ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) -INPUT_PORTS_END - void bishi_state::machine_start() { save_item(NAME(m_cur_control)); @@ -485,14 +414,6 @@ void bishi_state::bishi(machine_config &config) ymz.add_route(1, "rspeaker", 1.0); } -void bishi_state::dobouchn(machine_config &config) -{ - bishi(config); -// TODO: change accordingly (ASCII charset definitely not 8bpp, 5bpp perhaps?) -// m_k056832->set_tile_callback(FUNC(bishi_state::dobouchn_tile_callback)); - m_k056832->set_config(K056832_BPP_8, 1, 0); -} - // ROM definitions @@ -581,29 +502,7 @@ ROM_START( sbishika ) ROM_LOAD( "675kaa04.8f", 0x180000, 0x080000, CRC(ebcbd813) SHA1(d67540d0ea303f09866f4a766e2d5162f05cd4ac) ) ROM_END -ROM_START( dobouchn ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD16_WORD_SWAP( "640-a05-2n.bin", 0x000000, 0x080000, CRC(7643dbc6) SHA1(3b55a782f04a741088b93954279b35c1c90af622) ) - - ROM_REGION( 0x200000, "k056832", 0 ) - // makes GFX ROM test to pass - // must return 0xf0c3 and 0xee9e, check snippets at 0x2e1c and 0x2e42 - // TODO: might require a different K056832_rom_r callback instead - ROM_LOAD16_BYTE( "640-a06-14n.bin", 0x000000, 0x080000, CRC(c6c5016c) SHA1(ad0b5258e2c1d0ba95dfc0d8fc6332b524f2c1e2) ) - ROM_RELOAD( 0x100001, 0x080000 ) - ROM_LOAD16_BYTE( "640-a07-17n.bin", 0x000001, 0x080000, CRC(614fee32) SHA1(080fea72c0417752eb0a0b109b524d87379b2921) ) - ROM_RELOAD( 0x100000, 0x080000 ) - - // dummy region (game has no sprites, but we want to use the GX mixer) - ROM_REGION( 0x80000, "gfx2", ROMREGION_ERASE00 ) - - ROM_REGION( 0x200000, "ymz", 0 ) - ROM_LOAD( "640-a01-2f.bin", 0x000000, 0x080000, CRC(326e2844) SHA1(62ce14ffe5d0a35c37c9a5a98c9c3a5df63d4512) ) - ROM_LOAD( "640-a02-4f.bin", 0x080000, 0x080000, CRC(ab6593f5) SHA1(95907ee4a2cdf3bf27b7c0c1283b2bc36b868d9d) ) -ROM_END - GAME( 1996, bishi, 0, bishi, bishi, bishi_state, empty_init, ROT0, "Konami", "Bishi Bashi Championship Mini Game Senshuken (ver JAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1998, sbishi, 0, bishi, bishi2p, bishi_state, empty_init, ROT0, "Konami", "Super Bishi Bashi Championship (ver JAA, 2 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1998, sbishik, sbishi, bishi, bishi, bishi_state, empty_init, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAB, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1998, sbishika, sbishi, bishi, bishi, bishi_state, empty_init, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1996, dobouchn, 0, dobouchn, dobouchn, bishi_state, empty_init, ROT0, "Konami", "Dobou-Chan (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/konmedal68k.cpp b/src/mame/drivers/konmedal68k.cpp index dc5de34da78..b32b631b737 100644 --- a/src/mame/drivers/konmedal68k.cpp +++ b/src/mame/drivers/konmedal68k.cpp @@ -50,6 +50,11 @@ public: void kzaurus(machine_config &config); void koropens(machine_config &config); +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + private: uint32_t screen_update_konmedal68k(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void fill_backcolor(bitmap_ind16 &bitmap, const rectangle &cliprect, int pen_idx, int mode); @@ -96,10 +101,6 @@ private: void kzaurus_main(address_map &map); void koropens_main(address_map &map); - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void video_start() override; - static constexpr int NUM_LAYERS = 4; required_device<cpu_device> m_maincpu; @@ -325,6 +326,8 @@ INPUT_PORTS_END void konmedal68k_state::machine_start() { + save_item(NAME(m_control)); + save_item(NAME(m_control2)); } void konmedal68k_state::machine_reset() @@ -442,8 +445,22 @@ ROM_START( kattobas ) ROM_LOAD( "841-a02-4f.bin", 0x080000, 0x080000, CRC(685c1c10) SHA1(9884940df8c079e8129fc8d870f90e5b7987e6f4) ) ROM_END -GAME( 1995, kzaurus, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Pittanko Zaurus", MACHINE_IMPERFECT_GRAPHICS ) +ROM_START( dobouchn ) + ROM_REGION( 0x80000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "640-a05-2n.bin", 0x000000, 0x080000, CRC(7643dbc6) SHA1(3b55a782f04a741088b93954279b35c1c90af622) ) + + ROM_REGION( 0x100000, "k056832", 0 ) + ROM_LOAD( "640-a06-14n.bin", 0x000000, 0x080000, CRC(c6c5016c) SHA1(ad0b5258e2c1d0ba95dfc0d8fc6332b524f2c1e2) ) + ROM_LOAD( "640-a07-17n.bin", 0x080000, 0x080000, CRC(614fee32) SHA1(080fea72c0417752eb0a0b109b524d87379b2921) ) + + ROM_REGION( 0x200000, "ymz", 0 ) + ROM_LOAD( "640-a01-2f.bin", 0x000000, 0x080000, CRC(326e2844) SHA1(62ce14ffe5d0a35c37c9a5a98c9c3a5df63d4512) ) + ROM_LOAD( "640-a02-4f.bin", 0x080000, 0x080000, CRC(ab6593f5) SHA1(95907ee4a2cdf3bf27b7c0c1283b2bc36b868d9d) ) +ROM_END + +GAME( 1995, kzaurus, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Pittanko Zaurus", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1996, dobouchn, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Dobou-Chan (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, koropens, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Korokoro Pensuke", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1998, kattobas, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Kattobase Power Pro Kun", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1999, pwrchanc, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Powerful Chance", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1999, ymcapsul, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Yu-Gi-Oh Monster Capsule", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1999, ymcapsul, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Yu-Gi-Oh Monster Capsule", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 459e1e32f97..d5a9e822cfc 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -9250,7 +9250,6 @@ bishi // GX575 (c) 1996 (Japan) sbishi // GX675 (c) 1998 (Japan) sbishik // GX675 (c) 1998 (Korea) sbishika // GX675 (c) 1998 (Korea) -dobouchn // @source:bitel.cpp feap90 // @@ -18904,11 +18903,12 @@ tsukande mariorou @source:konmedal68k.cpp -kzaurus +dobouchn +kattobas koropens +kzaurus pwrchanc ymcapsul -kattobas @source:quickpick5.cpp quickp5 |