diff --git a/hash/apfimag_cass.xml b/hash/apfimag_cass.xml index 94e5fa3b78a..7406f39ee38 100644 --- a/hash/apfimag_cass.xml +++ b/hash/apfimag_cass.xml @@ -17,10 +17,10 @@ Once the tape has finished loading, just type RUN to start the loaded program -- 16K Letter Writter 1982 Milt Perry + - - + @@ -29,8 +29,8 @@ Once the tape has finished loading, just type RUN to start the loaded program -- An Adventure in Murder 198? R. Eisman + - @@ -41,8 +41,8 @@ Once the tape has finished loading, just type RUN to start the loaded program -- ALPHAbit 19?? MR R's + - @@ -419,8 +419,8 @@ checks whether the user is typing the program printed in the manual, for each le Escape + 21 + Escape 2 (Bad?) 198? Lacroix Games + - @@ -647,8 +647,8 @@ checks whether the user is typing the program printed in the manual, for each le Mission: Improbable - Mission Alpha 1982 Geo-Grafix + - @@ -855,8 +855,8 @@ checks whether the user is typing the program printed in the manual, for each le Space Shuttle 19?? York 10 Computerware + - @@ -984,8 +984,8 @@ checks whether the user is typing the program printed in the manual, for each le Transport + 15 Matches 19?? R. T. Carman + - diff --git a/src/emu/bus/coco/coco_dwsock.c b/src/emu/bus/coco/coco_dwsock.c index 898872f645a..aff17ae2929 100644 --- a/src/emu/bus/coco/coco_dwsock.c +++ b/src/emu/bus/coco/coco_dwsock.c @@ -134,6 +134,9 @@ READ8_MEMBER(beckerport_device::read) { unsigned char data = 0x5a; + if (m_pSocket == NULL) + return data; + switch (offset) { case DWS_STATUS: @@ -174,6 +177,9 @@ WRITE8_MEMBER(beckerport_device::write) char d = (char)data; file_error filerr; + if (m_pSocket == NULL) + return; + switch (offset) { case DWS_STATUS: diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index a332dcb5ee6..c4a76ced02d 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1139,11 +1139,11 @@ static const gfx_layout s2k_charlayout = ******************************/ static GFXDECODE_START( ampoker2 ) - GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) + GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 128 ) GFXDECODE_END static GFXDECODE_START( sigma2k ) - GFXDECODE_ENTRY( "gfx1", 0x0000, s2k_charlayout, 0, 16 ) + GFXDECODE_ENTRY( "gfx1", 0x0000, s2k_charlayout, 0, 128 ) GFXDECODE_END /************************* diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 0ca06b37362..cf43ea1d7cb 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -181,7 +181,7 @@ static const gfx_layout pfmolayout = static GFXDECODE_START( batman ) - GFXDECODE_ENTRY( "gfx3", 0, pfmolayout, 512, 16 ) /* sprites & playfield */ + GFXDECODE_ENTRY( "gfx3", 0, pfmolayout, 512, 32 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 256, 16 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, anlayout, 0, 64 ) /* characters 8x8 */ GFXDECODE_END diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 2e635627b51..583e19109af 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -2339,13 +2339,13 @@ static const gfx_layout tilelayout = *************************************************/ static GFXDECODE_START( calomega ) - GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) - GFXDECODE_ENTRY( "gfx2", 0, tilelayout, (8 * 3) + 128, 16 ) + GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) + GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) GFXDECODE_END static GFXDECODE_START( sys906 ) - GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 ) - GFXDECODE_ENTRY( "gfx1", 0x1000, tilelayout, (8 * 3) + 128, 16 ) + GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32 ) + GFXDECODE_ENTRY( "gfx1", 0x1000, tilelayout, 0, 32 ) GFXDECODE_END @@ -2589,7 +2589,7 @@ static MACHINE_CONFIG_START( sys903, calomega_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", calomega) - MCFG_PALETTE_ADD("palette", 1024) + MCFG_PALETTE_ADD("palette", 256) /* or 128? is the upper half of the PROMs really valid colors? */ MCFG_PALETTE_INIT_OWNER(calomega_state, calomega) MCFG_MC6845_ADD("crtc", MC6845, "screen", CPU_CLOCK) /* 6845 @ CPU clock */ @@ -2711,11 +2711,8 @@ ROM_START( comg074 ) /* Cal Omega v7.4 (Gaming Poker) */ ROM_LOAD( "poker_cg2b.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "poker_cg2a.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) /* from other set */ + ROM_REGION( 0x100, "proms", 0 ) /* from other set */ ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, BAD_DUMP CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg076 ) /* Cal Omega v7.6 (Arcade Poker) */ @@ -2734,11 +2731,8 @@ ROM_START( comg076 ) /* Cal Omega v7.6 (Arcade Poker) */ ROM_LOAD( "pkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "pkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg079 ) /* Cal Omega v7.9 (Arcade Poker) */ @@ -2761,11 +2755,8 @@ ROM_START( comg079 ) /* Cal Omega v7.9 (Arcade Poker) */ ROM_LOAD( "pkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "pkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg080 ) /* Cal Omega v8.0 (Arcade Black Jack) */ @@ -2784,11 +2775,8 @@ ROM_START( comg080 ) /* Cal Omega v8.0 (Arcade Black Jack) */ ROM_LOAD( "gpkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "gpkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg094 ) /* Cal Omega v9.4 (Keno) */ @@ -2807,11 +2795,8 @@ ROM_START( comg094 ) /* Cal Omega v9.4 (Keno) */ ROM_LOAD( "kcgb.u69", 0x0800, 0x0800, CRC(2b9205d9) SHA1(48ed4dcef38e9567246f09bd9bea5bf291e7e1b9) ) ROM_LOAD( "kcga.u68", 0x1000, 0x0800, CRC(c4491e35) SHA1(44acb8bd7af287350b99d159b6f83015fcdbd93c) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg107 ) /* Cal Omega v10.7c (Big Game) */ @@ -2833,11 +2818,8 @@ ROM_START( comg107 ) /* Cal Omega v10.7c (Big Game) */ ROM_REGION( 0x0800, "user1", 0 ) /* keyboard interfase ROM */ ROM_LOAD( "lotkbd.sub", 0x0000, 0x0800, CRC(c1636ab5) SHA1(5a3ad24918751ca6a6640807e421e80f6b4cc844) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "bclr.u28", 0x0000, 0x0100, CRC(0ec45d01) SHA1(da73ae7e1c74913921dc378a97795c6da47dcbfb) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg123 ) /* Cal Omega v12.3 (Ticket Poker) */ @@ -2856,11 +2838,8 @@ ROM_START( comg123 ) /* Cal Omega v12.3 (Ticket Poker) */ ROM_LOAD( "pkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "pkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg125 ) /* Cal Omega v12.5 (Bingo) */ @@ -2879,11 +2858,8 @@ ROM_START( comg125 ) /* Cal Omega v12.5 (Bingo) */ ROM_LOAD( "nbcgb.u69", 0x1000, 0x1000, CRC(9d409932) SHA1(d3ffca50a059278777238d206895a0d188f4ff6f) ) ROM_LOAD( "nbcga.u68", 0x2000, 0x1000, CRC(afe1a666) SHA1(c1530700a283d18e7136754d45904930ef424bcf) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "bclr.u28", 0x0000, 0x0100, CRC(0ec45d01) SHA1(da73ae7e1c74913921dc378a97795c6da47dcbfb) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg127 ) /* Cal Omega v12.7 (Keno) */ @@ -2902,11 +2878,8 @@ ROM_START( comg127 ) /* Cal Omega v12.7 (Keno) */ ROM_LOAD( "kcgb.u69", 0x0800, 0x0800, CRC(2b9205d9) SHA1(48ed4dcef38e9567246f09bd9bea5bf291e7e1b9) ) ROM_LOAD( "kcga.u68", 0x1000, 0x0800, CRC(c4491e35) SHA1(44acb8bd7af287350b99d159b6f83015fcdbd93c) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg128 ) /* Cal Omega v12.8 (Arcade Game) */ @@ -2925,11 +2898,8 @@ ROM_START( comg128 ) /* Cal Omega v12.8 (Arcade Game) */ ROM_LOAD( "pkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "pkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg134 ) /* Cal Omega 13.4 (Nudge Keno) */ @@ -2948,11 +2918,8 @@ ROM_START( comg134 ) /* Cal Omega 13.4 (Nudge Keno) */ ROM_LOAD( "nbcgb.u69", 0x1000, 0x1000, CRC(9d409932) SHA1(d3ffca50a059278777238d206895a0d188f4ff6f) ) ROM_LOAD( "nbcga.u68", 0x2000, 0x1000, CRC(afe1a666) SHA1(c1530700a283d18e7136754d45904930ef424bcf) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "bclr.u28", 0x0000, 0x0100, CRC(0ec45d01) SHA1(da73ae7e1c74913921dc378a97795c6da47dcbfb) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg145 ) /* Cal Omega v14.5 (Pixels) */ @@ -2971,11 +2938,8 @@ ROM_START( comg145 ) /* Cal Omega v14.5 (Pixels) */ ROM_LOAD( "pxcgb.u69", 0x1000, 0x1000, CRC(a3bed6b1) SHA1(078cface4af9720bee3288f5f0236725c8bfb575) ) ROM_LOAD( "pxcga.u68", 0x2000, 0x1000, CRC(d80f064a) SHA1(1b22ca3e446ed3c6fb49a90c463394dec96bc4ec) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pixclr.u28", 0x0000, 0x0100, CRC(67d23e76) SHA1(826cf77ca5a4d492d66e45ee96a7780a94fbe634) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg157 ) /* Cal Omega v15.7 (Double-Draw Poker) */ @@ -2994,11 +2958,8 @@ ROM_START( comg157 ) /* Cal Omega v15.7 (Double-Draw Poker) */ ROM_LOAD( "gpkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "gpkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg159 ) /* Cal Omega v15.9 (Wild Double-Up) */ @@ -3017,11 +2978,8 @@ ROM_START( comg159 ) /* Cal Omega v15.9 (Wild Double-Up) */ ROM_LOAD( "jkr2cgb.u69", 0x0800, 0x0800, CRC(d77dda31) SHA1(e11b476cf0b609a8a40981b81b4d83b3c86678dc) ) ROM_LOAD( "jkr2cga.u68", 0x1000, 0x0800, CRC(def60756) SHA1(fe71424fc638761d9ff65391261a030a2889ad5e) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "wldclr.u28", 0x0000, 0x0100, CRC(a26a8fae) SHA1(d570fe9443a0912bd34b81ac4c3e4c5f8901f523) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg164 ) /* Cal Omega v16.4 (Keno) */ @@ -3040,11 +2998,8 @@ ROM_START( comg164 ) /* Cal Omega v16.4 (Keno) */ ROM_LOAD( "kcgb.u69", 0x0800, 0x0800, CRC(2b9205d9) SHA1(48ed4dcef38e9567246f09bd9bea5bf291e7e1b9) ) ROM_LOAD( "kcga.u68", 0x1000, 0x0800, CRC(c4491e35) SHA1(44acb8bd7af287350b99d159b6f83015fcdbd93c) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg168 ) /* Cal Omega v16.8 (Keno) */ @@ -3063,11 +3018,8 @@ ROM_START( comg168 ) /* Cal Omega v16.8 (Keno) */ ROM_LOAD( "kcgb.u69", 0x0800, 0x0800, CRC(2b9205d9) SHA1(48ed4dcef38e9567246f09bd9bea5bf291e7e1b9) ) ROM_LOAD( "kcga.u68", 0x1000, 0x0800, CRC(c4491e35) SHA1(44acb8bd7af287350b99d159b6f83015fcdbd93c) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg172 ) /* Cal Omega v17.2 (Double Double Poker) */ @@ -3086,11 +3038,8 @@ ROM_START( comg172 ) /* Cal Omega v17.2 (Double Double Poker) */ ROM_LOAD( "jkrpkrcgb.u69", 0x0800, 0x0800, CRC(d77dda31) SHA1(e11b476cf0b609a8a40981b81b4d83b3c86678dc) ) ROM_LOAD( "jkrpkrcga.u68", 0x1000, 0x0800, CRC(def60756) SHA1(fe71424fc638761d9ff65391261a030a2889ad5e) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "wldclr.u28", 0x0000, 0x0100, CRC(a26a8fae) SHA1(d570fe9443a0912bd34b81ac4c3e4c5f8901f523) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg175 ) /* Cal Omega v17.5 (Gaming Draw Poker) */ @@ -3109,11 +3058,8 @@ ROM_START( comg175 ) /* Cal Omega v17.5 (Gaming Draw Poker) */ ROM_LOAD( "pkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "pkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg176 ) /* Cal Omega 17.6 (Nudge Keno) */ @@ -3132,11 +3078,8 @@ ROM_START( comg176 ) /* Cal Omega 17.6 (Nudge Keno) */ ROM_LOAD( "nbcgb.u69", 0x1000, 0x1000, CRC(9d409932) SHA1(d3ffca50a059278777238d206895a0d188f4ff6f) ) ROM_LOAD( "nbcga.u68", 0x2000, 0x1000, CRC(afe1a666) SHA1(c1530700a283d18e7136754d45904930ef424bcf) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "bclr.u28", 0x0000, 0x0100, CRC(0ec45d01) SHA1(da73ae7e1c74913921dc378a97795c6da47dcbfb) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg181 ) /* Cal Omega 18.1 (Nudge Keno) */ @@ -3155,11 +3098,8 @@ ROM_START( comg181 ) /* Cal Omega 18.1 (Nudge Keno) */ ROM_LOAD( "nbcgb.u69", 0x1000, 0x1000, CRC(9d409932) SHA1(d3ffca50a059278777238d206895a0d188f4ff6f) ) ROM_LOAD( "nbcga.u68", 0x2000, 0x1000, CRC(afe1a666) SHA1(c1530700a283d18e7136754d45904930ef424bcf) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "bclr.u28", 0x0000, 0x0100, CRC(0ec45d01) SHA1(da73ae7e1c74913921dc378a97795c6da47dcbfb) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg183 ) /* Cal Omega v18.3 (Pixels) */ @@ -3178,11 +3118,8 @@ ROM_START( comg183 ) /* Cal Omega v18.3 (Pixels) */ ROM_LOAD( "pxcgb.u69", 0x1000, 0x1000, CRC(a3bed6b1) SHA1(078cface4af9720bee3288f5f0236725c8bfb575) ) ROM_LOAD( "pxcga.u68", 0x2000, 0x1000, CRC(d80f064a) SHA1(1b22ca3e446ed3c6fb49a90c463394dec96bc4ec) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pixclr.u28", 0x0000, 0x0100, CRC(67d23e76) SHA1(826cf77ca5a4d492d66e45ee96a7780a94fbe634) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg185 ) /* Cal Omega v18.5 (Pixels) */ @@ -3201,11 +3138,8 @@ ROM_START( comg185 ) /* Cal Omega v18.5 (Pixels) */ ROM_LOAD( "pxcgb.u69", 0x1000, 0x1000, CRC(a3bed6b1) SHA1(078cface4af9720bee3288f5f0236725c8bfb575) ) ROM_LOAD( "pxcga.u68", 0x2000, 0x1000, CRC(d80f064a) SHA1(1b22ca3e446ed3c6fb49a90c463394dec96bc4ec) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pixclr.u28", 0x0000, 0x0100, CRC(67d23e76) SHA1(826cf77ca5a4d492d66e45ee96a7780a94fbe634) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg186 ) /* Cal Omega v18.6 (Pixels) */ @@ -3224,11 +3158,8 @@ ROM_START( comg186 ) /* Cal Omega v18.6 (Pixels) */ ROM_LOAD( "pxcgb.u69", 0x1000, 0x1000, CRC(a3bed6b1) SHA1(078cface4af9720bee3288f5f0236725c8bfb575) ) ROM_LOAD( "pxcga.u68", 0x2000, 0x1000, CRC(d80f064a) SHA1(1b22ca3e446ed3c6fb49a90c463394dec96bc4ec) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pixclr.u28", 0x0000, 0x0100, CRC(67d23e76) SHA1(826cf77ca5a4d492d66e45ee96a7780a94fbe634) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg187 ) /* Cal Omega v18.7 (Amusement Poker) */ @@ -3247,11 +3178,8 @@ ROM_START( comg187 ) /* Cal Omega v18.7 (Amusement Poker) */ ROM_LOAD( "jkr2cgb.u69", 0x0800, 0x0800, CRC(d77dda31) SHA1(e11b476cf0b609a8a40981b81b4d83b3c86678dc) ) ROM_LOAD( "jkr2cga.u68", 0x1000, 0x0800, CRC(def60756) SHA1(fe71424fc638761d9ff65391261a030a2889ad5e) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "mltclr.u28", 0x0000, 0x0100, CRC(fefb0fa8) SHA1(66d86aa19d9d37ffd2840d6653fcec667bc716d4) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg204 ) /* Cal Omega v20.4 (Super Blackjack) */ @@ -3270,11 +3198,8 @@ ROM_START( comg204 ) /* Cal Omega v20.4 (Super Blackjack) */ ROM_LOAD( "jkr2cgb.u69", 0x0800, 0x0800, CRC(d77dda31) SHA1(e11b476cf0b609a8a40981b81b4d83b3c86678dc) ) ROM_LOAD( "jkr2cga.u68", 0x1000, 0x0800, CRC(def60756) SHA1(fe71424fc638761d9ff65391261a030a2889ad5e) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "mltclr.u28", 0x0000, 0x0100, CRC(fefb0fa8) SHA1(66d86aa19d9d37ffd2840d6653fcec667bc716d4) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg208 ) /* Cal Omega v20.8 (Winner's Choice) */ @@ -3293,11 +3218,8 @@ ROM_START( comg208 ) /* Cal Omega v20.8 (Winner's Choice) */ ROM_LOAD( "mlt2cgb.u69", 0x1000, 0x1000, CRC(d5173679) SHA1(396c9c3eb7a0a5e5d279d079e635c8e4e5581779) ) ROM_LOAD( "mlt2cga.u68", 0x2000, 0x1000, CRC(b7397d3a) SHA1(f35607a4cd60e4467e27474e8063b7a7a4a65d9f) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "mltclr.u28", 0x0000, 0x0100, CRC(fefb0fa8) SHA1(66d86aa19d9d37ffd2840d6653fcec667bc716d4) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg227 ) /* Cal Omega v22.7 (Amusement Poker (Double Double)) */ @@ -3316,11 +3238,8 @@ ROM_START( comg227 ) /* Cal Omega v22.7 (Amusement Poker (Double Double)) */ ROM_LOAD( "jkrpkrcgb.u69", 0x0800, 0x0800, CRC(d77dda31) SHA1(e11b476cf0b609a8a40981b81b4d83b3c86678dc) ) ROM_LOAD( "jkrpkrcga.u68", 0x1000, 0x0800, CRC(def60756) SHA1(fe71424fc638761d9ff65391261a030a2889ad5e) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "wldclr.u28", 0x0000, 0x0100, CRC(a26a8fae) SHA1(d570fe9443a0912bd34b81ac4c3e4c5f8901f523) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg230 ) /* Cal Omega v23.0 (FC Bingo (4-card)) */ @@ -3339,11 +3258,8 @@ ROM_START( comg230 ) /* Cal Omega v23.0 (FC Bingo (4-card)) */ ROM_LOAD( "fcbcgb.u69", 0x1000, 0x1000, BAD_DUMP CRC(a7548075) SHA1(a751289cbc8b726082b60740c0202c08e3981e24) ) ROM_LOAD( "fcbcga.u68", 0x2000, 0x1000, BAD_DUMP CRC(3fc39df9) SHA1(223d05f8969a1846a986b29395c98f97a3218bf7) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "fcbclr.u28", 0x0000, 0x0100, BAD_DUMP CRC(6db5a344) SHA1(5f1a81ac02a2a74252decd3bb95a5436cc943930) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg236 ) /* Cal Omega v23.6 (Hotline) */ @@ -3362,11 +3278,8 @@ ROM_START( comg236 ) /* Cal Omega v23.6 (Hotline) */ ROM_LOAD( "hlcgb.u69", 0x1000, 0x1000, CRC(db2d3eb7) SHA1(45f686edf7093069b44e895547c7ec67f820447d) ) ROM_LOAD( "hlcga.u68", 0x2000, 0x1000, CRC(a7e583fd) SHA1(d3b0aa9e24b6aedf24af55e5b149ab75d6f01a36) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "hlclr.u28", 0x0000, 0x0100, CRC(1c994cda) SHA1(5c8698b4c5e43146106c9da8a306e3099b26ca2d) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END /* @@ -3418,11 +3331,8 @@ ROM_START( comg239 ) /* Cal Omega v23.9 (Gaming Draw Poker) */ ROM_LOAD( "pkcgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "pkcga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "82s129n.u28", 0x0000, 0x0100, CRC(6db5a344) SHA1(5f1a81ac02a2a74252decd3bb95a5436cc943930) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg240 ) /* Cal Omega v24.0 (Gaming Draw Poker) */ @@ -3441,11 +3351,8 @@ ROM_START( comg240 ) /* Cal Omega v24.0 (Gaming Draw Poker) */ ROM_LOAD( "cgb.u69", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) ROM_LOAD( "cga.u68", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) - ROM_REGION( 0x400, "proms", 0 ) /* is this prom ok? */ + ROM_REGION( 0x100, "proms", 0 ) /* is this prom ok? */ ROM_LOAD( "pok-6301.u28", 0x0000, 0x0100, CRC(56c2577b) SHA1(cb75882067e1e0d9f9369a37b5a829dd091d473e) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg246 ) /* Cal Omega v24.6 (Hotline) */ @@ -3464,11 +3371,8 @@ ROM_START( comg246 ) /* Cal Omega v24.6 (Hotline) */ ROM_LOAD( "hlcgb.u69", 0x1000, 0x1000, CRC(db2d3eb7) SHA1(45f686edf7093069b44e895547c7ec67f820447d) ) ROM_LOAD( "hlcga.u68", 0x2000, 0x1000, CRC(a7e583fd) SHA1(d3b0aa9e24b6aedf24af55e5b149ab75d6f01a36) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "hlclr.u28", 0x0000, 0x0100, CRC(1c994cda) SHA1(5c8698b4c5e43146106c9da8a306e3099b26ca2d) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg272a ) /* Cal Omega v27.2 (Keno (amusement)) */ @@ -3487,11 +3391,8 @@ ROM_START( comg272a ) /* Cal Omega v27.2 (Keno (amusement)) */ ROM_LOAD( "kcgb.u69", 0x0800, 0x0800, CRC(2b9205d9) SHA1(48ed4dcef38e9567246f09bd9bea5bf291e7e1b9) ) ROM_LOAD( "kcga.u68", 0x1000, 0x0800, CRC(c4491e35) SHA1(44acb8bd7af287350b99d159b6f83015fcdbd93c) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg272b ) /* Cal Omega v27.2 (Keno (gaming)) */ @@ -3510,11 +3411,8 @@ ROM_START( comg272b ) /* Cal Omega v27.2 (Keno (gaming)) */ ROM_LOAD( "kcgb.u69", 0x0800, 0x0800, CRC(2b9205d9) SHA1(48ed4dcef38e9567246f09bd9bea5bf291e7e1b9) ) ROM_LOAD( "kcga.u68", 0x1000, 0x0800, CRC(c4491e35) SHA1(44acb8bd7af287350b99d159b6f83015fcdbd93c) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "pokclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END /* @@ -3541,9 +3439,8 @@ ROM_START( comg5108 ) /* Cal Omega v51.08 (Gaming Poker) */ ROM_LOAD( "cg2b.u5", 0x2000, 0x2000, CRC(1f79f76d) SHA1(b2bce60e24dd61977f7bf6ee4705ca7d104ab388) ) ROM_LOAD( "cg2a.u6", 0x4000, 0x2000, CRC(d5fd9fc2) SHA1(68472e7271f835656197109620bb3988fc52308a) ) - ROM_REGION( 0x400, "proms", 0 ) /* from other set */ + ROM_REGION( 0x200, "proms", 0 ) /* from other set, upper half is empty */ ROM_LOAD( "bprom.u16", 0x0000, 0x0200, CRC(a6d43709) SHA1(cbff2cb60137462dc0b7c7719a64574218d96c62) ) - ROM_RELOAD( 0x0200, 0x0200 ) ROM_END @@ -3564,11 +3461,8 @@ ROM_START( comg903d ) /* Cal Omega 903d (System 903 diag.PROM) */ ROM_REGION( 0x1800, "gfx2", 0 ) ROM_FILL( 0x0000, 0x1800, 0xff ) /* removed all ROMs (requested by the manual) */ - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "testclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( comg905d ) /* Cal Omega 905d (System 905 diag.PROM) */ @@ -3585,11 +3479,8 @@ ROM_START( comg905d ) /* Cal Omega 905d (System 905 diag.PROM) */ ROM_REGION( 0x1800, "gfx2", 0 ) ROM_FILL( 0x0000, 0x1800, 0xff ) /* removed all ROMs (requested by the manual) */ - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "testclr.u28", 0x0000, 0x0100, CRC(a8191ef7) SHA1(d6f777980179ab091e2713ee815d46bf9c0ac486) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END @@ -3639,11 +3530,8 @@ ROM_START( elgrande ) ROM_LOAD( "d1.u69", 0x0800, 0x0800, CRC(ed3c83b7) SHA1(93e2134de3d9f79a6cff0391c1a32fccd3840c3f) ) ROM_LOAD( "d1.u68", 0x1000, 0x0800, CRC(81d07f12) SHA1(c14226f8bc1d08fcdfc5cb71fcaf6e070fa2d4a8) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "d1.u28", 0x0000, 0x0100, CRC(a26a8fae) SHA1(d570fe9443a0912bd34b81ac4c3e4c5f8901f523) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( jjpoker ) /* tuni-83 */ @@ -3662,11 +3550,8 @@ ROM_START( jjpoker ) /* tuni-83 */ ROM_LOAD( "tuni-83.u69", 0x0800, 0x0800, CRC(3483b4fb) SHA1(ac04b68c5fb8f8f142582181ad13bee87636cead) ) ROM_LOAD( "tuni-83.u68", 0x1000, 0x0800, CRC(e055a148) SHA1(d80e4330dce96b98df5bec731876f185476d6058) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "tunipoker.u28", 0x0000, 0x0100, CRC(5101a33b) SHA1(a36bc421064d0ed96beb27b549f69adce0a553c2) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( jjpokerb ) /* pokr_j */ @@ -3685,11 +3570,8 @@ ROM_START( jjpokerb ) /* pokr_j */ ROM_LOAD( "tuni-83.u69", 0x0800, 0x0800, CRC(3483b4fb) SHA1(ac04b68c5fb8f8f142582181ad13bee87636cead) ) ROM_LOAD( "tuni-83.u68", 0x1000, 0x0800, CRC(e055a148) SHA1(d80e4330dce96b98df5bec731876f185476d6058) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "tunipoker.u28", 0x0000, 0x0100, CRC(5101a33b) SHA1(a36bc421064d0ed96beb27b549f69adce0a553c2) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( ssipkr24 ) /* pokr02_4 (gfx and prom from jjpoker) */ @@ -3708,11 +3590,8 @@ ROM_START( ssipkr24 ) /* pokr02_4 (gfx and prom from jjpoker) */ ROM_LOAD( "tuni-83.u69", 0x0800, 0x0800, BAD_DUMP CRC(3483b4fb) SHA1(ac04b68c5fb8f8f142582181ad13bee87636cead) ) ROM_LOAD( "tuni-83.u68", 0x1000, 0x0800, BAD_DUMP CRC(e055a148) SHA1(d80e4330dce96b98df5bec731876f185476d6058) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "tunipoker.u28", 0x0000, 0x0100, BAD_DUMP CRC(5101a33b) SHA1(a36bc421064d0ed96beb27b549f69adce0a553c2) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( ssipkr30 ) /* pokr03_0 (gfx and prom from jjpoker) */ @@ -3731,11 +3610,8 @@ ROM_START( ssipkr30 ) /* pokr03_0 (gfx and prom from jjpoker) */ ROM_LOAD( "tuni-83.u69", 0x0800, 0x0800, BAD_DUMP CRC(3483b4fb) SHA1(ac04b68c5fb8f8f142582181ad13bee87636cead) ) ROM_LOAD( "tuni-83.u68", 0x1000, 0x0800, BAD_DUMP CRC(e055a148) SHA1(d80e4330dce96b98df5bec731876f185476d6058) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "tunipoker.u28", 0x0000, 0x0100, BAD_DUMP CRC(5101a33b) SHA1(a36bc421064d0ed96beb27b549f69adce0a553c2) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END ROM_START( ssipkr40 ) /* (gfx and prom from jjpoker) */ @@ -3754,11 +3630,8 @@ ROM_START( ssipkr40 ) /* (gfx and prom from jjpoker) */ ROM_LOAD( "tuni-83.u69", 0x0800, 0x0800, BAD_DUMP CRC(3483b4fb) SHA1(ac04b68c5fb8f8f142582181ad13bee87636cead) ) ROM_LOAD( "tuni-83.u68", 0x1000, 0x0800, BAD_DUMP CRC(e055a148) SHA1(d80e4330dce96b98df5bec731876f185476d6058) ) - ROM_REGION( 0x400, "proms", 0 ) + ROM_REGION( 0x100, "proms", 0 ) ROM_LOAD( "tunipoker.u28", 0x0000, 0x0100, BAD_DUMP CRC(5101a33b) SHA1(a36bc421064d0ed96beb27b549f69adce0a553c2) ) - ROM_RELOAD( 0x0100, 0x0100 ) - ROM_RELOAD( 0x0200, 0x0100 ) - ROM_RELOAD( 0x0300, 0x0100 ) ROM_END @@ -3768,59 +3641,18 @@ ROM_END DRIVER_INIT_MEMBER(calomega_state,standard) { - /* background color is adjusted through RGB pots */ - int x; - UINT8 *BPR = memregion( "proms" )->base(); - - for (x = 0x0000; x < 0x0400; x++) - { - if (BPR[x] == 0x07) - BPR[x] = 0x04; /* blue background */ - } - m_palette->update(); } DRIVER_INIT_MEMBER(calomega_state,elgrande) { - int x; - UINT8 *BPR = memregion( "proms" )->base(); - - /* background color is adjusted through RGB pots */ - for (x = 0x0000; x < 0x0400; x++) - { - if (BPR[x] == 0x07) - BPR[x] = 0x00; /* black background */ - } - m_palette->update(); } DRIVER_INIT_MEMBER(calomega_state,jjpoker) { - /* background color is adjusted through RGB pots */ - int x; - UINT8 *BPR = memregion( "proms" )->base(); - - for (x = 0x0000; x < 0x0400; x++) - { - if (BPR[x] == 0x02) - BPR[x] = 0x00; /* black background */ - } - m_palette->update(); } DRIVER_INIT_MEMBER(calomega_state,comg080) { - /* background color is adjusted through RGB pots */ - int x; - UINT8 *BPR = memregion( "proms" )->base(); - - for (x = 0x0000; x < 0x0400; x++) - { - if (BPR[x] == 0x07) - BPR[x] = 0x04; /* blue background */ - } - m_palette->update(); - /* Injecting missing Start and NMI vectors... Start = $2042; NMI = $26f8; Also a fake vector at $3ff8-$3ff9. The code checks these values to continue. diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index ac8a9d1dbc5..12ca5acfa40 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -770,7 +770,7 @@ GFXDECODE_END static GFXDECODE_START( mutantf ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 64 ) /* Tiles 16x16 */ - GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 64 ) /* Tiles 16x16 */ + GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 80 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx4", 0, spritelayout, 0, 128 ) /* Sprites 16x16 */ GFXDECODE_ENTRY( "gfx5", 0, spritelayout, 0, 16 ) /* Sprites 16x16 */ GFXDECODE_END diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index fbcf4f64fbe..456db9fc6fd 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -1407,7 +1407,7 @@ static const gfx_layout charlayout = }; static GFXDECODE_START( coinmstr ) - GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) + GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 46*32 ) GFXDECODE_END diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 9876a12f245..e49d6bb8650 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -1183,7 +1183,7 @@ static const gfx_layout cupsocsb_tilelayout = static GFXDECODE_START( heatbrl_csb ) GFXDECODE_ENTRY( "gfx1", 0, cupsocsb_8x8_tilelayout, 48*16, 16 ) - GFXDECODE_ENTRY( "gfx3", 0, cupsocsb_tilelayout, 0*16, 16 ) + GFXDECODE_ENTRY( "gfx3", 0, cupsocsb_tilelayout, 0*16, 32 ) GFXDECODE_ENTRY( "gfx4", 0, cupsocsb_tilelayout, 32*16, 16 ) /* unused */ GFXDECODE_ENTRY( "gfx2", 0, cupsocsb_spritelayout, 0*16, 8*16 ) GFXDECODE_ENTRY( "gfx5", 0, cupsocsb_tilelayout, 32*16, 16 ) diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 9a6f97d65d1..092e574ae00 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -203,7 +203,7 @@ TILE_GET_INFO_MEMBER(miniboy7_state::get_bg_tile_info) int attr = m_colorram[tile_index]; int code = m_videoram[tile_index]; int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ - int color = (attr & 0x3c); /* bits 2-3-4-5 for color? */ + int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color? */ if (bank == 1) /* temporary hack to point to the 3rd gfx bank */ bank = 2; @@ -367,7 +367,7 @@ static const gfx_layout tilelayout = 8, 8, RGN_FRAC(1,3), 3, - { 0, RGN_FRAC(1,3), RGN_FRAC(2,3) }, /* bitplanes are separated */ + { RGN_FRAC(2,3), RGN_FRAC(1,3), 0 }, /* bitplanes are separated */ { 0, 1, 2, 3, 4, 5, 6, 7 }, { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, 8*8 @@ -379,14 +379,14 @@ static const gfx_layout tilelayout = ****************************************/ static GFXDECODE_START( miniboy7 ) - GFXDECODE_ENTRY( "gfx1", 0x0800, charlayout, 0, 16 ) /* text layer 1 */ - GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) /* text layer 2 */ + GFXDECODE_ENTRY( "gfx1", 0x0800, charlayout, 0, 128 ) /* text layer 1 */ + GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 128 ) /* text layer 2 */ /* 0x000 cards 0x100 joker 0x200 dices 0x300 bigtxt */ - GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 ) + GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) GFXDECODE_END @@ -477,7 +477,7 @@ ROM_START( miniboy7 ) ROM_LOAD( "mb7_cg2.d13", 0x2000, 0x2000, CRC(b3362650) SHA1(603907fd3a0049c0a3e1858c4329bf9fd58137f6) ) /* bitplane 2 */ ROM_LOAD( "mb7_cg3.d14", 0x4000, 0x2000, CRC(10c2bf71) SHA1(23a01625b0fc0b772054ee4bc026d2257df46a03) ) /* bitplane 3 */ - ROM_REGION( 0x0200, "proms", 0 ) /* both bipolar PROMs are identical */ + ROM_REGION( 0x0200, "proms", ROMREGION_INVERT ) /* both bipolar PROMs are identical */ ROM_LOAD( "j.e7", 0x0000, 0x0100, CRC(4b66215e) SHA1(de4a8f1ee7b9bea02f3a5fc962358d19c7a871a0) ) /* N82S129N BPROM simply labeled J */ ROM_LOAD( "j.f10", 0x0100, 0x0100, CRC(4b66215e) SHA1(de4a8f1ee7b9bea02f3a5fc962358d19c7a871a0) ) /* N82S129N BPROM simply labeled J */ ROM_END @@ -503,7 +503,7 @@ ROM_START( miniboy7a ) ROM_LOAD( "mb72.13d", 0x2000, 0x2000, CRC(b3362650) SHA1(603907fd3a0049c0a3e1858c4329bf9fd58137f6) ) ROM_LOAD( "mb73.14d", 0x4000, 0x2000, CRC(10c2bf71) SHA1(23a01625b0fc0b772054ee4bc026d2257df46a03) ) - ROM_REGION( 0x0200, "proms", 0 ) /* both bipolar PROMs are identical */ + ROM_REGION( 0x0200, "proms", ROMREGION_INVERT ) /* both bipolar PROMs are identical */ ROM_LOAD( "j.e7", 0x0000, 0x0100, CRC(4b66215e) SHA1(de4a8f1ee7b9bea02f3a5fc962358d19c7a871a0) ) /* N82S129N BPROM simply labeled J */ ROM_LOAD( "j.f10", 0x0100, 0x0100, CRC(4b66215e) SHA1(de4a8f1ee7b9bea02f3a5fc962358d19c7a871a0) ) /* N82S129N BPROM simply labeled J */ ROM_END @@ -525,7 +525,7 @@ ROM_START( miniboy7b ) /* "Might" be the same set as miniboy7a, all roms read co ROM_LOAD( "mb7_2.13d", 0x2000, 0x2000, CRC(b3362650) SHA1(603907fd3a0049c0a3e1858c4329bf9fd58137f6) ) ROM_LOAD( "mb7_3.14d", 0x4000, 0x2000, CRC(10c2bf71) SHA1(23a01625b0fc0b772054ee4bc026d2257df46a03) ) - ROM_REGION( 0x0200, "proms", 0 ) /* both bipolar PROMs are identical */ + ROM_REGION( 0x0200, "proms", ROMREGION_INVERT ) /* both bipolar PROMs are identical */ ROM_LOAD( "j.e7", 0x0000, 0x0100, CRC(4b66215e) SHA1(de4a8f1ee7b9bea02f3a5fc962358d19c7a871a0) ) /* N82S129N BPROM simply labeled J */ ROM_LOAD( "j.f10", 0x0100, 0x0100, CRC(4b66215e) SHA1(de4a8f1ee7b9bea02f3a5fc962358d19c7a871a0) ) /* N82S129N BPROM simply labeled J */ ROM_END diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 87528507d9d..3ac0cf00653 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -556,8 +556,8 @@ static const gfx_layout splayout = static GFXDECODE_START( pipedrm ) - GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 64 ) - GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 64 ) + GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 128 ) + GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 128 ) GFXDECODE_ENTRY( "gfx3", 0, splayout, 1024, 32 ) GFXDECODE_END diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 27301e58c3b..d8ceb8bf13c 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -137,7 +137,7 @@ static const gfx_layout char16layout = }; static GFXDECODE_START( sbugger ) - GFXDECODE_ENTRY( "gfx1", 0, char16layout, 0, 1 ) + GFXDECODE_ENTRY( "gfx1", 0, char16layout, 0, 256 ) GFXDECODE_END @@ -278,5 +278,5 @@ ROM_START( sbuggera ) ROM_LOAD( "spbugger.gfx", 0x0000, 0x1000, CRC(d3f345b5) SHA1(a5082ffc3043352e9b731af95770bdd62fb928bf) ) ROM_END -GAME( 1981, sbugger, 0, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 1)", GAME_NOT_WORKING | GAME_IMPERFECT_COLORS ) -GAME( 1981, sbuggera, sbugger, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 2)", GAME_IMPERFECT_COLORS ) +GAME( 1981, sbugger, 0, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 1)", GAME_NOT_WORKING | GAME_WRONG_COLORS ) +GAME( 1981, sbuggera, sbugger, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 2)", GAME_WRONG_COLORS ) diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c index dab2c0576e2..723090e1de7 100644 --- a/src/mame/video/calomega.c +++ b/src/mame/video/calomega.c @@ -40,22 +40,14 @@ TILE_GET_INFO_MEMBER(calomega_state::get_bg_tile_info) int attr = m_colorram[tile_index]; int code = m_videoram[tile_index]; int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ - int color = (attr & 0x3c); /* bits 2-3-4-5 for color */ - - if (attr == 0x3a) /* Is the palette wrong? */ - color = 0x3b; /* 0x3b is the best match */ - - if (attr == 0x36) /* Is the palette wrong? */ - color = 0x3a; /* 0x3a is the best match */ - - if (attr == 0x32) /* Is the palette wrong? */ - color = 0x39; /* 0x39 is the best match */ + int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */ SET_TILE_INFO_MEMBER(bank, code, color, 0); } void calomega_state::video_start() { + m_gfxdecode->gfx(0)->set_granularity(8); m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(calomega_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 31); } @@ -68,34 +60,43 @@ UINT32 calomega_state::screen_update_calomega(screen_device &screen, bitmap_ind1 PALETTE_INIT_MEMBER(calomega_state, calomega) { const UINT8 *color_prom = memregion("proms")->base(); -/* prom bits - 7654 3210 - ---- ---x red component. - ---- --x- green component. - ---- -x-- blue component. - xxxx x--- unused. + +/* the proms are 256x4 bit, but the games only seem to need the first 128 entries, + and the rest of the PROM data looks like junk rather than valid colors + + prom bits + 3210 + ---x red component + --x- green component + -x-- blue component + x--- foreground (colors with this bit set are full brightness, + colors with it clear are attenuated by the background color pots) */ - int i; + + // TODO: hook pots up as PORT_ADJUSTERs instead of hard coding them here + + // let's make the BG a little darker than FG blue + const int r_pot = 0x00; + const int g_pot = 0x00; + const int b_pot = 0xc0; /* 00000BGR */ if (color_prom == 0) return; - for (i = 0;i < palette.entries();i++) + for (int i = 0;i < palette.entries();i++) { - int bit0, bit1, bit2, r, g, b; + int nibble = color_prom[i]; + + int fg = BIT(nibble, 3); /* red component */ - bit0 = (color_prom[i] >> 0) & 0x01; - r = bit0 * 0xff; + int r = BIT(nibble, 0) * (fg ? 0xff : r_pot); /* green component */ - bit1 = (color_prom[i] >> 1) & 0x01; - g = bit1 * 0xff; + int g = BIT(nibble, 1) * (fg ? 0xff : g_pot); /* blue component */ - bit2 = (color_prom[i] >> 2) & 0x01; - b = bit2 * 0xff; - + int b = BIT(nibble, 2) * (fg ? 0xff : b_pot); palette.set_pen_color(i, rgb_t(r, g, b)); } diff --git a/src/mame/video/k054156_k054157_k056832.c b/src/mame/video/k054156_k054157_k056832.c index 573c906bc07..aa696ed05ec 100644 --- a/src/mame/video/k054156_k054157_k056832.c +++ b/src/mame/video/k054156_k054157_k056832.c @@ -2149,6 +2149,7 @@ void k056832_device::create_gfx(const char *gfx_memory_region, int bpp, int big) } m_gfxdecode->gfx(gfx_index)->set_granularity(16); /* override */ + m_gfxdecode->gfx(gfx_index)->set_colors(m_palette->entries() / 16); m_gfx_memory_region = gfx_memory_region; m_gfx_num = gfx_index;