Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-27 06:39:03 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mainsnk.c, mirax.c: added save state support (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2015-03-31 20:29:55 +02:00
parent ccb2831bc6
commit 5881b5caad
4 changed files with 119 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mame/drivers/mainsnk.c
View File

@ -11,11 +11,11 @@ Notes:
The game uses 2 joysticks (with button on top) and 2 buttons per player. The game uses 2 joysticks (with button on top) and 2 buttons per player.
Left stick Left stick
up: left straight punch to enemy's face up: left straight punch to enemy's face
left: swey to left left: sway to left
Right stick Right stick
up: right straight punch to enemy's face up: right straight punch to enemy's face
right: swey to right right: sway to right
Left + Right stick combinations Left + Right stick combinations
L down + R up: right straight punch to enemy's body L down + R up: right straight punch to enemy's body
@ -112,6 +112,12 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k
#include "sound/ay8910.h" #include "sound/ay8910.h"
#include "includes/mainsnk.h" #include "includes/mainsnk.h"
void mainsnk_state::machine_start()
{
save_item(NAME(m_sound_cpu_busy));
}
WRITE8_MEMBER(mainsnk_state::sound_command_w) WRITE8_MEMBER(mainsnk_state::sound_command_w)
{ {
m_sound_cpu_busy = 1; m_sound_cpu_busy = 1;
@ -119,18 +125,13 @@ WRITE8_MEMBER(mainsnk_state::sound_command_w)
m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
} }
READ8_MEMBER(mainsnk_state::sound_command_r)
{
return soundlatch_byte_r(space, 0);
}
READ8_MEMBER(mainsnk_state::sound_ack_r) READ8_MEMBER(mainsnk_state::sound_ack_r)
{ {
m_sound_cpu_busy = 0; m_sound_cpu_busy = 0;
return 0xff; return 0xff;
} }
CUSTOM_INPUT_MEMBER(mainsnk_state::mainsnk_sound_r) CUSTOM_INPUT_MEMBER(mainsnk_state::sound_r)
{ {
return (m_sound_cpu_busy) ? 0x01 : 0x00; return (m_sound_cpu_busy) ? 0x01 : 0x00;
} }
@ -145,18 +146,18 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mainsnk_state )
AM_RANGE(0xc300, 0xc300) AM_READ_PORT("IN3") AM_RANGE(0xc300, 0xc300) AM_READ_PORT("IN3")
AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW1") AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW1")
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW2") AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW2")
AM_RANGE(0xc600, 0xc600) AM_WRITE(mainsnk_c600_w) AM_RANGE(0xc600, 0xc600) AM_WRITE(c600_w)
AM_RANGE(0xc700, 0xc700) AM_WRITE(sound_command_w) AM_RANGE(0xc700, 0xc700) AM_WRITE(sound_command_w)
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(mainsnk_bgram_w) AM_SHARE("bgram") AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(bgram_w) AM_SHARE("bgram")
AM_RANGE(0xdc00, 0xe7ff) AM_RAM AM_RANGE(0xdc00, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(mainsnk_fgram_w) AM_SHARE("fgram") // + work RAM AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(fgram_w) AM_SHARE("fgram") // + work RAM
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, mainsnk_state ) static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, mainsnk_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(sound_command_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r)
AM_RANGE(0xc000, 0xc000) AM_READ(sound_ack_r) AM_RANGE(0xc000, 0xc000) AM_READ(sound_ack_r)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ay1", ay8910_device, address_data_w) AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
AM_RANGE(0xe002, 0xe003) AM_WRITENOP // ? always FFFF, snkwave leftover? AM_RANGE(0xe002, 0xe003) AM_WRITENOP // ? always FFFF, snkwave leftover?
@ -177,7 +178,7 @@ static INPUT_PORTS_START( mainsnk )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mainsnk_state,mainsnk_sound_r, NULL) /* sound CPU status */ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mainsnk_state, sound_r, NULL) /* sound CPU status */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE )
@ -271,7 +272,7 @@ static INPUT_PORTS_START( canvas )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mainsnk_state,mainsnk_sound_r, NULL) /* sound CPU status */ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, mainsnk_state, sound_r, NULL) /* sound CPU status */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE )
@ -399,7 +400,7 @@ static MACHINE_CONFIG_START( mainsnk, mainsnk_state )
MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(36*8, 28*8) MCFG_SCREEN_SIZE(36*8, 28*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1) MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mainsnk_state, screen_update_mainsnk) MCFG_SCREEN_UPDATE_DRIVER(mainsnk_state, screen_update)
MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mainsnk) MCFG_GFXDECODE_ADD("gfxdecode", "palette", mainsnk)
@ -483,5 +484,5 @@ ROM_START( canvas )
ROM_END ROM_END
GAME( 1984, mainsnk, 0, mainsnk, mainsnk, driver_device, 0, ROT0, "SNK", "Main Event (1984)", 0) GAME( 1984, mainsnk, 0, mainsnk, mainsnk, driver_device, 0, ROT0, "SNK", "Main Event (1984)", GAME_SUPPORTS_SAVE )
GAME( 1985, canvas, 0, mainsnk, canvas, driver_device, 0, ROT0, "SNK", "Canvas Croquis", 0) GAME( 1985, canvas, 0, mainsnk, canvas, driver_device, 0, ROT0, "SNK", "Canvas Croquis", GAME_SUPPORTS_SAVE )

118
src/mame/drivers/mirax.c
View File

@ -93,7 +93,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
* different stages names : * different stages names :
. stages 1 to 10 : "LUXORI" instead of "MIRAX" . stages 1 to 10 : "LUXORI" instead of "MIRAX"
. stages 71 to 80 : "DESCOM" instead of "DESBOM" . stages 71 to 80 : "DESCOM" instead of "DESBOM"
futhermore, for all stages, it's written "UNIT" instead of "CITY" furthermore, for all stages, it's written "UNIT" instead of "CITY"
- Same ingame bug as in 'mirax' when you reach level 100 (of course, it will display - Same ingame bug as in 'mirax' when you reach level 100 (of course, it will display
"LUXORI UNIT" instead of "MIRAX CITY" on "presentation" screen). "LUXORI UNIT" instead of "MIRAX CITY" on "presentation" screen).
@ -110,40 +110,46 @@ class mirax_state : public driver_device
public: public:
mirax_state(const machine_config &mconfig, device_type type, const char *tag) mirax_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_colorram(*this, "colorram"),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"), m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { } m_palette(*this, "palette"),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_colorram(*this, "colorram") { }
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_colorram;
UINT8 m_nAyCtrl;
UINT8 m_nmi_mask;
UINT8 m_flipscreen_x;
UINT8 m_flipscreen_y;
DECLARE_WRITE8_MEMBER(audio_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
DECLARE_WRITE8_MEMBER(mirax_sound_cmd_w);
DECLARE_WRITE8_MEMBER(mirax_coin_counter0_w);
DECLARE_WRITE8_MEMBER(mirax_coin_counter1_w);
DECLARE_WRITE8_MEMBER(mirax_flip_screen_w);
DECLARE_WRITE8_MEMBER(ay1_sel);
DECLARE_WRITE8_MEMBER(ay2_sel);
DECLARE_DRIVER_INIT(mirax);
DECLARE_PALETTE_INIT(mirax);
virtual void sound_start();
UINT32 screen_update_mirax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(mirax_vblank_irq);
void draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 draw_flag);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette; required_device<palette_device> m_palette;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_colorram;
UINT8 m_nAyCtrl;
UINT8 m_nmi_mask;
UINT8 m_flipscreen_x;
UINT8 m_flipscreen_y;
DECLARE_WRITE8_MEMBER(audio_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
DECLARE_WRITE8_MEMBER(sound_cmd_w);
DECLARE_WRITE8_MEMBER(coin_counter0_w);
DECLARE_WRITE8_MEMBER(coin_counter1_w);
DECLARE_WRITE8_MEMBER(flip_screen_w);
DECLARE_WRITE8_MEMBER(ay1_sel);
DECLARE_WRITE8_MEMBER(ay2_sel);
DECLARE_DRIVER_INIT(mirax);
DECLARE_PALETTE_INIT(mirax);
virtual void machine_start();
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 draw_flag);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_irq);
}; };
@ -207,32 +213,29 @@ void mirax_state::draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect,
void mirax_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) void mirax_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
UINT8 *spriteram = m_spriteram; for(int count=0;count<0x200;count+=4)
int count;
for(count=0;count<0x200;count+=4)
{ {
int spr_offs,x,y,color,fx,fy; int spr_offs,x,y,color,fx,fy;
if(spriteram[count] == 0x00 || spriteram[count+3] == 0x00) if(m_spriteram[count] == 0x00 || m_spriteram[count+3] == 0x00)
continue; continue;
spr_offs = (spriteram[count+1] & 0x3f); spr_offs = (m_spriteram[count+1] & 0x3f);
color = spriteram[count+2] & 0x7; color = m_spriteram[count+2] & 0x7;
fx = (m_flipscreen_x) ^ ((spriteram[count+1] & 0x40) >> 6); //<- guess fx = (m_flipscreen_x) ^ ((m_spriteram[count+1] & 0x40) >> 6); //<- guess
fy = (m_flipscreen_y) ^ ((spriteram[count+1] & 0x80) >> 7); fy = (m_flipscreen_y) ^ ((m_spriteram[count+1] & 0x80) >> 7);
spr_offs += (spriteram[count+2] & 0xe0)<<1; spr_offs += (m_spriteram[count+2] & 0xe0)<<1;
spr_offs += (spriteram[count+2] & 0x10)<<5; spr_offs += (m_spriteram[count+2] & 0x10)<<5;
y = (m_flipscreen_y) ? spriteram[count] : 0x100 - spriteram[count] - 16; y = (m_flipscreen_y) ? m_spriteram[count] : 0x100 - m_spriteram[count] - 16;
x = (m_flipscreen_x) ? 240 - spriteram[count+3] : spriteram[count+3]; x = (m_flipscreen_x) ? 240 - m_spriteram[count+3] : m_spriteram[count+3];
m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,spr_offs,color,fx,fy,x,y,0); m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,spr_offs,color,fx,fy,x,y,0);
} }
} }
UINT32 mirax_state::screen_update_mirax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) UINT32 mirax_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
draw_tilemap(bitmap,cliprect,1); draw_tilemap(bitmap,cliprect,1);
draw_sprites(bitmap,cliprect); draw_sprites(bitmap,cliprect);
@ -241,9 +244,14 @@ UINT32 mirax_state::screen_update_mirax(screen_device &screen, bitmap_ind16 &bit
} }
void mirax_state::sound_start() void mirax_state::machine_start()
{ {
m_nAyCtrl = 0x00; m_nAyCtrl = 0x00;
save_item(NAME(m_nAyCtrl));
save_item(NAME(m_nmi_mask));
save_item(NAME(m_flipscreen_x));
save_item(NAME(m_flipscreen_y));
} }
WRITE8_MEMBER(mirax_state::audio_w) WRITE8_MEMBER(mirax_state::audio_w)
@ -272,25 +280,25 @@ WRITE8_MEMBER(mirax_state::nmi_mask_w)
printf("Warning: %02x written at $f501\n",data); printf("Warning: %02x written at $f501\n",data);
} }
WRITE8_MEMBER(mirax_state::mirax_sound_cmd_w) WRITE8_MEMBER(mirax_state::sound_cmd_w)
{ {
soundlatch_byte_w(space, 0, data & 0xff); soundlatch_byte_w(space, 0, data & 0xff);
m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
} }
WRITE8_MEMBER(mirax_state::mirax_coin_counter0_w) WRITE8_MEMBER(mirax_state::coin_counter0_w)
{ {
coin_counter_w(machine(), 0, data & 1); coin_counter_w(machine(), 0, data & 1);
} }
WRITE8_MEMBER(mirax_state::mirax_coin_counter1_w) WRITE8_MEMBER(mirax_state::coin_counter1_w)
{ {
coin_counter_w(machine(), 1, data & 1); coin_counter_w(machine(), 1, data & 1);
} }
/* One address flips X, the other flips Y, but I can't tell which is which - Since the value is the same for the 2 addresses, it doesn't really matter */ /* One address flips X, the other flips Y, but I can't tell which is which - Since the value is the same for the 2 addresses, it doesn't really matter */
WRITE8_MEMBER(mirax_state::mirax_flip_screen_w) WRITE8_MEMBER(mirax_state::flip_screen_w)
{ {
if (offset == 0) if (offset == 0)
m_flipscreen_x = data & 0x01; m_flipscreen_x = data & 0x01;
@ -310,11 +318,11 @@ static ADDRESS_MAP_START( mirax_main_map, AS_PROGRAM, 8, mirax_state )
AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW1") AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW1")
AM_RANGE(0xf300, 0xf300) AM_READNOP //watchdog? value is always read then discarded AM_RANGE(0xf300, 0xf300) AM_READNOP //watchdog? value is always read then discarded
AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW2") AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW2")
AM_RANGE(0xf500, 0xf500) AM_WRITE(mirax_coin_counter0_w) AM_RANGE(0xf500, 0xf500) AM_WRITE(coin_counter0_w)
AM_RANGE(0xf501, 0xf501) AM_WRITE(nmi_mask_w) AM_RANGE(0xf501, 0xf501) AM_WRITE(nmi_mask_w)
AM_RANGE(0xf502, 0xf502) AM_WRITE(mirax_coin_counter1_w) // only used in 'miraxa' - see notes AM_RANGE(0xf502, 0xf502) AM_WRITE(coin_counter1_w) // only used in 'miraxa' - see notes
AM_RANGE(0xf506, 0xf507) AM_WRITE(mirax_flip_screen_w) AM_RANGE(0xf506, 0xf507) AM_WRITE(flip_screen_w)
AM_RANGE(0xf800, 0xf800) AM_WRITE(mirax_sound_cmd_w) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_cmd_w)
// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack? // AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack?
ADDRESS_MAP_END ADDRESS_MAP_END
@ -455,7 +463,7 @@ static GFXDECODE_START( mirax )
GFXDECODE_END GFXDECODE_END
INTERRUPT_GEN_MEMBER(mirax_state::mirax_vblank_irq) INTERRUPT_GEN_MEMBER(mirax_state::vblank_irq)
{ {
if(m_nmi_mask) if(m_nmi_mask)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
@ -464,7 +472,7 @@ INTERRUPT_GEN_MEMBER(mirax_state::mirax_vblank_irq)
static MACHINE_CONFIG_START( mirax, mirax_state ) static MACHINE_CONFIG_START( mirax, mirax_state )
MCFG_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80 MCFG_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80
MCFG_CPU_PROGRAM_MAP(mirax_main_map) MCFG_CPU_PROGRAM_MAP(mirax_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mirax_state, mirax_vblank_irq) MCFG_CPU_VBLANK_INT_DRIVER("screen", mirax_state, vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80, 12000000/4) MCFG_CPU_ADD("audiocpu", Z80, 12000000/4)
MCFG_CPU_PROGRAM_MAP(mirax_sound_map) MCFG_CPU_PROGRAM_MAP(mirax_sound_map)
@ -476,7 +484,7 @@ static MACHINE_CONFIG_START( mirax, mirax_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mirax_state, screen_update_mirax) MCFG_SCREEN_UPDATE_DRIVER(mirax_state, screen_update)
MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 0x40) MCFG_PALETTE_ADD("palette", 0x40)
@ -572,5 +580,5 @@ DRIVER_INIT_MEMBER(mirax_state,mirax)
m_flipscreen_y = 0; m_flipscreen_y = 0;
} }
GAME( 1985, mirax, 0, mirax, mirax, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 1)", 0 ) GAME( 1985, mirax, 0, mirax, mirax, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 1)", GAME_SUPPORTS_SAVE )
GAME( 1985, miraxa, mirax, mirax, miraxa, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 2)", 0 ) GAME( 1985, miraxa, mirax, mirax, miraxa, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 2)", GAME_SUPPORTS_SAVE )

58
src/mame/includes/mainsnk.h
View File

@ -3,38 +3,44 @@ class mainsnk_state : public driver_device
public: public:
mainsnk_state(const machine_config &mconfig, device_type type, const char *tag) mainsnk_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_bgram(*this, "bgram"),
m_spriteram(*this, "spriteram"),
m_fgram(*this, "fgram"),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"), m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { } m_palette(*this, "palette"),
m_bgram(*this, "bgram"),
m_spriteram(*this, "spriteram"),
m_fgram(*this, "fgram") { }
tilemap_t *m_tx_tilemap;
tilemap_t *m_bg_tilemap;
required_shared_ptr<UINT8> m_bgram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_fgram;
int m_sound_cpu_busy;
UINT32 m_bg_tile_offset;
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_READ8_MEMBER(sound_command_r);
DECLARE_READ8_MEMBER(sound_ack_r);
DECLARE_WRITE8_MEMBER(mainsnk_c600_w);
DECLARE_WRITE8_MEMBER(mainsnk_fgram_w);
DECLARE_WRITE8_MEMBER(mainsnk_bgram_w);
DECLARE_CUSTOM_INPUT_MEMBER(mainsnk_sound_r);
TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void video_start();
DECLARE_PALETTE_INIT(mainsnk);
UINT32 screen_update_mainsnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int scrollx, int scrolly );
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette; required_device<palette_device> m_palette;
required_shared_ptr<UINT8> m_bgram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_fgram;
tilemap_t *m_tx_tilemap;
tilemap_t *m_bg_tilemap;
int m_sound_cpu_busy;
UINT32 m_bg_tile_offset;
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_READ8_MEMBER(sound_ack_r);
DECLARE_WRITE8_MEMBER(c600_w);
DECLARE_WRITE8_MEMBER(fgram_w);
DECLARE_WRITE8_MEMBER(bgram_w);
DECLARE_CUSTOM_INPUT_MEMBER(sound_r);
TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(mainsnk);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int scrollx, int scrolly );
}; };

10
src/mame/video/mainsnk.c
View File

@ -76,10 +76,12 @@ void mainsnk_state::video_start()
m_bg_tilemap->set_scrolldx(16, 16); m_bg_tilemap->set_scrolldx(16, 16);
m_bg_tilemap->set_scrolldy(8, 8); m_bg_tilemap->set_scrolldy(8, 8);
save_item(NAME(m_bg_tile_offset));
} }
WRITE8_MEMBER(mainsnk_state::mainsnk_c600_w) WRITE8_MEMBER(mainsnk_state::c600_w)
{ {
int bank; int bank;
int total_elements = m_gfxdecode->gfx(0)->elements(); int total_elements = m_gfxdecode->gfx(0)->elements();
@ -102,13 +104,13 @@ WRITE8_MEMBER(mainsnk_state::mainsnk_c600_w)
} }
} }
WRITE8_MEMBER(mainsnk_state::mainsnk_fgram_w) WRITE8_MEMBER(mainsnk_state::fgram_w)
{ {
m_fgram[offset] = data; m_fgram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset); m_tx_tilemap->mark_tile_dirty(offset);
} }
WRITE8_MEMBER(mainsnk_state::mainsnk_bgram_w) WRITE8_MEMBER(mainsnk_state::bgram_w)
{ {
m_bgram[offset] = data; m_bgram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset); m_bg_tilemap->mark_tile_dirty(offset);
@ -158,7 +160,7 @@ void mainsnk_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect
} }
UINT32 mainsnk_state::screen_update_mainsnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) UINT32 mainsnk_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
draw_sprites(bitmap, cliprect, 0, 0); draw_sprites(bitmap, cliprect, 0, 0);