Skip to content

Commit 1c3c97a

Browse files
committed
New systems marked not working
------------------------------ Ocean Paradise (V105US) [Ioannis Bampoulas] New clones marked not working ----------------------------- Ocean Paradise (V101US) [Ioannis Bampoulas]
1 parent d8cf5de commit 1c3c97a

File tree

3 files changed

+40
-5
lines changed

3 files changed

+40
-5
lines changed

src/mame/igs/igs_m027.cpp

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,12 +471,45 @@ ROM_START( fruitpar )
471471
ROM_REGION( 0x400000, "igs017_igs031:sprites", 0 )
472472
ROM_LOAD( "igs_m4101.u13", 0x000000, 0x400000, CRC(84899398) SHA1(badac65af6e03c490798f4368eb2b15db8c590d0) ) // FIXED BITS (xxxxxxx0xxxxxxxx)
473473

474-
475474
ROM_REGION( 0x80000, "oki", 0 )
476475
ROM_LOAD( "igs_w4102.u28", 0x00000, 0x80000, CRC(558cab25) SHA1(0280b37a14589329f0385c048e5742b9e89bd587) )
477476
ROM_END
478477

478+
ROM_START( oceanpar ) // IGS PCB-0331-02-FG
479+
ROM_REGION( 0x04000, "maincpu", 0 )
480+
// Internal ROM of IGS027A type G ARM based MCU
481+
ROM_LOAD( "oceanpar_igs027a", 0x00000, 0x4000, NO_DUMP )
482+
483+
ROM_REGION32_LE( 0x80000, "user1", 0 ) // external ARM data / prg
484+
ROM_LOAD( "ocean_paradise_v105us.u23", 0x00000, 0x80000, CRC(e6eb66c3) SHA1(f6c1e31ccddc8ebb8218f52b5c0d97f0797b2e84) )
485+
486+
ROM_REGION( 0x080000, "igs017_igs031:tilemaps", 0 )
487+
ROM_LOAD( "ocean_paradise_text.u12", 0x000000, 0x080000, CRC(bdaa4407) SHA1(845eead0902c81290c2b5d7543ac9dfda375fdd1) )
488+
489+
ROM_REGION( 0x400000, "igs017_igs031:sprites", 0 )
490+
ROM_LOAD( "igs_m4101.u13", 0x000000, 0x400000, CRC(84899398) SHA1(badac65af6e03c490798f4368eb2b15db8c590d0) ) // FIXED BITS (xxxxxxx0xxxxxxxx), same as fruitpar
491+
492+
ROM_REGION( 0x80000, "oki", 0 )
493+
ROM_LOAD( "igs_w4102.u28", 0x00000, 0x80000, CRC(558cab25) SHA1(0280b37a14589329f0385c048e5742b9e89bd587) ) // same as fruitpar
494+
ROM_END
479495

496+
ROM_START( oceanpara ) // IGS PCB-0331-01-FG
497+
ROM_REGION( 0x04000, "maincpu", 0 )
498+
// Internal ROM of IGS027A type G ARM based MCU
499+
ROM_LOAD( "oceanpara_igs027a", 0x00000, 0x4000, NO_DUMP )
500+
501+
ROM_REGION32_LE( 0x80000, "user1", 0 ) // external ARM data / prg
502+
ROM_LOAD( "ocean_paradise_v101us.u23", 0x00000, 0x80000, CRC(4f2bf87a) SHA1(559c8728632336ba84f455ac22b6e514967c644b) )
503+
504+
ROM_REGION( 0x080000, "igs017_igs031:tilemaps", 0 )
505+
ROM_LOAD( "ocean_paradise_text.u12", 0x000000, 0x080000, CRC(bdaa4407) SHA1(845eead0902c81290c2b5d7543ac9dfda375fdd1) )
506+
507+
ROM_REGION( 0x400000, "igs017_igs031:sprites", 0 )
508+
ROM_LOAD( "igs_m4101.u13", 0x000000, 0x400000, CRC(84899398) SHA1(badac65af6e03c490798f4368eb2b15db8c590d0) ) // FIXED BITS (xxxxxxx0xxxxxxxx), same as fruitpar
509+
510+
ROM_REGION( 0x80000, "oki", 0 )
511+
ROM_LOAD( "igs_w4102.u28", 0x00000, 0x80000, CRC(558cab25) SHA1(0280b37a14589329f0385c048e5742b9e89bd587) ) // same as fruitpar
512+
ROM_END
480513

481514
/***************************************************************************
482515
@@ -1238,6 +1271,8 @@ GAME( 1999, qlgs, 0, igs_mahjong, sdwx, igs_m027_state, init_qlg
12381271
GAME( 1999, amazonia, 0, igs_mahjong, amazonia, igs_m027_state, init_amazonia, ROT0, "IGS", "Amazonia King (V104BR)", MACHINE_IS_SKELETON )
12391272
GAME( 1999, amazonkp, amazonia, igs_mahjong, amazonia, igs_m027_state, init_amazonia, ROT0, "IGS", "Amazonia King Plus (V204BR)", MACHINE_IS_SKELETON )
12401273
GAME( 1999, fruitpar, 0, igs_mahjong, sdwx, igs_m027_state, init_fruitpar, ROT0, "IGS", "Fruit Paradise (V214)", MACHINE_IS_SKELETON )
1274+
GAME( 199?, oceanpar, 0, igs_mahjong, sdwx, igs_m027_state, init_fruitpar, ROT0, "IGS", "Ocean Paradise (V105US)", MACHINE_IS_SKELETON )
1275+
GAME( 199?, oceanpara, oceanpar, igs_mahjong, sdwx, igs_m027_state, init_fruitpar, ROT0, "IGS", "Ocean Paradise (V101US)", MACHINE_IS_SKELETON )
12411276
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?)
12421277
GAME( 2003, amazoni2, 0, igs_mahjong, sdwx, igs_m027_state, init_amazoni2, ROT0, "IGS", "Amazonia King II (V202BR)", MACHINE_IS_SKELETON )
12431278
GAME( 200?, sddz, 0, igs_mahjong, sdwx, igs_m027_state, init_sddz, ROT0, "IGS", "Super Dou Di Zhu", MACHINE_IS_SKELETON )

src/mame/mame.lst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20207,6 +20207,8 @@ lhzb4 // (c) 200?
2020720207
mgcs3 // (c) 200?
2020820208
mgfx // (c) 200?
2020920209
mgzz // (c) 2003
20210+
oceanpar //
20211+
oceanpara //
2021020212
qlgs // (c) 1999
2021120213
sddz // (c) 200?
2021220214
sdwx // (c) 2002

src/mame/merit/merit3xx.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,7 @@ static INPUT_PORTS_START( merit3xx )
695695
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME("Discard 5")
696696
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
697697
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL )
698-
PORT_DIPNAME( 0x80, 0x80, "IN0.8" ) // something printer related. Causes 'printing cash ticket' if switched with coins inserted
699-
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
700-
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
698+
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT )
701699

702700
PORT_START("IN1")
703701
PORT_DIPNAME( 0x01, 0x01, "IN1.1" )
@@ -801,7 +799,6 @@ void merit3xx_state::merit300(machine_config &config)
801799
Z80(config, m_maincpu, 10_MHz_XTAL / 2);
802800
m_maincpu->set_addrmap(AS_PROGRAM, &merit3xx_state::main_map);
803801
m_maincpu->set_addrmap(AS_IO, &merit3xx_state::io_map);
804-
m_maincpu->set_vblank_int("screen", FUNC(merit3xx_state::irq0_line_hold));
805802

806803
// TODO: reenable NVRAM, currently m6710a doesn't like it at all
807804
//NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
@@ -823,6 +820,7 @@ void merit3xx_state::merit300(machine_config &config)
823820
crtc.set_show_border_area(false);
824821
crtc.set_char_width(8);
825822
crtc.set_update_row_callback(FUNC(merit3xx_state::update_row));
823+
crtc.out_vsync_callback().set_inputline(m_maincpu, 0);
826824

827825
BT476(config, "ramdac", 10_MHz_XTAL);
828826

0 commit comments

Comments
 (0)