From 9641d91e8b8b15b97121683d2e2fc734c612bea1 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 8 Dec 2024 19:31:21 +0100 Subject: kchamp: separate kchampvs romset from kchamp --- src/mame/dataeast/kchamp.cpp | 8 ++++---- src/mame/dataeast/kchamp_v.cpp | 18 +++++++++--------- src/mame/misc/cvs.cpp | 4 +++- src/mame/olympia/dday.cpp | 1 - 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/mame/dataeast/kchamp.cpp b/src/mame/dataeast/kchamp.cpp index f39c00ca6e9..fdb2af5ddd1 100644 --- a/src/mame/dataeast/kchamp.cpp +++ b/src/mame/dataeast/kchamp.cpp @@ -995,8 +995,8 @@ GAME( 1984, kchamptec, kchamp, kchamp, kchamp, kchamp_state, empty_init GAME( 1984, karateda, kchamp, kchamp_arfyc, kchamp, kchamp_state, empty_init, ROT90, "bootleg (Arfyc)", "Karate Dou (Arfyc bootleg)", MACHINE_SUPPORTS_SAVE ) // VS versions -GAME( 1984, kchampvs, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East USA", "Karate Champ - Player Vs Player (US, set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, kchampvs2, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs2, ROT90, "Data East USA", "Karate Champ - Player Vs Player (US, set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, kchampvs3, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East USA", "Karate Champ - Player Vs Player (US, set 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, kchampvs4, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East USA", "Karate Champ - Player Vs Player (US, set 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, kchampvs, 0, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East USA", "Karate Champ: Player Vs Player (US, set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, kchampvs2, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs2, ROT90, "Data East USA", "Karate Champ: Player Vs Player (US, set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, kchampvs3, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East USA", "Karate Champ: Player Vs Player (US, set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, kchampvs4, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East USA", "Karate Champ: Player Vs Player (US, set 4)", MACHINE_SUPPORTS_SAVE ) GAME( 1984, karatevs, kchamp, kchampvs, kchampvs, kchamp_state, init_kchampvs, ROT90, "Data East Corporation", "Taisen Karate Dou (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dataeast/kchamp_v.cpp b/src/mame/dataeast/kchamp_v.cpp index 030da4d9403..27430241779 100644 --- a/src/mame/dataeast/kchamp_v.cpp +++ b/src/mame/dataeast/kchamp_v.cpp @@ -50,20 +50,20 @@ void kchamp_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(kchamp_state::get_bg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } -/* - Sprites - ------- - Offset Encoding - 0 YYYYYYYY - 1 TTTTTTTT - 2 FGGTCCCC - 3 XXXXXXXX -*/ void kchamp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int dx, int dy) { for (int offs = 0; offs < 0x100; offs += 4) { + /* sprite format: + + Offset Encoding + 0 YYYYYYYY + 1 TTTTTTTT - tile# + 2 FGGTCCCC - y flip, gfx bank, high bit of tile#, color + 3 XXXXXXXX + */ + int attr = m_spriteram[offs + 2]; int bank = 1 + ((attr & 0x60) >> 5); int code = m_spriteram[offs + 1] + ((attr & 0x10) << 4); diff --git a/src/mame/misc/cvs.cpp b/src/mame/misc/cvs.cpp index 38919f8f36c..af43705fe68 100644 --- a/src/mame/misc/cvs.cpp +++ b/src/mame/misc/cvs.cpp @@ -102,6 +102,8 @@ Main 2650 runs at 1.78MHz (14.318/8). Sound board 2650s run at 0.89MHz (14.318/16). Also seen with a 15.625MHz XTAL, which would result in slightly higher DAC sound pitch. +Video timing is via a Signetics 2621 (PAL). + *******************************************************************************/ #include "emu.h" @@ -1365,7 +1367,7 @@ void cvs_state::cvs(machine_config &config) BEEP(config, m_beep[0], 600).add_route(ALL_OUTPUTS, "speaker", 0.15); // placeholder BEEP(config, m_beep[1], 150).add_route(ALL_OUTPUTS, "speaker", 0.15); // " - TMS5100(config, m_tms5110, XTAL(640'000)); + TMS5100(config, m_tms5110, 640_kHz_XTAL); m_tms5110->data().set(FUNC(cvs_state::speech_rom_read_bit)); m_tms5110->add_route(ALL_OUTPUTS, "speaker", 0.30); } diff --git a/src/mame/olympia/dday.cpp b/src/mame/olympia/dday.cpp index d87e7a8c131..5cb8bf7eda2 100644 --- a/src/mame/olympia/dday.cpp +++ b/src/mame/olympia/dday.cpp @@ -633,7 +633,6 @@ void dday_state::dday(machine_config &config) Z80(config, m_maincpu, 2'000'000); // 2 MHz ? m_maincpu->set_addrmap(AS_PROGRAM, &dday_state::program_map); - // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_refresh_hz(60); -- cgit v1.2.3