summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/mame/drivers/namcos2.cpp51
-rw-r--r--src/mame/drivers/spg2xx.cpp8
-rw-r--r--src/mame/drivers/spg2xx_jakks.cpp49
-rw-r--r--src/mame/includes/namcos2.h1
-rw-r--r--src/mame/mame.lst8
5 files changed, 70 insertions, 47 deletions
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index c396afd6ca7..33ae8e76e60 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -3727,18 +3727,18 @@ ROM_START( fourtraxa )
ROM_LOAD16_BYTE( "fx_voi-1.3m", 0x000000, 0x080000, CRC(6173364f) SHA1(cc426f49b7e87b11f1f51e8e10db7cad87ffb44d) )
ROM_END
-/* MARVEL LAND (USA) */
+/* MARVEL LAND (JAPAN) */
ROM_START( marvland )
ROM_REGION( 0x040000, "maincpu", 0 ) /* Master CPU */
- ROM_LOAD16_BYTE( "mv2_mpr0", 0x000000, 0x020000, CRC(d8b14fee) SHA1(8b5615106426efad45c651f1d6b9a6e3238bc242) )
- ROM_LOAD16_BYTE( "mv2_mpr1", 0x000001, 0x020000, CRC(29ff2738) SHA1(9f493f32ae1c4e7ef48d7e208c63a222636bda06) )
+ ROM_LOAD16_BYTE( "mv1-mpr0.bin", 0x000000, 0x010000, CRC(8369120f) SHA1(58cf481bf97f74a91ecc5ff77696528441b41b04) )
+ ROM_LOAD16_BYTE( "mv1-mpr1.bin", 0x000001, 0x010000, CRC(6d5442cc) SHA1(8cdaf6e1ec735740ace78393df2d867a213a4725) )
ROM_REGION( 0x040000, "slave", 0 ) /* Slave CPU */
- ROM_LOAD16_BYTE( "mv2_spr0", 0x000000, 0x010000, CRC(aa418f29) SHA1(413798d9c1d98cfcadb045a5436aaee61ce6718f) )
- ROM_LOAD16_BYTE( "mv2_spr1", 0x000001, 0x010000, CRC(dbd94def) SHA1(56a8d7acd483bc4d12c8bc5b7e90ffdb132be670) )
+ ROM_LOAD16_BYTE( "mv1-spr0.bin", 0x000000, 0x010000, CRC(c3909925) SHA1(bf76cb77c38787574bf75caf868700316894895c) )
+ ROM_LOAD16_BYTE( "mv1-spr1.bin", 0x000001, 0x010000, CRC(1c5599f5) SHA1(6bdf11da4e2a56c6bb6011977b045d9537d0597f) )
ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU (Banked) */
- ROM_LOAD( "mv2_snd0", 0x000000, 0x020000, CRC(a5b99162) SHA1(cafe8d1dae1e981c7ff9b70076b3e1d52cd806f7) )
+ ROM_LOAD( "mv1-snd0.bin", 0x000000, 0x020000, CRC(51b8ccd7) SHA1(5aacb020c12d9a3c43c098f3abd8358bc18acc64) )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
@@ -3766,27 +3766,25 @@ ROM_START( marvland )
NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
- NAMCOS2_DATA_LOAD_E_128K( "mv2_dat0.13s", 0x000000, CRC(62e6318b) SHA1(5c26bc054298f2a0980f7e82ba1844bc9f5eff98) )
- NAMCOS2_DATA_LOAD_O_128K( "mv2_dat1.13p", 0x000000, CRC(8a6902ca) SHA1(272e8699b872b3a50d72090b43c57493e6642bfe) )
- NAMCOS2_DATA_LOAD_E_128K( "mv2_dat2.13r", 0x100000, CRC(f5c6408c) SHA1(568fb08d0763dc91674d708fa2d15ca952956145) )
- NAMCOS2_DATA_LOAD_O_128K( "mv2_dat3.13n", 0x100000, CRC(6df76955) SHA1(fcfb520399acdd3776f66944121d6980552d3100) )
+ NAMCOS2_DATA_LOAD_E_128K( "mv1-dat0.13s", 0x000000, CRC(e15f412e) SHA1(d3ff006d4577540a690c912e94897a1b638ac265) )
+ NAMCOS2_DATA_LOAD_O_128K( "mv1-dat1.13p", 0x000000, CRC(73e1545a) SHA1(a04034e56fef69fb2a2eb88f2f392c376e52d00d) )
ROM_REGION16_BE( 0x200000, "c140", ROMREGION_ERASE00 ) /* Sound voices */
- ROM_LOAD16_BYTE( "mv1-voi1.bin", 0x000000, 0x080000, BAD_DUMP CRC(de5cac09) SHA1(2d73e54c4f159e52db2c403a59d6c137cce6f53e) ) // either undumped, or PCB was wrongly populated with JP samples ROM?
+ ROM_LOAD16_BYTE( "mv1-voi1.bin", 0x000000, 0x080000, CRC(de5cac09) SHA1(2d73e54c4f159e52db2c403a59d6c137cce6f53e) )
ROM_END
-/* MARVEL LAND (JAPAN) */
-ROM_START( marvlandj )
+/* MARVEL LAND (USA) */
+ROM_START( marvlandup )
ROM_REGION( 0x040000, "maincpu", 0 ) /* Master CPU */
- ROM_LOAD16_BYTE( "mv1-mpr0.bin", 0x000000, 0x010000, CRC(8369120f) SHA1(58cf481bf97f74a91ecc5ff77696528441b41b04) )
- ROM_LOAD16_BYTE( "mv1-mpr1.bin", 0x000001, 0x010000, CRC(6d5442cc) SHA1(8cdaf6e1ec735740ace78393df2d867a213a4725) )
+ ROM_LOAD16_BYTE( "mv2_mpr0", 0x000000, 0x020000, CRC(d8b14fee) SHA1(8b5615106426efad45c651f1d6b9a6e3238bc242) )
+ ROM_LOAD16_BYTE( "mv2_mpr1", 0x000001, 0x020000, CRC(29ff2738) SHA1(9f493f32ae1c4e7ef48d7e208c63a222636bda06) )
ROM_REGION( 0x040000, "slave", 0 ) /* Slave CPU */
- ROM_LOAD16_BYTE( "mv1-spr0.bin", 0x000000, 0x010000, CRC(c3909925) SHA1(bf76cb77c38787574bf75caf868700316894895c) )
- ROM_LOAD16_BYTE( "mv1-spr1.bin", 0x000001, 0x010000, CRC(1c5599f5) SHA1(6bdf11da4e2a56c6bb6011977b045d9537d0597f) )
+ ROM_LOAD16_BYTE( "mv2_spr0", 0x000000, 0x010000, CRC(aa418f29) SHA1(413798d9c1d98cfcadb045a5436aaee61ce6718f) )
+ ROM_LOAD16_BYTE( "mv2_spr1", 0x000001, 0x010000, CRC(dbd94def) SHA1(56a8d7acd483bc4d12c8bc5b7e90ffdb132be670) )
ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU (Banked) */
- ROM_LOAD( "mv1-snd0.bin", 0x000000, 0x020000, CRC(51b8ccd7) SHA1(5aacb020c12d9a3c43c098f3abd8358bc18acc64) )
+ ROM_LOAD( "mv2_snd0", 0x000000, 0x020000, CRC(a5b99162) SHA1(cafe8d1dae1e981c7ff9b70076b3e1d52cd806f7) )
ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
ROM_LOAD( "sys2c65c.bin", 0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
@@ -3814,11 +3812,13 @@ ROM_START( marvlandj )
NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) )
ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
- NAMCOS2_DATA_LOAD_E_128K( "mv1-dat0.13s", 0x000000, CRC(e15f412e) SHA1(d3ff006d4577540a690c912e94897a1b638ac265) )
- NAMCOS2_DATA_LOAD_O_128K( "mv1-dat1.13p", 0x000000, CRC(73e1545a) SHA1(a04034e56fef69fb2a2eb88f2f392c376e52d00d) )
+ NAMCOS2_DATA_LOAD_E_128K( "mv2_dat0.13s", 0x000000, CRC(62e6318b) SHA1(5c26bc054298f2a0980f7e82ba1844bc9f5eff98) )
+ NAMCOS2_DATA_LOAD_O_128K( "mv2_dat1.13p", 0x000000, CRC(8a6902ca) SHA1(272e8699b872b3a50d72090b43c57493e6642bfe) )
+ NAMCOS2_DATA_LOAD_E_128K( "mv2_dat2.13r", 0x100000, CRC(f5c6408c) SHA1(568fb08d0763dc91674d708fa2d15ca952956145) )
+ NAMCOS2_DATA_LOAD_O_128K( "mv2_dat3.13n", 0x100000, CRC(6df76955) SHA1(fcfb520399acdd3776f66944121d6980552d3100) )
ROM_REGION16_BE( 0x200000, "c140", ROMREGION_ERASE00 ) /* Sound voices */
- ROM_LOAD16_BYTE( "mv1-voi1.bin", 0x000000, 0x080000, CRC(de5cac09) SHA1(2d73e54c4f159e52db2c403a59d6c137cce6f53e) )
+ ROM_LOAD16_BYTE( "mv1-voi1.bin", 0x000000, 0x080000, BAD_DUMP CRC(de5cac09) SHA1(2d73e54c4f159e52db2c403a59d6c137cce6f53e) ) // either undumped, or PCB was wrongly populated with JP samples ROM?
ROM_END
/* METAL HAWK */
@@ -5564,11 +5564,6 @@ void namcos2_state::init_kyukaidk()
m_gametype = NAMCOS2_KYUUKAI_DOUCHUUKI;
}
-void namcos2_state::init_marvlanj()
-{
- m_gametype = NAMCOS2_MARVEL_LAND;
-}
-
void namcos2_state::init_marvland()
{
m_gametype = NAMCOS2_MARVEL_LAND;
@@ -5753,8 +5748,8 @@ GAME( 1989, finehour, 0, base2, base, namcos2_state, init_fineh
GAME( 1989, burnforc, 0, base3, base, namcos2_state, init_burnforc, ROT0, "Namco", "Burning Force (Japan, new version (Rev C))", MACHINE_SUPPORTS_SAVE )
GAME( 1989, burnforco, burnforc, base3, base, namcos2_state, init_burnforc, ROT0, "Namco", "Burning Force (Japan, old version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, marvland, 0, base, base, namcos2_state, init_marvland, ROT0, "Namco", "Marvel Land (US, prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, marvlandj, marvland, base, base, namcos2_state, init_marvlanj, ROT0, "Namco", "Marvel Land (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, marvland, 0, base, base, namcos2_state, init_marvland, ROT0, "Namco", "Marvel Land (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, marvlandup, marvland, base, base, namcos2_state, init_marvland, ROT0, "Namco", "Marvel Land (US, prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // or World as no WDUD logo. Game is incomplete and ends abruptly at World 3-4
GAME( 1990, kyukaidk, 0, base, kyukaidk, namcos2_state, init_kyukaidk, ROT0, "Namco", "Kyuukai Douchuuki (Japan, new version (Rev B))", MACHINE_SUPPORTS_SAVE )
GAME( 1990, kyukaidko, kyukaidk, base, kyukaidk, namcos2_state, init_kyukaidk, ROT0, "Namco", "Kyuukai Douchuuki (Japan, old version)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spg2xx.cpp b/src/mame/drivers/spg2xx.cpp
index 9a4d5cbc469..c9a249ab426 100644
--- a/src/mame/drivers/spg2xx.cpp
+++ b/src/mame/drivers/spg2xx.cpp
@@ -2095,6 +2095,10 @@ ROM_START( doraglob )
ROM_LOAD16_WORD_SWAP( "doraglobe.bin", 0x000000, 0x800000, CRC(6f454c50) SHA1(201e2de3d90abe017a8dc141613cbf6383423d13) )
ROM_END
+ROM_START( doraglobg )
+ ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+ ROM_LOAD16_WORD_SWAP( "doraglobegerman.bin", 0x000000, 0x800000, CRC(538aa197) SHA1(e97e0641df04074a0e45d02cecb43fbec91a4ce6) )
+ROM_END
ROM_START( senspeed )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
@@ -2235,8 +2239,10 @@ CONS( 2007, itvphone, 0, 0, spg2xx_pal, itvphone, spg2xx_game_state,
CONS( 2006, doraphon, 0, 0, doraphone, doraphone, spg2xx_game_doraphone_state,empty_init, "VTech", "Dora the Explorer - Dora TV Explorer Phone / Boots's Special Day", MACHINE_IMPERFECT_SOUND )
// This was from a 'cost reduced' unit with the 'non-TV' mode switch and internal speaker removed, however it looks like the code was not disabled or removed as the mode is fully functional.
// The ZC-Infinity video for this on YouTube shows the map scrolling to center the continent, there doesn't appear to be an input for this, different revision?
-// A Dutch localized version also exists, which again must be different code
+// Dutch and French localized versions also exists, which again must be different code
CONS( 2007, doraglob, 0, 0, doraphone, doraglobe, spg2xx_game_doraphone_state,empty_init, "VTech", "Dora the Explorer - Dora TV Adventure Globe", MACHINE_IMPERFECT_SOUND )
+CONS( 2007, doraglobg, doraglob, 0, doraphone, doraglobe, spg2xx_game_doraphone_state,empty_init, "VTech", "Dora the Explorer - Doras Abenteuer-Globus (Germany)", MACHINE_IMPERFECT_SOUND )
+
// ROM checksum fails, but is expecting 0 as a result? shows 'CopyRight' when booting normally? protection?
CONS( 200?, jouet, 0, 0, spg2xx, spg2xx, spg2xx_game_state, empty_init, "<unknown>", "10 Jeux Interactifs / Jeux Pour Filles (France)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/spg2xx_jakks.cpp b/src/mame/drivers/spg2xx_jakks.cpp
index 9878d16ac2a..da3125d5e32 100644
--- a/src/mame/drivers/spg2xx_jakks.cpp
+++ b/src/mame/drivers/spg2xx_jakks.cpp
@@ -16,8 +16,7 @@ public:
{ }
void base_config(machine_config& config);
- void batman(machine_config &config);
- void walle(machine_config& config);
+ void spg2xx_jakks(machine_config& config);
void mk(machine_config& config);
void jakks_mpac(machine_config& config);
@@ -46,13 +45,14 @@ static INPUT_PORTS_START( batman )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Menu")
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("B Button")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("X Button")
+ PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("P3")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
PORT_BIT(0xfffe, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
-static INPUT_PORTS_START( walle )
+static INPUT_PORTS_START( spg2xx_jakks )
PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_NAME("Joypad Up")
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_NAME("Joypad Down")
@@ -60,11 +60,18 @@ static INPUT_PORTS_START( walle )
PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_NAME("Joypad Right")
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("A Button")
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("B Button")
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) // Button 3 if used
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) // Button 4 if used
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Menu / Pause")
+ PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("P3")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
- PORT_BIT( 0xfff6, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0006, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) // PAL/NTSC flag, set to NTSC (unverified here)
+ PORT_BIT( 0xfff0, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( mk )
@@ -127,13 +134,7 @@ void jakks_state::base_config(machine_config& config)
I2C_24C04(config, m_i2cmem, 0); // ?
}
-void jakks_state::batman(machine_config &config)
-{
- base_config(config);
- m_maincpu->set_addrmap(AS_PROGRAM, &jakks_state::mem_map_4m);
-}
-
-void jakks_state::walle(machine_config &config)
+void jakks_state::spg2xx_jakks(machine_config &config)
{
base_config(config);
m_maincpu->set_addrmap(AS_PROGRAM, &jakks_state::mem_map_2m);
@@ -181,6 +182,11 @@ ROM_START( jak_wall )
//ROM_LOAD16_WORD_SWAP( "walle.bin", 0x000000, 0x400000, BAD_DUMP CRC(6bc90b16) SHA1(184d72de059057aae7800da510fcf05ed1da9ec9))
ROM_END
+ROM_START( jak_sbjd )
+ ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+ ROM_LOAD16_WORD_SWAP( "spongebobjelly.bin", 0x000000, 0x400000, CRC(804fbd87) SHA1(519aa7fada993837cb57fce26a1d721547af1861) )
+ROM_END
+
ROM_START( jak_mk )
ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
// Sources indicate this should use a 6MB ROM. The ROM here dosen't end on a blank fill and even the ROM checksum listed in the header seems to be about 50% off.
@@ -194,9 +200,9 @@ ROM_START( jak_mpacw )
ROM_END
-// JAKKS Pacific Inc TV games
-CONS( 2004, jak_batm, 0, 0, batman, batman, jakks_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "The Batman (JAKKS Pacific TV Game)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 2008, jak_wall, 0, 0, walle, walle, jakks_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Wall-E (JAKKS Pacific TV Game)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+// Pre-GameKey units
+
+CONS( 2004, jak_batm, 0, 0, spg2xx_jakks, batman, jakks_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "The Batman (JAKKS Pacific TV Game)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
// you could link 2 pads of this together for 2 player mode as you could with WWE (feature not emulated)
CONS( 2004, jak_mk, 0, 0, mk, mk, jakks_state, empty_init, "JAKKS Pacific Inc / Digital Eclipse", "Mortal Kombat (JAKKS Pacific TV Game)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
@@ -204,3 +210,18 @@ CONS( 2004, jak_mk, 0, 0, mk, mk, jakks_state, empty_init, "JAKKS Paci
// this is an older unit than the jak_mpac Game Key Ready set and features no GameKey branding
CONS( 2004, jak_mpacw,0, 0, jakks_mpac, jak_mpac, jakks_state, empty_init, "JAKKS Pacific Inc / Namco / HotGen Ltd", "Ms. Pac-Man 7-in-1 (Wireless) (Ms. Pac-Man, Pole Position, Galaga, Xevious, Mappy, New Rally X, Bosconian) (18 AUG 2004 A)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // uses NM (3 keys available [Dig Dug, New Rally-X], [Rally-X, Pac-Man, Bosconian], [Pac-Man, Bosconian])
+
+// Post-GameKey units (all of these still have GameKey references in the code even if the physical connector was no longer present on the PCB)
+
+// This was available in 2 different case styles, initially an underwater / jellyfish themed one, then later
+// reissued in a 'SpongeBob head' style case reminiscent of the undumpable 2003 SpongeBob plug and play but
+// with 2 buttons in the top left corner instead of 1
+//
+// The software on both versions of Jellyfish Dodge is believed to be the same, the build date can be seen in
+// the 'hidden' test mode.
+//
+// A further updated version of this, adapted for touch controls, was released as a 'TV Touch' unit, see
+// spg2xx_jakks_tvtouch.cpp
+CONS( 2007, jak_sbjd, 0, 0, spg2xx_jakks, spg2xx_jakks, jakks_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "SpongeBob SquarePants Jellyfish Dodge (JAKKS Pacific TV Game) (Apr 5 2007)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+CONS( 2008, jak_wall, 0, 0, spg2xx_jakks, spg2xx_jakks, jakks_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Wall-E (JAKKS Pacific TV Game) (Dec 18 2007 11:34:25)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 82077a7105c..e6d634d4b3e 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -106,7 +106,6 @@ public:
void init_finehour();
void init_finallap();
void init_dirtfoxj();
- void init_marvlanj();
void init_sws92();
void init_dsaber();
void init_assault();
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index fb57c4864cd..60892757b98 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -31755,8 +31755,8 @@ kyukaidk // (c) 1990 (Japan, new version)
kyukaidko // (c) 1990 (Japan, old version)
luckywld // (c) 1992
luckywldj // (c) 1992
-marvland // (c) 1989 (US)
-marvlandj // (c) 1989 (Japan)
+marvland // (c) 1989 (Japan)
+marvlandup // (c) 1989 (US)
metlhawk // (c) 1988
metlhawkj // (c) 1988
mirninja // (c) 1988 (Japan)
@@ -38934,6 +38934,7 @@ comil //
decathln
decathlna
doraglob // (c) 2007 VTech
+doraglobg
doraphon // (c) 2006 VTech
dreamlss
fordrace
@@ -38979,9 +38980,10 @@ icanpian //
@source:spg2xx_jakks.cpp
jak_batm // The Batman, 2004
-jak_wall //
jak_mk
jak_mpacw
+jak_sbjd
+jak_wall
@source:spg2xx_jakks_gkr.cpp
jak_capc //