Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various video system driver fixes/cleanups #12410

Merged
merged 6 commits into from
Jul 3, 2024
Merged

Various video system driver fixes/cleanups #12410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e15fdb9
Various video system driver fixes/cleanups
cam900 May 26, 2024
b3c86c9
Merge branch 'master' of https://github.com/mamedev/mame into vsystem…
cam900 Jun 30, 2024
df59e8f
vsystem_spr.h: Tidy
cuavas Jul 3, 2024
526adae
vsystem_spr.cpp: Lift some repeated expressions out of absurdly long …
cuavas Jul 3, 2024
08b82c4
vsystem_spr2.cpp: Make some lines shorter.
cuavas Jul 3, 2024
99cd05f
vsystem_spr.cpp: File uses standard integer types, not abbreviated ones.
cuavas Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions src/mame/vsystem/aerofgt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class aerofgt_state : public driver_device
void setbank(int layer, int num, int bank);
void gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint32_t tile_callback(uint32_t code);
uint32_t pri_callback(uint32_t color);
void soundlatch_pending_w(int state);
void sh_bankswitch_w(uint8_t data);

Expand Down Expand Up @@ -123,11 +124,17 @@ void aerofgt_state::video_start()

save_item(NAME(m_gfxbank));
save_item(NAME(m_bank));
save_item(NAME(m_scrolly));
}

uint32_t aerofgt_state::tile_callback(uint32_t code)
{
return m_sprlookupram[code&0x7fff];
return m_sprlookupram[code & 0x7fff];
}

uint32_t aerofgt_state::pri_callback(uint32_t color)
{
return BIT(color, 5) ? 0 : GFX_PMASK_2;
}


Expand Down Expand Up @@ -171,15 +178,10 @@ uint32_t aerofgt_state::screen_update(screen_device &screen, bitmap_ind16 &bitma

screen.priority().fill(0, cliprect);

m_tilemap[0]->draw(screen, bitmap, cliprect, 0, 0);

m_spr->draw_sprites(m_spriteram, m_spriteram.bytes(), screen, bitmap, cliprect, 0x03, 0x00);
m_spr->draw_sprites(m_spriteram, m_spriteram.bytes(), screen, bitmap, cliprect, 0x03, 0x01);
m_tilemap[0]->draw(screen, bitmap, cliprect, 0, 1);
m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 2);

m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0);

m_spr->draw_sprites(m_spriteram, m_spriteram.bytes(), screen, bitmap, cliprect, 0x03, 0x02);
m_spr->draw_sprites(m_spriteram, m_spriteram.bytes(), screen, bitmap, cliprect, 0x03, 0x03);
m_spr->draw_sprites(m_spriteram, m_spriteram.bytes(), screen, bitmap, cliprect);

return 0;
}
Expand Down Expand Up @@ -339,20 +341,23 @@ INPUT_PORTS_END


static GFXDECODE_START( gfx_aerofgt )
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 0, 16 )
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_msb, 256, 16 )
GFXDECODE_ENTRY( "gfx2", 0, gfx_16x16x4_packed_msb, 512, 32 )
GFXDECODE_ENTRY( "tiles", 0, gfx_8x8x4_packed_msb, 0, 16 )
GFXDECODE_ENTRY( "tiles", 0, gfx_8x8x4_packed_msb, 256, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_aerofgt_spr )
GFXDECODE_ENTRY( "sprites", 0, gfx_16x16x4_packed_msb, 512, 32 )
GFXDECODE_END


void aerofgt_state::machine_start()
{
m_soundbank->configure_entries(0, 4, memregion("soundbank")->base(), 0x8000);
m_soundbank->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000);
}

void aerofgt_state::machine_reset()
{
m_soundbank->set_entry(0); // needed by spinlbrk
m_soundbank->set_entry(0);
}

void aerofgt_state::aerofgt(machine_config &config)
Expand Down Expand Up @@ -390,10 +395,9 @@ void aerofgt_state::aerofgt(machine_config &config)
GFXDECODE(config, m_gfxdecode, m_palette, gfx_aerofgt);
PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 1024);

VSYSTEM_SPR(config, m_spr, 0);
VSYSTEM_SPR(config, m_spr, 0, m_palette, gfx_aerofgt_spr);
m_spr->set_tile_indirect_cb(FUNC(aerofgt_state::tile_callback));
m_spr->set_gfx_region(2);
m_spr->set_gfxdecode_tag(m_gfxdecode);
m_spr->set_pri_cb(FUNC(aerofgt_state::pri_callback));

// sound hardware
SPEAKER(config, "lspeaker").front_left();
Expand Down Expand Up @@ -423,17 +427,14 @@ ROM_START( aerofgt )
ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 code
ROM_LOAD16_WORD_SWAP( "1.u4", 0x00000, 0x80000, CRC(6fdff0a2) SHA1(7cc9529b426091027aa3e23586cb7d162376c0ff) )

ROM_REGION( 0x20000, "soundbank", 0 ) // 128k for the audio CPU + banks
ROM_REGION( 0x20000, "audiocpu", 0 ) // 128k for the audio CPU + banks
ROM_LOAD( "2.153", 0x00000, 0x20000, CRC(a1ef64ec) SHA1(fa3e434738bf4e742ad68882c1e914100ce0f761) )

ROM_REGION( 0x08000, "audiocpu", 0 ) // 32k for the audio CPU
ROM_COPY( "soundbank", 0x00000, 0x00000, 0x08000 )

ROM_REGION( 0x100000, "gfx1", 0 )
ROM_REGION( 0x100000, "tiles", 0 )
ROM_LOAD16_WORD_SWAP( "538a54.124", 0x000000, 0x80000, CRC(4d2c4df2) SHA1(f51c2b3135f0a921ac1a79e63d6878c03cb6254b) )
ROM_LOAD16_WORD_SWAP( "1538a54.124", 0x080000, 0x80000, CRC(286d109e) SHA1(3a5f3d2d89cf58f6ef15e4bd3f570b84e8e695b2) )

ROM_REGION( 0x400000, "gfx2", 0 )
ROM_REGION( 0x400000, "sprites", 0 )
ROM_LOAD16_WORD_SWAP( "538a53.u9", 0x000000, 0x100000, CRC(630d8e0b) SHA1(5a0c252ccd53c5199a695909d25ecb4e53dc15b9) )
ROM_LOAD16_WORD_SWAP( "534g8f.u18", 0x200000, 0x080000, CRC(76ce0926) SHA1(5ef4cec215d4dd600d8fcd1bd9a4c09081d59e33) )

Expand Down
40 changes: 14 additions & 26 deletions src/mame/vsystem/crshrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,22 +561,12 @@ INPUT_PORTS_END



static const gfx_layout tilelayout =
{
16,16,
RGN_FRAC(1,1),
4,
{ 0, 1, 2, 3 },
{ 2*4, 3*4, 0*4, 1*4, 6*4, 7*4, 4*4, 5*4,
10*4, 11*4, 8*4, 9*4, 14*4, 15*4, 12*4, 13*4 },
{ 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64,
8*64, 9*64, 10*64, 11*64, 12*64, 13*64, 14*64, 15*64 },
128*8
};

static GFXDECODE_START( gfx_crshrace )
GFXDECODE_ENTRY( "chars", 0, gfx_8x8x8_raw, 0, 1 )
GFXDECODE_ENTRY( "tiles", 0, tilelayout, 256, 16 )
GFXDECODE_ENTRY( "tiles", 0, gfx_16x16x4_packed_msb, 256, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_crshrace_spr )
GFXDECODE_ENTRY( "sprites", 0, gfx_16x16x4_packed_lsb, 512, 32 )
GFXDECODE_END

Expand Down Expand Up @@ -621,10 +611,8 @@ void crshrace_state::crshrace(machine_config &config) // TODO: PCB sports 32 MHz
GFXDECODE(config, m_gfxdecode, m_palette, gfx_crshrace);
PALETTE(config, m_palette).set_format(palette_device::xGBR_555, 2048);

VSYSTEM_SPR(config, m_spr, 0);
VSYSTEM_SPR(config, m_spr, 0, m_palette, gfx_crshrace_spr);
m_spr->set_tile_indirect_cb(FUNC(crshrace_state::tile_callback));
m_spr->set_gfx_region(2);
m_spr->set_gfxdecode_tag(m_gfxdecode);

BUFFERED_SPRITERAM16(config, m_spriteram[0]);
BUFFERED_SPRITERAM16(config, m_spriteram[1]);
Expand Down Expand Up @@ -667,9 +655,9 @@ ROM_START( crshrace )
ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) )

ROM_REGION( 0x400000, "tiles", 0 )
ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
ROM_LOAD16_WORD_SWAP( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
ROM_LOAD16_WORD_SWAP( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
ROM_LOAD16_WORD_SWAP( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
// 300000-3fffff empty

ROM_REGION( 0x400000, "sprites", 0 )
Expand Down Expand Up @@ -700,9 +688,9 @@ ROM_START( crshrace2 )
ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) )

ROM_REGION( 0x400000, "tiles", 0 )
ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
ROM_LOAD16_WORD_SWAP( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
ROM_LOAD16_WORD_SWAP( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
ROM_LOAD16_WORD_SWAP( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
// 300000-3fffff empty

ROM_REGION( 0x400000, "sprites", 0 )
Expand Down Expand Up @@ -733,9 +721,9 @@ ROM_START( crshrace2a )
ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) )

ROM_REGION( 0x400000, "tiles", 0 ) // on a riser board
ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
ROM_LOAD16_WORD_SWAP( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
ROM_LOAD16_WORD_SWAP( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
ROM_LOAD16_WORD_SWAP( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
// 300000-3fffff empty

ROM_REGION( 0x400000, "sprites", 0 )
Expand Down
60 changes: 35 additions & 25 deletions src/mame/vsystem/f1gp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ TILE_GET_INFO_MEMBER(f1gp_state::get_roz_tile_info)
{
int const code = m_rozvideoram[tile_index];

tileinfo.set(3, code & 0x7ff, code >> 12, 0);
tileinfo.set(1, code & 0x7ff, code >> 12, 0);
}

TILE_GET_INFO_MEMBER(f1gp2_state::get_roz_tile_info)
{
int const code = m_rozvideoram[tile_index];

tileinfo.set(2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0);
tileinfo.set(1, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0);
}


Expand Down Expand Up @@ -262,7 +262,7 @@ void f1gp2_state::video_start()
void f1gp_state::rozgfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_rozgfxram[offset]);
m_gfxdecode->gfx(3)->mark_dirty(offset / 64);
m_gfxdecode->gfx(1)->mark_dirty(offset / 64);
}

void f1gp_state::rozvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
Expand Down Expand Up @@ -319,13 +319,13 @@ uint32_t f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bit
// quick kludge for "continue" screen priority
if (m_gfxctrl == 0x00)
{
m_spr_old[0]->turbofrc_draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02);
m_spr_old[1]->turbofrc_draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02);
m_spr_old[0]->draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02);
m_spr_old[1]->draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02);
}
else
{
m_spr_old[0]->turbofrc_draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x00);
m_spr_old[1]->turbofrc_draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02);
m_spr_old[0]->draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x00);
m_spr_old[1]->draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02);
}
return 0;
}
Expand Down Expand Up @@ -386,8 +386,8 @@ void f1gp_state::f1gpbl_draw_sprites(screen_device &screen,bitmap_ind16 &bitmap,
{
int const x = (m_spriteram[attr_start + 2] & 0x03ff) - 48;
int const y = (256 - (m_spriteram[attr_start + 3 - 4] & 0x03ff)) - 15;
int const flipx = m_spriteram[attr_start + 1] & 0x0800;
int const flipy = m_spriteram[attr_start + 1] & 0x8000;
bool const flipx = BIT(m_spriteram[attr_start + 1], 11);
bool const flipy = BIT(m_spriteram[attr_start + 1], 15);
int const color = m_spriteram[attr_start + 1] & 0x000f;
int code = m_spriteram[attr_start + 0] & 0x3fff;
int const pri = 0; //?
Expand All @@ -413,7 +413,7 @@ void f1gp_state::f1gpbl_draw_sprites(screen_device &screen,bitmap_ind16 &bitmap,
gfx = 0;
}

m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap, cliprect,
m_gfxdecode->gfx(2 + gfx)->prio_transpen(bitmap, cliprect,
code,
color,
flipx, flipy,
Expand All @@ -422,7 +422,7 @@ void f1gp_state::f1gpbl_draw_sprites(screen_device &screen,bitmap_ind16 &bitmap,
pri ? 0 : 0x2, 15);

// wrap around x
m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap, cliprect,
m_gfxdecode->gfx(2 + gfx)->prio_transpen(bitmap, cliprect,
code,
color,
flipx, flipy,
Expand Down Expand Up @@ -746,15 +746,31 @@ INPUT_PORTS_END

static GFXDECODE_START( gfx_f1gp )
GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x8_raw, 0x000, 1 )
GFXDECODE_RAM( "rozgfxram", 0, gfx_16x16x4_packed_msb, 0x300, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_f1gp_spr1 )
GFXDECODE_ENTRY( "sprites1", 0, gfx_16x16x4_packed_lsb, 0x100, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_f1gp_spr2 )
GFXDECODE_ENTRY( "sprites2", 0, gfx_16x16x4_packed_lsb, 0x200, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_f1gpbl )
GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x8_raw, 0x000, 1 )
GFXDECODE_RAM( "rozgfxram", 0, gfx_16x16x4_packed_msb, 0x300, 16 )
GFXDECODE_ENTRY( "sprites1", 0, gfx_16x16x4_packed_lsb, 0x100, 16 )
GFXDECODE_ENTRY( "sprites2", 0, gfx_16x16x4_packed_lsb, 0x200, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_f1gp2 )
GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x8_raw, 0x000, 1 )
GFXDECODE_ENTRY( "roztiles", 0, gfx_16x16x4_packed_msb, 0x100, 16 )
GFXDECODE_END

static GFXDECODE_START( gfx_f1gp2_spr )
GFXDECODE_ENTRY( "sprites1", 0, gfx_16x16x4_packed_lsb, 0x200, 32 )
GFXDECODE_ENTRY( "sprites2", 0, gfx_16x16x4_packed_msb, 0x100, 16 )
GFXDECODE_END


Expand Down Expand Up @@ -829,17 +845,13 @@ void f1gp_state::f1gp(machine_config &config)

VSYSTEM_GGA(config, "gga", XTAL(14'318'181) / 2); // divider not verified

VSYSTEM_SPR2(config, m_spr_old[0], 0);
VSYSTEM_SPR2(config, m_spr_old[0], 0, m_palette, gfx_f1gp_spr1);
m_spr_old[0]->set_tile_indirect_cb(FUNC(f1gp2_state::tile_callback<0>));
m_spr_old[0]->set_gfx_region(1);
m_spr_old[0]->set_pritype(2);
m_spr_old[0]->set_gfxdecode_tag(m_gfxdecode);

VSYSTEM_SPR2(config, m_spr_old[1], 0);
VSYSTEM_SPR2(config, m_spr_old[1], 0, m_palette, gfx_f1gp_spr2);
m_spr_old[1]->set_tile_indirect_cb(FUNC(f1gp2_state::tile_callback<1>));
m_spr_old[1]->set_gfx_region(2);
m_spr_old[1]->set_pritype(2);
m_spr_old[1]->set_gfxdecode_tag(m_gfxdecode);

K053936(config, m_k053936, 0);
m_k053936->set_wrap(1);
Expand Down Expand Up @@ -891,7 +903,7 @@ void f1gp_state::f1gpbl(machine_config &config)
screen.set_screen_update(FUNC(f1gp_state::screen_update_f1gpbl));
screen.set_palette(m_palette);

GFXDECODE(config, m_gfxdecode, m_palette, gfx_f1gp);
GFXDECODE(config, m_gfxdecode, m_palette, gfx_f1gpbl);
PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048);

//VSYSTEM_GGA(config, "gga", 0);
Expand Down Expand Up @@ -920,10 +932,8 @@ void f1gp2_state::f1gp2(machine_config &config)
config.device_remove("vsystem_spr_old1");
config.device_remove("vsystem_spr_old2");

VSYSTEM_SPR(config, m_spr, 0);
VSYSTEM_SPR(config, m_spr, 0, m_palette, gfx_f1gp2_spr);
m_spr->set_tile_indirect_cb(FUNC(f1gp2_state::tile_callback<0>));
m_spr->set_gfx_region(1);
m_spr->set_gfxdecode_tag(m_gfxdecode);

m_k053936->set_offsets(-48, -21);
}
Expand Down Expand Up @@ -993,7 +1003,7 @@ ROM_START( f1gpa )
ROM_REGION( 0x20000, "sub", 0 ) // 68000 code
ROM_LOAD16_WORD_SWAP( "rom4-a.4", 0x00000, 0x20000, CRC(8e811d36) SHA1(2b806b50a3a307a21894687f16485ace287a7c4c) )

ROM_REGION( 0x20000, "audiocpu", 0 ) /* 64k for the audio CPU + banks */
ROM_REGION( 0x20000, "audiocpu", 0 ) // 64k for the audio CPU + banks
ROM_LOAD( "rom5-a.8", 0x00000, 0x20000, CRC(9ea36e35) SHA1(9254dea8362318d8cfbd5e36e476e0e235e6326a) )

ROM_REGION( 0x200000, "fgtiles", 0 )
Expand Down Expand Up @@ -1036,7 +1046,7 @@ ROM_START( f1gpb ) // 0F17-A-04 PCB
ROM_REGION( 0x20000, "sub", 0 ) // 68000 code
ROM_LOAD16_WORD_SWAP( "rom4.4", 0x00000, 0x20000, CRC(8e811d36) SHA1(2b806b50a3a307a21894687f16485ace287a7c4c) )

ROM_REGION( 0x20000, "audiocpu", 0 ) /* 64k for the audio CPU + banks */
ROM_REGION( 0x20000, "audiocpu", 0 ) // 64k for the audio CPU + banks
ROM_LOAD( "rom5.8", 0x00000, 0x20000, CRC(9ea36e35) SHA1(9254dea8362318d8cfbd5e36e476e0e235e6326a) )

ROM_REGION( 0x200000, "fgtiles", 0 )
Expand Down Expand Up @@ -1137,7 +1147,7 @@ ROM_START( f1gp2 )
ROM_REGION( 0x200000, "sprites1", 0 )
ROM_LOAD( "rom15", 0x000000, 0x200000, CRC(1ac03e2e) SHA1(9073d0ae24364229a993046bd71e403988692993) )

ROM_REGION( 0x400000, "sprites2", 0 )
ROM_REGION( 0x400000, "roztiles", 0 )
ROM_LOAD16_WORD_SWAP( "rom11", 0x000000, 0x100000, CRC(b22a2c1f) SHA1(b5e67726be5a8561cd04c3c07895b8518b73b89c) )
ROM_LOAD16_WORD_SWAP( "rom10", 0x100000, 0x100000, CRC(43fcbe23) SHA1(54ab58d904890a0b907e674f855092e974c45edc) )
ROM_LOAD16_WORD_SWAP( "rom9", 0x200000, 0x100000, CRC(1bede8a1) SHA1(325ecc3afb30d281c2c8a56719e83e4dc20545bb) )
Expand Down
7 changes: 3 additions & 4 deletions src/mame/vsystem/fromance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "vsystem_gga.h"
#include "vsystem_spr2.h"
#include "emupal.h"
#include "screen.h"
#include "tilemap.h"
Expand Down Expand Up @@ -80,19 +79,19 @@ class fromance_state : public driver_device
optional_device<generic_latch_8_device> m_sublatch;
optional_device<msm5205_device> m_msm;

/* video-related */
// video-related
std::unique_ptr<uint8_t[]> m_local_videoram[2];
std::unique_ptr<uint8_t[]> m_local_paletteram;

emu_timer *m_crtc_timer;

/* misc */
// misc
uint8_t m_portselect = 0;
uint8_t m_adpcm_reset = 0;
uint8_t m_adpcm_data = 0;
uint8_t m_vclk_left = 0;

/* devices */
// devices
uint8_t fromance_busycheck_main_r();
uint8_t fromance_busycheck_sub_r();
void fromance_rombank_w(uint8_t data);
Expand Down
Loading
Loading