From 489f33d95674c309fdce8e5729f31284b3a72731 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sun, 5 Dec 2021 08:20:21 +0100 Subject: New working machines -------------------- Super Model II [Brian Troha, Darksoft, simzy, system11] --- src/mame/drivers/expro02.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++- src/mame/mame.lst | 1 + 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index ec26352e003..553f327b478 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -222,6 +222,8 @@ BTANB: #include "speaker.h" +namespace { + class expro02_state : public driver_device { public: @@ -240,6 +242,7 @@ public: { } void supmodel(machine_config &config); + void supmodl2(machine_config &config); void zipzap(machine_config &config); void fantasia(machine_config &config); void fantsia2(machine_config &config); @@ -251,6 +254,9 @@ public: void init_expro02(); +protected: + virtual void machine_start() override; + private: required_device m_maincpu; optional_device m_view2; @@ -273,7 +279,6 @@ private: void oki_bankswitch_w(u8 data); - virtual void machine_start() override; void expro02_palette(palette_device &palette) const; uint32_t screen_update_backgrounds(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -294,6 +299,7 @@ private: void oki_map(address_map &map); void smissw_map(address_map &map); void supmodel_map(address_map &map); + void supmodl2_map(address_map &map); void zipzap_map(address_map &map); }; @@ -778,6 +784,13 @@ void expro02_state::fantsia2_map(address_map &map) map(0xf80000, 0xf8ffff).ram(); } +void expro02_state::supmodl2_map(address_map &map) +{ + fantsia2_map(map); + map(0x800006, 0x800007).r(FUNC(expro02_state::comad_timer_r)); + map(0x80000a, 0x80000b).r(FUNC(expro02_state::comad_timer_r)); +} + @@ -1004,6 +1017,13 @@ void expro02_state::fantsia2(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &expro02_state::fantsia2_map); } +void expro02_state::supmodl2(machine_config &config) +{ + fantsia2(config); + + m_maincpu->set_addrmap(AS_PROGRAM, &expro02_state::supmodl2_map); +} + void expro02_state::galhustl(machine_config &config) { comad_noview2(config); @@ -1708,6 +1728,29 @@ ROM_START( fantsia2n ) ROM_LOAD( "music1.1a", 0x80000, 0x80000, CRC(864167c2) SHA1(c454b26b6dea993e6bd64546f92beef05e46d7d7) ) ROM_END +ROM_START( supmodl2 ) // PCB silkscreened COMAD INDUSTRY CO.,LTD 961210 MADE IN KOREA (PCB has an additional OSC marked 18MHz, currently unpopulated) + ROM_REGION( 0x500000, "maincpu", 0 ) // 68000 code + ROM_LOAD16_BYTE( "12_prog2.ue17", 0x000000, 0x80000, CRC(9107f65d) SHA1(c66c1cfeae2afc5a1bf0d6385291592c0f9b1578) ) + ROM_LOAD16_BYTE( "7_prog1.ud17", 0x000001, 0x80000, CRC(0d9253a7) SHA1(2c7e84bfbf648c22acf76dbfcbb9e2416225abc9) ) + ROM_LOAD16_BYTE( "11_i-scr2.ue16b", 0x100000, 0x80000, CRC(b836c1f3) SHA1(56c611313336dbb0ebcdba42ba73c5738ca7c8d7) ) + ROM_LOAD16_BYTE( "6_i-scr1.ue16a", 0x100001, 0x80000, CRC(d56cac96) SHA1(31fe266ba6abbd51ed7ff6089ebc86e528ac249a) ) + ROM_LOAD16_BYTE( "10_i-scr4.ue15b", 0x200000, 0x80000, CRC(aa85a247) SHA1(6508c0f8b1bc397599ecb0ae5c9a9ebcc532bdd8) ) + ROM_LOAD16_BYTE( "5_i-scr3.ue15a", 0x200001, 0x80000, CRC(3e9bd17a) SHA1(cbbd90120fe9504eac05bb6c8f38d16b44d8b475) ) + ROM_LOAD16_BYTE( "9_i-scr6.ue14b", 0x300000, 0x80000, CRC(d21355dc) SHA1(f449f6b2c815453545a798e6d7081327b8c1677c) ) + ROM_LOAD16_BYTE( "4_i-scr5.ue14a", 0x300001, 0x80000, CRC(d1c9155c) SHA1(9d50e0875feab77a91cc1d8fe575ad6361bfada2) ) + ROM_LOAD16_BYTE( "8_i-scr8.ue20b", 0x400000, 0x80000, CRC(7ffe761e) SHA1(63d0b6e3e34a465e038f8f96ae5f3f1e3666aaaa) ) + ROM_LOAD16_BYTE( "3_i-scr7.ue20a", 0x400001, 0x80000, CRC(d2bb19ef) SHA1(b8dee4c64915ae9d7e3a79a0d32f692f5e2a0d06) ) + + ROM_REGION( 0x100000, "kan_spr", 0 ) // sprites + ROM_LOAD( "13_obj1.u5", 0x00000, 0x80000, CRC(52e6872a) SHA1(7e5274b9a415ee0e536cd3b87f73d3eae9644669) ) + ROM_LOAD( "14_obj2.u4", 0x80000, 0x80000, CRC(ea6e3861) SHA1(463b40f5441231a0451571a0b8afe1ed0fd4b164) ) + + ROM_REGION( 0x100000, "oki", 0 ) // OKIM6295 samples + // 00000-2ffff is fixed, 30000-3ffff is bank switched from all the ROMs + ROM_LOAD( "1_music1.ub6", 0x00000, 0x80000, CRC(23cc4f9c) SHA1(06b5342c25de966ce590917c571e5b19af1fef7d) ) + ROM_LOAD( "2_music2.uc6", 0x80000, 0x80000, CRC(864167c2) SHA1(c454b26b6dea993e6bd64546f92beef05e46d7d7) ) +ROM_END + ROM_START( wownfant) ROM_REGION( 0x500000, "maincpu", 0 ) // 68000 code ROM_LOAD16_BYTE( "ep-4001 42750001 u81.bin", 0x000000, 0x80000, CRC(9942d200) SHA1(d2f69c0949881ef4aef202b564eac069c030a497) ) @@ -1918,6 +1961,9 @@ void expro02_state::init_expro02() } } +} // Anonymous namespace + + /************************************* * * Game driver(s) @@ -1957,6 +2003,8 @@ GAME( 1997, fantsia2, 0, fantsia2, missw96, expro02_state, empty_init, GAME( 1997, fantsia2a, fantsia2, fantsia2, missw96, expro02_state, empty_init, ROT0, "Comad", "Fantasia II (Less Explicit)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level GAME( 1998, fantsia2n, fantsia2, fantsia2, missw96, expro02_state, empty_init, ROT0, "Comad", "Fantasia II (1998)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level +GAME( 1997, supmodl2, 0, supmodl2, missw96, expro02_state, empty_init, ROT0, "Comad", "Super Model II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "C" nudity level + GAME( 2002, wownfant, 0, fantsia2, missw96, expro02_state, empty_init, ROT0, "Comad", "WOW New Fantasia", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level GAME( 2002, missw02, 0, fantsia2, missw96, expro02_state, empty_init, ROT0, "Daigom", "Miss World 2002", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 8700dd3273b..464babb4eee 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -13660,6 +13660,7 @@ pgalvip // (c) 1996 ACE International (Afega stickers on pgalvipa // smissw // supmodel // (c) 1994 Comad & New Japan System +supmodl2 // (c) 1997 Comad wownfant // (c) 2002 Comad zipzap // (c) 1995 Barko Corp zipzapa // (c) 1995 Barko Corp -- cgit v1.2.3