diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 20331b7f641..87a18bac56a 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -30,7 +30,7 @@ TODO: Updates: -- detatwin: sprites are left on screen during attract mode(fixed) +- blswhstl: sprites are left on screen during attract mode(fixed) Sprite buffer should be cleared at vblank start. On the GX OBJDMA automatically occurs 32.0-42.7us after clearing but on older boards using the K053245, DMA must be triggered manually. The game uses a @@ -82,7 +82,7 @@ WRITE16_HANDLER( tmnt_paletteram_word_w ); WRITE16_HANDLER( tmnt_0a0000_w ); WRITE16_HANDLER( punkshot_0a0020_w ); WRITE16_HANDLER( lgtnfght_0a0018_w ); -WRITE16_HANDLER( detatwin_700300_w ); +WRITE16_HANDLER( blswhstl_700300_w ); READ16_HANDLER( glfgreat_rom_r ); WRITE16_HANDLER( glfgreat_122000_w ); WRITE16_HANDLER( ssriders_1c0300_w ); @@ -91,12 +91,12 @@ WRITE16_HANDLER( tmnt_priority_w ); READ16_HANDLER( glfgreat_ball_r ); READ16_HANDLER( prmrsocr_rom_r ); VIDEO_START( sunsetbl ); -VIDEO_START( cuebrckj ); +VIDEO_START( cuebrick ); VIDEO_START( mia ); VIDEO_START( tmnt ); VIDEO_START( punkshot ); VIDEO_START( lgtnfght ); -VIDEO_START( detatwin ); +VIDEO_START( blswhstl ); VIDEO_START( glfgreat ); VIDEO_START( thndrx2 ); VIDEO_START( prmrsocr ); @@ -107,11 +107,11 @@ VIDEO_UPDATE( lgtnfght ); VIDEO_UPDATE( glfgreat ); VIDEO_UPDATE( tmnt2 ); VIDEO_UPDATE( thndrx2 ); -VIDEO_EOF( detatwin ); +VIDEO_EOF( blswhstl ); static int tmnt_soundlatch; -static int cbj_snd_irqlatch, cbj_nvram_bank; -static UINT16 cbj_nvram[0x400*0x20]; // 32k paged in a 1k window +static int cuebrick_snd_irqlatch, cuebrick_nvram_bank; +static UINT16 cuebrick_nvram[0x400*0x20]; // 32k paged in a 1k window static INT16 *sampledata; static READ16_HANDLER( K052109_word_noA12_r ) @@ -163,7 +163,7 @@ static READ16_HANDLER( K053245_scattered_word_r ) } } -static WRITE16_HANDLER( K053245_scattered_word_w ) //* +static WRITE16_HANDLER( K053245_scattered_word_w ) { COMBINE_DATA(spriteram16 + offset); @@ -191,7 +191,7 @@ static WRITE16_HANDLER( K053244_word_noA1_w ) K053244_w(offset + 1,data & 0xff); } -static INTERRUPT_GEN(cbj_interrupt) +static INTERRUPT_GEN(cuebrick_interrupt) { // cheap IRQ multiplexing to avoid losing sound IRQs switch (cpu_getiloops()) @@ -201,7 +201,7 @@ static INTERRUPT_GEN(cbj_interrupt) break; default: - if (cbj_snd_irqlatch) + if (cuebrick_snd_irqlatch) cpunum_set_input_line(0, MC68000_IRQ_6, HOLD_LINE); break; } @@ -234,7 +234,7 @@ static READ16_HANDLER( punkshot_sound_r ) return K053260_0_r(2 + offset); } -static READ16_HANDLER( detatwin_sound_r ) +static READ16_HANDLER( blswhstl_sound_r ) { /* If the sound CPU is running, read the status, otherwise just make it pass the test */ @@ -277,7 +277,7 @@ static WRITE16_HANDLER( prmrsocr_sound_irq_w ) cpunum_set_input_line_and_vector(1,0,HOLD_LINE,0xff); } -static WRITE8_HANDLER( prmrsocr_s_bankswitch_w ) +static WRITE8_HANDLER( prmrsocr_audio_bankswitch_w ) { UINT8 *rom = memory_region(REGION_CPU2) + 0x10000; @@ -410,7 +410,7 @@ static READ16_HANDLER( ssriders_protection_r ) data = -program_read_word(0x105818); data = ((data / 8 - 4) & 0x1f) * 0x40; data += ((program_read_word(0x105cb0) + - 256*K052109_r(0x1a01) + K052109_r(0x1a00) - 6) / 8 + 12) & 0x3f; //* + 256*K052109_r(0x1a01) + K052109_r(0x1a00) - 6) / 8 + 12) & 0x3f; return data; default: @@ -484,7 +484,7 @@ static NVRAM_HANDLER( eeprom ) } } -static READ16_HANDLER( detatwin_coin_r ) +static READ16_HANDLER( blswhstl_coin_r ) { int res; static int toggle; @@ -501,7 +501,7 @@ static READ16_HANDLER( detatwin_coin_r ) return res ^ toggle; } -static READ16_HANDLER( detatwin_eeprom_r ) +static READ16_HANDLER( blswhstl_eeprom_r ) { int res; @@ -530,7 +530,7 @@ static READ16_HANDLER( ssriders_eeprom_r ) return res ^ toggle; } -static READ16_HANDLER( ssridersbl_eeprom_r ) +static READ16_HANDLER( sunsetbl_eeprom_r ) { int res; static int toggle; @@ -549,7 +549,7 @@ static READ16_HANDLER( ssridersbl_eeprom_r ) return res ^ toggle; } -static WRITE16_HANDLER( detatwin_eeprom_w ) +static WRITE16_HANDLER( blswhstl_eeprom_w ) { if (ACCESSING_LSB) { @@ -684,12 +684,12 @@ static WRITE16_HANDLER( prmrsocr_eeprom_w ) } } -static READ16_HANDLER( cbj_snd_r ) +static READ16_HANDLER( cuebrick_snd_r ) { return YM2151_status_port_0_r(0)<<8; } -static WRITE16_HANDLER( cbj_snd_w ) +static WRITE16_HANDLER( cuebrick_snd_w ) { if (offset) { @@ -701,175 +701,123 @@ static WRITE16_HANDLER( cbj_snd_w ) } } -static READ16_HANDLER( cbj_nv_r ) +static READ16_HANDLER( cuebrick_nv_r ) { - return cbj_nvram[offset + (cbj_nvram_bank*0x400/2)]; + return cuebrick_nvram[offset + (cuebrick_nvram_bank*0x400/2)]; } -static WRITE16_HANDLER( cbj_nv_w ) +static WRITE16_HANDLER( cuebrick_nv_w ) { - COMBINE_DATA(&cbj_nvram[offset + (cbj_nvram_bank*0x400/2)]); + COMBINE_DATA(&cuebrick_nvram[offset + (cuebrick_nvram_bank*0x400/2)]); } -static WRITE16_HANDLER( cbj_nvbank_w ) +static WRITE16_HANDLER( cuebrick_nvbank_w ) { - cbj_nvram_bank = (data>>8); + cuebrick_nvram_bank = (data>>8); } -static ADDRESS_MAP_START( cuebrckj_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) +static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x01ffff) AM_ROM + AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */ + AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) - AM_RANGE(0x0a0010, 0x0a0011) AM_READ(input_port_3_word_r) + AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) + AM_RANGE(0x0a0010, 0x0a0011) AM_READWRITE(input_port_3_word_r, watchdog_reset16_w) AM_RANGE(0x0a0012, 0x0a0013) AM_READ(input_port_4_word_r) AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_5_word_r) - AM_RANGE(0x0b0000, 0x0b03ff) AM_READ(cbj_nv_r) - AM_RANGE(0x0c0000, 0x0c0003) AM_READ(cbj_snd_r) - AM_RANGE(0x100000, 0x107fff) AM_READ(K052109_word_noA12_r) - AM_RANGE(0x140000, 0x140007) AM_READ(K051937_word_r) - AM_RANGE(0x140400, 0x1407ff) AM_READ(K051960_word_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( cuebrckj_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_WRITE(tmnt_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(tmnt_0a0000_w) - AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) - AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x0b0000, 0x0b03ff) AM_WRITE(cbj_nv_w) - AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cbj_nvbank_w) - AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(cbj_snd_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(K052109_word_noA12_w) - AM_RANGE(0x140000, 0x140007) AM_WRITE(K051937_word_w) - AM_RANGE(0x140400, 0x1407ff) AM_WRITE(K051960_word_w) + AM_RANGE(0x0b0000, 0x0b03ff) AM_READWRITE(cuebrick_nv_r, cuebrick_nv_w) + AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrick_nvbank_w) + AM_RANGE(0x0c0000, 0x0c0003) AM_READWRITE(cuebrick_snd_r, cuebrick_snd_w) + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) + AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) + AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( mia_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) +static ADDRESS_MAP_START( mia_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x03ffff) AM_ROM + AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */ + AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) - AM_RANGE(0x0a0010, 0x0a0011) AM_READ(input_port_3_word_r) + AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) + AM_RANGE(0x0a0010, 0x0a0011) AM_READWRITE(input_port_3_word_r, watchdog_reset16_w) AM_RANGE(0x0a0012, 0x0a0013) AM_READ(input_port_4_word_r) AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_5_word_r) - AM_RANGE(0x100000, 0x107fff) AM_READ(K052109_word_noA12_r) - AM_RANGE(0x140000, 0x140007) AM_READ(K051937_word_r) - AM_RANGE(0x140400, 0x1407ff) AM_READ(K051960_word_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( mia_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_WRITE(tmnt_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(tmnt_0a0000_w) - AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) - AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(K052109_word_noA12_w) - AM_RANGE(0x140000, 0x140007) AM_WRITE(K051937_word_w) - AM_RANGE(0x140400, 0x1407ff) AM_WRITE(K051960_word_w) -// AM_RANGE(0x10e800, 0x10e801) AM_WRITE(MWA16_NOP) ??? #if 0 AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w) #endif + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) +// AM_RANGE(0x10e800, 0x10e801) AM_WRITE(MWA16_NOP) ??? + AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) + AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( tmnt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) + +static ADDRESS_MAP_START( tmnt_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x05ffff) AM_ROM + AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) AM_RANGE(0x0a0006, 0x0a0007) AM_READ(input_port_3_word_r) - AM_RANGE(0x0a0010, 0x0a0011) AM_READ(input_port_4_word_r) + AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) + AM_RANGE(0x0a0010, 0x0a0011) AM_READWRITE(input_port_4_word_r, watchdog_reset16_w) AM_RANGE(0x0a0012, 0x0a0013) AM_READ(input_port_5_word_r) AM_RANGE(0x0a0014, 0x0a0015) AM_READ(input_port_6_word_r) AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_7_word_r) - AM_RANGE(0x100000, 0x107fff) AM_READ(K052109_word_noA12_r) - AM_RANGE(0x140000, 0x140007) AM_READ(K051937_word_r) - AM_RANGE(0x140400, 0x1407ff) AM_READ(K051960_word_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( tmnt_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_WRITE(tmnt_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(tmnt_0a0000_w) - AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) - AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(K052109_word_noA12_w) + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) // AM_RANGE(0x10e800, 0x10e801) AM_WRITE(MWA16_NOP) ??? - AM_RANGE(0x140000, 0x140007) AM_WRITE(K051937_word_w) - AM_RANGE(0x140400, 0x1407ff) AM_WRITE(K051960_word_w) + AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) + AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( punkshot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x090000, 0x090fff) AM_READ(MRA16_RAM) + +static ADDRESS_MAP_START( punkshot_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x03ffff) AM_ROM + AM_RANGE(0x080000, 0x083fff) AM_RAM /* main RAM */ + AM_RANGE(0x090000, 0x090fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_3_word_r) AM_RANGE(0x0a0006, 0x0a0007) AM_READ(input_port_2_word_r) - AM_RANGE(0x0a0040, 0x0a0043) AM_READ(punkshot_sound_r) /* K053260 */ - AM_RANGE(0x100000, 0x107fff) AM_READ(K052109_word_noA12_r) - AM_RANGE(0x110000, 0x110007) AM_READ(K051937_word_r) - AM_RANGE(0x110400, 0x1107ff) AM_READ(K051960_word_r) - AM_RANGE(0xfffffc, 0xffffff) AM_READ(punkshot_kludge_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( punkshot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x090000, 0x090fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE(punkshot_0a0020_w) + AM_RANGE(0x0a0040, 0x0a0043) AM_READ(punkshot_sound_r) /* K053260 */ AM_RANGE(0x0a0040, 0x0a0041) AM_WRITE(K053260_0_lsb_w) AM_RANGE(0x0a0060, 0x0a007f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x0a0080, 0x0a0081) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(punkshot_K052109_word_noA12_w) - AM_RANGE(0x110000, 0x110007) AM_WRITE(K051937_word_w) - AM_RANGE(0x110400, 0x1107ff) AM_WRITE(K051960_word_w) + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, punkshot_K052109_word_noA12_w) + AM_RANGE(0x110000, 0x110007) AM_READWRITE(K051937_word_r, K051937_word_w) + AM_RANGE(0x110400, 0x1107ff) AM_READWRITE(K051960_word_r, K051960_word_w) + AM_RANGE(0xfffffc, 0xffffff) AM_READ(punkshot_kludge_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( lgtnfght_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x093fff) AM_READ(MRA16_RAM) /* main RAM */ + +static ADDRESS_MAP_START( lgtnfght_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x03ffff) AM_ROM + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x090000, 0x093fff) AM_RAM /*main RAM */ AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) AM_RANGE(0x0a0006, 0x0a0007) AM_READ(input_port_3_word_r) AM_RANGE(0x0a0008, 0x0a0009) AM_READ(input_port_4_word_r) AM_RANGE(0x0a0010, 0x0a0011) AM_READ(input_port_5_word_r) - AM_RANGE(0x0a0020, 0x0a0023) AM_READ(punkshot_sound_r) /* K053260 */ - AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(K053245_scattered_word_r) - AM_RANGE(0x0c0000, 0x0c001f) AM_READ(K053244_word_noA1_r) - AM_RANGE(0x100000, 0x107fff) AM_READ(K052109_word_noA12_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( lgtnfght_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x080fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x090000, 0x093fff) AM_WRITE(MWA16_RAM) /* main RAM */ AM_RANGE(0x0a0018, 0x0a0019) AM_WRITE(lgtnfght_0a0018_w) + AM_RANGE(0x0a0020, 0x0a0023) AM_READ(punkshot_sound_r) /* K053260 */ AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE(K053260_0_lsb_w) AM_RANGE(0x0a0028, 0x0a0029) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x0b0000, 0x0b3fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x0c0000, 0x0c001f) AM_WRITE(K053244_word_noA1_w) + AM_RANGE(0x0b0000, 0x0b3fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) + AM_RANGE(0x0c0000, 0x0c001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) AM_RANGE(0x0e0000, 0x0e001f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(K052109_word_noA12_w) + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) ADDRESS_MAP_END @@ -879,126 +827,77 @@ static WRITE16_HANDLER( ssriders_soundkludge_w ) cpunum_set_input_line_and_vector(1,0,HOLD_LINE,0xff); } -static ADDRESS_MAP_START( detatwin_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x180000, 0x183fff) AM_READ(K052109_word_r) - AM_RANGE(0x204000, 0x207fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x300000, 0x303fff) AM_READ(K053245_scattered_word_r) - AM_RANGE(0x400000, 0x400fff) AM_READ(MRA16_RAM) - AM_RANGE(0x500000, 0x50003f) AM_READ(K054000_lsb_r) - AM_RANGE(0x680000, 0x68001f) AM_READ(K053244_word_noA1_r) +static ADDRESS_MAP_START( blswhstl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x07ffff) AM_ROM + AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K052109_word_r, K052109_word_w) + AM_RANGE(0x204000, 0x207fff) AM_RAM /* main RAM */ + AM_RANGE(0x300000, 0x303fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x500000, 0x50003f) AM_READWRITE(K054000_lsb_r, K054000_lsb_w) + AM_RANGE(0x680000, 0x68001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) - AM_RANGE(0x700004, 0x700005) AM_READ(detatwin_coin_r) - AM_RANGE(0x700006, 0x700007) AM_READ(detatwin_eeprom_r) - AM_RANGE(0x780600, 0x780603) AM_READ(detatwin_sound_r) /* K053260 */ -ADDRESS_MAP_END - -static ADDRESS_MAP_START( detatwin_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x180000, 0x183fff) AM_WRITE(K052109_word_w) - AM_RANGE(0x204000, 0x207fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x300000, 0x303fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x500000, 0x50003f) AM_WRITE(K054000_lsb_w) - AM_RANGE(0x400000, 0x400fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x680000, 0x68001f) AM_WRITE(K053244_word_noA1_w) - AM_RANGE(0x700200, 0x700201) AM_WRITE(detatwin_eeprom_w) + AM_RANGE(0x700004, 0x700005) AM_READ(blswhstl_coin_r) + AM_RANGE(0x700006, 0x700007) AM_READ(blswhstl_eeprom_r) + AM_RANGE(0x700200, 0x700201) AM_WRITE(blswhstl_eeprom_w) + AM_RANGE(0x700300, 0x700301) AM_WRITE(blswhstl_700300_w) AM_RANGE(0x700400, 0x700401) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x700300, 0x700301) AM_WRITE(detatwin_700300_w) + AM_RANGE(0x780600, 0x780603) AM_READ(blswhstl_sound_r) /* K053260 */ AM_RANGE(0x780600, 0x780601) AM_WRITE(K053260_0_lsb_w) AM_RANGE(0x780604, 0x780605) AM_WRITE(ssriders_soundkludge_w) AM_RANGE(0x780700, 0x78071f) AM_WRITE(K053251_lsb_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( glfgreat_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x104000, 0x107fff) AM_READ(K053245_scattered_word_r) - AM_RANGE(0x108000, 0x108fff) AM_READ(MRA16_RAM) - AM_RANGE(0x10c000, 0x10cfff) AM_READ(MRA16_RAM) /* 053936? */ - AM_RANGE(0x114000, 0x11401f) AM_READ(K053244_lsb_r) + +static ADDRESS_MAP_START( glfgreat_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x03ffff) AM_ROM + AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ + AM_RANGE(0x104000, 0x107fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) + AM_RANGE(0x108000, 0x108fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x10c000, 0x10cfff) AM_RAM AM_BASE(&K053936_0_linectrl) /* 053936? */ + AM_RANGE(0x110000, 0x11001f) AM_WRITE(K053244_word_noA1_w) /* duplicate! */ + AM_RANGE(0x114000, 0x11401f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) /* duplicate! */ + AM_RANGE(0x118000, 0x11801f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0x11c000, 0x11c01f) AM_WRITE(K053251_msb_w) AM_RANGE(0x120000, 0x120001) AM_READ(input_port_0_word_r) AM_RANGE(0x120002, 0x120003) AM_READ(input_port_1_word_r) AM_RANGE(0x120004, 0x120005) AM_READ(input_port_3_word_r) AM_RANGE(0x120006, 0x120007) AM_READ(input_port_2_word_r) AM_RANGE(0x121000, 0x121001) AM_READ(glfgreat_ball_r) /* returns the color of the center pixel of the roz layer */ - AM_RANGE(0x125000, 0x125003) AM_READ(glfgreat_sound_r) /* K053260 */ - AM_RANGE(0x200000, 0x207fff) AM_READ(K052109_word_noA12_r) + AM_RANGE(0x122000, 0x122001) AM_WRITE(glfgreat_122000_w) + AM_RANGE(0x124000, 0x124001) AM_WRITE(watchdog_reset16_w) + AM_RANGE(0x125000, 0x125003) AM_READWRITE(glfgreat_sound_r, glfgreat_sound_w) /* K053260 */ + AM_RANGE(0x200000, 0x207fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) AM_RANGE(0x300000, 0x3fffff) AM_READ(glfgreat_rom_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( glfgreat_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x104000, 0x107fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x108000, 0x108fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x10c000, 0x10cfff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) - AM_RANGE(0x110000, 0x11001f) AM_WRITE(K053244_word_noA1_w) /* duplicate! */ - AM_RANGE(0x114000, 0x11401f) AM_WRITE(K053244_lsb_w) /* duplicate! */ + +static ADDRESS_MAP_START( prmrsocr_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x07ffff) AM_ROM + AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ + AM_RANGE(0x104000, 0x107fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) + AM_RANGE(0x108000, 0x108fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x10c000, 0x10cfff) AM_RAM AM_BASE(&K053936_0_linectrl) + AM_RANGE(0x110000, 0x11001f) AM_WRITE(K053244_word_noA1_w) /* duplicate! */ + AM_RANGE(0x114000, 0x11401f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) /* duplicate! */ AM_RANGE(0x118000, 0x11801f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) AM_RANGE(0x11c000, 0x11c01f) AM_WRITE(K053251_msb_w) - AM_RANGE(0x122000, 0x122001) AM_WRITE(glfgreat_122000_w) - AM_RANGE(0x124000, 0x124001) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x125000, 0x125003) AM_WRITE(glfgreat_sound_w) /* K053260 */ - AM_RANGE(0x200000, 0x207fff) AM_WRITE(K052109_word_noA12_w) -ADDRESS_MAP_END - - -static ADDRESS_MAP_START( prmrsocr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x104000, 0x107fff) AM_READ(K053245_scattered_word_r) - AM_RANGE(0x108000, 0x108fff) AM_READ(MRA16_RAM) - AM_RANGE(0x10c000, 0x10cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x114000, 0x11401f) AM_READ(K053244_lsb_r) AM_RANGE(0x120000, 0x120001) AM_READ(prmrsocr_IN0_r) AM_RANGE(0x120002, 0x120003) AM_READ(prmrsocr_eeprom_r) + AM_RANGE(0x12100c, 0x12100f) AM_WRITE(prmrsocr_sound_cmd_w) AM_RANGE(0x121014, 0x121015) AM_READ(prmrsocr_sound_r) - AM_RANGE(0x200000, 0x207fff) AM_READ(K052109_word_noA12_r) + AM_RANGE(0x122000, 0x122001) AM_WRITE(prmrsocr_eeprom_w) /* EEPROM + video control */ + AM_RANGE(0x123000, 0x123001) AM_WRITE(prmrsocr_sound_irq_w) + AM_RANGE(0x200000, 0x207fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) + AM_RANGE(0x280000, 0x280001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x300000, 0x33ffff) AM_READ(prmrsocr_rom_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( prmrsocr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x104000, 0x107fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x108000, 0x108fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x10c000, 0x10cfff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) - AM_RANGE(0x110000, 0x11001f) AM_WRITE(K053244_word_noA1_w) /* duplicate! */ - AM_RANGE(0x114000, 0x11401f) AM_WRITE(K053244_lsb_w) /* duplicate! */ - AM_RANGE(0x118000, 0x11801f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) - AM_RANGE(0x11c000, 0x11c01f) AM_WRITE(K053251_msb_w) - AM_RANGE(0x122000, 0x122001) AM_WRITE(prmrsocr_eeprom_w) /* EEPROM + video control */ - AM_RANGE(0x12100c, 0x12100f) AM_WRITE(prmrsocr_sound_cmd_w) - AM_RANGE(0x123000, 0x123001) AM_WRITE(prmrsocr_sound_irq_w) - AM_RANGE(0x200000, 0x207fff) AM_WRITE(K052109_word_noA12_w) - AM_RANGE(0x280000, 0x280001) AM_WRITE(watchdog_reset16_w) -ADDRESS_MAP_END - - -static ADDRESS_MAP_START( tmnt2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) //* - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x140000, 0x140fff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM) // K053245_scattered_word_r - AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) - AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_4_word_r) - AM_RANGE(0x1c0006, 0x1c0007) AM_READ(input_port_5_word_r) - AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_2_word_r) - AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r) - AM_RANGE(0x1c0400, 0x1c0401) AM_READ(watchdog_reset16_r) - AM_RANGE(0x1c0500, 0x1c057f) AM_READ(MRA16_RAM) /* TMNT2 only (1J) unknown, mostly MCU blit offsets */ -// AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) /* protection device */ - AM_RANGE(0x5a0000, 0x5a001f) AM_READ(K053244_word_noA1_r) - AM_RANGE(0x5c0600, 0x5c0603) AM_READ(tmnt2_sound_r) /* K053260 */ - AM_RANGE(0x600000, 0x603fff) AM_READ(K052109_word_r) -ADDRESS_MAP_END static UINT16 *tmnt2_1c0800,*sunset_104000; static UINT16 *tmnt2_rom; -#if 1 //* +#if 1 INLINE UINT32 tmnt2_get_word(UINT32 addr) { if (addr <= 0x07ffff/2) return(tmnt2_rom[addr]); else @@ -1226,238 +1125,173 @@ logerror("copy command %04x sprite %08x data %08x: %04x%04x %04x%04x modifiers } #endif -static ADDRESS_MAP_START( tmnt2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) //* - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) AM_BASE(&tmnt2_rom) - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM) AM_BASE(&sunset_104000) /* main RAM */ - AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x180000, 0x183fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ - AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) - AM_RANGE(0x1c0400, 0x1c0401) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x1c0500, 0x1c057f) AM_WRITE(MWA16_RAM) /* unknown: TMNT2 only (1J), mostly MCU blit offsets */ - AM_RANGE(0x1c0800, 0x1c081f) AM_WRITE(tmnt2_1c0800_w) AM_BASE(&tmnt2_1c0800) /* protection device */ - AM_RANGE(0x5a0000, 0x5a001f) AM_WRITE(K053244_word_noA1_w) - AM_RANGE(0x5c0600, 0x5c0601) AM_WRITE(K053260_0_lsb_w) - AM_RANGE(0x5c0604, 0x5c0605) AM_WRITE(ssriders_soundkludge_w) - AM_RANGE(0x5c0700, 0x5c071f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x600000, 0x603fff) AM_WRITE(K052109_word_w) -ADDRESS_MAP_END - - -static ADDRESS_MAP_START( ssriders_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x140000, 0x140fff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READ(K053245_scattered_word_r) +static ADDRESS_MAP_START( tmnt2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_BASE(&tmnt2_rom) + AM_RANGE(0x104000, 0x107fff) AM_RAM AM_BASE(&sunset_104000) /* main RAM */ + AM_RANGE(0x140000, 0x140fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE(MRA16_RAM, K053245_scattered_word_w) AM_BASE(&spriteram16) // K053245_scattered_word_r AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_4_word_r) AM_RANGE(0x1c0006, 0x1c0007) AM_READ(input_port_5_word_r) AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_2_word_r) AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r) - AM_RANGE(0x1c0400, 0x1c0401) AM_READ(watchdog_reset16_r) - AM_RANGE(0x1c0500, 0x1c057f) AM_READ(MRA16_RAM) /* TMNT2 only (1J) unknown */ - AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) /* protection device */ - AM_RANGE(0x5a0000, 0x5a001f) AM_READ(K053244_word_noA1_r) - AM_RANGE(0x5c0600, 0x5c0603) AM_READ(punkshot_sound_r) /* K053260 */ - AM_RANGE(0x600000, 0x603fff) AM_READ(K052109_word_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( ssriders_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x180000, 0x183fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) - AM_RANGE(0x1c0400, 0x1c0401) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x1c0500, 0x1c057f) AM_WRITE(MWA16_RAM) /* TMNT2 only (1J) unknown */ - AM_RANGE(0x1c0800, 0x1c0803) AM_WRITE(ssriders_protection_w) /* protection device */ - AM_RANGE(0x5a0000, 0x5a001f) AM_WRITE(K053244_word_noA1_w) + AM_RANGE(0x1c0400, 0x1c0401) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) + AM_RANGE(0x1c0500, 0x1c057f) AM_RAM /* TMNT2 only (1J) unknown, mostly MCU blit offsets */ +// AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) /* protection device */ + AM_RANGE(0x1c0800, 0x1c081f) AM_WRITE(tmnt2_1c0800_w) AM_BASE(&tmnt2_1c0800) /* protection device */ + AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) + AM_RANGE(0x5c0600, 0x5c0603) AM_READ(tmnt2_sound_r) /* K053260 */ AM_RANGE(0x5c0600, 0x5c0601) AM_WRITE(K053260_0_lsb_w) AM_RANGE(0x5c0604, 0x5c0605) AM_WRITE(ssriders_soundkludge_w) AM_RANGE(0x5c0700, 0x5c071f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x600000, 0x603fff) AM_WRITE(K052109_word_w) + AM_RANGE(0x600000, 0x603fff) AM_READWRITE(K052109_word_r, K052109_word_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( ssridersbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x14c000, 0x14cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READ(K053245_scattered_word_r) - AM_RANGE(0x184000, 0x18ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x5a0000, 0x5a001f) AM_READ(K053244_word_noA1_r) - AM_RANGE(0x600000, 0x603fff) AM_READ(K052109_word_r) + +static ADDRESS_MAP_START( ssriders_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x0bffff) AM_ROM + AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */ + AM_RANGE(0x140000, 0x140fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) + AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) + AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) + AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_4_word_r) + AM_RANGE(0x1c0006, 0x1c0007) AM_READ(input_port_5_word_r) + AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_2_word_r) + AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r) + AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ + AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) + AM_RANGE(0x1c0400, 0x1c0401) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) + AM_RANGE(0x1c0500, 0x1c057f) AM_RAM /* TMNT2 only (1J) unknown */ + AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) + AM_RANGE(0x1c0800, 0x1c0803) AM_WRITE(ssriders_protection_w) + AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) + AM_RANGE(0x5c0600, 0x5c0603) AM_READ(punkshot_sound_r) /* K053260 */ + AM_RANGE(0x5c0600, 0x5c0601) AM_WRITE(K053260_0_lsb_w) + AM_RANGE(0x5c0604, 0x5c0605) AM_WRITE(ssriders_soundkludge_w) + AM_RANGE(0x5c0700, 0x5c071f) AM_WRITE(K053251_lsb_w) + AM_RANGE(0x600000, 0x603fff) AM_READWRITE(K052109_word_r, K052109_word_w) +ADDRESS_MAP_END + + +static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x0bffff) AM_ROM + AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */ + AM_RANGE(0x14c000, 0x14cfff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x14e700, 0x14e71f) AM_WRITE(K053251_lsb_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) + AM_RANGE(0x184000, 0x18ffff) AM_RAM + AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) + AM_RANGE(0x1c0400, 0x1c0401) AM_WRITE(MWA16_NOP) + AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) + AM_RANGE(0x600000, 0x603fff) AM_READWRITE(K052109_word_r, K052109_word_w) + AM_RANGE(0x604020, 0x60402f) AM_WRITE(MWA16_NOP) /* written every frame */ + AM_RANGE(0x604200, 0x604201) AM_WRITE(MWA16_NOP) /* watchdog */ + AM_RANGE(0x6119e2, 0x6119e3) AM_WRITE(MWA16_NOP) /* written a lot in some test menus (PC=18204) */ AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_4_word_r) AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_5_word_r) + AM_RANGE(0xc00200, 0xc00201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ AM_RANGE(0xc00404, 0xc00405) AM_READ(input_port_2_word_r) - AM_RANGE(0xc00406, 0xc00407) AM_READ(ssridersbl_eeprom_r) - AM_RANGE(0xc00600, 0xc00601) AM_READ(OKIM6295_status_0_lsb_r) + AM_RANGE(0xc00406, 0xc00407) AM_READ(sunsetbl_eeprom_r) + AM_RANGE(0xc00600, 0xc00601) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) AM_RANGE(0x75d288, 0x75d289) AM_READ(MRA16_NOP) // read repeatedly in some test menus (PC=181f2) ADDRESS_MAP_END -static ADDRESS_MAP_START( ssridersbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x14c000, 0x14cfff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x14e700, 0x14e71f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x180000, 0x183fff) AM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x184000, 0x18ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) - AM_RANGE(0x1c0400, 0x1c0401) AM_WRITE(MWA16_NOP) - AM_RANGE(0x5a0000, 0x5a001f) AM_WRITE(K053244_word_noA1_w) - AM_RANGE(0x600000, 0x603fff) AM_WRITE(K052109_word_w) - AM_RANGE(0x604020, 0x60402f) AM_WRITE(MWA16_NOP) /* written every frame */ - AM_RANGE(0x604200, 0x604201) AM_WRITE(MWA16_NOP) /* watchdog */ - AM_RANGE(0x6119e2, 0x6119e3) AM_WRITE(MWA16_NOP) /* written a lot in some test menus (PC=18204) */ - AM_RANGE(0xc00200, 0xc00201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ - AM_RANGE(0xc00600, 0xc00601) AM_WRITE(OKIM6295_data_0_lsb_w) -ADDRESS_MAP_END -static ADDRESS_MAP_START( thndrx2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) +static ADDRESS_MAP_START( thndrx2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x03ffff) AM_ROM + AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ + AM_RANGE(0x200000, 0x200fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x300000, 0x30001f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x400000, 0x400003) AM_READ(punkshot_sound_r) /* K053260 */ - AM_RANGE(0x500000, 0x50003f) AM_READ(K054000_lsb_r) + AM_RANGE(0x400000, 0x400001) AM_WRITE(K053260_0_lsb_w) + AM_RANGE(0x500000, 0x50003f) AM_READWRITE(K054000_lsb_r, K054000_lsb_w) + AM_RANGE(0x500100, 0x500101) AM_WRITE(thndrx2_eeprom_w) AM_RANGE(0x500200, 0x500201) AM_READ(thndrx2_in0_r) AM_RANGE(0x500202, 0x500203) AM_READ(thndrx2_eeprom_r) - AM_RANGE(0x600000, 0x607fff) AM_READ(K052109_word_noA12_r) - AM_RANGE(0x700000, 0x700007) AM_READ(K051937_word_r) - AM_RANGE(0x700400, 0x7007ff) AM_READ(K051960_word_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( thndrx2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* main RAM */ - AM_RANGE(0x200000, 0x200fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x300000, 0x30001f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x400000, 0x400001) AM_WRITE(K053260_0_lsb_w) - AM_RANGE(0x500000, 0x50003f) AM_WRITE(K054000_lsb_w) - AM_RANGE(0x500100, 0x500101) AM_WRITE(thndrx2_eeprom_w) AM_RANGE(0x500300, 0x500301) AM_WRITE(MWA16_NOP) /* watchdog reset? irq enable? */ - AM_RANGE(0x600000, 0x607fff) AM_WRITE(K052109_word_noA12_w) - AM_RANGE(0x700000, 0x700007) AM_WRITE(K051937_word_w) - AM_RANGE(0x700400, 0x7007ff) AM_WRITE(K051960_word_w) + AM_RANGE(0x600000, 0x607fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) + AM_RANGE(0x700000, 0x700007) AM_READWRITE(K051937_word_r, K051937_word_w) + AM_RANGE(0x700400, 0x7007ff) AM_READWRITE(K051960_word_r, K051960_word_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( mia_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) +static ADDRESS_MAP_START( mia_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) - AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( mia_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) + AM_RANGE(0xb000, 0xb00d) AM_READWRITE(K007232_read_port_0_r, K007232_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) - AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) + AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( tmnt_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x9000) AM_READ(tmnt_sres_r) /* title music & UPD7759C reset */ + +static ADDRESS_MAP_START( tmnt_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0x8000, 0x87ff) AM_RAM + AM_RANGE(0x9000, 0x9000) AM_READWRITE(tmnt_sres_r, tmnt_sres_w) /* title music & UPD7759C reset */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) - AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) + AM_RANGE(0xb000, 0xb00d) AM_READWRITE(K007232_read_port_0_r, K007232_write_port_0_w) + AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) + AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) + AM_RANGE(0xd000, 0xd000) AM_WRITE(upd7759_0_port_w) + AM_RANGE(0xe000, 0xe000) AM_WRITE(upd7759_0_start_w) AM_RANGE(0xf000, 0xf000) AM_READ(upd7759_0_busy_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( tmnt_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9000, 0x9000) AM_WRITE(tmnt_sres_w) /* title music & UPD7759C reset */ - AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) - AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) - AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xd000, 0xd000) AM_WRITE(upd7759_0_port_w) - AM_RANGE(0xe000, 0xe000) AM_WRITE(upd7759_0_start_w) -ADDRESS_MAP_END -static ADDRESS_MAP_START( punkshot_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xfc00, 0xfc2f) AM_READ(K053260_0_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( punkshot_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) +static ADDRESS_MAP_START( punkshot_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w) - AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w) + AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_WRITE(K053260_0_w) + AM_RANGE(0xfc00, 0xfc2f) AM_READWRITE(K053260_0_r, K053260_0_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( lgtnfght_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa001, 0xa001) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xc000, 0xc02f) AM_READ(K053260_0_r) -ADDRESS_MAP_END -static ADDRESS_MAP_START( lgtnfght_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) +static ADDRESS_MAP_START( lgtnfght_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w) - AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xc000, 0xc02f) AM_WRITE(K053260_0_w) + AM_RANGE(0xa001, 0xa001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) + AM_RANGE(0xc000, 0xc02f) AM_READWRITE(K053260_0_r, K053260_0_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( glfgreat_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xf82f) AM_READ(K053260_0_r) -ADDRESS_MAP_END -static ADDRESS_MAP_START( glfgreat_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf800, 0xf82f) AM_WRITE(K053260_0_w) +static ADDRESS_MAP_START( glfgreat_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0xf000, 0xf7ff) AM_RAM + AM_RANGE(0xf800, 0xf82f) AM_READWRITE(K053260_0_r, K053260_0_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( ssriders_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xfa00, 0xfa2f) AM_READ(K053260_0_r) -ADDRESS_MAP_END -static ADDRESS_MAP_START( ssriders_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) +static ADDRESS_MAP_START( ssriders_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0xefff) AM_ROM + AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w) - AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xfa00, 0xfa2f) AM_WRITE(K053260_0_w) + AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) + AM_RANGE(0xfa00, 0xfa2f) AM_READWRITE(K053260_0_r, K053260_0_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( thndrx2_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xfc00, 0xfc2f) AM_READ(K053260_0_r) + +static ADDRESS_MAP_START( thndrx2_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0xefff) AM_ROM + AM_RANGE(0xf000, 0xf7ff) AM_RAM + AM_RANGE(0xf800, 0xf800) AM_MIRROR(0x0010) AM_WRITE(YM2151_register_port_0_w) + AM_RANGE(0xf801, 0xf801) AM_MIRROR(0x0010) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) + AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) + AM_RANGE(0xfc00, 0xfc2f) AM_READWRITE(K053260_0_r, K053260_0_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( thndrx2_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w) - AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xf811, 0xf811) AM_WRITE(YM2151_data_port_0_w) /* mirror */ - AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_WRITE(K053260_0_w) -ADDRESS_MAP_END static READ8_HANDLER( K054539_0_ctrl_r ) { @@ -1468,23 +1302,16 @@ static WRITE8_HANDLER( K054539_0_ctrl_w ) K054539_0_w(0x200+offset,data); } -static ADDRESS_MAP_START( prmrsocr_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe0ff) AM_READ(K054539_0_r) - AM_RANGE(0xe100, 0xe12f) AM_READ(K054539_0_ctrl_r) +static ADDRESS_MAP_START( prmrsocr_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0xc000, 0xdfff) AM_RAM + AM_RANGE(0xe000, 0xe0ff) AM_READWRITE(K054539_0_r, K054539_0_w) + AM_RANGE(0xe100, 0xe12f) AM_READWRITE(K054539_0_ctrl_r, K054539_0_ctrl_w) + AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( prmrsocr_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xe0ff) AM_WRITE(K054539_0_w) - AM_RANGE(0xe100, 0xe12f) AM_WRITE(K054539_0_ctrl_w) - AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) - AM_RANGE(0xf800, 0xf800) AM_WRITE(prmrsocr_s_bankswitch_w) + AM_RANGE(0xf800, 0xf800) AM_WRITE(prmrsocr_audio_bankswitch_w) ADDRESS_MAP_END @@ -1509,7 +1336,7 @@ ADDRESS_MAP_END PORT_BIT( 0x4000, IP_ACTIVE_LOW, button3 ) PORT_PLAYER(player) \ PORT_BIT( 0x8000, IP_ACTIVE_LOW, start ) -static INPUT_PORTS_START( cuebrckj ) +static INPUT_PORTS_START( cuebrick ) PORT_START /* COINS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -2114,7 +1941,7 @@ static INPUT_PORTS_START( lgtnfght ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( detatwin ) +static INPUT_PORTS_START( blswhstl ) PORT_START /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) @@ -2327,7 +2154,7 @@ static INPUT_PORTS_START( ssrid4ps ) INPUT_PORTS_END /* Version for the bootleg, which has the service switch a little different */ -static INPUT_PORTS_START( ssridbl ) +static INPUT_PORTS_START( sunsetbl ) PORT_START /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) @@ -2458,14 +2285,14 @@ static INPUT_PORTS_START( prmrsocr ) INPUT_PORTS_END -static void cbj_irq_handler(int state) +static void cuebrick_irq_handler(int state) { - cbj_snd_irqlatch = state; + cuebrick_snd_irqlatch = state; } static const struct YM2151interface ym2151_interface_cbj = { - cbj_irq_handler + cuebrick_irq_handler }; static void volume_callback(int v) @@ -2497,12 +2324,12 @@ static const struct K053260_interface k053260_interface = REGION_SOUND1 /* memory region */ }; -static MACHINE_DRIVER_START( cuebrckj ) +static MACHINE_DRIVER_START( cuebrick ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */ - MDRV_CPU_PROGRAM_MAP(cuebrckj_readmem,cuebrckj_writemem) - MDRV_CPU_VBLANK_INT(cbj_interrupt,10) + MDRV_CPU_PROGRAM_MAP(cuebrick_main_map,0) + MDRV_CPU_VBLANK_INT(cuebrick_interrupt,10) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2515,7 +2342,7 @@ static MACHINE_DRIVER_START( cuebrckj ) MDRV_PALETTE_LENGTH(1024) MDRV_NVRAM_HANDLER(generic_0fill) - MDRV_VIDEO_START(cuebrckj) + MDRV_VIDEO_START(cuebrick) MDRV_VIDEO_UPDATE(mia) /* sound hardware */ @@ -2531,12 +2358,12 @@ static MACHINE_DRIVER_START( mia ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */ - MDRV_CPU_PROGRAM_MAP(mia_readmem,mia_writemem) + MDRV_CPU_PROGRAM_MAP(mia_main_map,0) MDRV_CPU_VBLANK_INT(irq5_line_hold,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ - MDRV_CPU_PROGRAM_MAP(mia_s_readmem,mia_s_writemem) + MDRV_CPU_PROGRAM_MAP(mia_audio_map,0) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2576,14 +2403,14 @@ static MACHINE_DRIVER_START( tmnt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */ - MDRV_CPU_PROGRAM_MAP(tmnt_readmem,tmnt_writemem) + MDRV_CPU_PROGRAM_MAP(tmnt_main_map,0) MDRV_CPU_VBLANK_INT(irq5_line_hold,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ - MDRV_CPU_PROGRAM_MAP(tmnt_s_readmem,tmnt_s_writemem) + MDRV_CPU_PROGRAM_MAP(tmnt_audio_map,0) - MDRV_MACHINE_RESET(tmnt) + MDRV_MACHINE_RESET(tmnt); MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2625,12 +2452,12 @@ static MACHINE_DRIVER_START( punkshot ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* CPU is 68000/12, but this doesn't necessarily mean it's */ /* running at 12MHz. TMNT uses 8MHz */ - MDRV_CPU_PROGRAM_MAP(punkshot_readmem,punkshot_writemem) + MDRV_CPU_PROGRAM_MAP(punkshot_main_map,0) MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ - MDRV_CPU_PROGRAM_MAP(punkshot_s_readmem,punkshot_s_writemem) + MDRV_CPU_PROGRAM_MAP(punkshot_audio_map,0) /* NMIs are generated by the 053260 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2662,12 +2489,12 @@ static MACHINE_DRIVER_START( lgtnfght ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ - MDRV_CPU_PROGRAM_MAP(lgtnfght_readmem,lgtnfght_writemem) + MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map,0) MDRV_CPU_VBLANK_INT(lgtnfght_interrupt,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ - MDRV_CPU_PROGRAM_MAP(lgtnfght_s_readmem,lgtnfght_s_writemem) + MDRV_CPU_PROGRAM_MAP(lgtnfght_audio_map,0) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2696,16 +2523,16 @@ static MACHINE_DRIVER_START( lgtnfght ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( detatwin ) +static MACHINE_DRIVER_START( blswhstl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ - MDRV_CPU_PROGRAM_MAP(detatwin_readmem,detatwin_writemem) + MDRV_CPU_PROGRAM_MAP(blswhstl_main_map,0) MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ????? */ - MDRV_CPU_PROGRAM_MAP(ssriders_s_readmem,ssriders_s_writemem) + MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0) /* NMIs are generated by the 053260 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2719,9 +2546,9 @@ static MACHINE_DRIVER_START( detatwin ) MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) MDRV_PALETTE_LENGTH(2048) - MDRV_VIDEO_START(detatwin) + MDRV_VIDEO_START(blswhstl) MDRV_VIDEO_UPDATE(lgtnfght) - MDRV_VIDEO_EOF( detatwin ) //* + MDRV_VIDEO_EOF( blswhstl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") @@ -2758,12 +2585,12 @@ static MACHINE_DRIVER_START( glfgreat ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* ? */ - MDRV_CPU_PROGRAM_MAP(glfgreat_readmem,glfgreat_writemem) + MDRV_CPU_PROGRAM_MAP(glfgreat_main_map,0) MDRV_CPU_VBLANK_INT(lgtnfght_interrupt,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ - MDRV_CPU_PROGRAM_MAP(glfgreat_s_readmem,glfgreat_s_writemem) + MDRV_CPU_PROGRAM_MAP(glfgreat_audio_map,0) /* NMIs are generated by the 053260 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2805,12 +2632,12 @@ static MACHINE_DRIVER_START( prmrsocr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* ? */ - MDRV_CPU_PROGRAM_MAP(prmrsocr_readmem,prmrsocr_writemem) + MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map,0) MDRV_CPU_VBLANK_INT(lgtnfght_interrupt,1) MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ /* ? */ - MDRV_CPU_PROGRAM_MAP(prmrsocr_s_readmem,prmrsocr_s_writemem) + MDRV_CPU_PROGRAM_MAP(prmrsocr_audio_map,0) /* NMIs are generated by the 054539 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2838,11 +2665,11 @@ static MACHINE_DRIVER_START( prmrsocr ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( tmnt2 ) //* +static MACHINE_DRIVER_START( tmnt2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ - MDRV_CPU_PROGRAM_MAP(tmnt2_readmem,tmnt2_writemem) + MDRV_CPU_PROGRAM_MAP(tmnt2_main_map,0) MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) MDRV_CPU_ADD(Z80, 8000000) @@ -2851,7 +2678,7 @@ static MACHINE_DRIVER_START( tmnt2 ) //* /* without the wait, they cannot run on 8MHz. */ /* We are not emulating the wait state, so the ROM test ends at */ /* 02 instead of 00. */ - MDRV_CPU_PROGRAM_MAP(ssriders_s_readmem,ssriders_s_writemem) + MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0) /* NMIs are generated by the 053260 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2886,12 +2713,12 @@ static MACHINE_DRIVER_START( ssriders ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ - MDRV_CPU_PROGRAM_MAP(ssriders_readmem,ssriders_writemem) + MDRV_CPU_PROGRAM_MAP(ssriders_main_map,0) MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ????? makes the ROM test sync */ - MDRV_CPU_PROGRAM_MAP(ssriders_s_readmem,ssriders_s_writemem) + MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0) /* NMIs are generated by the 053260 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -2922,11 +2749,11 @@ static MACHINE_DRIVER_START( ssriders ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( ssridersbl ) +static MACHINE_DRIVER_START( sunsetbl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ - MDRV_CPU_PROGRAM_MAP(ssridersbl_readmem,ssridersbl_writemem) + MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map,0) MDRV_CPU_VBLANK_INT(irq4_line_hold,1) MDRV_SCREEN_REFRESH_RATE(60) @@ -2957,12 +2784,12 @@ static MACHINE_DRIVER_START( thndrx2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ - MDRV_CPU_PROGRAM_MAP(thndrx2_readmem,thndrx2_writemem) + MDRV_CPU_PROGRAM_MAP(thndrx2_main_map,0) MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ????? */ - MDRV_CPU_PROGRAM_MAP(thndrx2_s_readmem,thndrx2_s_writemem) + MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map,0) /* NMIs are generated by the 053260 */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -3000,7 +2827,7 @@ MACHINE_DRIVER_END ***************************************************************************/ -ROM_START( cuebrckj ) +ROM_START( cuebrick ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 2*64k for 68000 code */ ROM_LOAD16_BYTE( "903d25.g12", 0x00000, 0x10000, CRC(8d575663) SHA1(0e308e04936efa80351bf808ac304d3fcc82f19a) ) ROM_LOAD16_BYTE( "903d24.f12", 0x00001, 0x10000, CRC(2973625d) SHA1(e2496704390930761204624d4bf6b0b68d3133ab) ) @@ -4320,9 +4147,9 @@ static DRIVER_INIT( glfgreat ) shuffle(memory_region(REGION_GFX2),memory_region_length(REGION_GFX2)); } -static DRIVER_INIT( cuebrckj ) +static DRIVER_INIT( cuebrick ) { - generic_nvram = (UINT8 *)cbj_nvram; + generic_nvram = (UINT8 *)cuebrick_nvram; generic_nvram_size = 0x400*0x20; /* ROMs are interleaved at byte level */ @@ -4330,7 +4157,7 @@ static DRIVER_INIT( cuebrckj ) shuffle(memory_region(REGION_GFX2),memory_region_length(REGION_GFX2)); } -GAME( 1989, cuebrckj, cuebrick, cuebrckj, cuebrckj, cuebrckj, ROT0, "Konami", "Cue Brick (World version D)", 0 ) +GAME( 1989, cuebrick, 0, cuebrick, cuebrick, cuebrick, ROT0, "Konami", "Cue Brick (World version D)", 0 ) GAME( 1989, mia, 0, mia, mia, mia, ROT0, "Konami", "M.I.A. - Missing in Action (version T)", 0 ) GAME( 1989, mia2, mia, mia, mia, mia, ROT0, "Konami", "M.I.A. - Missing in Action (version S)", 0 ) @@ -4354,8 +4181,8 @@ GAME( 1990, lgtnfgha, lgtnfght, lgtnfght, lgtnfght, gfx, ROT90, "Konami", " GAME( 1990, lgtnfghu, lgtnfght, lgtnfght, lgtnfght, gfx, ROT90, "Konami", "Lightning Fighters (US)", 0 ) GAME( 1990, trigon, lgtnfght, lgtnfght, lgtnfght, gfx, ROT90, "Konami", "Trigon (Japan)", 0 ) -GAME( 1991, blswhstl, 0, detatwin, detatwin, gfx, ROT90, "Konami", "Bells & Whistles (Version L)", 0 ) -GAME( 1991, detatwin, blswhstl, detatwin, detatwin, gfx, ROT90, "Konami", "Detana!! Twin Bee (Japan ver. J)", 0 ) +GAME( 1991, blswhstl, 0, blswhstl, blswhstl, gfx, ROT90, "Konami", "Bells & Whistles (Version L)", 0 ) +GAME( 1991, detatwin, blswhstl, blswhstl, blswhstl, gfx, ROT90, "Konami", "Detana!! Twin Bee (Japan ver. J)", 0 ) GAME( 1991, glfgreat, 0, glfgreat, glfgreat, glfgreat, ROT0, "Konami", "Golfing Greats", GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) GAME( 1991, glfgretj, glfgreat, glfgreat, glfgreat, glfgreat, ROT0, "Konami", "Golfing Greats (Japan)", GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) @@ -4377,7 +4204,7 @@ GAME( 1991, ssrdrubc, ssriders, ssriders, ssriders, gfx, ROT0, "Konami", " GAME( 1991, ssrdrabd, ssriders, ssriders, ssriders, gfx, ROT0, "Konami", "Sunset Riders (2 Players ver ABD)", GAME_IMPERFECT_GRAPHICS ) GAME( 1991, ssrdradd, ssriders, ssriders, ssrid4ps, gfx, ROT0, "Konami", "Sunset Riders (4 Players ver ADD)", GAME_IMPERFECT_GRAPHICS ) GAME( 1991, ssrdrjbd, ssriders, ssriders, ssriders, gfx, ROT0, "Konami", "Sunset Riders (2 Players ver JBD)", GAME_IMPERFECT_GRAPHICS ) -GAME( 1991, sunsetbl, ssriders, ssridersbl, ssridbl, gfx, ROT0, "Konami", "Sunset Riders (bootleg 4 Players ver ADD)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS ) +GAME( 1991, sunsetbl, ssriders, sunsetbl, sunsetbl, gfx, ROT0, "Konami", "Sunset Riders (bootleg 4 Players ver ADD)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS ) GAME( 1991, thndrx2, 0, thndrx2, thndrx2, gfx, ROT0, "Konami", "Thunder Cross II (Japan)", 0 ) GAME( 1991, thndrx2a, thndrx2, thndrx2, thndrx2, gfx, ROT0, "Konami", "Thunder Cross II (Asia)", 0 ) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 333b0caebe1..d63785c9ecc 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -86,8 +86,8 @@ static UINT16 twin16_CPUA_register, twin16_CPUB_register; static UINT8 twin16_soundlatch; static UINT16 twin16_sound_command; -static int cuebrick_nvram_bank; -static UINT16 cuebrick_nvram[0x400*0x20]; // 32k paged in a 1k window +static int cuebrckj_nvram_bank; +static UINT16 cuebrckj_nvram[0x400*0x20]; // 32k paged in a 1k window int twin16_spriteram_process_enable( void ) @@ -245,19 +245,19 @@ static WRITE8_HANDLER( twin16_sres_w ) twin16_soundlatch = data; } -static READ16_HANDLER( cuebrick_nvram_r ) +static READ16_HANDLER( cuebrckj_nvram_r ) { - return cuebrick_nvram[offset + (cuebrick_nvram_bank * 0x400 / 2)]; + return cuebrckj_nvram[offset + (cuebrckj_nvram_bank * 0x400 / 2)]; } -static WRITE16_HANDLER( cuebrick_nvram_w ) +static WRITE16_HANDLER( cuebrckj_nvram_w ) { - COMBINE_DATA(&cuebrick_nvram[offset + (cuebrick_nvram_bank * 0x400 / 2)]); + COMBINE_DATA(&cuebrckj_nvram[offset + (cuebrckj_nvram_bank * 0x400 / 2)]); } -static WRITE16_HANDLER( cuebrick_nvram_bank_w ) +static WRITE16_HANDLER( cuebrckj_nvram_bank_w ) { - cuebrick_nvram_bank = (data >> 8); + cuebrckj_nvram_bank = (data >> 8); } /* Memory Maps */ @@ -291,7 +291,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) AM_RANGE(0x0a0000, 0x0a001b) AM_READ(twin16_input_r) - AM_RANGE(0x0b0000, 0x0b03ff) AM_READ(cuebrick_nvram_r) + AM_RANGE(0x0b0000, 0x0b03ff) AM_READ(cuebrckj_nvram_r) AM_RANGE(0x0c000e, 0x0c000f) AM_READ(twin16_sprite_status_r) AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) AM_RANGE(0x104000, 0x105fff) AM_READ(MRA16_RAM) // miaj @@ -309,8 +309,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(twin16_CPUA_register_w) AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(sound_command_w) AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x0b0000, 0x0b03ff) AM_WRITE(cuebrick_nvram_w) - AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrick_nvram_bank_w) + AM_RANGE(0x0b0000, 0x0b03ff) AM_WRITE(cuebrckj_nvram_w) + AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrckj_nvram_bank_w) AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(twin16_video_register_w) AM_RANGE(0x100000, 0x103fff) AM_WRITE(twin16_videoram2_w) AM_BASE(&twin16_videoram2) AM_RANGE(0x104000, 0x105fff) AM_WRITE(MWA16_RAM) // miaj @@ -833,7 +833,7 @@ static INPUT_PORTS_START( miaj ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( cuebrick ) +static INPUT_PORTS_START( cuebrckj ) PORT_START /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -1075,7 +1075,7 @@ static MACHINE_DRIVER_START( vulcan ) MDRV_VIDEO_UPDATE(vulcan ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( cuebrick ) +static MACHINE_DRIVER_START( cuebrckj ) MDRV_IMPORT_FROM(twin16) MDRV_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 2*8, 30*8-1) MDRV_VIDEO_START(fround) @@ -1437,7 +1437,7 @@ ROM_START( miaj ) ROM_REGION( 0x20000, REGION_SOUND2, ROMREGION_ERASE00 ) // samples ROM_END -ROM_START( cuebrick ) +ROM_START( cuebrckj ) ROM_REGION( 0x10000, REGION_CPU1, 0 ) // Z80 code (sound CPU) ROM_LOAD( "903_d03.10a", 0x00000, 0x8000, CRC(455e855a) SHA1(cfdd54a5071862653ee94c0455301f4a7245fbd8) ) @@ -1508,27 +1508,27 @@ static DRIVER_INIT( hpuncher ) twin16_custom_video = 2; } -static DRIVER_INIT( cuebrick ) +static DRIVER_INIT( cuebrckj ) { gfx_untangle(); twin16_custom_video = 2; - generic_nvram = (UINT8 *)cuebrick_nvram; + generic_nvram = (UINT8 *)cuebrckj_nvram; generic_nvram_size = 0x400*0x20; } /* Game Drivers */ -GAME( 1987, devilw, 0, heavysync, devilw, twin16, ROT0, "Konami", "Devil World", 0 ) -GAME( 1987, majuu, devilw, heavysync, devilw, twin16, ROT0, "Konami", "Majuu no Ohkoku", 0 ) -GAME( 1987, darkadv, devilw, heavysync, darkadv, twin16, ROT0, "Konami", "Dark Adventure", 0 ) -GAME( 1988, vulcan, 0, vulcan, vulcan, twin16, ROT0, "Konami", "Vulcan Venture", 0 ) -GAME( 1988, gradius2, vulcan, vulcan, gradius2, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan New Ver.)", 0 ) -GAME( 1988, grdius2a, vulcan, vulcan, vulcan, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Old Ver.)", 0 ) -GAME( 1988, grdius2b, vulcan, vulcan, vulcan, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Older Ver.)", 0 ) +GAME( 1987, devilw, 0, heavysync, devilw, twin16, ROT0, "Konami", "Devil World", 0 ) +GAME( 1987, majuu, devilw, heavysync, devilw, twin16, ROT0, "Konami", "Majuu no Ohkoku", 0 ) +GAME( 1987, darkadv, devilw, heavysync, darkadv, twin16, ROT0, "Konami", "Dark Adventure", 0 ) +GAME( 1988, vulcan, 0, vulcan, vulcan, twin16, ROT0, "Konami", "Vulcan Venture", 0 ) +GAME( 1988, gradius2, vulcan, vulcan, gradius2, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan New Ver.)", 0 ) +GAME( 1988, grdius2a, vulcan, vulcan, vulcan, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Old Ver.)", 0 ) +GAME( 1988, grdius2b, vulcan, vulcan, vulcan, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Older Ver.)", 0 ) -GAME( 1988, fround, 0, fround, fround, fround, ROT0, "Konami", "The Final Round (version M)", 0 ) -GAME( 1988, froundl, fround, fround, fround, fround, ROT0, "Konami", "The Final Round (version L)", 0 ) -GAME( 1988, hpuncher, fround, hpuncher, fround, hpuncher, ROT0, "Konami", "Hard Puncher (Japan)", 0 ) -GAME( 1989, miaj, mia, mia, miaj, hpuncher, ROT0, "Konami", "M.I.A. - Missing in Action (Japan)", 0 ) -GAME( 1989, cuebrick, 0, cuebrick, cuebrick, cuebrick, ROT0, "Konami", "Cue Brick (Japan)", 0 ) +GAME( 1988, fround, 0, fround, fround, fround, ROT0, "Konami", "The Final Round (version M)", 0 ) +GAME( 1988, froundl, fround, fround, fround, fround, ROT0, "Konami", "The Final Round (version L)", 0 ) +GAME( 1988, hpuncher, fround, hpuncher, fround, hpuncher, ROT0, "Konami", "Hard Puncher (Japan)", 0 ) +GAME( 1989, miaj, mia, mia, miaj, hpuncher, ROT0, "Konami", "M.I.A. - Missing in Action (Japan)", 0 ) +GAME( 1989, cuebrckj, cuebrick, cuebrckj, cuebrckj, cuebrckj, ROT0, "Konami", "Cue Brick (Japan)", 0 ) diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index f30535eeda2..fd320fdfb4c 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -4614,14 +4614,14 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11 DRIVER( gradius2 ) /* GX785 (c) 1988 (Japan) */ DRIVER( grdius2a ) /* GX785 (c) 1988 (Japan) */ DRIVER( grdius2b ) /* GX785 (c) 1988 (Japan) */ - DRIVER( cuebrick ) /* GX903 (c) 1989 */ + DRIVER( cuebrckj ) /* GX903 (c) 1989 */ DRIVER( fround ) /* GX870 (c) 1988 */ DRIVER( froundl ) /* GX870 (c) 1988 */ DRIVER( hpuncher ) /* GX870 (c) 1988 (Japan) */ DRIVER( miaj ) /* GX808 (c) 1989 (Japan) */ /* (some) Konami 68000 games */ - DRIVER( cuebrckj ) /* GX903 (c) 1989 */ + DRIVER( cuebrick ) /* GX903 (c) 1989 */ DRIVER( mia ) /* GX808 (c) 1989 */ DRIVER( mia2 ) /* GX808 (c) 1989 */ DRIVER( tmnt ) /* GX963 (c) 1989 (World) */ @@ -7410,7 +7410,7 @@ Other Sun games DRIVER( quizvadr ) /* 1991 BFM */ DRIVER( qos ) /* 1992 BFM */ DRIVER( qosa ) /* 1992 BFM */ - DRIVER( qosb ) /* 1992 BFM */ + DRIVER( qosb ) /* 1992 BFM */ /* Scorpion 2+Video Board Games */ DRIVER( qntoondo ) /* 1993 */ diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index cfe0f908caa..b690b36ea43 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -61,7 +61,7 @@ static void mia_tile_callback(int layer,int bank,int *code,int *color,int *flags } } -static void cuebrckj_tile_callback(int layer,int bank,int *code,int *color,int *flags,int *priority) +static void cuebrick_tile_callback(int layer,int bank,int *code,int *color,int *flags,int *priority) { if (layer == 0) { @@ -99,13 +99,13 @@ static void ssbl_tile_callback(int layer,int bank,int *code,int *color,int *flag *color = layer_colorbase[layer] + ((*color & 0xe0) >> 5); } -static int detatwin_rombank; +static int blswhstl_rombank; -static void detatwin_tile_callback(int layer,int bank,int *code,int *color,int *flags,int *priority) +static void blswhstl_tile_callback(int layer,int bank,int *code,int *color,int *flags,int *priority) { /* (color & 0x02) is flip y handled internally by the 052109 */ *code |= ((*color & 0x01) << 8) | ((*color & 0x10) << 5) | ((*color & 0x0c) << 8) - | (bank << 12) | detatwin_rombank << 14; + | (bank << 12) | blswhstl_rombank << 14; *color = layer_colorbase[layer] + ((*color & 0xe0) >> 5); } @@ -169,7 +169,7 @@ static void lgtnfght_sprite_callback(int *code,int *color,int *priority_mask) *color = sprite_colorbase + (*color & 0x1f); } -static void detatwin_sprite_callback(int *code,int *color,int *priority_mask) +static void blswhstl_sprite_callback(int *code,int *color,int *priority_mask) { #if 0 if (input_code_pressed(KEYCODE_Q) && (*color & 0x20)) *color = rand(); @@ -216,13 +216,13 @@ VIDEO_START( mia ) K051960_vh_start(machine,REGION_GFX2,REVERSE_PLANE_ORDER,mia_sprite_callback); } -VIDEO_START( cuebrckj ) +VIDEO_START( cuebrick ) { layer_colorbase[0] = 0; layer_colorbase[1] = 32; layer_colorbase[2] = 40; sprite_colorbase = 16; - K052109_vh_start(machine,REGION_GFX1,NORMAL_PLANE_ORDER,cuebrckj_tile_callback); + K052109_vh_start(machine,REGION_GFX1,NORMAL_PLANE_ORDER,cuebrick_tile_callback); K051960_vh_start(machine,REGION_GFX2,REVERSE_PLANE_ORDER,mia_sprite_callback); } @@ -266,11 +266,11 @@ VIDEO_START( sunsetbl ) K053245_vh_start(machine,0, REGION_GFX2,NORMAL_PLANE_ORDER,lgtnfght_sprite_callback); } -VIDEO_START( detatwin ) +VIDEO_START( blswhstl ) { K053251_vh_start(); - K052109_vh_start(machine,REGION_GFX1,NORMAL_PLANE_ORDER,detatwin_tile_callback); - K053245_vh_start(machine,0, REGION_GFX2,NORMAL_PLANE_ORDER,detatwin_sprite_callback); + K052109_vh_start(machine,REGION_GFX1,NORMAL_PLANE_ORDER,blswhstl_tile_callback); + K053245_vh_start(machine,0, REGION_GFX2,NORMAL_PLANE_ORDER,blswhstl_sprite_callback); } VIDEO_START( glfgreat ) @@ -396,7 +396,7 @@ WRITE16_HANDLER( lgtnfght_0a0018_w ) } } -WRITE16_HANDLER( detatwin_700300_w ) +WRITE16_HANDLER( blswhstl_700300_w ) { if (ACCESSING_LSB) { @@ -408,9 +408,9 @@ WRITE16_HANDLER( detatwin_700300_w ) K052109_set_RMRD_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); /* bit 7 = select char ROM bank */ - if (detatwin_rombank != ((data & 0x80) >> 7)) + if (blswhstl_rombank != ((data & 0x80) >> 7)) { - detatwin_rombank = (data & 0x80) >> 7; + blswhstl_rombank = (data & 0x80) >> 7; tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); } @@ -809,7 +809,7 @@ VIDEO_UPDATE( thndrx2 ) ***************************************************************************/ -VIDEO_EOF( detatwin ) +VIDEO_EOF( blswhstl ) { K053245_clear_buffer(0); }