diff --git a/hash/nes.xml b/hash/nes.xml index fcc88b9116a..fa09ef60990 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -8914,9 +8914,9 @@ - - + + @@ -61043,7 +61043,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx - + @@ -61353,10 +61353,32 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx - - + + + + + Dance 2000 - 12 in 1 (Chi) + 2000? + Benli + + + + + + + + + + + + + + + + + Dance 2000 - 12 in 1 (Chi, English) - 19?? + 2000? <unknown> @@ -61367,21 +61389,8 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx - - - - - Dance 2000 - 12 in 1 (Chi, Chinese) - 19?? - <unknown> - - - - - - - - + + @@ -69126,26 +69135,31 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + + + LIKO Study Cartridge 3 in 1 (Rus) 1996? - BBG Electronics Co. + Bu Bu Gao Electronics Co. - + - - - + + @@ -69157,7 +69171,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69178,7 +69192,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69205,26 +69219,31 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - - + + Education Computer 2000 48 in 1 (Asia?, Fixed) - 19?? + + + 2004? <unknown> + + + + @@ -69260,8 +69279,9 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - + + + @@ -69277,8 +69297,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - + + @@ -69297,7 +69317,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69323,14 +69343,14 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - + + + - Magistr-Genie 2 (Rus) 19?? @@ -69342,8 +69362,12 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - + + + + + + @@ -69356,7 +69380,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69373,7 +69397,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69394,7 +69418,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69415,7 +69439,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69436,7 +69460,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69457,7 +69481,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69478,16 +69502,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69500,16 +69523,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69522,16 +69544,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69544,16 +69565,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69598,16 +69618,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69619,7 +69638,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69643,9 +69662,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - - + + @@ -69664,9 +69682,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - - + + @@ -69686,9 +69703,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - - + + @@ -69707,9 +69723,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - - - + + @@ -69721,16 +69736,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69743,16 +69757,16 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + + @@ -69764,16 +69778,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69786,16 +69799,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69808,16 +69820,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69829,16 +69840,15 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + - - - + + @@ -69851,7 +69861,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69873,7 +69883,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t - + @@ -69937,7 +69947,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -69959,7 +69969,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70000,7 +70010,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70022,7 +70032,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70045,7 +70055,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70066,7 +70076,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70089,7 +70099,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70111,7 +70121,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70132,7 +70142,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70153,7 +70163,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70174,7 +70184,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70195,7 +70205,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70217,7 +70227,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70237,7 +70247,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + @@ -70300,7 +70310,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) - + diff --git a/src/devices/bus/nes/nes_carts.cpp b/src/devices/bus/nes/nes_carts.cpp index 5d04a57b77d..95cce71afaf 100644 --- a/src/devices/bus/nes/nes_carts.cpp +++ b/src/devices/bus/nes/nes_carts.cpp @@ -347,7 +347,6 @@ SLOT_INTERFACE_START(nes_cart) SLOT_INTERFACE_INTERNAL("ninjaryu", NES_NROM) // mapper 111 - UNSUPPORTED SLOT_INTERFACE_INTERNAL("unl_dance", NES_NROM) // UNSUPPORTED SLOT_INTERFACE_INTERNAL("onebus", NES_NROM) // UNSUPPORTED - SLOT_INTERFACE_INTERNAL("dance2k", NES_NROM) // UNSUPPORTED SLOT_INTERFACE_INTERNAL("pec586", NES_NROM) // UNSUPPORTED SLOT_INTERFACE_INTERNAL("coolboy", NES_NROM) // UNSUPPORTED SLOT_INTERFACE_INTERNAL("bmc_f15", NES_NROM) // UNSUPPORTED diff --git a/src/devices/bus/nes/nes_pcb.hxx b/src/devices/bus/nes/nes_pcb.hxx index 8d91645f300..610c85bcb88 100644 --- a/src/devices/bus/nes/nes_pcb.hxx +++ b/src/devices/bus/nes/nes_pcb.hxx @@ -322,7 +322,6 @@ static const nes_pcb pcb_list[] = { "coolboy", UNSUPPORTED_BOARD }, { "btl_900218", UNSUPPORTED_BOARD }, // pirate The Lord of King, to be emulated soon { "a9746", UNSUPPORTED_BOARD }, - { "dance2k", UNSUPPORTED_BOARD }, { "pec586", UNSUPPORTED_BOARD }, { "bmc_f15", UNSUPPORTED_BOARD }, // 150-in-1 Unchained Melody { "bmc_hp898f", UNSUPPORTED_BOARD }, // Primasoft 9999999-in-1 diff --git a/src/devices/bus/nes/nes_unif.hxx b/src/devices/bus/nes/nes_unif.hxx index 1aba38c2b6f..cdcab594725 100644 --- a/src/devices/bus/nes/nes_unif.hxx +++ b/src/devices/bus/nes/nes_unif.hxx @@ -107,7 +107,7 @@ static const unif unif_list[] = { "UNL-KS7017", 0, 0, CHRRAM_0, KAISER_KS7017}, { "UNL-KS7032", 0, 0, CHRRAM_0, KAISER_KS7032}, // mapper 142 { "UNL-603-5052", 0, 0, CHRRAM_0, UNL_603_5052}, // mapper 238? - { "UNL-EDU2000", 32, 0, CHRRAM_8, UNL_EDU2K}, + { "UNL-EDU2000", 0, 32, CHRRAM_8, UNL_EDU2K}, { "UNL-H2288", 0, 0, CHRRAM_0, UNL_H2288}, // mapper 123 { "UNL-SHERO", 0, 0, CHRRAM_8, SACHEN_SHERO}, { "UNL-YOKO", 0, 0, CHRRAM_0, YOKO_BOARD}, // similar to mapper 83, but not the same @@ -133,6 +133,7 @@ static const unif unif_list[] = { "BMC-11160", 0, 0, CHRRAM_0, BMC_11160}, { "UNL-MALISB", 0, 0, CHRRAM_0, UNL_MALISB}, { "UNL-TF1201", 0, 0, CHRRAM_0, UNL_TF1201}, + { "UNL-DANCE2000", 0, 8, CHRRAM_8, SUBOR_TYPE2}, // similar to some Subor carts { "BMC-12-IN-1", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, { "BMC-70IN1", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // mapper 236? { "BMC-70IN1B", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // mapper 236? @@ -152,7 +153,6 @@ static const unif unif_list[] = { "UNL-CITYFIGHT", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, { "COOLBOY", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, { "UNL-OneBus", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, - { "UNL-DANCE2000", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD} }; const unif *nes_unif_lookup( const char *board )