summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Angelo Salese <angelosa@users.noreply.github.com>2008-12-06 16:45:12 +0000
committer Angelo Salese <angelosa@users.noreply.github.com>2008-12-06 16:45:12 +0000
commit8c09fe8b03f9479de15e4f489cfbc8c4c19a7f95 (patch)
treeef84f5abee741753670b030caccdce857f8ce9bd
parentdb54cb03ba714cabae9f1b39345cce9f828cc36f (diff)
Merged The Couples driver with Merit,fixing most of the graphics/color bugs in it.
-rw-r--r--.gitattributes1
-rw-r--r--src/mame/drivers/couple.c481
-rw-r--r--src/mame/drivers/merit.c247
-rw-r--r--src/mame/mame.mak1
4 files changed, 247 insertions, 483 deletions
diff --git a/.gitattributes b/.gitattributes
index 6cb4f6685f7..7a82441e7ed 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1365,7 +1365,6 @@ src/mame/drivers/coolridr.c svneol=native#text/plain
src/mame/drivers/cop01.c svneol=native#text/plain
src/mame/drivers/copsnrob.c svneol=native#text/plain
src/mame/drivers/cosmic.c svneol=native#text/plain
-src/mame/drivers/couple.c svneol=native#text/plain
src/mame/drivers/cowrace.c svneol=native#text/plain
src/mame/drivers/cps1.c svneol=native#text/plain
src/mame/drivers/cps2.c svneol=native#text/plain
diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c
deleted file mode 100644
index fa5b4d64185..00000000000
--- a/src/mame/drivers/couple.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/*******************************************************************************************
-
-The Couples (c) 1986/1988 The Couples (?)
-
-Preliminary driver by Angelo Salese
-
-This seems the second revision of the Merit.c HW,with the rom banking,the backup ram &
-some sort of protection/funky ram banking which involves a program uploaded into
-the backup ram itself.
-
-TODO:
--Fix graphics bugs;
--Support the C.R.T.C 6845 features;
--Inputs are sometimes buggy;
--Colors;
--Merge with the Merit.c driver;
--Uncertain Manufacturer & Year of production,is it Merit,it is an hack/bootleg running
-on that board or Merit got bankrupt and can't use his trademark?
-- update 2006018 by f205v: in-game grafics clearly displays Merit simbol, for this reason
-I changed manufacturer to "Merit"
-
-********************************************************************************************
-
-Main CPU : Z80B CPU
-
-Sound : AY3-8910 + 2 x Nec D8255AC-2
-
-Other : MC6845P
-
-Battery backup ram (6264)
-
-Provided to you by Thierry (ShinobiZ) & Gerald (COY)
-
-*******************************************************************************************/
-
-#include "driver.h"
-#include "machine/8255ppi.h"
-#include "sound/ay8910.h"
-#include "video/mc6845.h"
-
-static tilemap *bg_tilemap;
-static UINT8 *vram_lo,*vram_hi;
-static UINT8 *backup_ram;
-
-//before 53 after 71 then 6b
-/*
-Hi VRAM Lo VRAM
-1111 11
-5432 1098 7654 3210
-x-x- ---- ---- ---- extra tile number.
--x-- ---- ---- ---- rom selector?
----x xxxx ---- ---- color?
----- ---- xxxx xxxx tile number
-*/
-
-static TILE_GET_INFO( get_tile_info )
-{
- UINT16 vram_data = (((vram_hi[tile_index] & 0xff) << 8) | (vram_lo[tile_index] & 0xff));
- UINT16 region = (vram_data & 0x4000) >> 14;
- UINT16 code = ((vram_data & 0xff) | ((vram_data & 0x8000) >> 7) | ((vram_data & 0x2000) >> 4));
- UINT16 color = (vram_data & 0x0f00) >> 8;
-
- SET_TILE_INFO(region, code, color, 0);
-}
-
-static VIDEO_START( couple )
-{
- bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,32);
-}
-
-static VIDEO_UPDATE( couple )
-{
- tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
- return 0;
-}
-
-static WRITE8_HANDLER( couple_vram_lo_w )
-{
- vram_lo[offset] = data;
- tilemap_mark_tile_dirty(bg_tilemap,offset);
-}
-
-static WRITE8_HANDLER( couple_vram_hi_w )
-{
- vram_hi[offset] = data;
- tilemap_mark_tile_dirty(bg_tilemap,offset);
-}
-
-#ifdef UNUSED_FUNCTION
-static READ8_HANDLER( dummy_inputs_r )
-{
- logerror("Read %02x @ %06x\n",offset,cpu_get_pc(space->cpu));
- return 0xff;
-}
-#endif
-
-/*static UINT8 unk_data;
-
-static READ8_HANDLER( unk_r )
-{
- return unk_data;
-}
-
-static WRITE8_HANDLER( unk_w )
-{
- unk_data = data;
- popmessage("%04x",data);
-}*/
-
-/*Actually clear RAM stuff,writes 0x90 at start-up.*/
-static WRITE8_HANDLER( merit_prot_w )
-{
- /*This is likely to be wrong here but I don't know where to put it,It ensures
- that the parent set don't crash when jumps to $b011*/
- backup_ram[0x1011] = 0xc9; //ret
- //unk_data = data;
- //if(data == 0xc9)
- //popmessage("%02x",data);
-}
-
-#if 0
-static const ay8910_interface ay8910_config =
-{
- input_port_4_r,
-};
-#endif
-
-static const ppi8255_interface ppi8255_intf[2] =
-{
- {
- DEVICE8_PORT("P1"), /* Port A read */
- DEVICE8_PORT("SYSTEM"), /* Port B read */
- NULL, /* Port C read */
- NULL, /* Port A write */
- NULL, /* Port B write */
- NULL /* Port C write */
- },
- {
- DEVICE8_PORT("DSW"), /* Port A read */
- DEVICE8_PORT("IN3"), /* Port B read */
- DEVICE8_PORT("IN4"), /* Port C read */
- NULL, /* Port A write */
- NULL, /* Port B write */
- NULL /* Port C write */
- }
-};
-
-static ADDRESS_MAP_START( merit_mem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE( 0x0000, 0x7fff ) AM_ROM
- AM_RANGE( 0x8000, 0x9fff ) AM_ROMBANK(1)
- AM_RANGE( 0xa000, 0xbfff ) AM_RAM AM_BASE(&backup_ram)
- AM_RANGE( 0xc004, 0xc007 ) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w)
- AM_RANGE( 0xc008, 0xc00a ) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w)
- AM_RANGE( 0xc00b, 0xc00b ) AM_WRITE(merit_prot_w)
-// AM_RANGE( 0xc000, 0xc00f ) AM_READ(dummy_inputs_r)
-// AM_RANGE( 0xc008, 0xc008 ) AM_READ_PORT("P1")
-// AM_RANGE( 0xc00a, 0xc00a ) AM_READ_PORT("DSW")
- AM_RANGE( 0xe000, 0xe000 ) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
- AM_RANGE( 0xe001, 0xe001 ) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w)
- AM_RANGE( 0xe800, 0xefff ) AM_RAM_WRITE(couple_vram_hi_w) AM_BASE(&vram_hi)
- AM_RANGE( 0xf000, 0xf7ff ) AM_RAM_WRITE(couple_vram_lo_w) AM_BASE(&vram_lo)
- AM_RANGE( 0xf800, 0xfbff ) AM_RAM /*extra VRAM?*/
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( merit_io, ADDRESS_SPACE_IO, 8 )
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0xc00c, 0xc00c) AM_WRITE(ay8910_control_port_0_w)
- AM_RANGE(0xc10c, 0xc10c) AM_WRITE(ay8910_write_port_0_w)
-ADDRESS_MAP_END
-
-static PALETTE_INIT( couple )
-{
- int i;
-
- /*TODO:color table not yet understood.Need a snapshot of the real thing.*/
- /*RRGGGBBB*/
- for (i = 0;i < 0xff;i++)
- {
- int bit0,bit1,bit2,bit3,r,g,b;
-
- bit0 = 1;
- bit1 = 1;
- bit2 = (color_prom[i] >> 6) & 0x01;
- bit3 = (color_prom[i] >> 7) & 0x01;
- r = 0x0e * bit0 + 0x1f * bit1 + 0x42 * bit2 + 0x90 * bit3;
- bit0 = 1;
- bit1 = (color_prom[i] >> 3) & 0x01;
- bit2 = (color_prom[i] >> 4) & 0x01;
- bit3 = (color_prom[i] >> 5) & 0x01;
- g = 0x0e * bit0 + 0x1f * bit1 + 0x42 * bit2 + 0x90 * bit3;
- bit0 = 1;
- bit1 = (color_prom[i] >> 0) & 0x01;
- bit2 = (color_prom[i] >> 1) & 0x01;
- bit3 = (color_prom[i] >> 2) & 0x01;
- b = 0x0e * bit0 + 0x1f * bit1 + 0x42 * bit2 + 0x90 * bit3;
-
- palette_set_color(machine,i,MAKE_RGB(r,g,b));
- //color_prom++;
- }
-}
-
-static INPUT_PORTS_START( couple )
- PORT_START("P1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_IMPULSE(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_IMPULSE(1)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_IMPULSE(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_IMPULSE(1)
-
- PORT_START("DSW")
- PORT_DIPNAME( 0x01, 0x00, "Number of Attempts" )
- PORT_DIPSETTING( 0x01, "99" )
- PORT_DIPSETTING( 0x00, "9" )
- PORT_DIPNAME( 0x02, 0x02, "Tries Per Coin" )
- PORT_DIPSETTING( 0x02, "3" )
- PORT_DIPSETTING( 0x00, "2" )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coinage ) )
- PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 1C_2C ) )
-/*2 Coins for 2 Credits?I think this is an invalid setting,it doesn't even work correctly*/
-/* PORT_DIPSETTING( 0x00, DEF_STR( 2C_2C ) ) */
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
- PORT_DIPNAME( 0x20, 0x00, "Sound" )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "Clear RAM" )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START("SYSTEM")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START("IN3")
- PORT_DIPNAME( 0x01, 0x01, "3" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START("IN4")
- PORT_DIPNAME( 0x01, 0x01, "4" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-INPUT_PORTS_END
-
-/*Different DSWs*/
-static INPUT_PORTS_START( couplep )
- PORT_INCLUDE( couple )
-
- PORT_MODIFY("DSW")
- PORT_DIPNAME( 0x40, 0x40, "Bonus Play" )
- PORT_DIPSETTING( 0x40, "at 150.000" )
- PORT_DIPSETTING( 0x00, "at 200.000" )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-INPUT_PORTS_END
-
-
-static const gfx_layout tiles8x8x4_layout =
-{
- 8,8,
- RGN_FRAC(1,4),
- 4,
- { RGN_FRAC(0,4), RGN_FRAC(1,4), RGN_FRAC(2,4), RGN_FRAC(3,4) },
- { 0, 1, 2, 3, 4, 5, 6, 7 },
- { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
- 16*8
-};
-
-static const gfx_layout tiles8x8x3_layout =
-{
- 8,8,
- RGN_FRAC(1,3),
- 3,
- { RGN_FRAC(0,3), RGN_FRAC(1,3), RGN_FRAC(2,3) },
- { 0, 1, 2, 3, 4, 5, 6, 7 },
- { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
- 16*8
-};
-
-static GFXDECODE_START( couple )
- GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 32 )
- GFXDECODE_ENTRY( "gfx2", 0, tiles8x8x4_layout, 0, 16 )
- GFXDECODE_ENTRY( "gfx1", 8, tiles8x8x3_layout, 0, 32 ) //flipped tiles
- GFXDECODE_ENTRY( "gfx2", 8, tiles8x8x4_layout, 0, 16 ) //flipped tiles
-GFXDECODE_END
-
-static MACHINE_DRIVER_START( couple )
- MDRV_CPU_ADD("main", Z80,18432000/6) /* ?? */
- MDRV_CPU_PROGRAM_MAP(merit_mem,0)
- MDRV_CPU_IO_MAP(merit_io,0)
- MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
-
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
-
- /* video hardware */
- MDRV_SCREEN_ADD("main", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
-
- MDRV_GFXDECODE(couple)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(couple)
-
- MDRV_VIDEO_START(couple)
- MDRV_VIDEO_UPDATE(couple)
-
- MDRV_DEVICE_ADD("crtc", MC6845)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay", AY8910, 4000000)
-// MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-MACHINE_DRIVER_END
-
-ROM_START( couple )
- ROM_REGION( 0x20000, "main", 0 )
- ROM_LOAD( "1.1d", 0x00000, 0x8000, CRC(bc70337a) SHA1(ffc484bc3965f0780d3fa5d8801af27a7164a417) )
- ROM_LOAD( "2.1e", 0x10000, 0x8000, CRC(17372a93) SHA1(e0f0980003473555c2543d98d1494f82afa49f1a) )
-
- ROM_REGION( 0x18000, "gfx1", 0 )
- ROM_LOAD( "3.9c", 0x00000, 0x8000, CRC(f017399a) SHA1(baf4c1bea6a12b1d4c8838552503fbdb81378411) )
- ROM_LOAD( "4.9d", 0x08000, 0x8000, CRC(66da76c1) SHA1(8cdcec008d0d51704544069246e9eabb5d5958ea) )
- ROM_LOAD( "5.10c", 0x10000, 0x8000, CRC(fc22bcf4) SHA1(cf3f6872965cb264d56d3a0b5ab998541b9af4ef) )
-
- ROM_REGION( 0x08000, "gfx2", 0 )
- ROM_LOAD( "6.10d", 0x00000, 0x8000, CRC(a6a9a73d) SHA1(f3cb1d434d730f6e00f48079eaf8b88f57779fa0) )
-
- ROM_REGION( 0x0800, "proms", 0 )
- /*Only 0x00-0xff data seems color prom*/
- ROM_LOAD( "7.7a", 0x00000, 0x0800, CRC(6c36361e) SHA1(7a018eecf3d8b7cf8845dcfcf8067feb292933b2) )
-ROM_END
-
-/*f205v's dump,same except for the first z80 rom,first noticeable differences are that
-it doesn't jump to the backup ram area and it gives an extra play if you reach a certain
-amount of points (there is a dip switch to select the trigger: 150.000 or 200.000*/
-ROM_START( couplep )
- ROM_REGION( 0x20000, "main", 0 )
- ROM_LOAD( "1.1d", 0x00000, 0x8000, CRC(4601ace6) SHA1(a824ceebf8b9ce77ef2c8e92636e4261f2ae0420) )
- ROM_LOAD( "2.1e", 0x10000, 0x8000, CRC(17372a93) SHA1(e0f0980003473555c2543d98d1494f82afa49f1a) )
-
- ROM_REGION( 0x18000, "gfx1", 0 )
- ROM_LOAD( "3.9c", 0x00000, 0x8000, CRC(f017399a) SHA1(baf4c1bea6a12b1d4c8838552503fbdb81378411) )
- ROM_LOAD( "4.9d", 0x08000, 0x8000, CRC(66da76c1) SHA1(8cdcec008d0d51704544069246e9eabb5d5958ea) )
- ROM_LOAD( "5.10c", 0x10000, 0x8000, CRC(fc22bcf4) SHA1(cf3f6872965cb264d56d3a0b5ab998541b9af4ef) )
-
- ROM_REGION( 0x08000, "gfx2", 0 )
- ROM_LOAD( "6.10d", 0x00000, 0x8000, CRC(a6a9a73d) SHA1(f3cb1d434d730f6e00f48079eaf8b88f57779fa0) )
-
- ROM_REGION( 0x0800, "proms", 0 )
- /*Only 0x00-0xff data seems color prom*/
- ROM_LOAD( "7.7a", 0x00000, 0x0800, CRC(6c36361e) SHA1(7a018eecf3d8b7cf8845dcfcf8067feb292933b2) )
-ROM_END
-
-/*f205v's dump,this one looks like an intermediate release between set1 and set2;
-it has same dips as set1, but remaining machine code is the same as set2*/
-ROM_START( couplei )
- ROM_REGION( 0x20000, "main", 0 )
- ROM_LOAD( "1.1d", 0x00000, 0x8000, CRC(760fa29e) SHA1(a37a1562028d9615adff3d2ef88e0156354c720a) )
- ROM_LOAD( "2.1e", 0x10000, 0x8000, CRC(17372a93) SHA1(e0f0980003473555c2543d98d1494f82afa49f1a) )
-
- ROM_REGION( 0x18000, "gfx1", 0 )
- ROM_LOAD( "3.9c", 0x00000, 0x8000, CRC(f017399a) SHA1(baf4c1bea6a12b1d4c8838552503fbdb81378411) )
- ROM_LOAD( "4.9d", 0x08000, 0x8000, CRC(66da76c1) SHA1(8cdcec008d0d51704544069246e9eabb5d5958ea) )
- ROM_LOAD( "5.10c", 0x10000, 0x8000, CRC(fc22bcf4) SHA1(cf3f6872965cb264d56d3a0b5ab998541b9af4ef) )
-
- ROM_REGION( 0x08000, "gfx2", 0 )
- ROM_LOAD( "6.10d", 0x00000, 0x8000, CRC(a6a9a73d) SHA1(f3cb1d434d730f6e00f48079eaf8b88f57779fa0) )
-
- ROM_REGION( 0x0800, "proms", 0 )
- /*Only 0x00-0xff data seems color prom*/
- ROM_LOAD( "7.7a", 0x00000, 0x0800, CRC(6c36361e) SHA1(7a018eecf3d8b7cf8845dcfcf8067feb292933b2) )
-ROM_END
-
-static DRIVER_INIT( couple )
-{
- UINT8 *ROM = memory_region(machine, "main");
-
- #if 0 //quick rom compare test
- {
- static int i,r;
- r = 0;
- for(i=0;i<0x2000;i++)
- {
- if(ROM[0x14000+i] == ROM[0x16000+i])
- r++;
- }
- mame_printf_debug("%02x (in HEX) identical bytes (no offset done)\n",r);
- }
- #endif
-
- /*The banked rom isn't a *real* banking,it's just a strange rom hook-up,the 2nd
- and the 3rd halves are 100% identical(!),unless it's an error of TWO different
- dumpers it's just the way it is,a.k.a. it's an "hardware" banking.
- update 20060118 by f205v: now we have 3 dumps from 3 different boards and they
- all behave the same...*/
- memory_set_bankptr(machine, 1,ROM + 0x10000 + (0x2000 * 2));
-}
-
-/*Year is uncertain:
-title screen says "1988"
-PCB marking (set 2) and (set 3) says "230188"
-service mode says "6221-51 U5-0 12/02/86" */
-
-GAME( 1988, couple, 0, couple, couple, couple, ROT0, "Merit", "The Couples (Set 1)", GAME_IMPERFECT_GRAPHICS | GAME_WRONG_COLORS | GAME_NOT_WORKING)
-GAME( 1988, couplep, couple, couple, couplep, couple, ROT0, "Merit", "The Couples (Set 2)", GAME_IMPERFECT_GRAPHICS | GAME_WRONG_COLORS | GAME_NOT_WORKING)
-GAME( 1988, couplei, couple, couple, couple, couple, ROT0, "Merit", "The Couples (Set 3)", GAME_IMPERFECT_GRAPHICS | GAME_WRONG_COLORS | GAME_NOT_WORKING)
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index a7b74e371b0..bfd13415ef6 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -31,6 +31,12 @@ Notes: it's important that "user1" is 0xa0000 bytes with empty space filled
4 categories, but they only use 3 categories.
---------------------------------------------------------------------------
+
+ The Couples: Year is uncertain,title screen says "1988"
+ PCB marking (set 2) and (set 3) says "230188"
+ service mode says "6221-51 U5-0 12/02/86"
+
+ ---------------------------------------------------------------------------
*/
#include "driver.h"
@@ -59,6 +65,8 @@ static int extra_video_bank_bit;
static int question_address;
static int decryption_key;
+static UINT8 *backup_ram;
+
static MACHINE_START(merit)
{
question_address = 0;
@@ -288,6 +296,18 @@ static WRITE8_DEVICE_HANDLER( misc_w )
/* other bits unknown */
}
+static WRITE8_DEVICE_HANDLER( misc_couple_w )
+{
+ flip_screen_set(~data & 0x10);
+ extra_video_bank_bit = (data & 2) << 8;
+ lscnblk = (data >> 3) & 1;
+
+ /* other bits unknown */
+
+ /*kludge to avoid jumps on ram area in The Couples*/
+ backup_ram[0x1011] = 0xc9; //ret
+}
+
static ADDRESS_MAP_START( pitboss_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
@@ -398,6 +418,18 @@ static ADDRESS_MAP_START( trvwhziv_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
+static ADDRESS_MAP_START( couple_map, ADDRESS_SPACE_PROGRAM, 8 )
+ AM_RANGE(0x0000, 0x7fff) AM_ROM
+ AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&backup_ram)
+ AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w)
+ AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w)
+ AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
+ AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w)
+ AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video)
+ AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
+ADDRESS_MAP_END
/* in service mode:
@@ -845,6 +877,106 @@ static INPUT_PORTS_START( bigappg )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
+static INPUT_PORTS_START( couple )
+ PORT_START("IN0")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x01, 0x00, "Number of Attempts" )
+ PORT_DIPSETTING( 0x01, "99" )
+ PORT_DIPSETTING( 0x00, "9" )
+ PORT_DIPNAME( 0x02, 0x02, "Tries Per Coin" )
+ PORT_DIPSETTING( 0x02, "3" )
+ PORT_DIPSETTING( 0x00, "2" )
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coinage ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( 1C_2C ) )
+/*2 Coins for 2 Credits?I think this is an invalid setting,it doesn't even work correctly*/
+/* PORT_DIPSETTING( 0x00, DEF_STR( 2C_2C ) ) */
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
+ PORT_DIPNAME( 0x20, 0x00, "Sound" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x80, "Clear RAM" )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+
+ PORT_START("IN2")
+ PORT_DIPNAME( 0x01, 0x01, "3" )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
+/*Different DSWs*/
+static INPUT_PORTS_START( couplep )
+ PORT_INCLUDE( couple )
+
+ PORT_MODIFY("DSW")
+ PORT_DIPNAME( 0x40, 0x40, "Bonus Play" )
+ PORT_DIPSETTING( 0x40, "at 150.000" )
+ PORT_DIPSETTING( 0x00, "at 200.000" )
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
+
static VIDEO_UPDATE( merit )
{
const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc");
@@ -873,6 +1005,26 @@ static const ppi8255_interface ppi8255_intf[2] =
}
};
+static const ppi8255_interface ppi8255_couple_intf[2] =
+{
+ {
+ DEVICE8_PORT("IN0"), /* Port A read */
+ DEVICE8_PORT("IN1"), /* Port B read */
+ DEVICE8_PORT("IN2"), /* Port C read */
+ NULL, /* Port A write */
+ NULL, /* Port B write */
+ NULL /* Port C write */
+ },
+ {
+ DEVICE8_PORT("DSW"), /* Port A read */
+ NULL, /* Port B read */
+ NULL, /* Port C read */
+ NULL, /* Port A write */
+ led1_w, /* Port B write */
+ misc_couple_w /* Port C write */
+ }
+};
+
static const ay8910_interface merit_ay8912_interface =
{
AY8910_LEGACY_OUTPUT,
@@ -950,6 +1102,19 @@ static MACHINE_DRIVER_START( trvwhziv )
MDRV_CPU_IO_MAP(tictac_io_map,0)
MACHINE_DRIVER_END
+static MACHINE_DRIVER_START( couple )
+ MDRV_IMPORT_FROM(pitboss)
+
+ MDRV_CPU_MODIFY("main")
+ MDRV_CPU_PROGRAM_MAP(couple_map,0)
+ MDRV_CPU_IO_MAP(tictac_io_map,0)
+
+ MDRV_DEVICE_MODIFY("ppi8255_0", PPI8255)
+ MDRV_DEVICE_CONFIG( ppi8255_couple_intf[0])
+ MDRV_DEVICE_MODIFY("ppi8255_1", PPI8255)
+ MDRV_DEVICE_CONFIG( ppi8255_couple_intf[1])
+MACHINE_DRIVER_END
+
ROM_START( pitboss )
ROM_REGION( 0x10000, "main", 0 )
@@ -1292,7 +1457,61 @@ ROM_START( dodge )
/* socket at position u40 is unpopulated */
ROM_END
+ROM_START( couple )
+ ROM_REGION( 0x20000, "main", 0 )
+ ROM_LOAD( "1.1d", 0x00000, 0x8000, CRC(bc70337a) SHA1(ffc484bc3965f0780d3fa5d8801af27a7164a417) )
+ ROM_LOAD( "2.1e", 0x10000, 0x8000, CRC(17372a93) SHA1(e0f0980003473555c2543d98d1494f82afa49f1a) )
+
+ ROM_REGION( 0x18000, "gfx1", 0 )
+ ROM_LOAD( "3.9c", 0x00000, 0x8000, CRC(f017399a) SHA1(baf4c1bea6a12b1d4c8838552503fbdb81378411) )
+ ROM_LOAD( "4.9d", 0x08000, 0x8000, CRC(66da76c1) SHA1(8cdcec008d0d51704544069246e9eabb5d5958ea) )
+ ROM_LOAD( "5.10c", 0x10000, 0x8000, CRC(fc22bcf4) SHA1(cf3f6872965cb264d56d3a0b5ab998541b9af4ef) )
+
+ ROM_REGION( 0x08000, "gfx2", 0 )
+ ROM_LOAD( "6.10d", 0x00000, 0x8000, CRC(a6a9a73d) SHA1(f3cb1d434d730f6e00f48079eaf8b88f57779fa0) )
+
+ ROM_REGION( 0x0800, "proms", 0 )
+ ROM_LOAD( "7.7a", 0x00000, 0x0800, CRC(6c36361e) SHA1(7a018eecf3d8b7cf8845dcfcf8067feb292933b2) ) /*video timing?*/
+ROM_END
+
+/*f205v's dump,same except for the first z80 rom,first noticeable differences are that
+it doesn't jump to the backup ram area and it gives an extra play if you reach a certain
+amount of points (there is a dip switch to select the trigger: 150.000 or 200.000*/
+ROM_START( couplep )
+ ROM_REGION( 0x20000, "main", 0 )
+ ROM_LOAD( "1.1d", 0x00000, 0x8000, CRC(4601ace6) SHA1(a824ceebf8b9ce77ef2c8e92636e4261f2ae0420) )
+ ROM_LOAD( "2.1e", 0x10000, 0x8000, CRC(17372a93) SHA1(e0f0980003473555c2543d98d1494f82afa49f1a) )
+
+ ROM_REGION( 0x18000, "gfx1", 0 )
+ ROM_LOAD( "3.9c", 0x00000, 0x8000, CRC(f017399a) SHA1(baf4c1bea6a12b1d4c8838552503fbdb81378411) )
+ ROM_LOAD( "4.9d", 0x08000, 0x8000, CRC(66da76c1) SHA1(8cdcec008d0d51704544069246e9eabb5d5958ea) )
+ ROM_LOAD( "5.10c", 0x10000, 0x8000, CRC(fc22bcf4) SHA1(cf3f6872965cb264d56d3a0b5ab998541b9af4ef) )
+
+ ROM_REGION( 0x08000, "gfx2", 0 )
+ ROM_LOAD( "6.10d", 0x00000, 0x8000, CRC(a6a9a73d) SHA1(f3cb1d434d730f6e00f48079eaf8b88f57779fa0) )
+
+ ROM_REGION( 0x0800, "proms", 0 )
+ ROM_LOAD( "7.7a", 0x00000, 0x0800, CRC(6c36361e) SHA1(7a018eecf3d8b7cf8845dcfcf8067feb292933b2) ) /*video timing?*/
+ROM_END
+
+/*f205v's dump,this one looks like an intermediate release between set1 and set2;
+it has same dips as set1, but remaining machine code is the same as set2*/
+ROM_START( couplei )
+ ROM_REGION( 0x20000, "main", 0 )
+ ROM_LOAD( "1.1d", 0x00000, 0x8000, CRC(760fa29e) SHA1(a37a1562028d9615adff3d2ef88e0156354c720a) )
+ ROM_LOAD( "2.1e", 0x10000, 0x8000, CRC(17372a93) SHA1(e0f0980003473555c2543d98d1494f82afa49f1a) )
+ ROM_REGION( 0x18000, "gfx1", 0 )
+ ROM_LOAD( "3.9c", 0x00000, 0x8000, CRC(f017399a) SHA1(baf4c1bea6a12b1d4c8838552503fbdb81378411) )
+ ROM_LOAD( "4.9d", 0x08000, 0x8000, CRC(66da76c1) SHA1(8cdcec008d0d51704544069246e9eabb5d5958ea) )
+ ROM_LOAD( "5.10c", 0x10000, 0x8000, CRC(fc22bcf4) SHA1(cf3f6872965cb264d56d3a0b5ab998541b9af4ef) )
+
+ ROM_REGION( 0x08000, "gfx2", 0 )
+ ROM_LOAD( "6.10d", 0x00000, 0x8000, CRC(a6a9a73d) SHA1(f3cb1d434d730f6e00f48079eaf8b88f57779fa0) )
+
+ ROM_REGION( 0x0800, "proms", 0 )
+ ROM_LOAD( "7.7a", 0x00000, 0x0800, CRC(6c36361e) SHA1(7a018eecf3d8b7cf8845dcfcf8067feb292933b2) ) /*video timing?*/
+ROM_END
static DRIVER_INIT( key_0 )
{
@@ -1319,6 +1538,31 @@ static DRIVER_INIT( key_7 )
decryption_key = 7;
}
+static DRIVER_INIT( couple )
+{
+ UINT8 *ROM = memory_region(machine, "main");
+
+ #if 0 //quick rom compare test
+ {
+ static int i,r;
+ r = 0;
+ for(i=0;i<0x2000;i++)
+ {
+ if(ROM[0x14000+i] == ROM[0x16000+i])
+ r++;
+ }
+ mame_printf_debug("%02x (in HEX) identical bytes (no offset done)\n",r);
+ }
+ #endif
+
+ /*The banked rom isn't a *real* banking,it's just a strange rom hook-up,the 2nd
+ and the 3rd halves are 100% identical(!),unless it's an error of TWO different
+ dumpers it's just the way it is,a.k.a. it's an "hardware" banking.
+ update 20060118 by f205v: now we have 3 dumps from 3 different boards and they
+ all behave the same...*/
+ memory_set_bankptr(machine, 1,ROM + 0x10000 + (0x2000 * 2));
+}
+
GAME( 1983, pitboss, 0, pitboss, pitboss, 0, ROT0, "Merit", "Pit Boss", GAME_SUPPORTS_SAVE | GAME_IMPERFECT_GRAPHICS )
GAME( 1983, casino5, 0, pitboss, pitboss, 0, ROT0, "Merit", "Casino 5", GAME_SUPPORTS_SAVE | GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING )
GAME( 1985, trvwzh, 0, trvwhiz, trivia, key_0, ROT0, "Merit", "Trivia ? Whiz (Horizontal - Question set 1)", GAME_SUPPORTS_SAVE )
@@ -1334,3 +1578,6 @@ GAME( 1986, phrcraze, 0, phrcraze, phrcraze, key_7, ROT0, "Merit", "Phra
GAME( 1986, phrcrazs, 0, phrcraze, phrcrazs, key_7, ROT90, "Merit", "Phraze Craze (Sex Kit)", GAME_SUPPORTS_SAVE )
GAME( 1986, bigappg, 0, bigappg, bigappg, 0, ROT0, "Merit", "Big Apple Games ?", GAME_SUPPORTS_SAVE | GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING )
GAME( 1986, dodge, 0, bigappg, bigappg, 0, ROT0, "Merit", "Dodge City", GAME_SUPPORTS_SAVE | GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING )
+GAME( 1988, couple, 0, couple, couple, couple, ROT0, "Merit", "The Couples (Set 1)", GAME_IMPERFECT_GRAPHICS | GAME_UNEMULATED_PROTECTION )
+GAME( 1988, couplep, couple, couple, couplep, couple, ROT0, "Merit", "The Couples (Set 2)", GAME_IMPERFECT_GRAPHICS | GAME_UNEMULATED_PROTECTION )
+GAME( 1988, couplei, couple, couple, couple, couple, ROT0, "Merit", "The Couples (Set 3)", GAME_IMPERFECT_GRAPHICS | GAME_UNEMULATED_PROTECTION )
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 6e7ed692a01..6959018fbee 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -954,7 +954,6 @@ $(MAMEOBJ)/meadows.a: \
$(DRIVERS)/meadows.o $(AUDIO)/meadows.o $(VIDEO)/meadows.o \
$(MAMEOBJ)/merit.a: \
- $(DRIVERS)/couple.o \
$(DRIVERS)/merit.o \
$(DRIVERS)/meritm.o \