get rid of guessed color overlays

This commit is contained in:
Michaël Banaan Ananas 2014-01-15 20:04:01 +00:00
parent 0881947f4b
commit e40deea684
6 changed files with 54 additions and 116 deletions

2
.gitattributes vendored
View File

@ -5443,7 +5443,6 @@ src/mame/layout/30test.lay svneol=native#text/xml
src/mame/layout/3bagflnz.lay svneol=native#text/xml
src/mame/layout/3bagflvt.lay svneol=native#text/xml
src/mame/layout/abaseb.lay svneol=native#text/xml
src/mame/layout/ace.lay svneol=native#text/xml
src/mame/layout/aces1.lay svneol=native#text/xml
src/mame/layout/ampoker2.lay svneol=native#text/xml
src/mame/layout/arcwins.lay svneol=native#text/xml
@ -5656,7 +5655,6 @@ src/mame/layout/sltblgtk.lay svneol=native#text/xml
src/mame/layout/smoto.lay svneol=native#text/xml
src/mame/layout/snookr10.lay svneol=native#text/xml
src/mame/layout/solarq.lay svneol=native#text/xml
src/mame/layout/sos.lay svneol=native#text/xml
src/mame/layout/spacecom.lay svneol=native#text/xml
src/mame/layout/spacewin.lay svneol=native#text/xml
src/mame/layout/spacezap.lay svneol=native#text/xml

View File

@ -40,20 +40,21 @@ A1 2101 2101
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "ace.lh"
#define MASTER_CLOCK XTAL_18MHz
// ace_state was also defined in mess/drivers/ace.c
class aceal_state : public driver_device
{
public:
aceal_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_scoreram(*this, "scoreram"),
m_ram2(*this, "ram2"),
m_characterram(*this, "characterram"),
m_maincpu(*this, "maincpu") { }
m_characterram(*this, "characterram")
{ }
required_device<cpu_device> m_maincpu;
/* video-related */
required_shared_ptr<UINT8> m_scoreram;
@ -72,7 +73,6 @@ public:
virtual void palette_init();
UINT32 screen_update_ace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void ace_postload();
required_device<cpu_device> m_maincpu;
};
@ -129,8 +129,8 @@ UINT32 aceal_state::screen_update_ace(screen_device &screen, bitmap_ind16 &bitma
void aceal_state::palette_init()
{
palette_set_color(machine(), 0, MAKE_RGB(0xff,0xff,0xff)); /* white */
palette_set_color(machine(), 1, MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine(), 0, MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine(), 1, MAKE_RGB(0xff,0xff,0xff)); /* white */
}
@ -362,7 +362,6 @@ static MACHINE_CONFIG_START( ace, aceal_state )
/* sound hardware */
/* ???? */
MACHINE_CONFIG_END
/***************************************************************************
@ -385,4 +384,4 @@ ROM_START( ace )
ROM_END
GAMEL(1976, ace, 0, ace, ace, driver_device, 0, ROT0, "Allied Leisure", "Ace", GAME_SUPPORTS_SAVE | GAME_NO_SOUND, layout_ace ) // color overlay assumed from flyer
GAME( 1976, ace, 0, ace, ace, driver_device, 0, ROT0, "Allied Leisure", "Ace", GAME_SUPPORTS_SAVE | GAME_NO_SOUND )

View File

@ -122,11 +122,6 @@ Notes:
- There are images/videos on the net of kaitei and geebee running in 3bpp
(aka 7 colors), this is assumed to be a homebrew repair or hack.
TODO:
- I arbitrarily assigned a uniform blue overlay to sos. I don't know how it's
supposed to be.
***************************************************************************/
#include "emu.h"
@ -135,7 +130,6 @@ TODO:
#include "geebee.lh"
#include "navarone.lh"
#include "sos.lh"
#define MASTER_CLOCK XTAL_18_432MHz
@ -143,7 +137,7 @@ TODO:
/* Interrupt Gen */
INTERRUPT_GEN_MEMBER(warpwarp_state::vblank_irq)
{
if(m_ball_on)
if (m_ball_on)
device.execute().set_input_line(0, ASSERT_LINE);
}
@ -377,15 +371,15 @@ static INPUT_PORTS_START( geebee )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( Free_Play ) )
PORT_DIPNAME( 0x30, 0x10, "Replay" ) PORT_DIPLOCATION("DSW2:5,6") // awards 1 credit
PORT_DIPSETTING( 0x10, "40k 80k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x20, "70k 140k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x30, "100k 200k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x10, "60k 120k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x20, "100k 200k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x30, "150k 300k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPNAME( 0x30, 0x10, "Replay" ) PORT_DIPLOCATION("DSW2:5,6") // awards 1 credit
PORT_DIPSETTING( 0x10, "40k 80k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x20, "70k 140k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x30, "100k 200k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x10, "60k 120k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x20, "100k 200k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x30, "150k 300k" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("IN1")
@ -431,14 +425,14 @@ static INPUT_PORTS_START( navarone )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x02, "3" )
PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW2:3,4")
PORT_DIPSETTING( 0x04, "5000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x08, "6000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x0c, "7000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x04, "6000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x08, "7000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x0c, "8000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x04, "5000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x08, "6000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x0c, "7000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x00)
PORT_DIPSETTING( 0x04, "6000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x08, "7000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x0c, "8000" ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_CONDITION("DSW2", 0x02, EQUALS, 0x02)
PORT_DIPNAME( 0x30, 0x10, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW2:5,6")
PORT_DIPSETTING( 0x30, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) )
@ -564,7 +558,7 @@ static INPUT_PORTS_START( sos )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_DIPNAME( 0x20, 0x20, "Nudity" ) PORT_DIPLOCATION("DSW2:6")
PORT_DIPNAME( 0x20, 0x20, "Nudity" ) PORT_DIPLOCATION("DSW2:6")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
@ -600,10 +594,10 @@ static INPUT_PORTS_START( bombbee )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW1:3,4")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x04, "4" )
// PORT_DIPSETTING( 0x08, "4" ) // duplicated setting
// PORT_DIPSETTING( 0x08, "4" ) // duplicated setting
PORT_DIPSETTING( 0x0c, "5" )
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "DSW1:5" )
PORT_DIPNAME( 0xe0, 0x00, "Replay" ) PORT_DIPLOCATION("DSW1:6,7,8") // awards 1 credit
PORT_DIPNAME( 0xe0, 0x00, "Replay" ) PORT_DIPLOCATION("DSW1:6,7,8") // awards 1 credit
PORT_DIPSETTING( 0x00, "50000" )
PORT_DIPSETTING( 0x20, "60000" )
PORT_DIPSETTING( 0x40, "70000" )
@ -660,14 +654,14 @@ static INPUT_PORTS_START( warpwarp )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x0c, "5" )
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW1:5,6")
PORT_DIPSETTING( 0x00, "8k 30k 30k+" ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING( 0x10, "10k 40k 40k+" ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING( 0x20, "15k 60k 60k+" ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING(0x30, DEF_STR( None ) ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING( 0x00, "30k" ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x10, "40k" ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x20, "60k" ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x30, DEF_STR( None ) ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x00, "8k 30k 30k+" ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING( 0x10, "10k 40k 40k+" ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING( 0x20, "15k 60k 60k+" ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING(0x30, DEF_STR( None ) ) PORT_CONDITION("DSW1", 0x0c, NOTEQUALS, 0x0c)
PORT_DIPSETTING( 0x00, "30k" ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x10, "40k" ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x20, "60k" ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPSETTING( 0x30, DEF_STR( None ) ) PORT_CONDITION("DSW1", 0x0c, EQUALS, 0x0c)
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSW1:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@ -732,7 +726,7 @@ static MACHINE_CONFIG_START( geebee, warpwarp_state )
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(geebee_map)
MCFG_CPU_IO_MAP(geebee_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpwarp_state, vblank_irq)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpwarp_state, vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -765,9 +759,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bombbee, warpwarp_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 18.432 MHz / 9 */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9)
MCFG_CPU_PROGRAM_MAP(bombbee_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpwarp_state, vblank_irq)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpwarp_state, vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -987,18 +981,18 @@ DRIVER_INIT_MEMBER(warpwarp_state,warpwarp)
/* B & W games */
GAMEL(1978, geebee, 0, geebee, geebee, warpwarp_state, geebee, ROT90, "Namco", "Gee Bee (Japan)", 0, layout_geebee )
GAMEL(1978, geebeeb, geebee, geebee, geebeeb, warpwarp_state, geebee, ROT90, "Namco (F.lli Bertolino license)", "Gee Bee (Europe)", 0, layout_geebee ) // Fratelli Bertolino
GAMEL(1978, geebeeg, geebee, geebee, geebee, warpwarp_state, geebee, ROT90, "Namco (Gremlin license)", "Gee Bee (US)", 0, layout_geebee )
GAMEL(1978, geebee, 0, geebee, geebee, warpwarp_state, geebee, ROT90, "Namco", "Gee Bee (Japan)", 0, layout_geebee )
GAMEL(1978, geebeeb, geebee, geebee, geebeeb, warpwarp_state, geebee, ROT90, "Namco (F.lli Bertolino license)", "Gee Bee (Europe)", 0, layout_geebee ) // Fratelli Bertolino
GAMEL(1978, geebeeg, geebee, geebee, geebee, warpwarp_state, geebee, ROT90, "Namco (Gremlin license)", "Gee Bee (US)", 0, layout_geebee )
GAMEL(1980, navarone, 0, navarone, navarone, warpwarp_state, navarone, ROT90, "Namco", "Navarone", GAME_IMPERFECT_SOUND, layout_navarone )
GAME( 1980, kaitein, kaitei, navarone, kaitein, warpwarp_state, kaitein, ROT90, "K.K. Tokki (Namco license)", "Kaitei Takara Sagashi (Namco license)", 0 ) // pretty sure it didn't have a color overlay
GAME( 1980, kaitei, 0, navarone, kaitei, warpwarp_state, kaitei, ROT90, "K.K. Tokki", "Kaitei Takara Sagashi", 0 ) // "
GAMEL(1980, sos, 0, navarone, sos, warpwarp_state, sos, ROT90, "Namco", "SOS", GAME_IMPERFECT_SOUND, layout_sos ) // developed by Shoei?
GAMEL(1980, navarone, 0, navarone, navarone, warpwarp_state, navarone, ROT90, "Namco", "Navarone", GAME_IMPERFECT_SOUND, layout_navarone )
GAME( 1980, kaitein, kaitei, navarone, kaitein, warpwarp_state, kaitein, ROT90, "K.K. Tokki (Namco license)", "Kaitei Takara Sagashi (Namco license)", 0 ) // pretty sure it didn't have a color overlay
GAME( 1980, kaitei, 0, navarone, kaitei, warpwarp_state, kaitei, ROT90, "K.K. Tokki", "Kaitei Takara Sagashi", 0 ) // "
GAME( 1980, sos, 0, navarone, sos, warpwarp_state, sos, ROT90, "Namco", "SOS", GAME_IMPERFECT_SOUND ) // developed by Shoei?
/* Color games */
GAME( 1979, bombbee, 0, bombbee, bombbee, warpwarp_state, bombbee, ROT90, "Namco", "Bomb Bee", 0 )
GAME( 1979, cutieq, 0, bombbee, cutieq, warpwarp_state, bombbee, ROT90, "Namco", "Cutie Q", 0 )
GAME( 1981, warpwarp, 0, warpwarp, warpwarp, warpwarp_state, warpwarp, ROT90, "Namco", "Warp & Warp", 0 )
GAME( 1981, warpwarpr, warpwarp, warpwarp, warpwarpr, warpwarp_state,warpwarp, ROT90, "Namco (Rock-Ola license)", "Warp Warp (Rock-Ola set 1)", 0 )
GAME( 1981, warpwarpr2, warpwarp, warpwarp, warpwarpr, warpwarp_state,warpwarp, ROT90, "Namco (Rock-Ola license)", "Warp Warp (Rock-Ola set 2)", 0 )
GAME( 1979, bombbee, 0, bombbee, bombbee, warpwarp_state, bombbee, ROT90, "Namco", "Bomb Bee", 0 )
GAME( 1979, cutieq, 0, bombbee, cutieq, warpwarp_state, bombbee, ROT90, "Namco", "Cutie Q", 0 )
GAME( 1981, warpwarp, 0, warpwarp, warpwarp, warpwarp_state, warpwarp, ROT90, "Namco", "Warp & Warp", 0 )
GAME( 1981, warpwarpr, warpwarp, warpwarp, warpwarpr, warpwarp_state, warpwarp, ROT90, "Namco (Rock-Ola license)", "Warp Warp (Rock-Ola set 1)", 0 )
GAME( 1981, warpwarpr2, warpwarp, warpwarp, warpwarpr, warpwarp_state, warpwarp, ROT90, "Namco (Rock-Ola license)", "Warp Warp (Rock-Ola set 2)", 0 )

View File

@ -1,21 +0,0 @@
<?xml version="1.0"?>
<mamelayout version="2">
<!-- NOTE: color overlay needs verification from real cabinet (or old photo) -->
<element name="overlay">
<rect>
<bounds left="0" top="0" right="1" bottom="1" />
<color red="0.094" green="0.5" blue="1.0" />
</rect>
</element>
<view name="Color Overlay">
<screen index="0">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
<overlay element="overlay">
<bounds left="0" top="0" right="4" bottom="3" />
</overlay>
</view>
</mamelayout>

View File

@ -1,29 +0,0 @@
<?xml version="1.0"?>
<mamelayout version="2">
<!-- NOTE: color overlay needs verification from real cabinet (or old photo) -->
<element name="overlay">
<rect>
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1" green="1" blue="1" />
</rect>
<rect>
<bounds left="0" top="1" right="1" bottom="33" />
<color red="0.5333" green="0.5333" blue="1.0" />
</rect>
<rect>
<bounds left="0" top="33" right="1" bottom="34" />
<color red="1" green="1" blue="1" />
</rect>
</element>
<view name="Color Overlay">
<screen index="0">
<bounds left="0" top="0" right="3" bottom="4" />
</screen>
<overlay element="overlay">
<bounds left="0" top="0" right="3" bottom="4" />
</overlay>
</view>
</mamelayout>

View File

@ -2278,8 +2278,6 @@ $(DRIVERS)/8080bw.o: $(LAYOUT)/attackfc.lh \
$(LAYOUT)/shuttlei.lh \
$(LAYOUT)/spacecom.lh
$(DRIVERS)/ace.o: $(LAYOUT)/ace.lh
$(DRIVERS)/aces1.o: $(LAYOUT)/aces1.lh
$(DRIVERS)/acefruit.o: $(LAYOUT)/sidewndr.lh
@ -2687,8 +2685,7 @@ $(DRIVERS)/videopkr.o: $(LAYOUT)/videopkr.lh \
$(LAYOUT)/babydad.lh
$(DRIVERS)/warpwarp.o: $(LAYOUT)/geebee.lh \
$(LAYOUT)/navarone.lh \
$(LAYOUT)/sos.lh
$(LAYOUT)/navarone.lh
$(DRIVERS)/wpc_an.o: $(LAYOUT)/wpc_an.lh