From 12fe78d8c7504ae17fc67293c6dec0273a9b88d8 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Tue, 5 Feb 2019 21:11:16 +0000 Subject: new NOT WORKING machines (TV Game work) (#4607) * new NOT WORKING machines --- XaviX Music & Circuit (XaviXPORT) [Sean Riddle, Peter Wilhelmsen] Domyos Fitness Dance (Domyos Interactive System) [Sean Riddle, Peter Wilhelmsen] also corrected name of jak_dor, this one os Nursery Rhyme Adventure, didn't realise there were 2 different Dora base units. and fixed a few things in the ekara xml * improved c2color documentation [zhongtiao1] * (nw) * DMA note (nw) --- hash/c2color_cart.xml | 39 +++++++++++++++++++++++------------- hash/ekara_japan_g.xml | 2 +- hash/ekara_japan_s.xml | 4 ++-- src/devices/cpu/m6502/dxavix2000.lst | 2 +- src/devices/cpu/m6502/oxavix.lst | 8 ++++++++ src/devices/cpu/m6502/oxavix2000.lst | 5 ----- src/devices/cpu/m6502/xavix.h | 1 + src/devices/cpu/m6502/xavix2000.h | 1 - src/mame/drivers/c2color.cpp | 2 +- src/mame/drivers/vii.cpp | 3 ++- src/mame/drivers/xavix.cpp | 18 +++++++++++++++++ src/mame/mame.lst | 4 +++- 12 files changed, 62 insertions(+), 27 deletions(-) diff --git a/hash/c2color_cart.xml b/hash/c2color_cart.xml index 9fe84b05d65..ee17a6e191c 100644 --- a/hash/c2color_cart.xml +++ b/hash/c2color_cart.xml @@ -2,26 +2,37 @@ - - untranslated title 1 - 20?? - unknown - - + + + + The Dark Ones Come Again + 2015 + Baiyi Animation + + - + - - untranslated title 2 - 20?? - unknown - - + + The Mysterious King of the Dragon Land + 2015 + Baiyi Animation + + - + diff --git a/hash/ekara_japan_g.xml b/hash/ekara_japan_g.xml index 42acff7a551..8430cd5df3e 100644 --- a/hash/ekara_japan_g.xml +++ b/hash/ekara_japan_g.xml @@ -24,7 +24,7 @@ G-11 GC0011-TPJ TV Pop Volume 4 G-12 GC0012-BHT BHT Volume 5 (Best Artists?) (Volume 4 is 'P-1' in 'P' series) G-13 GC0013- (unknown) Volume 6 - G-14 GC0014- (unknown) Volume 2 + G-14 GC0014-MIN? (unknown) Volume 2 G-15 *GC0015-BAT BAT Volume 5 (Artist Selection?) G-16 *GC0016-TPJ TV Pop Volume 5 G-17 GC0017-TPJ TV Pop Volume 6 diff --git a/hash/ekara_japan_s.xml b/hash/ekara_japan_s.xml index 86cc36ec1ce..42b6b17d9f8 100644 --- a/hash/ekara_japan_s.xml +++ b/hash/ekara_japan_s.xml @@ -11,7 +11,7 @@ SAI seems to be used for multiple different series here, need to look at the subtitles too S-1 SC0001- Hello Kitty Special - S-2 SC0002- (unknown) + S-2 SC0002-SAI (unknown) S-3 SC0003- (unknown) S-4 *SC0004-SAI SAI (series 1) Volume 1 S-5 *SC0005-SAI SAI (series 2) Volume 1 (same series as 6,9,19,21,22) @@ -27,7 +27,7 @@ S-15 SC0015- (unknown) S-16 SC0016- (unknown) S-17 SC0017- (unknown) - S-18 SC0018- (unknown) Volume 1 + S-18 SC0018-SAI (unknown) Volume 1 S-19 *SC0019-SAI SAI (series 2) Volume 6 (same series as 5,6,9,21,22) S-20 SC0020- (unknown) Volume 5 S-21 *SC0021-SAI SAI (series 2) Volume 7 (same series as 5,6,9,19,22) diff --git a/src/devices/cpu/m6502/dxavix2000.lst b/src/devices/cpu/m6502/dxavix2000.lst index c96f6987dd5..fc2e7bde133 100644 --- a/src/devices/cpu/m6502/dxavix2000.lst +++ b/src/devices/cpu/m6502/dxavix2000.lst @@ -6,7 +6,7 @@ bpl_rel xavora_idy phx_imp orapa_imp asr_zpx ora_zpx asl_zpx jsr_adr xavand_idx callf_xa3 andj_imp bit_zpg and_zpg rol_zpg andk_imp plp_imp and_imm rol_acc andl_imp bit_aba and_aba rol_aba andm_imp bmi_rel xavand_idy plx_imp andpa_imp bit_zpx and_zpx rol_zpx andpb_imp sec_imp and_aby bit_imm lpa0_imp bit_abx and_abx rol_abx lpb0_imp rti_xav_imp xaveor_idx nop_imp eorj_imp nop_imp eor_zpg lsr_zpg eork_imp pha_imp eor_imm lsr_acc eorl_imp jmp_adr eor_aba lsr_aba eorm_imp -bvc_rel xaveor_idy phy_imp eorpa_imp nop_imp eor_zpx lsr_zpx eorpb_imp cli_imp eor_aby nop_imp spa1_imp callf_aba eor_abx lsr_abx spb1_imp +bvc_rel xaveor_idy phy_imp eorpa_imp nop_imp eor_zpx lsr_zpx eorpb_imp cli_imp eor_aby nop_imp spa1_imp jmp_xa3 eor_abx lsr_abx spb1_imp rts_imp xavadc_idx nop_imp adcj_imp nop_imp adc_zpg ror_zpg adck_imp pla_imp adc_imm ror_acc adcl_imp jmp_ind adc_aba ror_aba adcm_imp bvs_rel xavadc_idy ply_imp adcpa_imp nop_imp adc_zpx ror_zpx adcpb_imp sei_imp adc_aby nop_imp lpa1_imp jmpf_ind adc_abx ror_abx lpb1_imp retf_imp xavsta_idx stz_zpg staj_imp sty_zpg sta_zpg stx_zpg stak_imp dey_imp sev_imp txa_imp stal_imp sty_aba sta_aba stx_aba stam_imp diff --git a/src/devices/cpu/m6502/oxavix.lst b/src/devices/cpu/m6502/oxavix.lst index 38b8eadee1a..437a86ffc5f 100644 --- a/src/devices/cpu/m6502/oxavix.lst +++ b/src/devices/cpu/m6502/oxavix.lst @@ -18,6 +18,14 @@ callf_xa3 set_codebank(TMP2); prefetch(); +jmp_xa3 + TMP2 = read_pc(); + TMP = read_pc(); + TMP = set_h(TMP, read_pc()); + PC = TMP; + set_codebank(TMP2); + prefetch(); + retf_imp read_pc_noinc(); read(SP); diff --git a/src/devices/cpu/m6502/oxavix2000.lst b/src/devices/cpu/m6502/oxavix2000.lst index 46456d6b7ea..3341c6eccf2 100644 --- a/src/devices/cpu/m6502/oxavix2000.lst +++ b/src/devices/cpu/m6502/oxavix2000.lst @@ -480,11 +480,6 @@ sev_imp P |= F_V; prefetch(); -callf_aba - fatalerror("unhandled opcode %02x%04x: %02x\n", m_codebank, PPC, inst_state); - read_pc_noinc(); - prefetch(); - jmpf_ind TMP = read_pc(); TMP = set_h(TMP, read_pc()); diff --git a/src/devices/cpu/m6502/xavix.h b/src/devices/cpu/m6502/xavix.h index ddd62e05c98..3e20ec8a899 100644 --- a/src/devices/cpu/m6502/xavix.h +++ b/src/devices/cpu/m6502/xavix.h @@ -24,6 +24,7 @@ public: // xaviv opcodes O(callf_xa3); + O(jmp_xa3); O(retf_imp); O(brk_xav_imp); O(rti_xav_imp); diff --git a/src/devices/cpu/m6502/xavix2000.h b/src/devices/cpu/m6502/xavix2000.h index 5897aca6194..425c15c8816 100644 --- a/src/devices/cpu/m6502/xavix2000.h +++ b/src/devices/cpu/m6502/xavix2000.h @@ -139,7 +139,6 @@ protected: O(cmc_imp); O(sev_imp); - O(callf_aba); O(jmpf_ind); #undef O diff --git a/src/mame/drivers/c2color.cpp b/src/mame/drivers/c2color.cpp index bb803d96e0a..092a68715e9 100644 --- a/src/mame/drivers/c2color.cpp +++ b/src/mame/drivers/c2color.cpp @@ -124,4 +124,4 @@ ROM_START( c2color ) ROM_END // year, name, parent, compat, machine, input, class, init, company, fullname, flags -CONS( 201?, c2color, 0, 0, c2_color, c2_color, c2_color_state, empty_init, "", "C2 Color", MACHINE_IS_SKELETON ) +CONS( 201?, c2color, 0, 0, c2_color, c2_color, c2_color_state, empty_init, "Baiyi Animation", "C2 Color (China)", MACHINE_IS_SKELETON ) diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index add04bec032..bedce3ac290 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -1292,7 +1292,8 @@ CONS( 2008, jak_wall, 0, 0, walle, walle, spg2xx_game_state, empty_init, "JAKKS CONS( 2005, jak_wwe, 0, 0, jakks_gkr_1m, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "WWE (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // WW (no game-keys released) CONS( 2005, jak_fan4, 0, 0, jakks_gkr_1m, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Digital Eclipse", "Fantastic Four (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // F4 (no game-keys released) CONS( 2005, jak_just, 0, 0, jakks_gkr_1m, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Taniko", "Justice League (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // DC (no game-keys released) -CONS( 2005, jak_dora, 0, 0, jakks_gkr_nk, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Handheld Games", "Dora the Explorer - Race To Play Park (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses NK keys (same as Nicktoons & Spongebob) (3+ released) +CONS( 2005, jak_dora, 0, 0, jakks_gkr_nk, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Handheld Games", "Dora the Explorer - Nursery Rhyme Adventure (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses NK keys (same as Nicktoons & Spongebob) (3+ released) - The upper part of this one is pink/purple. +// there is also a Dora the Explorer 'Race to Play Park' which is also a GameKeyReady unit with NK code, and different games - the upper part of this one is blue. CONS( 2005, jak_sdoo, 0, 0, jakks_gkr_2m, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Jolliford Management","Scooby-Doo! and the Mystery of the Castle (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // SD (no game-keys released) CONS( 2005, jak_disf, 0, 0, jakks_gkr_dy, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Disney Friends (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses DY keys (3 released) CONS( 2005, jak_sith, 0, 0, jakks_gkr_sw, jak_sith, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Griptonite Games", "Star Wars - Revenge of the Sith (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses SW keys (1 released) diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 715c663cc5c..6a32405682d 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -1737,6 +1737,17 @@ ROM_START( xavjmat ) ROM_LOAD( "xpjmat.bin", 0x000000, 0x1000000, CRC(71a51eef) SHA1(41fd2c3013d1c86756046ec9174e94400f8fa06d) ) ROM_END +// currently copies the wrong code into RAM to execute (due to extended ROM size, and possible banking) +// [:] ':maincpu' (00E074): rom_dmatrg_w (do DMA?) 01 +// [:] (possible DMA op SRC 00ebe2d3 DST 358a LEN 0398) +// needs to come from 006be2d3 (so still from lower 8MB, not upper 8MB) + +ROM_START( xavmusic ) + ROM_REGION( 0x1000000, "bios", ROMREGION_ERASE00 ) + ROM_LOAD( "xpmusicandcircuit.bin", 0x000000, 0x1000000, CRC(e06129d2) SHA1(d074d0dd85ce870f435da3c066a7f52b50999665) ) +ROM_END + + // Domyos DiS (XaviX 2002 based titles) ROM_START( domfitex ) ROM_REGION( 0x1000000, "bios", ROMREGION_ERASE00 ) @@ -1748,6 +1759,11 @@ ROM_START( domfitch ) ROM_LOAD( "xpfitnesschallenge.bin", 0x000000, 0x1000000, CRC(e0a4093d) SHA1(2692ac03f8be4f86a4777ad0c365cbab7b469e3b) ) ROM_END +ROM_START( domdance ) + ROM_REGION( 0x1000000, "bios", ROMREGION_ERASE00 ) + ROM_LOAD( "xpfitnessdance.bin", 0x000000, 0x1000000, CRC(3170dd41) SHA1(9c9b4f1d8e7c5097271bb8712463ad93c8d55d97) ) +ROM_END + // TODO: does it have an SEEPROM? why does it hang? full title? CONS( 2005, tmy_thom, 0, 0, xavix2002_i2c_24c04, xavix_i2c, xavix_i2c_state, init_xavix, "Tomy / SSD Company LTD", "Thomas and Friends (Tomy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) @@ -1760,6 +1776,7 @@ CONS( 2004, xavbassf, 0, 0, xavix2002_i2c_24c04, xavix_i2c, xavix_i2c_state, // TODO: check SEEPROM type and hookup, banking! CONS( 2005, xavjmat, 0, 0, xavix2002_i2c_jmat, xavix, xavix_i2c_jmat_state, init_xavix, "SSD Company LTD", "Jackie Chan J-Mat Fitness (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) +CONS( 2007, xavmusic, 0, 0, xavix2002_i2c_jmat, xavix, xavix_i2c_jmat_state, init_xavix, "SSD Company LTD", "XaviX Music & Circuit (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // https://arnaudmeyer.wordpress.com/domyos-interactive-system/ // Domyos Fitness Adventure @@ -1776,6 +1793,7 @@ CONS( 2005, xavjmat, 0, 0, xavix2002_i2c_jmat, xavix, xavix_i2c_jmat_stat // Has SEEPROM and an RTC. Exercise has some leftover PC buffer stuff. (TODO, check SEEPROM type, RTC type, banking) (both Exercises and Challenge are identical PCBs) CONS( 2008, domfitex, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Exercises (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) CONS( 2008, domfitch, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Challenge (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) +CONS( 2007, domdance, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Dance (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // Domyos DiS (unknown hardware, probably XaviX 2) // This DOES NOT look like a 6502 based Xavix / Super Xavix! maybe XaviX 2, the cartridges contain the entire system (CPU,Video,Sound,ROM) so that is possible. diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 956bf64825f..ede0840d869 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -39848,15 +39848,17 @@ ttv_sw // ttv_lotr // ttv_mx // drgqst // +tmy_thom // xavtenni // xavbaseb // xavbassf // xavbowl // xavbox // xavjmat // -tmy_thom // +xavmusic // domfitex // domfitch // +domdance // domfitad // dombikec // -- cgit v1.2.3