diff options
Diffstat (limited to 'src/mame/drivers/tatsumi.c')
-rw-r--r-- | src/mame/drivers/tatsumi.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index 4ec06e9f152..1ddd71f89dd 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -1284,9 +1284,9 @@ ROM_END static DRIVER_INIT( apache3 ) { tatsumi_state *state = machine.driver_data<tatsumi_state>(); - UINT8 *dst = machine.region("gfx1")->base(); - UINT8 *src1 = machine.region("gfx2")->base(); - UINT8 *src2 = machine.region("gfx3")->base(); + UINT8 *dst = machine.root_device().memregion("gfx1")->base(); + UINT8 *src1 = machine.root_device().memregion("gfx2")->base(); + UINT8 *src2 = state->memregion("gfx3")->base(); int i; for (i=0; i<0x100000; i+=32) { @@ -1299,10 +1299,10 @@ static DRIVER_INIT( apache3 ) } // Copy sprite & palette data out of GFX rom area - state->m_rom_sprite_lookup1 = machine.region("gfx2")->base(); - state->m_rom_sprite_lookup2 = machine.region("gfx3")->base(); - state->m_rom_clut0 = machine.region("gfx2")->base()+ 0x100000 - 0x800; - state->m_rom_clut1 = machine.region("gfx3")->base()+ 0x100000 - 0x800; + state->m_rom_sprite_lookup1 = machine.root_device().memregion("gfx2")->base(); + state->m_rom_sprite_lookup2 = machine.root_device().memregion("gfx3")->base(); + state->m_rom_clut0 = machine.root_device().memregion("gfx2")->base()+ 0x100000 - 0x800; + state->m_rom_clut1 = machine.root_device().memregion("gfx3")->base()+ 0x100000 - 0x800; tatsumi_reset(machine); @@ -1312,9 +1312,9 @@ static DRIVER_INIT( apache3 ) static DRIVER_INIT( roundup5 ) { tatsumi_state *state = machine.driver_data<tatsumi_state>(); - UINT8 *dst = machine.region("gfx1")->base(); - UINT8 *src1 = machine.region("gfx2")->base(); - UINT8 *src2 = machine.region("gfx3")->base(); + UINT8 *dst = machine.root_device().memregion("gfx1")->base(); + UINT8 *src1 = machine.root_device().memregion("gfx2")->base(); + UINT8 *src2 = state->memregion("gfx3")->base(); int i; for (i=0; i<0xc0000; i+=32) { @@ -1327,10 +1327,10 @@ static DRIVER_INIT( roundup5 ) } // Copy sprite & palette data out of GFX rom area - state->m_rom_sprite_lookup1 = machine.region("gfx2")->base(); - state->m_rom_sprite_lookup2 = machine.region("gfx3")->base(); - state->m_rom_clut0 = machine.region("gfx2")->base()+ 0xc0000 - 0x800; - state->m_rom_clut1 = machine.region("gfx3")->base()+ 0xc0000 - 0x800; + state->m_rom_sprite_lookup1 = machine.root_device().memregion("gfx2")->base(); + state->m_rom_sprite_lookup2 = machine.root_device().memregion("gfx3")->base(); + state->m_rom_clut0 = machine.root_device().memregion("gfx2")->base()+ 0xc0000 - 0x800; + state->m_rom_clut1 = machine.root_device().memregion("gfx3")->base()+ 0xc0000 - 0x800; tatsumi_reset(machine); } @@ -1338,11 +1338,11 @@ static DRIVER_INIT( roundup5 ) static DRIVER_INIT( cyclwarr ) { tatsumi_state *state = machine.driver_data<tatsumi_state>(); - UINT8 *dst = machine.region("gfx1")->base(); - UINT8 *src1 = machine.region("gfx2")->base(); - int len1 = machine.region("gfx2")->bytes(); - UINT8 *src2 = machine.region("gfx3")->base(); - int len2 = machine.region("gfx3")->bytes(); + UINT8 *dst = machine.root_device().memregion("gfx1")->base(); + UINT8 *src1 = machine.root_device().memregion("gfx2")->base(); + int len1 = machine.root_device().memregion("gfx2")->bytes(); + UINT8 *src2 = machine.root_device().memregion("gfx3")->base(); + int len2 = state->memregion("gfx3")->bytes(); int i; for (i=0; i<len1; i+=32) { memcpy(dst,src1,32); @@ -1353,19 +1353,19 @@ static DRIVER_INIT( cyclwarr ) src2+=32; } - dst = machine.region("maincpu")->base(); + dst = machine.root_device().memregion("maincpu")->base(); memcpy(state->m_cyclwarr_cpua_ram,dst,8); state->membank("bank1")->set_base(dst); - dst = machine.region("sub")->base(); + dst = machine.root_device().memregion("sub")->base(); memcpy(state->m_cyclwarr_cpub_ram,dst,8); state->membank("bank2")->set_base(dst); // Copy sprite & palette data out of GFX rom area - state->m_rom_sprite_lookup1 = machine.region("gfx2")->base(); - state->m_rom_sprite_lookup2 = machine.region("gfx3")->base(); - state->m_rom_clut0 = machine.region("gfx2")->base() + len1 - 0x1000; - state->m_rom_clut1 = machine.region("gfx3")->base() + len2 - 0x1000; + state->m_rom_sprite_lookup1 = machine.root_device().memregion("gfx2")->base(); + state->m_rom_sprite_lookup2 = machine.root_device().memregion("gfx3")->base(); + state->m_rom_clut0 = machine.root_device().memregion("gfx2")->base() + len1 - 0x1000; + state->m_rom_clut1 = machine.root_device().memregion("gfx3")->base() + len2 - 0x1000; tatsumi_reset(machine); } |