diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index f20a548a916..10ea532edda 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -722,9 +722,6 @@ static MACHINE_DRIVER_START( cd32 ) MDRV_SCREEN_SIZE(512*2, 312) MDRV_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1) - MDRV_PALETTE_LENGTH(4096) - MDRV_PALETTE_INIT(amiga_aga) - MDRV_VIDEO_START(amiga_aga) MDRV_VIDEO_UPDATE(amiga_aga) @@ -905,7 +902,7 @@ GAME( 1993, cd32, 0, cd32, cd32, cd32, ROT0, "Commodore", "Amiga GAME( 1995, cndypuzl, cd32, cd32, cndypuzl, cndypuzl, ROT0, "CD Express", "Candy Puzzle (v1.0)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 1995, haremchl, cd32, cd32, haremchl, haremchl, ROT0, "CD Express", "Harem Challenge", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 1995, lsrquiz, cd32, cd32, lsrquiz, lsrquiz, ROT0, "CD Express", "Laser Quiz Italy", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) /* no player 2 inputs */ -GAME( 1995, lsrquiz2, cd32, cd32, lsrquiz2, lsrquiz2, ROT0, "CD Express", "Laser Quiz 2 Italy (v1.0)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND | GAME_NOT_WORKING ) +GAME( 1995, lsrquiz2, cd32, cd32, lsrquiz2, lsrquiz2, ROT0, "CD Express", "Laser Quiz 2 Italy (v1.0)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 1995, lasstixx, cd32, cd32, lasstixx, lasstixx, ROT0, "CD Express", "Laser Strixx 2", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) /* not checked yet */ GAME( 1995, mgnumber, cd32, cd32, cd32, cd32, ROT0, "CD Express", "Magic Number", GAME_NOT_WORKING ) /* game resets before initialisation */ diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 6e1d92f85d8..2c12e80f880 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -418,7 +418,6 @@ void amiga_sprite_enable_comparitor(int which, int enable); /*----------- defined in video/amigaaga.c -----------*/ -PALETTE_INIT( amiga_aga ); VIDEO_START( amiga_aga ); VIDEO_UPDATE( amiga_aga ); diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c index 55d087a1cfd..a185ac2176c 100644 --- a/src/mame/video/amigaaga.c +++ b/src/mame/video/amigaaga.c @@ -173,22 +173,6 @@ void aga_palette_write(int color_reg, UINT16 data) aga_palette[color] = MAKE_RGB(cr,cg,cb); } -/************************************* - * - * 4-4-4 palette init - * - *************************************/ - -PALETTE_INIT( amiga_aga ) -{ - int i; - - for (i = 0; i < 0x1000; i++) - palette_set_color_rgb(machine, i, pal4bit(i >> 8), pal4bit(i >> 4), pal4bit(i)); -} - - - /************************************* * * Video startup @@ -861,7 +845,7 @@ void amiga_aga_render_scanline(running_machine *machine, bitmap_t *bitmap, int s /* compute the pixel fetch parameters */ ddf_start_pixel = ( CUSTOM_REG(REG_DDFSTRT) & 0xfc ) * 2 + (hires ? 9 : 17); - ddf_stop_pixel = ( CUSTOM_REG(REG_DDFSTOP) & 0xfc ) * 2 + (hires ? (9 + defbitoffs) : (17 + defbitoffs)); + ddf_stop_pixel = ( CUSTOM_REG(REG_DDFSTOP) & 0xfc ) * 2 + (hires ? (9 + defbitoffs - 16) : (17 + defbitoffs)); if ( ( CUSTOM_REG(REG_DDFSTRT) ^ CUSTOM_REG(REG_DDFSTOP) ) & 0x04 ) ddf_stop_pixel += 8; @@ -1152,8 +1136,8 @@ void amiga_aga_render_scanline(running_machine *machine, bitmap_t *bitmap, int s if ( hires && lace ) p = m_hilace; - //popmessage("%s(%d pl od=%02x ed=%02x start=%04x stop=%04x hstart=%04x hstop=%04x diwhigh=%04x)", p, planes, odelay, edelay, CUSTOM_REG(REG_DDFSTRT), CUSTOM_REG(REG_DDFSTOP), CUSTOM_REG(REG_DIWSTRT), CUSTOM_REG(REG_DIWSTOP), CUSTOM_REG(REG_DIWHIGH) ); - popmessage("%s(%d pl bplpt1=%06X, bpl1mod=%04x)", p, planes, CUSTOM_REG_LONG(REG_BPL1PTH), CUSTOM_REG(REG_BPL1MOD)); + popmessage("%s(%d pl od=%02x ed=%02x start=%d stop=%d hstart=%04x hstop=%04x diwhigh=%04x fetchbits=%d )", p, planes, odelay, edelay, ddf_start_pixel, ddf_stop_pixel, CUSTOM_REG(REG_DIWSTRT), CUSTOM_REG(REG_DIWSTOP), CUSTOM_REG(REG_DIWHIGH), defbitoffs ); + //popmessage("%s(%d pl bplpt1=%06X, bpl1mod=%04x, offset=%x)", p, planes, CUSTOM_REG_LONG(REG_BPL1PTH), CUSTOM_REG(REG_BPL1MOD), hires_modulo_offset ); } #endif