From 1c3c97a57e01efe194ca2575aa6e666c358dbd37 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sun, 30 Jun 2024 05:53:54 +0200 Subject: New systems marked not working ------------------------------ Ocean Paradise (V105US) [Ioannis Bampoulas] New clones marked not working ----------------------------- Ocean Paradise (V101US) [Ioannis Bampoulas] --- src/mame/igs/igs_m027.cpp | 37 ++++++++++++++++++++++++++++++++++++- src/mame/mame.lst | 2 ++ src/mame/merit/merit3xx.cpp | 6 ++---- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/mame/igs/igs_m027.cpp b/src/mame/igs/igs_m027.cpp index b1f8c02d463..83e5730ac1b 100644 --- a/src/mame/igs/igs_m027.cpp +++ b/src/mame/igs/igs_m027.cpp @@ -471,12 +471,45 @@ ROM_START( fruitpar ) ROM_REGION( 0x400000, "igs017_igs031:sprites", 0 ) ROM_LOAD( "igs_m4101.u13", 0x000000, 0x400000, CRC(84899398) SHA1(badac65af6e03c490798f4368eb2b15db8c590d0) ) // FIXED BITS (xxxxxxx0xxxxxxxx) - ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "igs_w4102.u28", 0x00000, 0x80000, CRC(558cab25) SHA1(0280b37a14589329f0385c048e5742b9e89bd587) ) ROM_END +ROM_START( oceanpar ) // IGS PCB-0331-02-FG + ROM_REGION( 0x04000, "maincpu", 0 ) + // Internal ROM of IGS027A type G ARM based MCU + ROM_LOAD( "oceanpar_igs027a", 0x00000, 0x4000, NO_DUMP ) + + ROM_REGION32_LE( 0x80000, "user1", 0 ) // external ARM data / prg + ROM_LOAD( "ocean_paradise_v105us.u23", 0x00000, 0x80000, CRC(e6eb66c3) SHA1(f6c1e31ccddc8ebb8218f52b5c0d97f0797b2e84) ) + + ROM_REGION( 0x080000, "igs017_igs031:tilemaps", 0 ) + ROM_LOAD( "ocean_paradise_text.u12", 0x000000, 0x080000, CRC(bdaa4407) SHA1(845eead0902c81290c2b5d7543ac9dfda375fdd1) ) + + ROM_REGION( 0x400000, "igs017_igs031:sprites", 0 ) + ROM_LOAD( "igs_m4101.u13", 0x000000, 0x400000, CRC(84899398) SHA1(badac65af6e03c490798f4368eb2b15db8c590d0) ) // FIXED BITS (xxxxxxx0xxxxxxxx), same as fruitpar + + ROM_REGION( 0x80000, "oki", 0 ) + ROM_LOAD( "igs_w4102.u28", 0x00000, 0x80000, CRC(558cab25) SHA1(0280b37a14589329f0385c048e5742b9e89bd587) ) // same as fruitpar +ROM_END +ROM_START( oceanpara ) // IGS PCB-0331-01-FG + ROM_REGION( 0x04000, "maincpu", 0 ) + // Internal ROM of IGS027A type G ARM based MCU + ROM_LOAD( "oceanpara_igs027a", 0x00000, 0x4000, NO_DUMP ) + + ROM_REGION32_LE( 0x80000, "user1", 0 ) // external ARM data / prg + ROM_LOAD( "ocean_paradise_v101us.u23", 0x00000, 0x80000, CRC(4f2bf87a) SHA1(559c8728632336ba84f455ac22b6e514967c644b) ) + + ROM_REGION( 0x080000, "igs017_igs031:tilemaps", 0 ) + ROM_LOAD( "ocean_paradise_text.u12", 0x000000, 0x080000, CRC(bdaa4407) SHA1(845eead0902c81290c2b5d7543ac9dfda375fdd1) ) + + ROM_REGION( 0x400000, "igs017_igs031:sprites", 0 ) + ROM_LOAD( "igs_m4101.u13", 0x000000, 0x400000, CRC(84899398) SHA1(badac65af6e03c490798f4368eb2b15db8c590d0) ) // FIXED BITS (xxxxxxx0xxxxxxxx), same as fruitpar + + ROM_REGION( 0x80000, "oki", 0 ) + ROM_LOAD( "igs_w4102.u28", 0x00000, 0x80000, CRC(558cab25) SHA1(0280b37a14589329f0385c048e5742b9e89bd587) ) // same as fruitpar +ROM_END /*************************************************************************** @@ -1238,6 +1271,8 @@ GAME( 1999, qlgs, 0, igs_mahjong, sdwx, igs_m027_state, init_qlg GAME( 1999, amazonia, 0, igs_mahjong, amazonia, igs_m027_state, init_amazonia, ROT0, "IGS", "Amazonia King (V104BR)", MACHINE_IS_SKELETON ) GAME( 1999, amazonkp, amazonia, igs_mahjong, amazonia, igs_m027_state, init_amazonia, ROT0, "IGS", "Amazonia King Plus (V204BR)", MACHINE_IS_SKELETON ) GAME( 1999, fruitpar, 0, igs_mahjong, sdwx, igs_m027_state, init_fruitpar, ROT0, "IGS", "Fruit Paradise (V214)", MACHINE_IS_SKELETON ) +GAME( 199?, oceanpar, 0, igs_mahjong, sdwx, igs_m027_state, init_fruitpar, ROT0, "IGS", "Ocean Paradise (V105US)", MACHINE_IS_SKELETON ) +GAME( 199?, oceanpara, oceanpar, igs_mahjong, sdwx, igs_m027_state, init_fruitpar, ROT0, "IGS", "Ocean Paradise (V101US)", MACHINE_IS_SKELETON ) GAME( 2002, sdwx, 0, igs_mahjong, sdwx, igs_m027_state, init_sdwx, ROT0, "IGS", "Sheng Dan Wu Xian", MACHINE_IS_SKELETON ) // aka Christmas 5 Line? (or Amazonia King II, shares roms at least?) GAME( 2003, amazoni2, 0, igs_mahjong, sdwx, igs_m027_state, init_amazoni2, ROT0, "IGS", "Amazonia King II (V202BR)", MACHINE_IS_SKELETON ) GAME( 200?, sddz, 0, igs_mahjong, sdwx, igs_m027_state, init_sddz, ROT0, "IGS", "Super Dou Di Zhu", MACHINE_IS_SKELETON ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index f3fc6edafa1..1d433262fc3 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -20207,6 +20207,8 @@ lhzb4 // (c) 200? mgcs3 // (c) 200? mgfx // (c) 200? mgzz // (c) 2003 +oceanpar // +oceanpara // qlgs // (c) 1999 sddz // (c) 200? sdwx // (c) 2002 diff --git a/src/mame/merit/merit3xx.cpp b/src/mame/merit/merit3xx.cpp index 0db24e53f15..07099b73bf4 100644 --- a/src/mame/merit/merit3xx.cpp +++ b/src/mame/merit/merit3xx.cpp @@ -695,9 +695,7 @@ static INPUT_PORTS_START( merit3xx ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME("Discard 5") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL ) - PORT_DIPNAME( 0x80, 0x80, "IN0.8" ) // something printer related. Causes 'printing cash ticket' if switched with coins inserted - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_START("IN1") PORT_DIPNAME( 0x01, 0x01, "IN1.1" ) @@ -801,7 +799,6 @@ void merit3xx_state::merit300(machine_config &config) Z80(config, m_maincpu, 10_MHz_XTAL / 2); m_maincpu->set_addrmap(AS_PROGRAM, &merit3xx_state::main_map); m_maincpu->set_addrmap(AS_IO, &merit3xx_state::io_map); - m_maincpu->set_vblank_int("screen", FUNC(merit3xx_state::irq0_line_hold)); // TODO: reenable NVRAM, currently m6710a doesn't like it at all //NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -823,6 +820,7 @@ void merit3xx_state::merit300(machine_config &config) crtc.set_show_border_area(false); crtc.set_char_width(8); crtc.set_update_row_callback(FUNC(merit3xx_state::update_row)); + crtc.out_vsync_callback().set_inputline(m_maincpu, 0); BT476(config, "ramdac", 10_MHz_XTAL); -- cgit v1.2.3