summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author David Haywood <28625134+DavidHaywood@users.noreply.github.com>2019-10-16 14:25:44 +0100
committer ajrhacker <ajrhacker@users.noreply.github.com>2019-10-16 09:25:44 -0400
commit9d44e619446393e82efb805059191308235c1496 (patch)
treedd835c4747a78d0b8a716fb249f2e3e021742dec
parenta7c424289adeee1351096af8a4977a20f16f8177 (diff)
Plug and Play additions (#5737)
* new WORKING machines ------- Disney Princesses (JAKKS Pacific TV Game, Game-Key Ready) [Sean Riddle, David Haywood, anonymous] Capcom 3-in-1 (1942, Commando, Ghosts'n Goblins) (JAKKS Pacific TV Game, Game-Key Ready) (29 MAR 2005 B) [Sean Riddle, David Haywood, anonymous] new NOT WORKING machines ----- Care Bears TV Games (JAKKS Pacific TV Game, Game-Key Ready) [Sean Riddle, David Haywood, anonymous] * new NOT WORKING software list entries ------- ekara_japan_a.xml: a3 : A-3 Pichi Pichi Pitch vol.3 (Japan) [David Haywood, Sean Riddle] evio.xml: em2: eM2 - evio Selection 02 [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em3: eM3 - Anime Mix 1 [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em4: eM4 - I Love Classic 1 [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em7: eM7 - Pure Kiss 1 [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em8: eM8 - Hard Soul 1 [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em9: eM9 - evio Selection 03 [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em16: eM16 - Chisako Takashima Selection [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] em18: eM18 - unknown [David Haywood, Peter Wilhelmsen, ShouTime, Sean Riddle] * additional cartridge info [AJR]
-rw-r--r--hash/ekara_japan_a.xml32
-rw-r--r--hash/ekara_japan_ac.xml5
-rw-r--r--hash/evio.xml124
-rw-r--r--src/devices/cpu/unsp/unsp.cpp1
-rw-r--r--src/devices/cpu/unsp/unsp_fxxx.cpp10
-rw-r--r--src/devices/cpu/unsp/unspdrc.cpp7
-rw-r--r--src/devices/cpu/unsp/unspfe.cpp3
-rw-r--r--src/mame/drivers/vii.cpp105
-rw-r--r--src/mame/drivers/xavix.cpp12
-rw-r--r--src/mame/includes/xavix.h1
-rw-r--r--src/mame/mame.lst5
11 files changed, 280 insertions, 25 deletions
diff --git a/hash/ekara_japan_a.xml b/hash/ekara_japan_a.xml
index 88803d48ca0..bb6cfdefc52 100644
--- a/hash/ekara_japan_a.xml
+++ b/hash/ekara_japan_a.xml
@@ -9,16 +9,18 @@
These are for use with e-pitch / e-kara (e-pitch internal ROM is the same as e-kara Japan, just button layout is changed)
- https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q10109392860
+ https://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q10109392860
- A-1 Pichi Pichi Pitch vol.1 / ぴちぴちピッチvol.1
- A-2 Pichi Pichi Pitch vol.2 / ぴちぴちピッチvol.2
- A-3 Pichi Pichi Pitch vol.3 / ぴちぴちピッチvol.3
- A-4 Pichi Pichi Pitch Pure Chapter 1 / ぴちぴちピッチピュア第1章
- A-5 Pichi Pichi Pitch Karaoke Party / ぴちぴちピッチカラオケパーティー
- A-6 Pichi Pichi Pitch Pure Chapter 2 / ぴちぴちピッチピュア第2章
- A-7 Pichi Pichi Pitch Pure Chapter 3 / ぴちぴちピッチピュア第3章
- A-8 Pichi Pichi Pitch Karaoke Party 2 / ぴちぴちピッチカラオケパーティー2
+ * = dumped
+
+ *A-1 Pichi Pichi Pitch vol.1 / ぴちぴちピッチvol.1
+ A-2 Pichi Pichi Pitch vol.2 / ぴちぴちピッチvol.2
+ *A-3 Pichi Pichi Pitch vol.3 / ぴちぴちピッチvol.3
+ *A-4 Pichi Pichi Pitch Pure Chapter 1 / ぴちぴちピッチピュア第1章
+ *A-5 Pichi Pichi Pitch Karaoke Party / ぴちぴちピッチカラオケパーティー
+ A-6 Pichi Pichi Pitch Pure Chapter 2 / ぴちぴちピッチピュア第2章
+ *A-7 Pichi Pichi Pitch Pure Chapter 3 / ぴちぴちピッチピュア第3章
+ A-8 Pichi Pichi Pitch Karaoke Party 2 / ぴちぴちピッチカラオケパーティー2
-->
@@ -34,6 +36,18 @@
</part>
</software>
+ <software name="a3" supported="no">
+ <description>A-3 Pichi Pichi Pitch vol.3 (Japan)</description>
+ <year>2004</year>
+ <publisher>Takara</publisher>
+ <part name="cart" interface="ekara_cart">
+ <feature name="slot" value="rom_24c08_epitch"/>
+ <dataarea name="rom" size="0x200000">
+ <rom name="ekara_a3.bin" size="0x200000" crc="19b79adf" sha1="31f82e8bf66f1b03df9d64061af628df3466c5ef"/>
+ </dataarea>
+ </part>
+ </software>
+
<software name="a4" supported="no">
<description>A-4 Pichi Pichi Pitch Pure Chapter 1 (Japan)</description>
<year>2004</year>
diff --git a/hash/ekara_japan_ac.xml b/hash/ekara_japan_ac.xml
index b7eef1b532d..be1dc20e6d8 100644
--- a/hash/ekara_japan_ac.xml
+++ b/hash/ekara_japan_ac.xml
@@ -7,8 +7,9 @@
Japanese cart listing (by AC code) * = dumped
* = dumped
- this numbering is a little unusual, maybe there are other AC cartridges that were
- bundled with other units?
+ this numbering is a little unusual, maybe the 'A' series Pichi Pichi Pitch
+ are actually 1-8 here, just lacking the actual AC markings.
+ see ekara_japan_a.xml
*AC0009-KIR / KR-1 Kirarin Cartridge Vol.1 (bundled with Kirarin microphone)
diff --git a/hash/evio.xml b/hash/evio.xml
new file mode 100644
index 00000000000..730decb5e8d
--- /dev/null
+++ b/hash/evio.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="evio" description="Tomy evio eM series cartridges">
+ <!-- cartridges contain the ROM only, the XaviX CPU and BIOS are in the base unit
+
+ ***********************************************************************************
+
+ Evio cart listing, most unknown
+
+ * = dumped
+
+ eM1 - evio Selection 01
+ *eM2 - evio Selection 02 (translucent red)
+ *eM3 - Anime Mix 1 (yellow)
+ *eM4 - I Love Classic 1 (brown)
+ eM5 - Healing Air 1
+ eM6 - Drama Mix 1
+ *eM7 - Pure Kiss 1 (pink)
+ *eM8 - Hard Soul 1 (black)
+ *eM9 - evio Selection 03 (translucent red)
+ eM10 - Anime Special - Pocket Monsters
+ eM11 - Anime Mix 2
+ eM12 - I Love Classic 2
+ eM13 - Concerto Selection
+ eM14 - Disney Special 1
+ eM15 - evio Selection 04
+ *eM16 - Chisako Takashima Selection (cream/gold)
+ eM17 - Minna no evio
+ *eM18 - Evio Challenge! (red/pink)
+
+ (more?)
+
+ -->
+
+ <software name="em2" supported="no">
+ <description>eM2 - evio Selection 02</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em02.bin" size="0x080000" crc="f4c25b10" sha1="97627f6753bf21f30ec497656dbae3eaf4ca8386"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="em3" supported="no">
+ <description>eM3 - Anime Mix 1</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em03.bin" size="0x080000" crc="2aa0107f" sha1="1f2302b0121819b8ea02409e23a7c21402e2632e"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="em4" supported="no">
+ <description>eM4 - I Love Classic 1</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em04.bin" size="0x080000" crc="22ad3e5b" sha1="e25269b1957e10cff6bb7590b912db9e62864c2d"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="em7" supported="no">
+ <description>eM7 - Pure Kiss 1</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em07.bin" size="0x080000" crc="b507b926" sha1="af2872b738e57a42e22904c3f6df15b2bf5ead87"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="em8" supported="no">
+ <description>eM8 - Hard Soul 1</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em08.bin" size="0x080000" crc="f41469c0" sha1="381e43b2a2fd716f3d91d47c7e899f02b2f52b91"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="em9" supported="no">
+ <description>eM9 - evio Selection 03</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em09.bin" size="0x080000" crc="17818b14" sha1="84058d60567972a336b36d8c406b1649956c8a2a"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="em16" supported="no">
+ <description>eM16 - Chisako Takashima Selection</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em16.bin" size="0x080000" crc="39c86418" sha1="8442cb3923e1f09b369ece58ca52bbb2f0a7ab19"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <!-- has eeprom -->
+ <software name="em18" supported="no">
+ <description>eM18 - Evio Challenge!</description>
+ <year>2003</year>
+ <publisher>Tomy</publisher>
+ <part name="cart" interface="ekara_cart">
+ <dataarea name="rom" size="0x200000">
+ <rom name="evio_em18.bin" size="0x100000" crc="725a5720" sha1="062316f860cb6ca3c29d9c1e63ea4973b1eebcd8"/>
+ </dataarea>
+ </part>
+ </software>
+
+</softwarelist>
diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp
index 2805d3a80e0..e7938572d08 100644
--- a/src/devices/cpu/unsp/unsp.cpp
+++ b/src/devices/cpu/unsp/unsp.cpp
@@ -59,6 +59,7 @@ unsp_device::unsp_device(const machine_config &mconfig, device_type type, const
, m_mem_write(nullptr)
, m_enable_drc(false)
{
+ m_iso = 10;
}
unsp_device::unsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/unsp/unsp_fxxx.cpp b/src/devices/cpu/unsp/unsp_fxxx.cpp
index 2c98161e847..c50344f7b81 100644
--- a/src/devices/cpu/unsp/unsp_fxxx.cpp
+++ b/src/devices/cpu/unsp/unsp_fxxx.cpp
@@ -341,6 +341,16 @@ void unsp_device::execute_fxxx_101_group(uint16_t op)
m_core->m_enable_fiq = 1;
return;
+ case 0xf144: case 0xf344: case 0xf544: case 0xf744: case 0xf944: case 0xfb44: case 0xfd44: case 0xff44:
+ logerror("fir_mov on (shouldn't exist on 1.0, is this 1.2 or does it act as a NOP?)\n");
+ //unimplemented_opcode(op); // jak_care triggers this, which again strongly suggests that everything we have is 1.2 or above even if most new features are unused
+ return;
+
+ case 0xf145: case 0xf345: case 0xf545: case 0xf745: case 0xf945: case 0xfb45: case 0xfd45: case 0xff45:
+ logerror("fir_mov off (shouldn't exist on 1.0, is this 1.2 or does it act as a NOP?)\n");
+ //unimplemented_opcode(op); // jak_care triggers this, see above
+ return;
+
case 0xf160: case 0xf360: case 0xf560: case 0xf760: case 0xf960: case 0xfb60: case 0xfd60: case 0xff60:
case 0xf168: case 0xf368: case 0xf568: case 0xf768: case 0xf968: case 0xfb68: case 0xfd68: case 0xff68:
case 0xf170: case 0xf370: case 0xf570: case 0xf770: case 0xf970: case 0xfb70: case 0xfd70: case 0xff70:
diff --git a/src/devices/cpu/unsp/unspdrc.cpp b/src/devices/cpu/unsp/unspdrc.cpp
index a34d20f8a7e..3b0b1e6db59 100644
--- a/src/devices/cpu/unsp/unspdrc.cpp
+++ b/src/devices/cpu/unsp/unspdrc.cpp
@@ -990,7 +990,14 @@ bool unsp_device::generate_opcode(drcuml_block &block, compiler_state &compiler,
// nop
break;
+ case 4: // should be 1.2 only but jak_care triggers, see notes in non-drc
+ break;
+
+ case 5: // ^^
+ break;
+
default:
+ logerror("unsp drc interrupt flags %02x\n", op & 0x3f);
return false;
}
return true;
diff --git a/src/devices/cpu/unsp/unspfe.cpp b/src/devices/cpu/unsp/unspfe.cpp
index 3d2cd6f6855..8e2cef76111 100644
--- a/src/devices/cpu/unsp/unspfe.cpp
+++ b/src/devices/cpu/unsp/unspfe.cpp
@@ -191,6 +191,9 @@ bool unsp_frontend::describe(opcode_desc &desc, const opcode_desc *prev)
case 12:
case 14:
case 37:
+
+ case 4: // should be 1.2 only but jak_care triggers, see notes in non-drc
+ case 5: // ^^
return true;
}
return false;
diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp
index 492d8368734..f2836703254 100644
--- a/src/mame/drivers/vii.cpp
+++ b/src/mame/drivers/vii.cpp
@@ -101,10 +101,14 @@
Game seems unhappy with NVRAM, clears contents on each boot.
jak_pooh:
In the 'Light Tag' minigame (select the rock) the game usually softlocks when you find a friend (with or without DRC)
+ jak_care:
+ All but one mini-game waits on RAM address 0x0165 changing from 0x00f9 to 0x00f8
+ The bottom left game "Wish Bear's Wishing Tree" appears to fail for more complex reasons.
jak_disf:
- Shows corrupt logo on first boot with no valid nvram (possibly hardware does too, or layer disable?)
- jak_nick:
- Channel chasers (first game) title screen background should be blue, not the current pattern (possible layer disable?)
+ Shows corrupt logo on first boot with no valid nvram (possibly hardware does too - verify if possible to invalidate EEPROM on device)
+ lexizeus:
+ Some corrupt sound effects and a few corrupt ground tiles a few minutes in. (checksum is good, and a video recorded
+ from one of these doesn't exhibit these problems, so either emulation issue or alt revision?)
vii:
When loading a cart from file manager, sometimes MAME will crash.
@@ -124,6 +128,19 @@
Disney Friends, MS Pacman, WallE, Batman (and some other HotGen GameKeys) for test mode, hold UP,
press A, press DOWN during startup
+ Capcom test (same access as other Hotgen games) mode looks like this (tested on PAL unit, same ROM as dumped one)
+
+ RAM OK 2800
+ 111111
+ 5432109876543210
+ IOA ............111. (values go from . to 1 when inputs are moved, never 0 as in MAME!, core bug?)
+ GAMEKEY E0
+ IOB0
+ IOC XXX.........X...
+ SPRITES
+
+ Care Bears : Hold analog stck up, rotate stick 360 degress back to up, press 'A' while still holding up
+
TODO:
Work out how to access the hidden TEST menus for all games (most JAKKS games should have one at least)
@@ -245,9 +262,11 @@ public:
void jakks_gkr_dp_i2c(machine_config &config);
void jakks_gkr_sw_i2c(machine_config &config);
void jakks_gkr_nm_i2c(machine_config &config);
+ void jakks_gkr_cc_i2c(machine_config &config);
void jakks_gkr_wf_i2c(machine_config &config);
void jakks_gkr_mv_i2c(machine_config &config);
void jakks_gkr_wp(machine_config &config);
+ void jakks_gkr_cb(machine_config &config);
DECLARE_READ_LINE_MEMBER(i2c_gkr_r);
@@ -684,6 +703,23 @@ static INPUT_PORTS_START( jak_pooh )
PORT_BIT(0x0fff, 0x0000, IPT_AD_STICK_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_MINMAX(0x00,0x0fff)
INPUT_PORTS_END
+static INPUT_PORTS_START( jak_care )
+ PORT_START("P1")
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Menu / Pause")
+ PORT_BIT( 0xf7df, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("P3")
+ PORT_BIT( 0xfff7, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) // PAL/NTSC flag, set to NTSC (unverified here)
+
+ PORT_START("JOYX")
+ PORT_BIT(0x0fff, 0x0000, IPT_AD_STICK_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_MINMAX(0x00,0x0fff)
+
+ PORT_START("JOYY")
+ PORT_BIT(0x0fff, 0x0000, IPT_AD_STICK_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_MINMAX(0x00,0x0fff)
+INPUT_PORTS_END
+
static INPUT_PORTS_START( jak_nm_i2c )
PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -706,6 +742,25 @@ static INPUT_PORTS_START( jak_nm_i2c )
PORT_BIT(0x0fff, 0x0000, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_MINMAX(0x00,0x0fff)
INPUT_PORTS_END
+static INPUT_PORTS_START( jak_cc_i2c )
+ PORT_START("P1")
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("A")
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("B")
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("C")
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("D")
+
+ PORT_START("P3")
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(jakks_gkr_state, i2c_gkr_r)
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) // PAL/NTSC flag, set to NTSC
+ PORT_BIT( 0xfff0, IP_ACTIVE_HIGH, IPT_UNUSED )
+INPUT_PORTS_END
+
static INPUT_PORTS_START( jak_wf_i2c )
PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -865,7 +920,7 @@ static INPUT_PORTS_START( jak_gkr_i2c )
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(jakks_gkr_state, i2c_gkr_r)
INPUT_PORTS_END
-static INPUT_PORTS_START( jak_disp_i2c )
+static INPUT_PORTS_START( jak_dpr_i2c )
PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -2197,6 +2252,15 @@ void jakks_gkr_state::jakks_gkr_wp(machine_config &config)
//SOFTWARE_LIST(config, "jakks_gamekey_wp").set_original("jakks_gamekey_wp"); // NO KEYS RELEASED
}
+void jakks_gkr_state::jakks_gkr_cb(machine_config &config)
+{
+ jakks_gkr(config);
+ m_maincpu->set_addrmap(AS_PROGRAM, &jakks_gkr_state::mem_map_1m);
+ m_maincpu->adc_in<0>().set_ioport("JOYX");
+ m_maincpu->adc_in<1>().set_ioport("JOYY");
+ //SOFTWARE_LIST(config, "jakks_gamekey_cb").set_original("jakks_gamekey_cb"); // NO KEYS RELEASED
+}
+
void jakks_gkr_state::jakks_gkr_nm_i2c(machine_config &config)
{
jakks_gkr_i2c(config);
@@ -2205,6 +2269,14 @@ void jakks_gkr_state::jakks_gkr_nm_i2c(machine_config &config)
SOFTWARE_LIST(config, "jakks_gamekey_nm").set_original("jakks_gamekey_nm");
}
+void jakks_gkr_state::jakks_gkr_cc_i2c(machine_config &config)
+{
+ jakks_gkr_i2c(config);
+ m_maincpu->set_addrmap(AS_PROGRAM, &jakks_gkr_state::mem_map_1m);
+ // shows 'E0' in gamekey test menu on real HW (maybe related to value key needs to return if one existed)
+ //SOFTWARE_LIST(config, "jakks_gamekey_cc").set_original("jakks_gamekey_cc"); // no game keys were released
+}
+
void jakks_gkr_state::jakks_gkr_wf_i2c(machine_config &config)
{
jakks_gkr_i2c(config);
@@ -2364,6 +2436,10 @@ ROM_START( jak_pooh )
ROM_LOAD16_WORD_SWAP( "jakkspoohgkr.bin", 0x000000, 0x200000, CRC(0d97df55) SHA1(f108621a83c7b2263dd1531d82311627c3a02002) )
ROM_END
+ROM_START( jak_care )
+ ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+ ROM_LOAD16_WORD_SWAP( "carebeargkr.bin", 0x000000, 0x200000, CRC(e6096eb7) SHA1(92ee1a6df374f8b355ba2280dc43d764f6f69dfe) )
+ROM_END
ROM_START( jak_wof )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
@@ -2380,11 +2456,16 @@ ROM_START( jak_disf )
ROM_LOAD16_WORD_SWAP( "disneyfriendsgkr.bin", 0x000000, 0x200000, CRC(77bca50b) SHA1(6e0f4fd229ee11eac721b5dbe79cf9002d3dbd64) )
ROM_END
-ROM_START( jak_disp )
+ROM_START( jak_dpr )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD16_WORD_SWAP( "jakksdisneyprincessgkr.bin", 0x000000, 0x200000, CRC(e26003ce) SHA1(ee15243281df6f09b96185c34582d7091604c954) )
ROM_END
+ROM_START( jak_dprs )
+ ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+ ROM_LOAD16_WORD_SWAP( "disneyprincess2gkr.bin", 0x000000, 0x200000, CRC(b670bdde) SHA1(c33ce7ada72a0c44bc881b5792cd33a9f2f0fb08) )
+ROM_END
+
ROM_START( jak_mpac )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD16_WORD_SWAP( "jakksmspacmangkr.bin", 0x000000, 0x100000, CRC(cab40f77) SHA1(30731acc461150d96aafa7a0451cfb1a25264678) )
@@ -2405,6 +2486,10 @@ ROM_START( jak_sith )
ROM_LOAD16_WORD_SWAP( "jakksstarwarsgkr.bin", 0x000000, 0x200000, CRC(932cde19) SHA1(b88b748c235e9eeeda574e4d5b4077ae9da6fbd0) )
ROM_END
+ROM_START( jak_capc )
+ ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+ ROM_LOAD16_WORD_SWAP( "capcomgkr.bin", 0x000000, 0x200000, CRC(6d47cce4) SHA1(263926a991d55459aa3cee90049d2202c1e3a70e) )
+ROM_END
ROM_START( lexizeus )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
@@ -2569,19 +2654,17 @@ CONS( 2005, jak_sbfc, 0, 0, jakks_gkr_nk_i2c, jak_gkr_i2c, jakks_gkr_state, emp
CONS( 2005, jak_sdoo, 0, 0, jakks_gkr_2m_i2c, jak_sdoo_i2c, 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) (was dumped from a later unit with GameKey port missing, but internal PCB still supported it, code likely the same)
CONS( 2005, jak_disn, 0, 0, jakks_gkr_dy, jak_gkr, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Disney (JAKKS Pacific TV Game, Game-Key Ready) (08 FEB 2005 A)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses DY keys (3 released)
CONS( 2005, jak_disf, 0, 0, jakks_gkr_dy_i2c, jak_gkr_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Disney Friends (JAKKS Pacific TV Game, Game-Key Ready) (17 MAY 2005 A)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses DY keys (3 released)
-CONS( 2005, jak_disp, 0, 0, jakks_gkr_dp_i2c, jak_disp_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / 5000ft, Inc", "Disney Princess (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses DP keys (1 key released)
-// There seems to be a second game called 'Disney Princesses' with a 'board game' style front end as well as the minigames, also GKR, see https://www.youtube.com/watch?v=w9p5TI029bQ The one we have is https://www.youtube.com/watch?v=9ppPKVbpoMs the physical package seems identical.
+CONS( 2005, jak_dpr, 0, 0, jakks_gkr_dp_i2c, jak_dpr_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / 5000ft, Inc", "Disney Princess (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses DP keys (1 key released)
+CONS( 2005, jak_dprs, 0, 0, jakks_gkr_dp_i2c, jak_dpr_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / 5000ft, Inc", "Disney Princesses (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses DP keys (1 key released) (unit looks identical to above, including just having 'Disney Princess' logo, but this one has the 'board game' as a frontend and a slightly different on-screen title)
CONS( 2005, jak_sith, 0, 0, jakks_gkr_sw_i2c, jak_sith_i2c, 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)
CONS( 2005, jak_dbz, 0, 0, jakks_gkr_1m_i2c, jak_gkr_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Handheld Games", "Dragon Ball Z (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // DB (no game-keys released, 1 in development but cancelled)
CONS( 2005, jak_mpac, 0, 0, jakks_gkr_nm_i2c, jak_nm_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Namco / HotGen Ltd", "Ms. Pac-Man 5-in-1 (Ms. Pac-Man, Pole Position, Galaga, Xevious, Mappy) (JAKKS Pacific TV Game, Game-Key Ready) (07 FEB 2005 A SKU F)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses NM (3 keys available [Dig Dug, New Rally-X], [Rally-X, Pac-Man, Bosconian], [Pac-Man, Bosconian])
+CONS( 2005, jak_capc, 0, 0, jakks_gkr_cc_i2c, jak_cc_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Capcom / HotGen Ltd", "Capcom 3-in-1 (1942, Commando, Ghosts'n Goblins) (JAKKS Pacific TV Game, Game-Key Ready) (29 MAR 2005 B)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses CC keys (no game-keys released)
CONS( 2005, jak_wof, 0, 0, jakks_gkr_wf_i2c, jak_wf_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Wheel of Fortune (JAKKS Pacific TV Game, Game-Key Ready) (Jul 11 2005 ORIG)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses WF keys (no game-keys released) analog wheel not emulated
// There is a 'Second Edition' version of Wheel of Fortune with a Gold case, GameKey port removed, and a '2' over the usual Game Key Ready logo, internals are different too, not Game-Key Ready
CONS( 2004, jak_spdm, 0, 0, jakks_gkr_mv_i2c, jak_gkr_i2c, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Digital Eclipse", "Spider-Man (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // MV (1 key available)
CONS( 2005, jak_pooh, 0, 0, jakks_gkr_wp, jak_pooh, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Backbone Entertainment", "Winnie the Pooh - Piglet's Special Day (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // WP (no game-keys released)
-
-// no keys released for the following, some were in development but cancelled
-// Capcom 3-in-1 CC (no game-keys released)
-// Care Bears CB (no game-keys released)
+CONS( 2005, jak_care, 0, 0, jakks_gkr_cb, jak_care, jakks_gkr_state, empty_init, "JAKKS Pacific Inc / Backbone Entertainment", "Care Bears TV Games (JAKKS Pacific TV Game, Game-Key Ready)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // CB (no game-keys released)
// Some versions of the Shrek - Over the Hedge unit show the GameKey logo on startup (others don't) there is no evidence to suggest it was ever released with a GameKey port tho, and the internal PCB has no place for one on the versions we've seen (which show the logo)
diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp
index ffba3abe833..46a9869aac7 100644
--- a/src/mame/drivers/xavix.cpp
+++ b/src/mame/drivers/xavix.cpp
@@ -1489,6 +1489,15 @@ void xavix_i2c_cart_state::xavix_i2c_jpopira(machine_config &config)
SOFTWARE_LIST(config, "cart_list_japan_sp").set_original("ekara_japan_sp");
}
+void xavix_cart_state::xavix_cart_evio(machine_config &config)
+{
+ xavix_cart(config);
+ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
+
+ SOFTWARE_LIST(config, "cart_list_evio").set_original("evio");
+}
+
+
void xavix_cart_state::xavix_cart_ekara(machine_config &config)
{
xavix_cart(config);
@@ -1982,8 +1991,7 @@ CONS( 2003, taikodp, 0, 0, xavix_i2c_taiko, taikodp, xavix_i2c_car
CONS( 2004, jpopira, 0, 0, xavix_i2c_jpopira,jpopira, xavix_i2c_cart_state, init_xavix, "Takara / SSD Company LTD", "Jumping Popira (Japan)", MACHINE_IMPERFECT_SOUND /*|MACHINE_IS_BIOS_ROOT*/ )
-
-CONS( 2003, evio, 0, 0, xavix_nv, evio, xavix_state, init_xavix, "Tomy / SSD Company LTD", "Evio (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND /*|MACHINE_IS_BIOS_ROOT*/ ) // inputs? it's a violin controller
+CONS( 2003, evio, 0, 0, xavix_cart_evio, evio, xavix_cart_state, init_xavix, "Tomy / SSD Company LTD", "Evio (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND /*|MACHINE_IS_BIOS_ROOT*/ ) // inputs? it's a violin controller
// Let’s!TVプレイ 超にんきスポット!ころがしほーだい たまごっちりぞーと (Let's! TV Play Chou Ninki Spot! Korogashi-Houdai Tamagotchi Resort) (only on the Japanese list? http://test.shinsedai.co.jp/english/products/Applied/list.html ) This also allows you to use an IR reciever to import a Tamagotchi from compatible games
diff --git a/src/mame/includes/xavix.h b/src/mame/includes/xavix.h
index b9074189bd1..b6e8b593193 100644
--- a/src/mame/includes/xavix.h
+++ b/src/mame/includes/xavix.h
@@ -761,6 +761,7 @@ public:
void xavix_cart_ekara(machine_config &config);
void xavix_cart_popira(machine_config &config);
void xavix_cart_ddrfammt(machine_config &config);
+ void xavix_cart_evio(machine_config &config);
protected:
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 352d354c70c..0da2710f9f3 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -39436,14 +39436,17 @@ jak_dora //
jak_dorr //
jak_disn //
jak_disf //
-jak_disp //
+jak_dpr //
+jak_dprs //
jak_sith //
jak_sdoo //
jak_dbz //
jak_mpac //
+jak_capc //
jak_wof //
jak_spdm //
jak_pooh //
+jak_care //
jak_nick //
jak_sbfc //
lexizeus // Lexibook