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

ddragon3.c: palette cleanup (nw)

Browse Source
This commit is contained in:
Alex W. Jackson 2014-05-06 05:59:14 +00:00
parent 4bfc3aa3e8
commit 4885348d99
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mame/drivers/ddragon3.c
View File

@ -260,15 +260,15 @@ WRITE16_MEMBER(wwfwfest_state::wwfwfest_flipscreen_w)
flip_screen_set(data&1);
}
/*- Palette Reads/Writes -*/
/*- Palette Reads/Writes - A5 and A6 are not connected */
READ16_MEMBER(wwfwfest_state::wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r)
READ16_MEMBER(wwfwfest_state::wwfwfest_paletteram_r)
{
offset = (offset & 0x000f) | (offset & 0x7fc0) >> 2;
return m_paletteram[offset];
}
WRITE16_MEMBER(wwfwfest_state::wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w)
WRITE16_MEMBER(wwfwfest_state::wwfwfest_paletteram_w)
{
offset = (offset & 0x000f) | (offset & 0x7fc0) >> 2;
m_palette->write(space, offset, data, mem_mask);
@ -367,7 +367,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wwfwfest_state )
AM_RANGE(0x140022, 0x140023) AM_READ_PORT("P2")
AM_RANGE(0x140024, 0x140025) AM_READ_PORT("P3")
AM_RANGE(0x140026, 0x140027) AM_READ_PORT("P4")
AM_RANGE(0x180000, 0x18ffff) AM_READWRITE(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r,wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x18ffff) AM_READWRITE(wwfwfest_paletteram_r,wwfwfest_paletteram_w) AM_SHARE("palette")
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* Work Ram */
ADDRESS_MAP_END
@ -800,9 +800,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon3_state::ddragon3_scanline)
void ddragon3_state::machine_start()
{
m_paletteram.resize(m_palette->entries());
m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2);
save_item(NAME(m_vreg));
save_item(NAME(m_bg_scrollx));
save_item(NAME(m_bg_scrolly));

9
src/mame/includes/ddragon3.h
View File

@ -32,7 +32,6 @@ public:
required_shared_ptr<UINT16> m_fg_videoram;
// required_shared_ptr<UINT16> m_spriteram;
required_device<buffered_spriteram16_device> m_spriteram;
dynamic_array<UINT16> m_paletteram;
/* video-related */
tilemap_t *m_fg_tilemap;
@ -86,7 +85,8 @@ class wwfwfest_state : public ddragon3_state
public:
wwfwfest_state(const machine_config &mconfig, device_type type, const char *tag)
: ddragon3_state(mconfig, type, tag),
m_fg0_videoram(*this, "fg0_videoram")
m_fg0_videoram(*this, "fg0_videoram"),
m_paletteram(*this, "palette")
{
vblank_level = 3;
raster_level = 2;
@ -94,6 +94,7 @@ public:
/* wwfwfest has an extra layer */
required_shared_ptr<UINT16> m_fg0_videoram;
required_shared_ptr<UINT16> m_paletteram;
tilemap_t *m_fg0_tilemap;
DECLARE_WRITE16_MEMBER(wwfwfest_fg0_videoram_w);
@ -103,8 +104,8 @@ public:
DECLARE_WRITE16_MEMBER(wwfwfest_scroll_write);
DECLARE_WRITE16_MEMBER(wwfwfest_irq_ack_w);
DECLARE_WRITE16_MEMBER(wwfwfest_flipscreen_w);
DECLARE_READ16_MEMBER(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r);
DECLARE_WRITE16_MEMBER(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w);
DECLARE_READ16_MEMBER(wwfwfest_paletteram_r);
DECLARE_WRITE16_MEMBER(wwfwfest_paletteram_w);
DECLARE_WRITE16_MEMBER(wwfwfest_soundwrite);
DECLARE_CUSTOM_INPUT_MEMBER(dsw_3f_r);