summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Mirko Buffoni <mirbuf@users.noreply.github.com>2009-01-28 10:32:54 +0000
committer Mirko Buffoni <mirbuf@users.noreply.github.com>2009-01-28 10:32:54 +0000
commit1ae43ea1d7ad98a37740ba5d968ee8163a57f021 (patch)
treecc2aa9974ae17074246de329121f966cc36cf1f0
parented11fa331879072adf2b436c4076bb2b96a0d0f1 (diff)
Fixed encryption in Cabaret and added sound emulation (Mirko Buffoni)
- Moved to a separate driver - Not fully playable, press reset to exit from pitfalls Added new game Super Poker (Mirko Buffoni)
-rw-r--r--.gitattributes2
-rw-r--r--src/mame/drivers/cabaret.c379
-rw-r--r--src/mame/drivers/iqblock.c72
-rw-r--r--src/mame/drivers/spoker.c430
-rw-r--r--src/mame/mame.mak2
-rw-r--r--src/mame/mamedriv.c3
6 files changed, 815 insertions, 73 deletions
diff --git a/.gitattributes b/.gitattributes
index 9ed57a8904a..f72464722f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1319,6 +1319,7 @@ src/mame/drivers/bwidow.c svneol=native#text/plain
src/mame/drivers/bwing.c svneol=native#text/plain
src/mame/drivers/bzone.c svneol=native#text/plain
src/mame/drivers/cabal.c svneol=native#text/plain
+src/mame/drivers/cabaret.c svneol=native#text/plain
src/mame/drivers/calomega.c svneol=native#text/plain
src/mame/drivers/calorie.c svneol=native#text/plain
src/mame/drivers/canyon.c svneol=native#text/plain
@@ -1998,6 +1999,7 @@ src/mame/drivers/speedspn.c svneol=native#text/plain
src/mame/drivers/speglsht.c svneol=native#text/plain
src/mame/drivers/spiders.c svneol=native#text/plain
src/mame/drivers/splash.c svneol=native#text/plain
+src/mame/drivers/spoker.c svneol=native#text/plain
src/mame/drivers/spool99.c svneol=native#text/plain
src/mame/drivers/sprcros2.c svneol=native#text/plain
src/mame/drivers/sprint2.c svneol=native#text/plain
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
new file mode 100644
index 00000000000..8239240eee3
--- /dev/null
+++ b/src/mame/drivers/cabaret.c
@@ -0,0 +1,379 @@
+/***************************************************************************
+
+Cabaret (AMT)
+Driver by Mirko Buffoni, David Haywood
+
+TODO:
+- This game should have an NVRAM. There is trace of System Reset so need
+ to find how to reset its content.
+- DSW3 is read, not sure where it's used
+- Keyboard is mapped thru test mode, but some bits are unknown, and hopper
+ is not emulated
+- Map Leds and Coin counters
+- Remove patches after finding why there are so many pitfalls. Maybe the
+ game expects to read inputs via an external device and expects certain
+ timings
+
+Press F1+F2 during reset to see 'pork*ish' test mode :P
+
+Interesting thing: this game is copyright AMT 1992, but protection checks
+are the same of IGS. AMT may be previous IGS name.
+
+***************************************************************************/
+
+#include "driver.h"
+#include "cpu/z180/z180.h"
+#include "sound/2413intf.h"
+
+
+/***************************************************************************
+ Video Hardware
+***************************************************************************/
+
+
+static UINT8 *bg_tile_ram;
+static tilemap *bg_tilemap;
+static UINT8 *bg_scroll;
+
+static UINT8 *fg_tile_ram, *fg_color_ram;
+static tilemap *fg_tilemap;
+
+static WRITE8_HANDLER( bg_scroll_w )
+{
+ bg_scroll[offset] = data;
+ tilemap_set_scrolly(bg_tilemap,offset,data);
+}
+
+static WRITE8_HANDLER( bg_tile_w )
+{
+ bg_tile_ram[offset] = data;
+ tilemap_mark_tile_dirty(bg_tilemap,offset);
+}
+
+static TILE_GET_INFO( get_bg_tile_info )
+{
+ int code = bg_tile_ram[tile_index];
+ SET_TILE_INFO(1, code & 0xff, 0, 0);
+}
+
+static TILE_GET_INFO( get_fg_tile_info )
+{
+ int code = fg_tile_ram[tile_index] | (fg_color_ram[tile_index] << 8);
+ int tile = code & 0x1fff;
+ SET_TILE_INFO(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
+}
+
+static WRITE8_HANDLER( fg_tile_w )
+{
+ fg_tile_ram[offset] = data;
+ tilemap_mark_tile_dirty(fg_tilemap,offset);
+}
+
+static WRITE8_HANDLER( fg_color_w )
+{
+ fg_color_ram[offset] = data;
+ tilemap_mark_tile_dirty(fg_tilemap,offset);
+}
+
+static VIDEO_START(cabaret)
+{
+ bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 64, 8);
+ fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32);
+ tilemap_set_transparent_pen(fg_tilemap, 0);
+ tilemap_set_scroll_cols(bg_tilemap, 64);
+}
+
+
+static VIDEO_UPDATE(cabaret)
+{
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+
+ tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
+
+ tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0);
+
+ return 0;
+}
+
+/***************************************************************************
+ Memory Maps
+***************************************************************************/
+
+static int nmi_enable;
+
+static UINT8 out[3];
+
+static void show_out(void)
+{
+#ifdef MAME_DEBUG
+ popmessage("%02x %02x %02x", out[0], out[1], out[2]);
+#endif
+}
+
+static WRITE8_HANDLER( cabaret_nmi_and_coins_w )
+{
+ if ((nmi_enable ^ data) & (~0xdd))
+ {
+ logerror("PC %06X: nmi_and_coins = %02x\n",cpu_get_pc(space->cpu),data);
+// popmessage("%02x",data);
+ }
+
+ coin_counter_w(0, data & 0x01); // coin_a
+ coin_counter_w(1, data & 0x04); // coin_c
+ coin_counter_w(2, data & 0x08); // key in
+ coin_counter_w(3, data & 0x10); // coin out mech
+
+ set_led_status(6, data & 0x40); // led for coin out / hopper active
+
+ nmi_enable = data; // data & 0x80 // nmi enable?
+
+ out[0] = data;
+ show_out();
+}
+
+
+
+static ADDRESS_MAP_START( cabaret_map, ADDRESS_SPACE_PROGRAM, 8 )
+ AM_RANGE( 0x00000, 0x0efff ) AM_ROM
+ AM_RANGE( 0x0f000, 0x0ffff ) AM_RAM AM_REGION("main", 0xf000)
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( cabaret_portmap, ADDRESS_SPACE_IO, 8 )
+ AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
+
+ AM_RANGE( 0x0080, 0x0080 ) AM_READ_PORT( "BUTTONS2" )
+ AM_RANGE( 0x0081, 0x0081 ) AM_READ_PORT( "SERVICE" )
+ AM_RANGE( 0x0082, 0x0082 ) AM_READ_PORT( "COINS" )
+ AM_RANGE( 0x0090, 0x0090 ) AM_READ_PORT( "BUTTONS1" )
+ AM_RANGE( 0x00a0, 0x00a0 ) AM_WRITE( cabaret_nmi_and_coins_w )
+
+ AM_RANGE( 0x00a1, 0x00a1 ) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE( 0x00a2, 0x00a2 ) AM_READ_PORT("DSW2") /* DSW2 */
+ AM_RANGE( 0x00b0, 0x00b0 ) AM_READ_PORT("DSW3") /* DSW3 */
+
+ AM_RANGE( 0x00e0, 0x00e0 ) AM_WRITE( ym2413_register_port_0_w )
+ AM_RANGE( 0x00e1, 0x00e1 ) AM_WRITE( ym2413_data_port_0_w )
+
+ AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram )
+ AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE( fg_color_w ) AM_BASE( &fg_color_ram )
+
+ AM_RANGE( 0x3000, 0x37ff ) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_BASE( &paletteram )
+ AM_RANGE( 0x3800, 0x3fff ) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_BASE( &paletteram_2 )
+
+ AM_RANGE( 0x1000, 0x103f ) AM_RAM_WRITE( bg_scroll_w ) AM_BASE( &bg_scroll )
+
+ AM_RANGE( 0x1800, 0x19ff ) AM_RAM_WRITE( bg_tile_w ) AM_BASE( &bg_tile_ram )
+ AM_RANGE( 0x8000, 0xffff ) AM_ROM AM_REGION("gfx3", 0)
+ADDRESS_MAP_END
+
+
+/***************************************************************************
+ Input Ports
+***************************************************************************/
+
+static INPUT_PORTS_START( cabaret )
+ PORT_START("DSW1") // OK
+ PORT_DIPNAME( 0x07, 0x00, "Poke %" ) PORT_DIPLOCATION("SWA:1,2,3")
+ PORT_DIPSETTING( 0x07, "60%" )
+ PORT_DIPSETTING( 0x06, "65%" )
+ PORT_DIPSETTING( 0x05, "70%" )
+ PORT_DIPSETTING( 0x04, "75%" )
+ PORT_DIPSETTING( 0x03, "82%" )
+ PORT_DIPSETTING( 0x02, "85%" )
+ PORT_DIPSETTING( 0x01, "88%" )
+ PORT_DIPSETTING( 0x00, "92%" )
+ PORT_DIPNAME( 0x08, 0x00, "Double %" ) PORT_DIPLOCATION("SWA:4")
+ PORT_DIPSETTING( 0x08, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
+ PORT_DIPNAME( 0x10, 0x00, "Coin Credit" ) PORT_DIPLOCATION("SWA:5")
+ PORT_DIPSETTING( 0x10, "5/1" )
+ PORT_DIPSETTING( 0x00, "10/1" )
+ PORT_DIPNAME( 0x20, 0x00, "Held Method" ) PORT_DIPLOCATION("SWA:6")
+ PORT_DIPSETTING( 0x20, "Discard" )
+ PORT_DIPSETTING( 0x00, "Held" )
+ PORT_DIPNAME( 0x40, 0x00, "Speed" ) PORT_DIPLOCATION("SWA:7")
+ PORT_DIPSETTING( 0x40, "Slow" )
+ PORT_DIPSETTING( 0x00, "Quick" )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+
+ PORT_START("DSW2") // OK
+ PORT_DIPNAME( 0x03, 0x00, "Limit" ) PORT_DIPLOCATION("SWB:1,2")
+ PORT_DIPSETTING( 0x03, "5000" )
+ PORT_DIPSETTING( 0x02, "10000" )
+ PORT_DIPSETTING( 0x01, "15000" )
+ PORT_DIPSETTING( 0x00, "30000" )
+ PORT_DIPNAME( 0x0c, 0x00, "Max Bet" ) PORT_DIPLOCATION("SWB:3,4")
+ PORT_DIPSETTING( 0x0c, "20" )
+ PORT_DIPSETTING( 0x08, "30" )
+ PORT_DIPSETTING( 0x04, "40" )
+ PORT_DIPSETTING( 0x00, "50" )
+ PORT_DIPNAME( 0x10, 0x00, "Withdraw" ) PORT_DIPLOCATION("SWB:5")
+ PORT_DIPSETTING( 0x10, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
+ PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPLOCATION("SWB:6,7,8")
+
+ PORT_START("DSW3")
+ PORT_DIPUNKNOWN( 0xff, 0xff )
+
+ PORT_START("SERVICE")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Memory Clear") // stats, memory
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")
+ PORT_SERVICE_NO_TOGGLE( 0x20, IP_ACTIVE_LOW )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Statistics")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("COINS")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_CODE(KEYCODE_Q) PORT_NAME("Key In")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_CODE(KEYCODE_W) PORT_NAME("Key Down")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("BUTTONS1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Hold1")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_X) PORT_NAME("Hold2")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_C) PORT_NAME("Hold3")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_V) PORT_NAME("Hold4")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_B) PORT_NAME("Hold5")
+ PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
+
+ PORT_START("BUTTONS2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Decrement")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Bet")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Collect")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("W-Up")
+ PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
+INPUT_PORTS_END
+
+/***************************************************************************
+ Graphics Layout
+***************************************************************************/
+
+static const gfx_layout layout_8x8x6 =
+{
+ 8, 8,
+ RGN_FRAC(1, 3),
+ 6,
+ { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
+ RGN_FRAC(1,3)+8,RGN_FRAC(1,3)+0,
+ RGN_FRAC(2,3)+8,RGN_FRAC(2,3)+0 },
+ { STEP8(0,1) },
+ { STEP8(0,2*8) },
+ 8*8*2
+};
+
+static const gfx_layout layout_8x32x6i =
+{
+ 8, 32,
+ RGN_FRAC(1, 3),
+ 6,
+ { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
+ RGN_FRAC(1,3)+8,RGN_FRAC(1,3)+0,
+ RGN_FRAC(2,3)+8,RGN_FRAC(2,3)+0 },
+ { STEP8(0,1) },
+ { STEP32(0,2*8) },
+ 8*32*2
+};
+
+static GFXDECODE_START( cabaret )
+ GFXDECODE_ENTRY( "gfx1", 0x00000, layout_8x8x6, 0, 16 )
+ GFXDECODE_ENTRY( "gfx2", 0x00000, layout_8x32x6i, 0, 16 )
+GFXDECODE_END
+
+
+
+
+/***************************************************************************
+ Machine Drivers
+***************************************************************************/
+
+static MACHINE_RESET( cabaret )
+{
+ nmi_enable = 0;
+}
+
+static INTERRUPT_GEN( cabaret_interrupt )
+{
+ if (nmi_enable & 0x80)
+ cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
+}
+
+static MACHINE_DRIVER_START( cabaret )
+ /* basic machine hardware */
+ MDRV_CPU_ADD("main", Z180, XTAL_12MHz / 2)
+ MDRV_CPU_PROGRAM_MAP(cabaret_map,0)
+ MDRV_CPU_IO_MAP(cabaret_portmap,0)
+ MDRV_CPU_VBLANK_INT("main",cabaret_interrupt)
+
+ MDRV_MACHINE_RESET(cabaret)
+
+ /* 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(512, 256)
+ MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+
+ MDRV_GFXDECODE(cabaret)
+ MDRV_PALETTE_LENGTH(0x800)
+
+ MDRV_VIDEO_START(cabaret)
+ MDRV_VIDEO_UPDATE(cabaret)
+
+ /* sound hardware */
+ MDRV_SPEAKER_STANDARD_MONO("mono")
+ MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
+ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+MACHINE_DRIVER_END
+
+
+static DRIVER_INIT( cabaret )
+{
+ UINT8 *rom = memory_region(machine, "main");
+ int i;
+
+ /* decrypt the program ROM */
+ for (i = 0;i < 0xf000;i++)
+ {
+ if ((i & 0x2206) == 0x2002) rom[i] ^= 0x01;
+ }
+
+ /* Patch pitfalls */
+ rom[0x1012] =
+ rom[0x1013] = 0;
+ rom[0x13b8] = 0x18;
+ rom[0x53a6] = 0x18;
+ rom[0x73c6] = 0x18;
+ rom[0xc46a] = 0x18;
+ rom[0xc583] = 0x18;
+ rom[0xc5fa] = 0x18;
+ rom[0xc6c4] = 0x18;
+}
+
+ROM_START( cabaret )
+ ROM_REGION( 0x10000, "main", 0 ) /* 64k for code */
+ ROM_LOAD( "cg-8v204.u97", 0x0000, 0x10000, CRC(44cebf77) SHA1(e3f4e4abf41388f0eed50cf9a0fd0b14aa2f8b93) )
+
+ ROM_REGION( 0x60000, "gfx1", ROMREGION_DISPOSE )
+ ROM_LOAD( "cg-4.u43", 0x40000, 0x20000, CRC(e509f50a) SHA1(7e68ca54642c92cdb348d5cf9466065938d0e027) )
+ ROM_LOAD( "cg-5.u44", 0x20000, 0x20000, CRC(e2cbf489) SHA1(3a15ed7efd5696656e6d55b54ec0ff779bdb0d98) )
+ ROM_LOAD( "cg-6.u45", 0x00000, 0x20000, CRC(4f2fced7) SHA1(b954856ffdc97fbc99fd3ec087376fbf466d2d5a) )
+
+ ROM_REGION( 0xc000, "gfx2", ROMREGION_DISPOSE )
+ ROM_LOAD( "cg-1.u40", 0x8000, 0x4000, CRC(7dee8b1f) SHA1(80dbdf6aab9b02cc000956b7894023552428e6a1) )
+ ROM_LOAD( "cg-2.u41", 0x0000, 0x4000, CRC(ce8dea39) SHA1(b30d1678a7b98cd821d2ce7383a83cb7c9f31b5f) )
+ ROM_LOAD( "cg-3.u42", 0x4000, 0x4000, CRC(7e1f821f) SHA1(b709d49f9d1890fe3b8ca7f90affc0017a0ad95e) )
+
+ ROM_REGION( 0x8000, "gfx3", 0 )
+ ROM_LOAD( "cg-7.u98", 0x0000, 0x8000, CRC(b93ae6f8) SHA1(accb87045c278d5d79fff65bb763aa6e8025a945) ) /* background maps, read by the CPU */
+ROM_END
+
+GAME( 1992, cabaret, 0, cabaret, cabaret, cabaret, ROT0, "AMT Co. Ltd.", "Cabaret", GAME_NOT_WORKING )
+
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 0f14e44ecb3..f799329a21b 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -264,10 +264,6 @@ static GFXDECODE_START( iqblock )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout2, 0, 4 ) /* only color codes 0 and 3 used */
GFXDECODE_END
-static GFXDECODE_START( cabaret )
- GFXDECODE_ENTRY( "gfx1", 0, tilelayout1, 0, 16 )
- GFXDECODE_ENTRY( "gfx2", 0, tilelayout3, 0, 16 )
-GFXDECODE_END
static MACHINE_DRIVER_START( iqblock )
@@ -301,36 +297,6 @@ static MACHINE_DRIVER_START( iqblock )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
-static MACHINE_DRIVER_START( cabaret )
-
- /* basic machine hardware */
- MDRV_CPU_ADD("main", Z180,12000000/2) /* 6 MHz , appears to use Z180 instructions */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
- MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
-
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
-
- /* 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, 30*8-1)
-
- MDRV_GFXDECODE(cabaret)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(iqblock)
- MDRV_VIDEO_UPDATE(iqblock)
-
- /* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-MACHINE_DRIVER_END
/***************************************************************************
@@ -458,24 +424,6 @@ ROM_START( grndtour )
ROM_LOAD( "grand5.u24", 0x4000, 0x4000, CRC(f896efb2) SHA1(8dc8546e363b4ff80983e3b8e2a19ebb7ff30c7b) )
ROM_END
-ROM_START( cabaret )
- ROM_REGION( 0x20000, "main", 0 ) /* 64k for code + 64K for extra RAM */
- ROM_LOAD( "cg-8v204.u97", 0x0000, 0x10000, CRC(44cebf77) SHA1(e3f4e4abf41388f0eed50cf9a0fd0b14aa2f8b93) )
-
- ROM_REGION( 0x8000, "user1", 0 )
- ROM_LOAD( "cg-7.u98", 0x0000, 0x8000, CRC(b93ae6f8) SHA1(accb87045c278d5d79fff65bb763aa6e8025a945) ) /* background maps, read by the CPU */
-
- ROM_REGION( 0x60000, "gfx1", ROMREGION_DISPOSE )
- ROM_LOAD( "cg-4.u43", 0x00000, 0x20000, CRC(e509f50a) SHA1(7e68ca54642c92cdb348d5cf9466065938d0e027) )
- ROM_LOAD( "cg-5.u44", 0x20000, 0x20000, CRC(e2cbf489) SHA1(3a15ed7efd5696656e6d55b54ec0ff779bdb0d98) )
- ROM_LOAD( "cg-6.u45", 0x40000, 0x20000, CRC(4f2fced7) SHA1(b954856ffdc97fbc99fd3ec087376fbf466d2d5a) )
-
- ROM_REGION( 0xc000, "gfx2", ROMREGION_DISPOSE )
- ROM_LOAD( "cg-1.u40", 0x0000, 0x4000, CRC(7dee8b1f) SHA1(80dbdf6aab9b02cc000956b7894023552428e6a1) )
- ROM_LOAD( "cg-2.u41", 0x4000, 0x4000, CRC(ce8dea39) SHA1(b30d1678a7b98cd821d2ce7383a83cb7c9f31b5f) )
- ROM_LOAD( "cg-3.u42", 0x8000, 0x4000, CRC(7e1f821f) SHA1(b709d49f9d1890fe3b8ca7f90affc0017a0ad95e) )
-ROM_END
-
static DRIVER_INIT( iqblock )
{
UINT8 *rom = memory_region(machine, "main");
@@ -521,27 +469,7 @@ static DRIVER_INIT( grndtour )
}
-static DRIVER_INIT( cabaret )
-{
- UINT8 *rom = memory_region(machine, "main");
- int i;
-
- /* decrypt the program ROM */
- for (i = 0;i < 0xf000;i++)
- {
- if ((i & 0xb206) == 0xa002) rom[i] ^= 0x01; // could be (i & 0x3206) == 0x2002
- }
-
- /* initialize pointers for I/O mapped RAM */
- paletteram = rom + 0x12000;
- paletteram_2 = rom + 0x12800;
- iqblock_fgvideoram = rom + 0x16800;
- iqblock_bgvideoram = rom + 0x17000;
- iqblock_video_type=0;
-}
-
GAME( 1993, iqblock, 0, iqblock, iqblock, iqblock, ROT0, "IGS", "IQ-Block", 0 )
GAME( 1993, grndtour, 0, iqblock, iqblock, grndtour, ROT0, "IGS", "Grand Tour", 0 )
-GAME( 19??, cabaret, 0, cabaret, iqblock, cabaret, ROT0, "IGS", "Cabaret", GAME_NOT_WORKING | GAME_NO_SOUND )
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
new file mode 100644
index 00000000000..3af82f40225
--- /dev/null
+++ b/src/mame/drivers/spoker.c
@@ -0,0 +1,430 @@
+/***************************************************************************
+Super Poker (IGS)
+Driver by Mirko Buffoni
+
+TODO:
+- Understand how to reset NVRAM
+- Map DSW (Operator mode doesn't help)
+- Map Leds and Coin counters
+***************************************************************************/
+
+#include "driver.h"
+#include "cpu/z180/z180.h"
+#include "sound/2413intf.h"
+#include "sound/okim6295.h"
+
+
+/***************************************************************************
+ Video Hardware
+***************************************************************************/
+
+
+static UINT8 *bg_tile_ram;
+static tilemap *bg_tilemap;
+
+static UINT8 *fg_tile_ram, *fg_color_ram;
+static tilemap *fg_tilemap;
+
+static int video_enable;
+
+static WRITE8_HANDLER( bg_tile_w )
+{
+ bg_tile_ram[offset] = data;
+ tilemap_mark_tile_dirty(bg_tilemap,offset);
+}
+
+static TILE_GET_INFO( get_bg_tile_info )
+{
+ int code = bg_tile_ram[tile_index];
+ SET_TILE_INFO(1 + (tile_index & 3), code & 0xff, 0, 0);
+}
+
+static TILE_GET_INFO( get_fg_tile_info )
+{
+ int code = fg_tile_ram[tile_index] | (fg_color_ram[tile_index] << 8);
+ SET_TILE_INFO(0, code, (4*(code >> 14)+3), 0);
+}
+
+static WRITE8_HANDLER( fg_tile_w )
+{
+ fg_tile_ram[offset] = data;
+ tilemap_mark_tile_dirty(fg_tilemap,offset);
+}
+
+static WRITE8_HANDLER( fg_color_w )
+{
+ fg_color_ram[offset] = data;
+ tilemap_mark_tile_dirty(fg_tilemap,offset);
+}
+
+static VIDEO_START(spoker)
+{
+ bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 128, 8);
+ fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 128, 32);
+ tilemap_set_transparent_pen(fg_tilemap, 0);
+}
+
+static VIDEO_UPDATE(spoker)
+{
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+
+ tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
+
+ tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0);
+
+ return 0;
+}
+
+/***************************************************************************
+ Memory Maps
+***************************************************************************/
+
+static int nmi_enable, hopper;
+
+static CUSTOM_INPUT( hopper_r )
+{
+ if (hopper) return !(video_screen_get_frame_number(field->port->machine->primary_screen)%10);
+ return input_code_pressed(KEYCODE_H);
+}
+
+static UINT8 out[3];
+
+static void show_out(void)
+{
+#ifdef MAME_DEBUG
+ popmessage("%02x %02x %02x", out[0], out[1], out[2]);
+#endif
+}
+
+static WRITE8_HANDLER( spoker_nmi_and_coins_w )
+{
+ if ((nmi_enable ^ data) & (~0xdd))
+ {
+ logerror("PC %06X: nmi_and_coins = %02x\n",cpu_get_pc(space->cpu),data);
+// popmessage("%02x",data);
+ }
+
+ coin_counter_w(0, data & 0x01); // coin_a
+ coin_counter_w(1, data & 0x04); // coin_c
+ coin_counter_w(2, data & 0x08); // key in
+ coin_counter_w(3, data & 0x10); // coin out mech
+
+ set_led_status(6, data & 0x40); // led for coin out / hopper active
+
+ nmi_enable = data; // data & 0x80 // nmi enable?
+
+ out[0] = data;
+ show_out();
+}
+
+static WRITE8_HANDLER( spoker_video_and_leds_w )
+{
+ set_led_status(4, data & 0x01); // start?
+ set_led_status(5, data & 0x04); // l_bet?
+
+ video_enable = data & 0x40;
+ hopper = (~data)& 0x80;
+
+ out[1] = data;
+ show_out();
+}
+
+static WRITE8_HANDLER( spoker_leds_w )
+{
+ set_led_status(0, data & 0x01); // stop_1
+ set_led_status(1, data & 0x02); // stop_2
+ set_led_status(2, data & 0x04); // stop_3
+ set_led_status(3, data & 0x08); // stop
+ // data & 0x10?
+
+ out[2] = data;
+ show_out();
+}
+
+static UINT8 igs_magic[2];
+
+static WRITE8_HANDLER( spoker_magic_w )
+{
+ igs_magic[offset] = data;
+
+ if (offset == 0)
+ return;
+
+ switch(igs_magic[0])
+ {
+ case 0x01:
+ break;
+
+ default:
+// popmessage("magic %x <- %04x",igs_magic[0],data);
+ logerror("%06x: warning, writing to igs_magic %02x = %02x\n", cpu_get_pc(space->cpu), igs_magic[0], data);
+ }
+}
+
+static READ8_HANDLER( spoker_magic_r )
+{
+ switch(igs_magic[0])
+ {
+ case 0x00:
+ if ( !(igs_magic[1] & 0x01) ) return input_port_read(space->machine, "DSW1");
+ if ( !(igs_magic[1] & 0x02) ) return input_port_read(space->machine, "DSW2");
+ if ( !(igs_magic[1] & 0x04) ) return input_port_read(space->machine, "DSW3");
+ if ( !(igs_magic[1] & 0x08) ) return input_port_read(space->machine, "DSW4");
+ if ( !(igs_magic[1] & 0x10) ) return input_port_read(space->machine, "DSW5");
+ logerror("%06x: warning, reading dsw with igs_magic[1] = %02x\n", cpu_get_pc(space->cpu), igs_magic[1]);
+ break;
+
+ default:
+ logerror("%06x: warning, reading with igs_magic = %02x\n", cpu_get_pc(space->cpu), igs_magic[0]);
+ }
+
+ return 0;
+}
+
+
+
+
+static ADDRESS_MAP_START( spoker_map, ADDRESS_SPACE_PROGRAM, 8 )
+ AM_RANGE( 0x00000, 0x0f3ff ) AM_ROM
+ AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_BASE( &generic_nvram ) AM_SIZE( &generic_nvram_size )
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( spoker_portmap, ADDRESS_SPACE_IO, 8 )
+ AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
+
+ AM_RANGE( 0x2000, 0x23ff ) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_BASE( &paletteram )
+ AM_RANGE( 0x2400, 0x27ff ) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_BASE( &paletteram_2 )
+
+ AM_RANGE( 0x3000, 0x33ff ) AM_RAM_WRITE( bg_tile_w ) AM_BASE( &bg_tile_ram )
+
+ AM_RANGE( 0x5000, 0x5fff ) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram )
+
+ AM_RANGE( 0x6480, 0x6480 ) AM_WRITE( spoker_nmi_and_coins_w )
+
+ AM_RANGE( 0x6481, 0x6481 ) AM_READ_PORT( "SERVICE" )
+ AM_RANGE( 0x6482, 0x6482 ) AM_READ_PORT( "COINS" )
+ AM_RANGE( 0x6490, 0x6490 ) AM_READ_PORT( "BUTTONS1" )
+ AM_RANGE( 0x6491, 0x6491 ) AM_WRITE( spoker_video_and_leds_w )
+ AM_RANGE( 0x6492, 0x6492 ) AM_WRITE( spoker_leds_w )
+ AM_RANGE( 0x64a0, 0x64a0 ) AM_READ_PORT( "BUTTONS2" )
+
+ AM_RANGE( 0x64b0, 0x64b0 ) AM_WRITE( ym2413_register_port_0_w )
+ AM_RANGE( 0x64b1, 0x64b1 ) AM_WRITE( ym2413_data_port_0_w )
+
+ AM_RANGE( 0x64c0, 0x64c0 ) AM_READWRITE( okim6295_status_0_r, okim6295_data_0_w )
+
+ AM_RANGE( 0x64d0, 0x64d1 ) AM_READWRITE( spoker_magic_r, spoker_magic_w ) // DSW1-5
+
+ AM_RANGE( 0x7000, 0x7fff ) AM_RAM_WRITE( fg_color_w ) AM_BASE( &fg_color_ram )
+ADDRESS_MAP_END
+
+
+
+
+/***************************************************************************
+ Input Ports
+***************************************************************************/
+
+static INPUT_PORTS_START( spoker )
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPUNKNOWN( 0x02, 0x02 )
+ PORT_DIPUNKNOWN( 0x04, 0x04 )
+ PORT_DIPUNKNOWN( 0x08, 0x08 )
+ PORT_DIPUNKNOWN( 0x10, 0x10 )
+ PORT_DIPUNKNOWN( 0x20, 0x20 )
+ PORT_DIPUNKNOWN( 0x40, 0x40 )
+ PORT_DIPUNKNOWN( 0x80, 0x80 )
+
+ PORT_START("DSW2")
+ PORT_DIPUNKNOWN( 0x01, 0x01 )
+ PORT_DIPUNKNOWN( 0x02, 0x02 )
+ PORT_DIPUNKNOWN( 0x04, 0x04 )
+ PORT_DIPUNKNOWN( 0x08, 0x08 )
+ PORT_DIPUNKNOWN( 0x10, 0x10 )
+ PORT_DIPUNKNOWN( 0x20, 0x20 )
+ PORT_DIPUNKNOWN( 0x40, 0x40 )
+ PORT_DIPUNKNOWN( 0x80, 0x80 )
+
+ PORT_START("DSW3")
+ PORT_DIPUNKNOWN( 0x01, 0x01 )
+ PORT_DIPUNKNOWN( 0x02, 0x02 )
+ PORT_DIPUNKNOWN( 0x04, 0x04 )
+ PORT_DIPUNKNOWN( 0x08, 0x08 )
+ PORT_DIPUNKNOWN( 0x10, 0x10 )
+ PORT_DIPUNKNOWN( 0x20, 0x20 )
+ PORT_DIPUNKNOWN( 0x40, 0x40 )
+ PORT_DIPUNKNOWN( 0x80, 0x80 )
+
+ PORT_START("DSW4")
+ PORT_DIPUNKNOWN( 0xff, 0xff )
+
+ PORT_START("DSW5")
+ PORT_DIPUNKNOWN( 0xff, 0xff )
+
+ PORT_START("SERVICE")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Memory Clear") // stats, memory
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM( hopper_r, (void *)0 ) PORT_NAME("HPSW") // hopper sensor
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")
+ PORT_SERVICE_NO_TOGGLE( 0x20, IP_ACTIVE_LOW )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Statistics")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("COINS")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_CODE(KEYCODE_Q) PORT_NAME("Key In")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_CODE(KEYCODE_W) PORT_NAME("Key Down")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("BUTTONS1")
+ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("BUTTONS2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1/High/Low")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold5/Bet")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold4/Take")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3/W-Up")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2/Red/Black")
+ PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+INPUT_PORTS_END
+
+/***************************************************************************
+ Graphics Layout
+***************************************************************************/
+
+static const gfx_layout layout_8x8x6 =
+{
+ 8, 8,
+ RGN_FRAC(1, 3),
+ 6,
+ { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
+ RGN_FRAC(1,3)+8,RGN_FRAC(1,3)+0,
+ RGN_FRAC(2,3)+8,RGN_FRAC(2,3)+0 },
+ { STEP8(0,1) },
+ { STEP8(0,2*8) },
+ 8*8*2
+};
+
+static const gfx_layout layout_8x32x6 =
+{
+ 8, 32,
+ RGN_FRAC(1, 3),
+ 6,
+ { RGN_FRAC(0,3)+8,RGN_FRAC(0,3)+0,
+ RGN_FRAC(1,3)+8,RGN_FRAC(1,3)+0,
+ RGN_FRAC(2,3)+8,RGN_FRAC(2,3)+0 },
+ { STEP8(0,1) },
+ { STEP32(0,2*8) },
+ 8*32*2
+};
+
+static GFXDECODE_START( spoker )
+ GFXDECODE_ENTRY( "gfx1", 0x00000, layout_8x8x6, 0, 16 )
+ GFXDECODE_ENTRY( "gfx2", 0x04000, layout_8x32x6, 0, 16 )
+ GFXDECODE_ENTRY( "gfx2", 0x08000, layout_8x32x6, 0, 16 )
+ GFXDECODE_ENTRY( "gfx2", 0x0c000, layout_8x32x6, 0, 16 )
+ GFXDECODE_ENTRY( "gfx2", 0x00000, layout_8x32x6, 0, 16 )
+GFXDECODE_END
+
+
+
+
+/***************************************************************************
+ Machine Drivers
+***************************************************************************/
+
+static MACHINE_RESET( spoker )
+{
+ nmi_enable = 0;
+ hopper = 0;
+ video_enable = 1;
+}
+
+static INTERRUPT_GEN( spoker_interrupt )
+{
+ if (nmi_enable & 0x80)
+ cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
+}
+
+static MACHINE_DRIVER_START( spoker )
+ /* basic machine hardware */
+ MDRV_CPU_ADD("main", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
+ MDRV_CPU_PROGRAM_MAP(spoker_map,0)
+ MDRV_CPU_IO_MAP(spoker_portmap,0)
+ MDRV_CPU_VBLANK_INT("main",spoker_interrupt)
+
+ MDRV_MACHINE_RESET(spoker)
+
+ MDRV_NVRAM_HANDLER(generic_0fill)
+
+ /* 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(512, 256)
+ MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1)
+
+ MDRV_GFXDECODE(spoker)
+ MDRV_PALETTE_LENGTH(0x400)
+
+ MDRV_VIDEO_START(spoker)
+ MDRV_VIDEO_UPDATE(spoker)
+
+ /* sound hardware */
+ MDRV_SPEAKER_STANDARD_MONO("mono")
+ MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
+ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz / 12)
+ MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
+ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+MACHINE_DRIVER_END
+
+
+static DRIVER_INIT( spk116it )
+{
+ int A;
+ UINT8 *rom = memory_region(machine, "main");
+
+
+ for (A = 0;A < 0x10000;A++)
+ {
+ rom[A] ^= 0x02;
+ if ((A & 0x0208) == 0x0208) rom[A] ^= 0x20;
+ if ((A & 0x0228) == 0x0008) rom[A] ^= 0x20;
+ if ((A & 0x04A0) == 0x04A0) rom[A] ^= 0x02;
+ if ((A & 0x1208) == 0x1208) rom[A] ^= 0x01;
+ }
+}
+
+
+ROM_START( spk116it )
+ ROM_REGION( 0x10000, "main", 0 )
+ ROM_LOAD( "v.bin", 0x0000, 0x10000, CRC(e44e943a) SHA1(78e32d07e2be9a452be10735641cbcf269068c55) )
+
+ ROM_REGION( 0xc0000, "gfx1", ROMREGION_DISPOSE )
+ ROM_LOAD( "6.bin", 0x80000, 0x40000, CRC(55b54b11) SHA1(decf27d40ec842374af02c93d761375690be83a3) )
+ ROM_LOAD( "5.bin", 0x40000, 0x40000, CRC(163f5b64) SHA1(5d3a5c2a64691ee9e2bb3a7c283aa9efa53fb35e) )
+ ROM_LOAD( "4.bin", 0x00000, 0x40000, CRC(ec2c6ac3) SHA1(e0a38da26202d2b9a481060fe5b88a38e284201e) )
+
+ ROM_REGION( 0x30000, "gfx2", ROMREGION_DISPOSE )
+ ROM_LOAD( "3.bin", 0x20000, 0x10000, CRC(5f18b012) SHA1(c9a96237eaf3138f136bbaffb29dde0ef568ce73) )
+ ROM_LOAD( "2.bin", 0x10000, 0x10000, CRC(50fc3505) SHA1(ca1e4ee7e0bb59c3bd67727f65054a48000ae7fe) )
+ ROM_LOAD( "1.bin", 0x00000, 0x10000, CRC(28ce630a) SHA1(9b597073d33841e7db2c68bbe9f30b734d7f7b41) )
+
+ ROM_REGION( 0x40000, "oki", 0 ) /* expansion rom - contains backgrounds and pictures charmaps */
+ ROM_LOAD( "7.bin", 0x0000, 0x40000, CRC(67789f1c) SHA1(1bef621b4d6399f76020c6310e2e1c2f861679de) )
+ROM_END
+
+GAME( 1993?, spk116it, 0, spoker, spoker, spk116it, ROT0, "IGS", "Super Poker (v116IT)", 0 )
+
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 9e0c0d70a87..693865e0e83 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -752,6 +752,7 @@ $(MAMEOBJ)/greyhnd.a: \
$(DRIVERS)/getrivia.o \
$(MAMEOBJ)/igs.a: \
+ $(DRIVERS)/cabaret.o \
$(DRIVERS)/ddz.o \
$(DRIVERS)/dunhuang.o \
$(DRIVERS)/goldstar.o $(VIDEO)/goldstar.o \
@@ -762,6 +763,7 @@ $(MAMEOBJ)/igs.a: \
$(DRIVERS)/igs017.o \
$(DRIVERS)/igs_m027.o \
$(DRIVERS)/igs_m68.o \
+ $(DRIVERS)/spoker.o \
$(DRIVERS)/iqblock.o $(VIDEO)/iqblock.o \
$(DRIVERS)/lordgun.o $(VIDEO)/lordgun.o \
$(DRIVERS)/pgm.o $(VIDEO)/pgm.o \
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index b9235304190..ad037245ab1 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -7462,17 +7462,18 @@ Other Sun games
DRIVER( moonlght ) /* bootleg */
DRIVER( chry10 ) /* bootleg */
DRIVER( chrygld ) /* bootleg */
+ DRIVER( cabaret ) /* (c) 1992 AMT */
DRIVER( cpoker ) /* (c) 1993? IGS */
DRIVER( cpokert ) /* (c) 1993? Tuning */
DRIVER( csk227it ) /* (c) 198? IGS */
DRIVER( csk234it ) /* (c) 198? IGS */
DRIVER( igs_ncs ) /* (c) 198? IGS */
DRIVER( igs_ncs2 ) /* (c) 2000 IGS */
+ DRIVER( spk116it ) /* (c) 199? IGS */
DRIVER( jackie ) /* (c) 199? IGS */
DRIVER( stellecu ) /* (c) 1998 */
DRIVER( iqblock ) /* (c) 1993 */
DRIVER( grndtour ) /* (c) 1993 */
- DRIVER( cabaret )
DRIVER( jingbell ) /* (c) 1995? */
DRIVER( gp98 ) /* (c) 19?? */
DRIVER( lhb ) /* (c) 1995 */