diff --git a/hash/spectrum_betadisc_flop.xml b/hash/spectrum_betadisc_flop.xml
index ddcfce52fb7..ef23464ef5e 100644
--- a/hash/spectrum_betadisc_flop.xml
+++ b/hash/spectrum_betadisc_flop.xml
@@ -155,72 +155,6 @@
-
- Aliens Neoplasma (set 1, v1.2, English)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- Aliens Neoplasma (set 2, v1.2, English, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- Aliens Neoplasma (set 3, v1.2, Spanish)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- Aliens Neoplasma (set 4, v1.2, Spanish, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- Aliens Neoplasma (set 5, v1.2, Russian)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- Aliens Neoplasma (set 6, v1.2, Russian, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
Redshift
19??
diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
index 5f8f1e3e5e0..7468f814459 100644
--- a/hash/spectrum_cass.xml
+++ b/hash/spectrum_cass.xml
@@ -18319,72 +18319,6 @@
-
- >Aliens Neoplasma (set 1, v1.2, English)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- >Aliens Neoplasma (set 2, v1.2, English, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- >Aliens Neoplasma (set 3, v1.2, Spanish)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- >Aliens Neoplasma (set 4, v1.2, Spanish, Turbo Soudn)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- >Aliens Neoplasma (set 5, v1.2, Russian)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
- >Aliens Neoplasma (set 6, v1.2, Russian, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
Nominas (Investronica)
1984
@@ -90476,7 +90410,7 @@
- Lost In My Spectrum - (set 25, v1.0, Italian, 128k)
+ Lost In My Spectrum (set 25, v1.0, Italian, 128k)
2012
Alessandro Grussu
diff --git a/src/devices/bus/gio64/newport.cpp b/src/devices/bus/gio64/newport.cpp
index 13b93c1079c..9d509a21560 100644
--- a/src/devices/bus/gio64/newport.cpp
+++ b/src/devices/bus/gio64/newport.cpp
@@ -913,34 +913,34 @@ void rb2_device::deserialize(FILE *file)
uint32_t rb2_device::expand_to_all_lanes(uint32_t src)
{
- switch (m_draw_depth) {
- case 0:
- src |= src << 4;
- src |= src << 8;
- src |= src << 16;
- break;
- case 1:
- src |= src << 8;
- src |= src << 16;
- break;
- case 2:
- src |= src << 12;
- break;
- case 3:
- break;
- }
- switch (m_plane_enable)
- {
- case 1: // RGB/CI
- case 2: // RGBA
- case 6: // CID
- return src;
- case 4: // OLAY
- return src << 8;
- case 5: // PUP
- return src << 2;
- }
- return src;
+ switch (m_draw_depth) {
+ case 0:
+ src |= src << 4;
+ src |= src << 8;
+ src |= src << 16;
+ break;
+ case 1:
+ src |= src << 8;
+ src |= src << 16;
+ break;
+ case 2:
+ src |= src << 12;
+ break;
+ case 3:
+ break;
+ }
+ switch (m_plane_enable)
+ {
+ case 1: // RGB/CI
+ case 2: // RGBA
+ case 6: // CID
+ return src;
+ case 4: // OLAY
+ return src << 8;
+ case 5: // PUP
+ return src << 2;
+ }
+ return src;
}
void rb2_device::set_write_mask(uint32_t data)
@@ -2372,10 +2372,10 @@ void newport_base_device::output_pixel(int16_t x, int16_t y, uint32_t color)
const uint32_t address = (uint32_t)(y * (1280 + 64) + x);
m_set_address(address);
- if (BIT(m_rex3.m_draw_mode1, 18))
- blend_pixel(color);
- else
- m_write_pixel(color);
+ if (BIT(m_rex3.m_draw_mode1, 18))
+ blend_pixel(color);
+ else
+ m_write_pixel(color);
}
void newport_base_device::blend_pixel(uint32_t src)
@@ -3268,27 +3268,27 @@ uint32_t newport_base_device::get_default_color(uint32_t src)
case 0: // 4bpp
color &= 0xf;
color |= color << 4;
- color |= color << 8;
- color |= color << 16;
+ color |= color << 8;
+ color |= color << 16;
break;
case 1: // 8bpp
color &= 0xff;
- color |= color << 8;
- color |= color << 16;
+ color |= color << 8;
+ color |= color << 16;
break;
case 2: // 12bpp
if (BIT(m_rex3.m_draw_mode1, 15))
color = ((m_rex3.m_color_vram & 0xf00000) >> 12) | ((m_rex3.m_color_vram & 0xf000) >> 8) | ((m_rex3.m_color_vram & 0xf0) >> 4);
- else
- color &= 0x00000fff;
- color |= color << 12;
+ else
+ color &= 0x00000fff;
+ color |= color << 12;
break;
case 3: // 24bpp
color = m_rex3.m_color_vram & 0xffffff;
break;
}
- return color;
+ return color;
}
void newport_base_device::do_rex3_command()
diff --git a/src/devices/bus/gio64/newport.h b/src/devices/bus/gio64/newport.h
index d1166030a3a..49e0af4e937 100644
--- a/src/devices/bus/gio64/newport.h
+++ b/src/devices/bus/gio64/newport.h
@@ -458,7 +458,7 @@ protected:
void iterate_shade();
- uint32_t get_default_color(uint32_t src);
+ uint32_t get_default_color(uint32_t src);
uint32_t get_host_color();
uint32_t get_rgb_color(int16_t x, int16_t y);
diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp
index ef21b9bdbf4..2eeff6a9a4e 100644
--- a/src/mame/drivers/sdk85.cpp
+++ b/src/mame/drivers/sdk85.cpp
@@ -35,15 +35,6 @@ On the right you'll get a "clue", slightly different than on the standard game (
Once you find the number, you'll see it flashing. Press the 2 key and you'll get your score (number of attempts before guessing).
Press 0 to restart.
-Notes on expansion rom with default content Mastermind.
-Original authors: see above (Paolo Forlani and Stefano Bodrato)
-Ported to option rom: NASZVADI Peter
-
-The game can be started from monitor by defining SP as 20FFh and PC as 0800h and starting execution.
-When setting register values in monitor, SPH, SPL, PCH and PCL values must be set to 20, FF, 08, 00 respectively before start!
-Stefano's bios had been altered in order to use lower ram bank and the option rom slot.
-When selecting "Empty" a14, which is basically 2kbytes of zeros, the default option rom will be launched directly.
-
*************************************************************************************************************************************/
#include "emu.h"
@@ -193,11 +184,8 @@ ROM_START( sdk85 )
ROMX_LOAD( "sdk85.a14", 0x0000, 0x0800, CRC(9d5a983f) SHA1(54e218560fbec009ac3de5cfb64b920241ef2eeb), ROM_BIOS(0) )
ROM_SYSTEM_BIOS(1, "mastermind", "Mastermind")
ROMX_LOAD( "mastermind.a14", 0x0000, 0x0800, CRC(36b694ae) SHA1(4d8a5ae5d10e8f72a6e349c7eeaf1aa00c4e45e1), ROM_BIOS(1) )
- ROM_SYSTEM_BIOS(2, "empty", "Empty")
- ROMX_LOAD( "empty.a14", 0x0000, 0x0800, CRC(f1e8ba9e) SHA1(605db3fdbaff4ba13729371ad0c4fbab3889378e), ROM_BIOS(2) )
ROM_REGION( 0x800, "expromio", ROMREGION_ERASEFF )
- ROM_LOAD_OPTIONAL( "mastermind.a15", 0x0000, 0x0800, CRC(0538e162) SHA1(c351975e2cf515cee29fcaeb04ef47189afe5250) )
ROM_END
/* Driver */