From 579b5b2a8ebe240ba4522eb7788b9eaf624772f1 Mon Sep 17 00:00:00 2001 From: cam900 Date: Wed, 1 Jan 2025 16:21:31 +0900 Subject: [PATCH] atari: Clearned up various Atari 2D drivers: (#13133) * Reduce tilemap sizes to match tilemap RAM size. * Suppress side effects for debugger accesses. * Reduced use of literal tags and run-time tag lookups. * Use GFXENTRY_SCALE rather than duplicating bits in the layouts. * Made some variable const, improved naming of functions and ROM regions, and updated comments. * atari/arcadecl.cpp: moved graphics decoding device to Arcade Classics state as Sparks lacks sprites. * atari/atarimo.cpp: Removed unnecessary configuration parameter and unnecessary graphics decode reconfiguration. * atari/atarisy1.cpp, atari/atarisys2.cpp: Reduced use of preprocessor macros. * atari/skullxbo.cpp: Removed unnecessary driver init functions. --- src/mame/atari/arcadecl.cpp | 13 +- src/mame/atari/atarimo.cpp | 49 +++--- src/mame/atari/atarimo.h | 19 ++- src/mame/atari/atarisy1.cpp | 14 +- src/mame/atari/atarisy1.h | 34 +++-- src/mame/atari/atarisy1_v.cpp | 110 +++++++------- src/mame/atari/atarisy2.cpp | 276 +++++++++++++++++----------------- src/mame/atari/atarisy2.h | 37 +++-- src/mame/atari/atarisy2_v.cpp | 19 ++- src/mame/atari/atarivad.cpp | 21 +-- src/mame/atari/badlands.cpp | 24 +-- src/mame/atari/badlands.h | 9 ++ src/mame/atari/badlands_v.cpp | 11 +- src/mame/atari/badlandsbl.cpp | 19 +-- src/mame/atari/batman.cpp | 15 +- src/mame/atari/blstroid.cpp | 19 +-- src/mame/atari/cyberbal.cpp | 26 +--- src/mame/atari/cybstorm.cpp | 19 ++- src/mame/atari/eprom.cpp | 22 ++- src/mame/atari/gauntlet.cpp | 129 ++++++++-------- src/mame/atari/klax.cpp | 3 +- src/mame/atari/marblmd2.cpp | 11 +- src/mame/atari/offtwall.cpp | 62 ++++---- src/mame/atari/rampart.cpp | 13 +- src/mame/atari/relief.cpp | 3 +- src/mame/atari/shuuz.cpp | 19 ++- src/mame/atari/skullxbo.cpp | 51 +++---- src/mame/atari/thunderj.cpp | 19 ++- src/mame/atari/toobin.cpp | 51 +++---- src/mame/atari/vindictr.cpp | 3 +- src/mame/atari/xybots.cpp | 5 +- 31 files changed, 539 insertions(+), 586 deletions(-) diff --git a/src/mame/atari/arcadecl.cpp b/src/mame/atari/arcadecl.cpp index df3e86d5fa6..ae53073f1e3 100644 --- a/src/mame/atari/arcadecl.cpp +++ b/src/mame/atari/arcadecl.cpp @@ -92,7 +92,6 @@ public: sparkz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") - , m_gfxdecode(*this, "gfxdecode") , m_screen(*this, "screen") , m_oki(*this, "oki") , m_bitmap(*this, "bitmap") @@ -104,7 +103,6 @@ protected: virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; - required_device m_gfxdecode; required_device m_screen; required_device m_oki; required_shared_ptr m_bitmap; @@ -122,6 +120,7 @@ class arcadecl_state : public sparkz_state public: arcadecl_state(const machine_config &mconfig, device_type type, const char *tag) : sparkz_state(mconfig, type, tag) + , m_gfxdecode(*this, "gfxdecode") , m_mob(*this, "mob") { } @@ -132,6 +131,7 @@ protected: virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) override; private: + required_device m_gfxdecode; required_device m_mob; static const atari_motion_objects_config s_mob_config; @@ -166,7 +166,6 @@ const atari_motion_objects_config arcadecl_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -288,7 +287,7 @@ void sparkz_state::latch_w(uint8_t data) 0x001F == volume */ - m_oki->set_rom_bank((data >> 7) & 1); + m_oki->set_rom_bank(BIT(data, 7)); m_oki->set_output_gain(ALL_OUTPUTS, (data & 0x001f) / 31.0f); } @@ -319,7 +318,7 @@ void sparkz_state::main_map(address_map &map) map(0x640041, 0x640041).mirror(0xe).w(FUNC(sparkz_state::latch_w)); map(0x640060, 0x64006f).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write16)); map(0x641000, 0x6413ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); - map(0x642000, 0x642000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x642000, 0x642000).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x646000, 0x646001).mirror(0xffe).w(FUNC(sparkz_state::scanline_int_ack_w)); map(0x647000, 0x647fff).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); } @@ -476,7 +475,6 @@ void sparkz_state::sparkz(machine_config &config) WATCHDOG_TIMER(config, "watchdog"); // video hardware - GFXDECODE(config, m_gfxdecode, "palette", gfx_arcadecl); palette_device &palette(PALETTE(config, "palette")); palette.set_format(palette_device::IRGB_1555, 512); palette.set_membits(8); @@ -500,6 +498,7 @@ void arcadecl_state::arcadecl(machine_config &config) { sparkz(config); + GFXDECODE(config, m_gfxdecode, "palette", gfx_arcadecl); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, arcadecl_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); } @@ -530,8 +529,6 @@ ROM_START( sparkz ) ROM_LOAD16_BYTE( "sparkzpg.0", 0x00000, 0x80000, CRC(a75c331c) SHA1(855ed44bd23c1dd0ca64926cacc8be62aca82fe2) ) ROM_LOAD16_BYTE( "sparkzpg.1", 0x00001, 0x80000, CRC(1af1fc04) SHA1(6d92edb1a881ba6b63e0144c9c3e631b654bf8ae) ) - ROM_REGION( 0x20000, "gfx1", ROMREGION_ERASE00 ) // Unknown size, Unpopulated - ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "sparkzsn", 0x00000, 0x80000, CRC(87097ce2) SHA1(dc4d199b5af692d111c087af3edc01e2ac0287a8) ) ROM_END diff --git a/src/mame/atari/atarimo.cpp b/src/mame/atari/atarimo.cpp index 74701174253..85d852cc374 100644 --- a/src/mame/atari/atarimo.cpp +++ b/src/mame/atari/atarimo.cpp @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles /*************************************************************************** - atarimo.c + atarimo.cpp Common motion object management functions for Atari raster games. @@ -308,19 +308,19 @@ void atari_motion_objects_device::device_start() m_slipram = m_slipramshare; // allocate and initialize the code lookup - int codesize = round_to_powerof2(m_codemask.mask()); + int const codesize = round_to_powerof2(m_codemask.mask()); m_codelookup.resize(codesize); for (int i = 0; i < codesize; i++) m_codelookup[i] = i; // allocate and initialize the color lookup - int colorsize = round_to_powerof2(m_colormask.mask()); + int const colorsize = round_to_powerof2(m_colormask.mask()); m_colorlookup.resize(colorsize); for (int i = 0; i < colorsize; i++) m_colorlookup[i] = i; // allocate and the gfx lookup - int gfxsize = codesize / 256; + int const gfxsize = codesize / 256; m_gfxlookup.resize(gfxsize); for (int i = 0; i < gfxsize; i++) m_gfxlookup[i] = m_gfxindex; @@ -373,7 +373,7 @@ TIMER_CALLBACK_MEMBER(atari_motion_objects_device::force_update) void atari_motion_objects_device::build_active_list(int link) { - uint16_t *bankbase = &spriteram()[m_bank << (m_entrybits + 2)]; + uint16_t const *bankbase = &spriteram()[m_bank << (m_entrybits + 2)]; uint16_t *current = &m_activelist[0]; // visit all the motion objects and copy their data into the display list @@ -384,7 +384,7 @@ void atari_motion_objects_device::build_active_list(int link) uint16_t *modata = current; if (!m_split) { - uint16_t *srcdata = &bankbase[link * 4]; + uint16_t const *srcdata = &bankbase[link * 4]; *current++ = srcdata[0]; *current++ = srcdata[1]; *current++ = srcdata[2]; @@ -392,7 +392,7 @@ void atari_motion_objects_device::build_active_list(int link) } else { - uint16_t *srcdata = &bankbase[link]; + uint16_t const *srcdata = &bankbase[link]; *current++ = srcdata[uint32_t(0 << m_entrybits)]; *current++ = srcdata[uint32_t(1 << m_entrybits)]; *current++ = srcdata[uint32_t(2 << m_entrybits)]; @@ -421,28 +421,22 @@ void atari_motion_objects_device::build_active_list(int link) void atari_motion_objects_device::render_object(bitmap_ind16 &bitmap, const rectangle &cliprect, const uint16_t *entry) { // select the gfx element and save off key information - int rawcode = m_codemask.extract(entry); + int const rawcode = m_codemask.extract(entry); gfx_element *gfx = m_gfxdecode->gfx(m_gfxlookup[rawcode >> 8]); - int save_granularity = gfx->granularity(); - int save_colorbase = gfx->colorbase(); - int save_colors = gfx->colors(); - gfx->set_granularity(1); - gfx->set_colorbase(0); - gfx->set_colors(65536); // extract data from the various words int code = m_codelookup[rawcode]; int color = m_colorlookup[m_colormask.extract(entry)]; int xpos = m_xposmask.extract(entry) + m_xoffset; int ypos = -m_yposmask.extract(entry); - int hflip = m_hflipmask.extract(entry); - int vflip = m_vflipmask.extract(entry); - int width = m_widthmask.extract(entry) + 1; - int height = m_heightmask.extract(entry) + 1; - int priority = m_prioritymask.extract(entry); + int const hflip = m_hflipmask.extract(entry); + int const vflip = m_vflipmask.extract(entry); + int const width = m_widthmask.extract(entry) + 1; + int const height = m_heightmask.extract(entry) + 1; + int const priority = m_prioritymask.extract(entry); // compute the effective color, merging in priority - color = (color * save_granularity) | (priority << PRIORITY_SHIFT); + color = (color * gfx->granularity()) | (priority << PRIORITY_SHIFT); color += m_palettebase; // add in the scroll positions if we're not in absolute coordinates @@ -520,7 +514,7 @@ void atari_motion_objects_device::render_object(bitmap_ind16 &bitmap, const rect continue; // draw the sprite - gfx->transpen_raw(bitmap,cliprect, code, color, hflip, vflip, sx, sy, m_transpen); + gfx->transpen_raw(bitmap, cliprect, code, color, hflip, vflip, sx, sy, m_transpen); mark_dirty(sx, sx + m_tilewidth - 1, sy, sy + m_tileheight - 1); } } @@ -549,17 +543,12 @@ void atari_motion_objects_device::render_object(bitmap_ind16 &bitmap, const rect continue; // draw the sprite - gfx->transpen_raw(bitmap,cliprect, code, color, hflip, vflip, sx, sy, m_transpen); + gfx->transpen_raw(bitmap, cliprect, code, color, hflip, vflip, sx, sy, m_transpen); mark_dirty(sx, sx + m_tilewidth - 1, sy, sy + m_tileheight - 1); } } } } - - // restore original gfx information - gfx->set_granularity(save_granularity); - gfx->set_colorbase(save_colorbase); - gfx->set_colors(save_colors); } @@ -573,9 +562,9 @@ void atari_motion_objects_device::render_object(bitmap_ind16 &bitmap, const rect //------------------------------------------------- atari_motion_objects_device::sprite_parameter::sprite_parameter() - : m_word(0), - m_shift(0), - m_mask(0) + : m_word(0) + , m_shift(0) + , m_mask(0) { } diff --git a/src/mame/atari/atarimo.h b/src/mame/atari/atarimo.h index 35b506d1115..5c2e777d055 100644 --- a/src/mame/atari/atarimo.h +++ b/src/mame/atari/atarimo.h @@ -24,20 +24,19 @@ struct atari_motion_objects_config struct entry { uint16_t data[4]; }; struct dual_entry { uint16_t data_lower[4]; uint16_t data_upper[4]; }; - uint8_t m_gfxindex; // index to which gfx system - uint8_t m_bankcount; // number of motion object banks + uint8_t m_gfxindex; // index to which gfx system + uint8_t m_bankcount; // number of motion object banks bool m_linked; // are the entries linked? bool m_split; // are the entries split? bool m_reverse; // render in reverse order? bool m_swapxy; // render in swapped X/Y order? bool m_nextneighbor; // does the neighbor bit affect the next object? - uint16_t m_slipheight; // pixels per SLIP entry (0 for no-slip) - uint8_t m_slipoffset; // pixel offset for SLIPs - uint16_t m_maxperline; // maximum number of links to visit/scanline (0=all) + uint16_t m_slipheight; // pixels per SLIP entry (0 for no-slip) + uint8_t m_slipoffset; // pixel offset for SLIPs + uint16_t m_maxperline; // maximum number of links to visit/scanline (0=all) - uint16_t m_palettebase; // base palette entry - uint16_t m_maxcolors; // maximum number of colors (remove me) - uint8_t m_transpen; // transparent pen index + uint16_t m_palettebase; // base palette entry + uint8_t m_transpen; // transparent pen index entry m_link_entry; // mask for the link dual_entry m_code_entry; // mask for the code index @@ -52,7 +51,7 @@ struct atari_motion_objects_config entry m_neighbor_entry; // mask for the neighbor entry m_absolute_entry; // mask for absolute coordinates entry m_special_entry; // mask for the special value - uint16_t m_specialvalue; // resulting value to indicate "special" + uint16_t m_specialvalue; // resulting value to indicate "special" }; @@ -155,7 +154,7 @@ private: private: sprite_parameter m_lower; // lower parameter sprite_parameter m_upper; // upper parameter - uint16_t m_uppershift; // upper shift + uint16_t m_uppershift; // upper shift }; // parameter masks diff --git a/src/mame/atari/atarisy1.cpp b/src/mame/atari/atarisy1.cpp index 1cfc665d908..6519058bd7d 100644 --- a/src/mame/atari/atarisy1.cpp +++ b/src/mame/atari/atarisy1.cpp @@ -406,18 +406,18 @@ void atarisy1_state::main_map(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x080000, 0x081fff).mirror(0x6000).bankr(m_slapstic_bank); // slapstic maps here - map(0x2e0000, 0x2e0001).r(FUNC(atarisy1_state::atarisy1_int3state_r)); + map(0x2e0000, 0x2e0001).r(FUNC(atarisy1_state::int3state_r)); map(0x400000, 0x401fff).ram(); - map(0x800000, 0x800001).w(FUNC(atarisy1_state::atarisy1_xscroll_w)).share("xscroll"); - map(0x820000, 0x820001).w(FUNC(atarisy1_state::atarisy1_yscroll_w)).share("yscroll"); - map(0x840000, 0x840001).w(FUNC(atarisy1_state::atarisy1_priority_w)); + map(0x800000, 0x800001).w(FUNC(atarisy1_state::xscroll_w)).share(m_xscroll); + map(0x820000, 0x820001).w(FUNC(atarisy1_state::yscroll_w)).share(m_yscroll); + map(0x840000, 0x840001).w(FUNC(atarisy1_state::priority_w)); map(0x860001, 0x860001).w(FUNC(atarisy1_state::bankselect_w)); map(0x880001, 0x880001).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x8a0001, 0x8a0001).w(FUNC(atarisy1_state::video_int_ack_w)); map(0x8c0001, 0x8c0001).w("eeprom", FUNC(eeprom_parallel_28xx_device::unlock_write8)); map(0x900000, 0x9fffff).ram(); map(0xa00000, 0xa01fff).ram().w(m_playfield_tilemap, FUNC(tilemap_device::write16)).share("playfield"); - map(0xa02000, 0xa02fff).ram().w(FUNC(atarisy1_state::atarisy1_spriteram_w)).share("mob"); + map(0xa02000, 0xa02fff).ram().w(FUNC(atarisy1_state::spriteram_w)).share("mob"); map(0xa03000, 0xa03fff).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); map(0xb00000, 0xb007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xf00000, 0xf003ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).umask16(0x00ff); @@ -685,7 +685,7 @@ static const gfx_layout anlayout = static GFXDECODE_START( gfx_atarisy1 ) - GFXDECODE_ENTRY( "alpha", 0x00000, anlayout, 0, 64 ) + GFXDECODE_ENTRY( "alpha", 0x00000, anlayout, 0, 64 ) GFXDECODE_END @@ -768,7 +768,7 @@ void atarisy1_state::atarisy1(machine_config &config) // note: these parameters are from published specs, not derived // video timing comes from an 82S163 (H) and an 82S129 (V) m_screen->set_raw(14.318181_MHz_XTAL/2, 456, 0, 336, 262, 0, 240); - m_screen->set_screen_update(FUNC(atarisy1_state::screen_update_atarisy1)); + m_screen->set_screen_update(FUNC(atarisy1_state::screen_update)); m_screen->set_palette(m_palette); m_screen->screen_vblank().set_inputline(m_maincpu, M68K_IRQ_4, ASSERT_LINE); diff --git a/src/mame/atari/atarisy1.h b/src/mame/atari/atarisy1.h index d769f2f04b9..8ef8c5d683e 100644 --- a/src/mame/atari/atarisy1.h +++ b/src/mame/atari/atarisy1.h @@ -83,27 +83,17 @@ protected: required_device m_mob; required_device m_palette; - uint8_t m_joystick_type = 0; - uint8_t m_trackball_type = 0; - optional_device m_adc; optional_device m_ajsint; - // playfield parameters required_device m_playfield_tilemap; required_device m_alpha_tilemap; required_shared_ptr m_xscroll; required_shared_ptr m_yscroll; - uint16_t m_playfield_lookup[256]{}; - uint8_t m_playfield_tile_bank = 0; - uint16_t m_playfield_priority_pens = 0; required_device m_yscroll_reset_timer; - // INT3 tracking - int m_next_timer_scanline = 0; required_device m_scanline_timer; required_device m_int3off_timer; - uint8_t m_scanline_int_state = 0; // speech optional_device m_tms; @@ -111,6 +101,18 @@ protected: required_device m_outlatch; optional_device m_via; + uint8_t m_joystick_type = 0; + uint8_t m_trackball_type = 0; + + // playfield parameters + uint16_t m_playfield_lookup[256]{}; + uint8_t m_playfield_tile_bank = 0; + uint16_t m_playfield_priority_pens = 0; + + // INT3 tracking + int m_next_timer_scanline = 0; + bool m_scanline_int_state = false; + // graphics bank tracking uint8_t m_bank_gfx[3][8]{}; uint8_t m_bank_color_shift[MAX_GFX_ELEMENTS]{}; @@ -130,19 +132,19 @@ protected: uint8_t via_pb_r(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - uint32_t screen_update_atarisy1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(reset_yscroll_callback); TIMER_DEVICE_CALLBACK_MEMBER(int3off_callback); TIMER_DEVICE_CALLBACK_MEMBER(int3_callback); virtual void update_timers(int scanline); void decode_gfx(uint16_t *pflookup, uint16_t *molookup); int get_bank(uint8_t prom1, uint8_t prom2, int bpp); - uint16_t atarisy1_int3state_r(); - void atarisy1_spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t int3state_r(); + void spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void bankselect_w(uint8_t data); - void atarisy1_xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void atarisy1_yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void atarisy1_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); static const atari_motion_objects_config s_mob_config; void add_adc(machine_config &config); diff --git a/src/mame/atari/atarisy1_v.cpp b/src/mame/atari/atarisy1_v.cpp index 6a29ae2e8be..9376c5b4b45 100644 --- a/src/mame/atari/atarisy1_v.cpp +++ b/src/mame/atari/atarisy1_v.cpp @@ -19,19 +19,19 @@ *************************************/ /* the color and remap PROMs are mapped as follows */ -#define PROM1_BANK_4 0x80 /* active low */ -#define PROM1_BANK_3 0x40 /* active low */ -#define PROM1_BANK_2 0x20 /* active low */ -#define PROM1_BANK_1 0x10 /* active low */ -#define PROM1_OFFSET_MASK 0x0f /* postive logic */ +static constexpr unsigned PROM1_BANK_4 = 0x80; /* active low */ +static constexpr unsigned PROM1_BANK_3 = 0x40; /* active low */ +static constexpr unsigned PROM1_BANK_2 = 0x20; /* active low */ +static constexpr unsigned PROM1_BANK_1 = 0x10; /* active low */ +static constexpr unsigned PROM1_OFFSET_MASK = 0x0f; /* postive logic */ -#define PROM2_BANK_6_OR_7 0x80 /* active low */ -#define PROM2_BANK_5 0x40 /* active low */ -#define PROM2_PLANE_5_ENABLE 0x20 /* active high */ -#define PROM2_PLANE_4_ENABLE 0x10 /* active high */ -#define PROM2_PF_COLOR_MASK 0x0f /* negative logic */ -#define PROM2_BANK_7 0x08 /* active low, plus PROM2_BANK_6_OR_7 low as well */ -#define PROM2_MO_COLOR_MASK 0x07 /* negative logic */ +static constexpr unsigned PROM2_BANK_6_OR_7 = 0x80; /* active low */ +static constexpr unsigned PROM2_BANK_5 = 0x40; /* active low */ +static constexpr unsigned PROM2_PLANE_5_ENABLE = 0x20; /* active high */ +static constexpr unsigned PROM2_PLANE_4_ENABLE = 0x10; /* active high */ +static constexpr unsigned PROM2_PF_COLOR_MASK = 0x0f; /* negative logic */ +static constexpr unsigned PROM2_BANK_7 = 0x08; /* active low, plus PROM2_BANK_6_OR_7 low as well */ +static constexpr unsigned PROM2_MO_COLOR_MASK = 0x07; /* negative logic */ @@ -84,21 +84,21 @@ static const gfx_layout objlayout_6bpp = TILE_GET_INFO_MEMBER(atarisy1_state::get_alpha_tile_info) { - uint16_t data = m_alpha_tilemap->basemem_read(tile_index); - int code = data & 0x3ff; - int color = (data >> 10) & 0x07; - int opaque = data & 0x2000; + uint16_t const data = m_alpha_tilemap->basemem_read(tile_index); + int const code = data & 0x3ff; + int const color = (data >> 10) & 0x07; + int const opaque = data & 0x2000; tileinfo.set(0, code, color, opaque ? TILE_FORCE_LAYER0 : 0); } TILE_GET_INFO_MEMBER(atarisy1_state::get_playfield_tile_info) { - uint16_t data = m_playfield_tilemap->basemem_read(tile_index); - uint16_t lookup = m_playfield_lookup[((data >> 8) & 0x7f) | (m_playfield_tile_bank << 7)]; - int gfxindex = (lookup >> 8) & 15; - int code = ((lookup & 0xff) << 8) | (data & 0xff); - int color = 0x20 + (((lookup >> 12) & 15) << m_bank_color_shift[gfxindex]); + uint16_t const data = m_playfield_tilemap->basemem_read(tile_index); + uint16_t const lookup = m_playfield_lookup[((data >> 8) & 0x7f) | (m_playfield_tile_bank << 7)]; + int const gfxindex = (lookup >> 8) & 15; + int const code = ((lookup & 0xff) << 8) | (data & 0xff); + int const color = 0x20 + (((lookup >> 12) & 15) << m_bank_color_shift[gfxindex]); tileinfo.set(gfxindex, code, color, (data >> 15) & 1); } @@ -124,7 +124,6 @@ const atari_motion_objects_config atarisy1_state::s_mob_config = 0x38, /* maximum number of links to visit/scanline (0=all) */ 0x100, /* base palette entry */ - 0x100, /* maximum number of colors */ 0, /* transparent pen index */ {{ 0,0,0,0x003f }}, /* mask for the link */ @@ -167,7 +166,7 @@ void atarisy1_state::video_start() // reset the statics m_mob->set_yscroll(256); m_next_timer_scanline = -1; - m_scanline_int_state = 0; + m_scanline_int_state = false; m_bankselect = 0xff; m_playfield_tile_bank = 0; @@ -189,12 +188,12 @@ void atarisy1_state::video_start() void atarisy1_state::bankselect_w(uint8_t data) { - uint8_t oldselect = m_bankselect; - uint8_t newselect = data; - int scanline = m_screen->vpos(); + uint8_t const oldselect = m_bankselect; + uint8_t const newselect = data; + int const scanline = m_screen->vpos(); // update memory - uint8_t diff = oldselect ^ newselect; + uint8_t const diff = oldselect ^ newselect; // sound CPU reset if (BIT(diff, 7)) @@ -218,9 +217,9 @@ void atarisy1_state::bankselect_w(uint8_t data) update_timers(scanline); // playfield bank select - if (diff & 0x04) + if (BIT(diff, 2)) { - m_playfield_tile_bank = (newselect >> 2) & 1; + m_playfield_tile_bank = BIT(newselect, 2); m_playfield_tilemap->mark_all_dirty(); } @@ -236,9 +235,9 @@ void atarisy1_state::bankselect_w(uint8_t data) * *************************************/ -void atarisy1_state::atarisy1_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask) +void atarisy1_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t oldpens = m_playfield_priority_pens; + uint16_t const oldpens = m_playfield_priority_pens; uint16_t newpens = oldpens; /* force a partial update in case this changes mid-screen */ @@ -256,9 +255,9 @@ void atarisy1_state::atarisy1_priority_w(offs_t offset, uint16_t data, uint16_t * *************************************/ -void atarisy1_state::atarisy1_xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) +void atarisy1_state::xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t oldscroll = *m_xscroll; + uint16_t const oldscroll = *m_xscroll; uint16_t newscroll = oldscroll; /* force a partial update in case this changes mid-screen */ @@ -287,12 +286,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_state::reset_yscroll_callback) } -void atarisy1_state::atarisy1_yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) +void atarisy1_state::yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t oldscroll = *m_yscroll; + uint16_t const oldscroll = *m_yscroll; uint16_t newscroll = oldscroll; - int scanline = m_screen->vpos(); - int adjusted_scroll; + int const scanline = m_screen->vpos(); /* force a partial update in case this changes mid-screen */ COMBINE_DATA(&newscroll); @@ -300,7 +298,7 @@ void atarisy1_state::atarisy1_yscroll_w(offs_t offset, uint16_t data, uint16_t m /* because this latches a new value into the scroll base, we need to adjust for the scanline */ - adjusted_scroll = newscroll; + int adjusted_scroll = newscroll; if (scanline <= m_screen->visible_area().bottom()) adjusted_scroll -= (scanline + 1); m_playfield_tilemap->set_scrolly(0, adjusted_scroll); @@ -321,11 +319,11 @@ void atarisy1_state::atarisy1_yscroll_w(offs_t offset, uint16_t data, uint16_t m * *************************************/ -void atarisy1_state::atarisy1_spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) +void atarisy1_state::spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - int active_bank = m_mob->bank(); + int const active_bank = m_mob->bank(); uint16_t *spriteram = m_mob->spriteram(); - int oldword = spriteram[offset]; + int const oldword = spriteram[offset]; int newword = oldword; COMBINE_DATA(&newword); @@ -364,17 +362,17 @@ void atarisy1_state::atarisy1_spriteram_w(offs_t offset, uint16_t data, uint16_t TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_state::int3off_callback) { // clear the state - m_scanline_int_state = 0; + m_scanline_int_state = false; m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_state::int3_callback) { - int scanline = param; + int const scanline = param; // update the state - m_scanline_int_state = 1; + m_scanline_int_state = true; m_maincpu->set_input_line(M68K_IRQ_3, ASSERT_LINE); // set a timer to turn it off @@ -393,7 +391,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_state::int3_callback) * *************************************/ -uint16_t atarisy1_state::atarisy1_int3state_r() +uint16_t atarisy1_state::int3state_r() { return m_scanline_int_state ? 0x0080 : 0x0000; } @@ -412,7 +410,7 @@ void atarisy1_state::update_timers(int scanline) void atarisy1r_state::update_timers(int scanline) { - int offset = m_mob->bank() * 64 * 4; + int const offset = m_mob->bank() * 64 * 4; int link = 0, best = scanline, found = 0; uint8_t spritevisit[64]; @@ -425,9 +423,9 @@ void atarisy1r_state::update_timers(int scanline) /* timers are indicated by 0xffff in entry 2 */ if (m_mob->spriteram()[offset + link + 0x40] == 0xffff) { - int data = m_mob->spriteram()[offset + link]; - int vsize = (data & 15) + 1; - int ypos = (256 - (data >> 5) - vsize * 8 - 1) & 0x1ff; + int const data = m_mob->spriteram()[offset + link]; + int const vsize = (data & 15) + 1; + int const ypos = (256 - (data >> 5) - vsize * 8 - 1) & 0x1ff; /* note that we found something */ found = 1; @@ -475,7 +473,7 @@ void atarisy1r_state::update_timers(int scanline) * *************************************/ -uint32_t atarisy1_state::screen_update_atarisy1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t atarisy1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // start drawing m_mob->draw_async(cliprect); @@ -526,18 +524,17 @@ uint32_t atarisy1_state::screen_update_atarisy1(screen_device &screen, bitmap_in void atarisy1_state::decode_gfx(uint16_t *pflookup, uint16_t *molookup) { - uint8_t *prom1 = &memregion("proms")->as_u8(0x000); - uint8_t *prom2 = &memregion("proms")->as_u8(0x200); - int obj, i; + uint8_t const *prom1 = &memregion("proms")->as_u8(0x000); + uint8_t const *prom2 = &memregion("proms")->as_u8(0x200); /* reset the globals */ memset(&m_bank_gfx[0][0], 0, sizeof(m_bank_gfx)); /* loop for two sets of objects */ - for (obj = 0; obj < 2; obj++) + for (int obj = 0; obj < 2; obj++) { /* loop for 256 objects in the set */ - for (i = 0; i < 256; i++, prom1++, prom2++) + for (int i = 0; i < 256; i++, prom1++, prom2++) { int bank, bpp, color, offset; @@ -588,7 +585,6 @@ void atarisy1_state::decode_gfx(uint16_t *pflookup, uint16_t *molookup) int atarisy1_state::get_bank(uint8_t prom1, uint8_t prom2, int bpp) { - const uint8_t *srcdata; int bank_index, gfx_index; /* determine the bank index */ @@ -628,7 +624,7 @@ int atarisy1_state::get_bank(uint8_t prom1, uint8_t prom2, int bpp) assert(gfx_index != MAX_GFX_ELEMENTS); /* decode the graphics */ - srcdata = &tiles->as_u8(0x80000 * (bank_index - 1)); + const uint8_t *srcdata = &tiles->as_u8(0x80000 * (bank_index - 1)); switch (bpp) { case 4: diff --git a/src/mame/atari/atarisy2.cpp b/src/mame/atari/atarisy2.cpp index 1818d560611..98baffabf2c 100644 --- a/src/mame/atari/atarisy2.cpp +++ b/src/mame/atari/atarisy2.cpp @@ -133,9 +133,7 @@ #include "speaker.h" -#define MASTER_CLOCK XTAL(20'000'000) -#define SOUND_CLOCK XTAL(14'318'181) -#define VIDEO_CLOCK XTAL(32'000'000) +static constexpr XTAL MASTER_CLOCK = XTAL(20'000'000); @@ -192,7 +190,7 @@ void atarisy2_state::video_int_ack_w(uint8_t data) TIMER_DEVICE_CALLBACK_MEMBER(atarisy2_state::scanline_update) { - int scanline = param; + int const scanline = param; if (scanline <= m_screen->height()) { // generate the 32V interrupt (IRQ 2) @@ -348,11 +346,9 @@ void atarisy2_state::bankselect_w(offs_t offset, uint16_t data) uint8_t atarisy2_state::leta_r(offs_t offset) { - static const char *const letanames[] = { "LETA0", "LETA1", "LETA2", "LETA3" }; - if (offset <= 1 && m_pedal_count == -1) // 720 { - switch (ioport("SELECT")->read()) + switch (m_io_select->read()) { case 0: // Real break; @@ -360,12 +356,11 @@ uint8_t atarisy2_state::leta_r(offs_t offset) case 1: // Fake Joystick /* special thanks to MAME Analog+ for the mapping code */ { - int analogx = ioport("FAKE_JOY_X")->read() - 128; - int analogy = ioport("FAKE_JOY_Y")->read() - 128; - double angle; + int const analogx = m_io_fake_joy_x->read() - 128; + int const analogy = m_io_fake_joy_y->read() - 128; /* if the joystick is centered, leave the rest of this alone */ - angle = m_joy_last_angle; + double angle = m_joy_last_angle; if (analogx < -32 || analogx > 32 || analogy < -32 || analogy > 32) angle = atan2((double)analogx, (double)analogy) * 360 / (2 * M_PI); @@ -400,7 +395,7 @@ uint8_t atarisy2_state::leta_r(offs_t offset) { int32_t diff; uint32_t temp; - uint32_t rotate_count = ioport("FAKE_SPINNER")->read() & 0xffff; + uint32_t const rotate_count = m_io_fake_spinner->read() & 0xffff; /* rotate_count behaves the same as the real LEAT1 Rotate encoder * we use it to generate the LETA0 Center encoder count */ @@ -478,7 +473,7 @@ uint8_t atarisy2_state::leta_r(offs_t offset) return 0xff; } } - return ioport(letanames[offset])->read(); + return m_io_leta[offset]->read(); } @@ -577,8 +572,6 @@ uint8_t atarisy2_state::leta_r(offs_t offset) void atarisy2_state::mixer_w(uint8_t data) { - double rbott, rtop, gain; - // these gains are cheesed up, but give an approximate effect /* @@ -597,19 +590,19 @@ void atarisy2_state::mixer_w(uint8_t data) */ // bits 0-2 control the volume of the YM2151, using 22k, 47k, and 100k resistors - rtop = 1.0/(1.0/100 + 1.0/100); - rbott = 0; - if (!(data & 0x01)) rbott += 1.0/100; - if (!(data & 0x02)) rbott += 1.0/47; - if (!(data & 0x04)) rbott += 1.0/22; - gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); + double rtop = 1.0/(1.0/100 + 1.0/100); + double rbott = 0; + if (BIT(~data, 0)) rbott += 1.0/100; + if (BIT(~data, 1)) rbott += 1.0/47; + if (BIT(~data, 2)) rbott += 1.0/22; + double gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); m_ym2151->set_output_gain(ALL_OUTPUTS, gain); // bits 3-4 control the volume of the POKEYs, using 47k and 100k resistors rtop = 1.0/(1.0/100 + 1.0/100); rbott = 0; - if (!(data & 0x08)) rbott += 1.0/47; - if (!(data & 0x10)) rbott += 1.0/22; + if (BIT(~data, 3)) rbott += 1.0/47; + if (BIT(~data, 4)) rbott += 1.0/22; gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); m_pokey[0]->set_output_gain(ALL_OUTPUTS, gain); m_pokey[1]->set_output_gain(ALL_OUTPUTS, gain); @@ -619,9 +612,9 @@ void atarisy2_state::mixer_w(uint8_t data) { rtop = 1.0/(1.0/100 + 1.0/100); rbott = 0; - if (!(data & 0x20)) rbott += 1.0/100; - if (!(data & 0x40)) rbott += 1.0/47; - if (!(data & 0x80)) rbott += 1.0/22; + if (BIT(~data, 5)) rbott += 1.0/100; + if (BIT(~data, 6)) rbott += 1.0/47; + if (BIT(~data, 7)) rbott += 1.0/22; gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); m_tms5220->set_output_gain(ALL_OUTPUTS, gain); } @@ -631,9 +624,9 @@ void atarisy2_state::mixer_w(uint8_t data) void atarisy2_state::sndrst_6502_w(uint8_t data) { // if no change, do nothing - if ((data & 1) == m_sound_reset_state) + if ((BIT(data, 0)) == m_sound_reset_state) return; - m_sound_reset_state = data & 1; + m_sound_reset_state = BIT(data, 0); m_ym2151->reset_w(m_sound_reset_state); // only track the 0 -> 1 transition @@ -724,8 +717,8 @@ void atarisy2_state::tms5220_strobe_w(offs_t offset, uint8_t data) void atarisy2_state::coincount_w(uint8_t data) { - machine().bookkeeping().coin_counter_w(0, (data >> 0) & 1); - machine().bookkeeping().coin_counter_w(1, (data >> 1) & 1); + machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); + machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); } void atarisy2_state::switch_6502_w(uint8_t data) @@ -761,8 +754,8 @@ void atarisy2_state::main_map(address_map &map) map(0012740, 0012740).mirror(00036).w(FUNC(atarisy2_state::video_int_ack_w)); map(0013000, 0013000).mirror(00176).w(FUNC(atarisy2_state::int_enable_w)); map(0013200, 0013200).mirror(00176).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0013400, 0013401).mirror(00176).w(FUNC(atarisy2_state::xscroll_w)).share("xscroll"); - map(0013600, 0013601).mirror(00176).w(FUNC(atarisy2_state::yscroll_w)).share("yscroll"); + map(0013400, 0013401).mirror(00176).w(FUNC(atarisy2_state::xscroll_w)).share(m_xscroll); + map(0013600, 0013601).mirror(00176).w(FUNC(atarisy2_state::yscroll_w)).share(m_yscroll); map(0014000, 0014001).mirror(01776).portr("IN0"); map(0014000, 0014000).mirror(01776).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0016000, 0016001).mirror(01776).r(FUNC(atarisy2_state::sound_r)); @@ -771,8 +764,8 @@ void atarisy2_state::main_map(address_map &map) m_vmmu[0](034000, 037777).ram().w(FUNC(atarisy2_state::spriteram_w)).share("mob"); m_vmmu[2](020000, 037777).ram().w(FUNC(atarisy2_state::playfieldt_w)).share(m_playfieldt); m_vmmu[3](020000, 037777).ram().w(FUNC(atarisy2_state::playfieldb_w)).share(m_playfieldb); - map(0040000, 0057777).bankr("rombank1"); - map(0060000, 0077777).bankr("rombank2"); + map(0040000, 0057777).bankr(m_rombank[0]); + map(0060000, 0077777).bankr(m_rombank[1]); map(0100000, 0177777).rom(); } @@ -1171,9 +1164,9 @@ static const gfx_layout molayout = static GFXDECODE_START( gfx_atarisy2 ) - GFXDECODE_ENTRY( "gfx1", 0, pflayout, 128, 8 ) - GFXDECODE_ENTRY( "gfx2", 0, molayout, 0, 4 ) - GFXDECODE_ENTRY( "gfx3", 0, anlayout, 64, 8 ) + GFXDECODE_ENTRY( "tiles", 0, pflayout, 128, 8 ) + GFXDECODE_ENTRY( "sprites", 0, molayout, 0, 4 ) + GFXDECODE_ENTRY( "chars", 0, anlayout, 64, 8 ) GFXDECODE_END @@ -1185,6 +1178,9 @@ GFXDECODE_END void atarisy2_state::atarisy2(machine_config &config) { + constexpr XTAL SOUND_CLOCK = XTAL(14'318'181); + constexpr XTAL VIDEO_CLOCK = XTAL(32'000'000); + // basic machine hardware T11(config, m_maincpu, MASTER_CLOCK/2); m_maincpu->set_initial_mode(0x36ff); // initial mode word has DAL15,14,11,8 pulled low @@ -1223,7 +1219,7 @@ void atarisy2_state::atarisy2(machine_config &config) screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_video_attributes(VIDEO_UPDATE_BEFORE_VBLANK); screen.set_raw(VIDEO_CLOCK/2, 640, 0, 512, 416, 0, 384); - screen.set_screen_update(FUNC(atarisy2_state::screen_update_atarisy2)); + screen.set_screen_update(FUNC(atarisy2_state::screen_update)); screen.set_palette("palette"); screen.screen_vblank().set(FUNC(atarisy2_state::vblank_int)); @@ -1335,13 +1331,13 @@ ROM_START( paperboy ) // ALL of these roms should be 136034-xxx but the correct ROM_LOAD( "cpu_b02.rv2", 0x008000, 0x004000, CRC(e4e7a8b9) SHA1(f11a0cf40d5c51ff180f0fa1cf676f95090a1010) ) ROM_LOAD( "cpu_c02.rv2", 0x00c000, 0x004000, CRC(d44c2aa2) SHA1(f1b00e36d87f6d77746cf003198c7f19aa2f4fab) ) - ROM_REGION( 0x20000, "gfx1", 0 ) + ROM_REGION( 0x20000, "tiles", 0 ) ROM_LOAD( "vid_a06.rv1", 0x000000, 0x008000, CRC(b32ffddf) SHA1(5b7619008e34ed7f5eb5e85e5f45c375e078086a) ) ROM_LOAD( "vid_b06.rv1", 0x00c000, 0x004000, CRC(301b849d) SHA1(d608a854027da5eb88c071df1d01f31124db89a8) ) ROM_LOAD( "vid_c06.rv1", 0x010000, 0x008000, CRC(7bb59d68) SHA1(fcaa8bd32448d8f951ae446eb425b608f2cecbef) ) ROM_LOAD( "vid_d06.rv1", 0x01c000, 0x004000, CRC(1a1d4ba8) SHA1(603d61fd17e312d0784d883a50ce6b03aba27d10) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "vid_l06.rv1", 0x000000, 0x008000, CRC(067ef202) SHA1(519f32995a32ed96086f4ed3d49530b6917ad7d3) ) ROM_LOAD( "vid_k06.rv1", 0x008000, 0x008000, CRC(76b977c4) SHA1(09988aceaf398279556980e3a21c0dc1b619fb72) ) ROM_LOAD( "vid_j06.rv1", 0x010000, 0x008000, CRC(2a3cc8d0) SHA1(c0165286486a0844baf99c782d2fffdd6ad003b6) ) @@ -1351,7 +1347,7 @@ ROM_START( paperboy ) // ALL of these roms should be 136034-xxx but the correct ROM_LOAD( "vid_n06.rv1", 0x030000, 0x008000, CRC(c34a517d) SHA1(f0af3db87f73c1fad00a270269ba380898ef5a4b) ) ROM_LOAD( "vid_m06.rv1", 0x038000, 0x008000, CRC(df723956) SHA1(613d398f30463086c0cc720a760bda652e0f3832) ) - ROM_REGION( 0x2000, "gfx3", 0 ) + ROM_REGION( 0x2000, "chars", 0 ) ROM_LOAD( "vid_t06.rv1", 0x000000, 0x002000, CRC(60d7aebb) SHA1(ad74221c4270496ebcfedd46ea16dca2cda1b4be) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1377,13 +1373,13 @@ ROM_START( paperboyr2 ) ROM_LOAD( "cpu_b02.rv2", 0x008000, 0x004000, CRC(e4e7a8b9) SHA1(f11a0cf40d5c51ff180f0fa1cf676f95090a1010) ) ROM_LOAD( "cpu_c02.rv2", 0x00c000, 0x004000, CRC(d44c2aa2) SHA1(f1b00e36d87f6d77746cf003198c7f19aa2f4fab) ) - ROM_REGION( 0x20000, "gfx1", 0 ) + ROM_REGION( 0x20000, "tiles", 0 ) ROM_LOAD( "vid_a06.rv1", 0x000000, 0x008000, CRC(b32ffddf) SHA1(5b7619008e34ed7f5eb5e85e5f45c375e078086a) ) ROM_LOAD( "vid_b06.rv1", 0x00c000, 0x004000, CRC(301b849d) SHA1(d608a854027da5eb88c071df1d01f31124db89a8) ) ROM_LOAD( "vid_c06.rv1", 0x010000, 0x008000, CRC(7bb59d68) SHA1(fcaa8bd32448d8f951ae446eb425b608f2cecbef) ) ROM_LOAD( "vid_d06.rv1", 0x01c000, 0x004000, CRC(1a1d4ba8) SHA1(603d61fd17e312d0784d883a50ce6b03aba27d10) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "vid_l06.rv1", 0x000000, 0x008000, CRC(067ef202) SHA1(519f32995a32ed96086f4ed3d49530b6917ad7d3) ) ROM_LOAD( "vid_k06.rv1", 0x008000, 0x008000, CRC(76b977c4) SHA1(09988aceaf398279556980e3a21c0dc1b619fb72) ) ROM_LOAD( "vid_j06.rv1", 0x010000, 0x008000, CRC(2a3cc8d0) SHA1(c0165286486a0844baf99c782d2fffdd6ad003b6) ) @@ -1393,7 +1389,7 @@ ROM_START( paperboyr2 ) ROM_LOAD( "vid_n06.rv1", 0x030000, 0x008000, CRC(c34a517d) SHA1(f0af3db87f73c1fad00a270269ba380898ef5a4b) ) ROM_LOAD( "vid_m06.rv1", 0x038000, 0x008000, CRC(df723956) SHA1(613d398f30463086c0cc720a760bda652e0f3832) ) - ROM_REGION( 0x2000, "gfx3", 0 ) + ROM_REGION( 0x2000, "chars", 0 ) ROM_LOAD( "vid_t06.rv1", 0x000000, 0x002000, CRC(60d7aebb) SHA1(ad74221c4270496ebcfedd46ea16dca2cda1b4be) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1419,13 +1415,13 @@ ROM_START( paperboyr1 ) ROM_LOAD( "cpu_b02.rv1", 0x008000, 0x004000, CRC(de4147c6) SHA1(c997510b2018291924abddfe604a8f738fd8035c) ) ROM_LOAD( "cpu_c02.rv1", 0x00c000, 0x004000, CRC(b71505fc) SHA1(15fd156038861cb715fce10f1c56f3ded851be39) ) - ROM_REGION( 0x20000, "gfx1", 0 ) + ROM_REGION( 0x20000, "tiles", 0 ) ROM_LOAD( "vid_a06.rv1", 0x000000, 0x008000, CRC(b32ffddf) SHA1(5b7619008e34ed7f5eb5e85e5f45c375e078086a) ) ROM_LOAD( "vid_b06.rv1", 0x00c000, 0x004000, CRC(301b849d) SHA1(d608a854027da5eb88c071df1d01f31124db89a8) ) ROM_LOAD( "vid_c06.rv1", 0x010000, 0x008000, CRC(7bb59d68) SHA1(fcaa8bd32448d8f951ae446eb425b608f2cecbef) ) ROM_LOAD( "vid_d06.rv1", 0x01c000, 0x004000, CRC(1a1d4ba8) SHA1(603d61fd17e312d0784d883a50ce6b03aba27d10) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "vid_l06.rv1", 0x000000, 0x008000, CRC(067ef202) SHA1(519f32995a32ed96086f4ed3d49530b6917ad7d3) ) ROM_LOAD( "vid_k06.rv1", 0x008000, 0x008000, CRC(76b977c4) SHA1(09988aceaf398279556980e3a21c0dc1b619fb72) ) ROM_LOAD( "vid_j06.rv1", 0x010000, 0x008000, CRC(2a3cc8d0) SHA1(c0165286486a0844baf99c782d2fffdd6ad003b6) ) @@ -1435,7 +1431,7 @@ ROM_START( paperboyr1 ) ROM_LOAD( "vid_n06.rv1", 0x030000, 0x008000, CRC(c34a517d) SHA1(f0af3db87f73c1fad00a270269ba380898ef5a4b) ) ROM_LOAD( "vid_m06.rv1", 0x038000, 0x008000, CRC(df723956) SHA1(613d398f30463086c0cc720a760bda652e0f3832) ) - ROM_REGION( 0x2000, "gfx3", 0 ) + ROM_REGION( 0x2000, "chars", 0 ) ROM_LOAD( "vid_t06.rv1", 0x000000, 0x002000, CRC(60d7aebb) SHA1(ad74221c4270496ebcfedd46ea16dca2cda1b4be) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1510,13 +1506,13 @@ ROM_START( paperboyp ) /* there was no video board, so all GFX roms are marked as BAD_DUMP as they might not be correct for this revision it is also possible that the video hardware is closer to system1 rather than system2 */ - ROM_REGION( 0x20000, "gfx1", 0 ) + ROM_REGION( 0x20000, "tiles", 0 ) ROM_LOAD( "vid_a06.rv1", 0x000000, 0x008000, BAD_DUMP CRC(b32ffddf) SHA1(5b7619008e34ed7f5eb5e85e5f45c375e078086a) ) ROM_LOAD( "vid_b06.rv1", 0x00c000, 0x004000, BAD_DUMP CRC(301b849d) SHA1(d608a854027da5eb88c071df1d01f31124db89a8) ) ROM_LOAD( "vid_c06.rv1", 0x010000, 0x008000, BAD_DUMP CRC(7bb59d68) SHA1(fcaa8bd32448d8f951ae446eb425b608f2cecbef) ) ROM_LOAD( "vid_d06.rv1", 0x01c000, 0x004000, BAD_DUMP CRC(1a1d4ba8) SHA1(603d61fd17e312d0784d883a50ce6b03aba27d10) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "vid_l06.rv1", 0x000000, 0x008000, BAD_DUMP CRC(067ef202) SHA1(519f32995a32ed96086f4ed3d49530b6917ad7d3) ) ROM_LOAD( "vid_k06.rv1", 0x008000, 0x008000, BAD_DUMP CRC(76b977c4) SHA1(09988aceaf398279556980e3a21c0dc1b619fb72) ) ROM_LOAD( "vid_j06.rv1", 0x010000, 0x008000, BAD_DUMP CRC(2a3cc8d0) SHA1(c0165286486a0844baf99c782d2fffdd6ad003b6) ) @@ -1526,7 +1522,7 @@ ROM_START( paperboyp ) ROM_LOAD( "vid_n06.rv1", 0x030000, 0x008000, BAD_DUMP CRC(c34a517d) SHA1(f0af3db87f73c1fad00a270269ba380898ef5a4b) ) ROM_LOAD( "vid_m06.rv1", 0x038000, 0x008000, BAD_DUMP CRC(df723956) SHA1(613d398f30463086c0cc720a760bda652e0f3832) ) - ROM_REGION( 0x2000, "gfx3", 0 ) + ROM_REGION( 0x2000, "chars", 0 ) ROM_LOAD( "vid_t06.rv1", 0x000000, 0x002000, BAD_DUMP CRC(60d7aebb) SHA1(ad74221c4270496ebcfedd46ea16dca2cda1b4be) ) ROM_END @@ -1547,7 +1543,7 @@ ROM_START( 720 ) ROM_LOAD( "136047-1135.2b", 0x008000, 0x004000, CRC(b1f157d0) SHA1(26355324d49baa02acb777940d7f49d074a75fe5) ) ROM_LOAD( "136047-2136.2cd", 0x00c000, 0x004000, CRC(00b06bec) SHA1(cd771eea329e0f6ab5bff1035f931800cc5da545) ) - ROM_REGION( 0x40000, "gfx1", 0 ) + ROM_REGION( 0x40000, "tiles", 0 ) ROM_LOAD( "136047-1121.6a", 0x000000, 0x008000, CRC(7adb5f9a) SHA1(8b4dba6c7ecd9d1c03c5d87326b5971ad1cb8863) ) ROM_LOAD( "136047-1122.6b", 0x008000, 0x008000, CRC(41b60141) SHA1(a426a0a5f6d4b500571731b3ce5ce8acb5e1db92) ) ROM_LOAD( "136047-1123.7a", 0x010000, 0x008000, CRC(501881d5) SHA1(f38b13774c45eb5b48c87c4410afe4bd311cf3c7) ) @@ -1557,7 +1553,7 @@ ROM_START( 720 ) ROM_LOAD( "136047-1119.7d", 0x030000, 0x008000, CRC(8f7b20e5) SHA1(9f0928a442f63c66350e66b35b1503fe4f9d8e33) ) ROM_LOAD( "136047-1120.7c", 0x038000, 0x008000, CRC(46af6d35) SHA1(c3c2b131245f1231839b3649c117bf5bbace0641) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136047-1109.6t", 0x020000, 0x008000, CRC(0a46b693) SHA1(77a743816663a8b8fe6bd9aa2dd0a4e570071068) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136047-1110.6sr", 0x028000, 0x008000, CRC(457d7e38) SHA1(9ac8e5b49e8f61cb8ce4d739462d17049c966a5d) ) @@ -1591,7 +1587,7 @@ ROM_START( 720 ) ROM_LOAD( "136047-1108.5jh", 0x0f8000, 0x008000, CRC(9815eda6) SHA1(89a80c67f4b3426e7516cd1179d5712779ef5db7) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136047-1125.4t", 0x000000, 0x004000, CRC(6b7e2328) SHA1(cc9a315ccafe7228951b7c32cf3b31caa89ae7d3) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1615,7 +1611,7 @@ ROM_START( 720r3 ) ROM_LOAD( "136047-1135.2b", 0x008000, 0x004000, CRC(b1f157d0) SHA1(26355324d49baa02acb777940d7f49d074a75fe5) ) ROM_LOAD( "136047-1136.2cd", 0x00c000, 0x004000, CRC(dad40e6d) SHA1(a94bc1b5f0a5218e9e44cd32f2ca6268b48072c2) ) - ROM_REGION( 0x40000, "gfx1", 0 ) + ROM_REGION( 0x40000, "tiles", 0 ) ROM_LOAD( "136047-1121.6a", 0x000000, 0x008000, CRC(7adb5f9a) SHA1(8b4dba6c7ecd9d1c03c5d87326b5971ad1cb8863) ) ROM_LOAD( "136047-1122.6b", 0x008000, 0x008000, CRC(41b60141) SHA1(a426a0a5f6d4b500571731b3ce5ce8acb5e1db92) ) ROM_LOAD( "136047-1123.7a", 0x010000, 0x008000, CRC(501881d5) SHA1(f38b13774c45eb5b48c87c4410afe4bd311cf3c7) ) @@ -1625,7 +1621,7 @@ ROM_START( 720r3 ) ROM_LOAD( "136047-1119.7d", 0x030000, 0x008000, CRC(8f7b20e5) SHA1(9f0928a442f63c66350e66b35b1503fe4f9d8e33) ) ROM_LOAD( "136047-1120.7c", 0x038000, 0x008000, CRC(46af6d35) SHA1(c3c2b131245f1231839b3649c117bf5bbace0641) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136047-1109.6t", 0x020000, 0x008000, CRC(0a46b693) SHA1(77a743816663a8b8fe6bd9aa2dd0a4e570071068) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136047-1110.6sr", 0x028000, 0x008000, CRC(457d7e38) SHA1(9ac8e5b49e8f61cb8ce4d739462d17049c966a5d) ) @@ -1659,7 +1655,7 @@ ROM_START( 720r3 ) ROM_LOAD( "136047-1108.5jh", 0x0f8000, 0x008000, CRC(9815eda6) SHA1(89a80c67f4b3426e7516cd1179d5712779ef5db7) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136047-1125.4t", 0x000000, 0x004000, CRC(6b7e2328) SHA1(cc9a315ccafe7228951b7c32cf3b31caa89ae7d3) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1683,7 +1679,7 @@ ROM_START( 720r2 ) ROM_LOAD( "136047-1135.2b", 0x008000, 0x004000, CRC(b1f157d0) SHA1(26355324d49baa02acb777940d7f49d074a75fe5) ) ROM_LOAD( "136047-1136.2cd", 0x00c000, 0x004000, CRC(dad40e6d) SHA1(a94bc1b5f0a5218e9e44cd32f2ca6268b48072c2) ) - ROM_REGION( 0x40000, "gfx1", 0 ) + ROM_REGION( 0x40000, "tiles", 0 ) ROM_LOAD( "136047-1121.6a", 0x000000, 0x008000, CRC(7adb5f9a) SHA1(8b4dba6c7ecd9d1c03c5d87326b5971ad1cb8863) ) ROM_LOAD( "136047-1122.6b", 0x008000, 0x008000, CRC(41b60141) SHA1(a426a0a5f6d4b500571731b3ce5ce8acb5e1db92) ) ROM_LOAD( "136047-1123.7a", 0x010000, 0x008000, CRC(501881d5) SHA1(f38b13774c45eb5b48c87c4410afe4bd311cf3c7) ) @@ -1693,7 +1689,7 @@ ROM_START( 720r2 ) ROM_LOAD( "136047-1119.7d", 0x030000, 0x008000, CRC(8f7b20e5) SHA1(9f0928a442f63c66350e66b35b1503fe4f9d8e33) ) ROM_LOAD( "136047-1120.7c", 0x038000, 0x008000, CRC(46af6d35) SHA1(c3c2b131245f1231839b3649c117bf5bbace0641) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136047-1109.6t", 0x020000, 0x008000, CRC(0a46b693) SHA1(77a743816663a8b8fe6bd9aa2dd0a4e570071068) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136047-1110.6sr", 0x028000, 0x008000, CRC(457d7e38) SHA1(9ac8e5b49e8f61cb8ce4d739462d17049c966a5d) ) @@ -1727,7 +1723,7 @@ ROM_START( 720r2 ) ROM_LOAD( "136047-1108.5jh", 0x0f8000, 0x008000, CRC(9815eda6) SHA1(89a80c67f4b3426e7516cd1179d5712779ef5db7) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136047-1125.4t", 0x000000, 0x004000, CRC(6b7e2328) SHA1(cc9a315ccafe7228951b7c32cf3b31caa89ae7d3) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1751,7 +1747,7 @@ ROM_START( 720r1 ) ROM_LOAD( "136047-1135.2b", 0x008000, 0x004000, CRC(b1f157d0) SHA1(26355324d49baa02acb777940d7f49d074a75fe5) ) ROM_LOAD( "136047-1136.2cd", 0x00c000, 0x004000, CRC(dad40e6d) SHA1(a94bc1b5f0a5218e9e44cd32f2ca6268b48072c2) ) - ROM_REGION( 0x40000, "gfx1", 0 ) + ROM_REGION( 0x40000, "tiles", 0 ) ROM_LOAD( "136047-1121.6a", 0x000000, 0x008000, CRC(7adb5f9a) SHA1(8b4dba6c7ecd9d1c03c5d87326b5971ad1cb8863) ) ROM_LOAD( "136047-1122.6b", 0x008000, 0x008000, CRC(41b60141) SHA1(a426a0a5f6d4b500571731b3ce5ce8acb5e1db92) ) ROM_LOAD( "136047-1123.7a", 0x010000, 0x008000, CRC(501881d5) SHA1(f38b13774c45eb5b48c87c4410afe4bd311cf3c7) ) @@ -1761,7 +1757,7 @@ ROM_START( 720r1 ) ROM_LOAD( "136047-1119.7d", 0x030000, 0x008000, CRC(8f7b20e5) SHA1(9f0928a442f63c66350e66b35b1503fe4f9d8e33) ) ROM_LOAD( "136047-1120.7c", 0x038000, 0x008000, CRC(46af6d35) SHA1(c3c2b131245f1231839b3649c117bf5bbace0641) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136047-1109.6t", 0x020000, 0x008000, CRC(0a46b693) SHA1(77a743816663a8b8fe6bd9aa2dd0a4e570071068) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136047-1110.6sr", 0x028000, 0x008000, CRC(457d7e38) SHA1(9ac8e5b49e8f61cb8ce4d739462d17049c966a5d) ) @@ -1795,7 +1791,7 @@ ROM_START( 720r1 ) ROM_LOAD( "136047-1108.5jh", 0x0f8000, 0x008000, CRC(9815eda6) SHA1(89a80c67f4b3426e7516cd1179d5712779ef5db7) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136047-1125.4t", 0x000000, 0x004000, CRC(6b7e2328) SHA1(cc9a315ccafe7228951b7c32cf3b31caa89ae7d3) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1819,7 +1815,7 @@ ROM_START( 720g ) ROM_LOAD( "136047-1135.2b", 0x008000, 0x004000, CRC(b1f157d0) SHA1(26355324d49baa02acb777940d7f49d074a75fe5) ) ROM_LOAD( "136047-2136.2cd", 0x00c000, 0x004000, CRC(00b06bec) SHA1(cd771eea329e0f6ab5bff1035f931800cc5da545) ) - ROM_REGION( 0x40000, "gfx1", 0 ) + ROM_REGION( 0x40000, "tiles", 0 ) ROM_LOAD( "136047-1121.6a", 0x000000, 0x008000, CRC(7adb5f9a) SHA1(8b4dba6c7ecd9d1c03c5d87326b5971ad1cb8863) ) ROM_LOAD( "136047-1122.6b", 0x008000, 0x008000, CRC(41b60141) SHA1(a426a0a5f6d4b500571731b3ce5ce8acb5e1db92) ) ROM_LOAD( "136047-1123.7a", 0x010000, 0x008000, CRC(501881d5) SHA1(f38b13774c45eb5b48c87c4410afe4bd311cf3c7) ) @@ -1829,7 +1825,7 @@ ROM_START( 720g ) ROM_LOAD( "136047-1119.7d", 0x030000, 0x008000, CRC(8f7b20e5) SHA1(9f0928a442f63c66350e66b35b1503fe4f9d8e33) ) ROM_LOAD( "136047-1120.7c", 0x038000, 0x008000, CRC(46af6d35) SHA1(c3c2b131245f1231839b3649c117bf5bbace0641) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136047-1109.6t", 0x020000, 0x008000, CRC(0a46b693) SHA1(77a743816663a8b8fe6bd9aa2dd0a4e570071068) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136047-1110.6sr", 0x028000, 0x008000, CRC(457d7e38) SHA1(9ac8e5b49e8f61cb8ce4d739462d17049c966a5d) ) @@ -1863,7 +1859,7 @@ ROM_START( 720g ) ROM_LOAD( "136047-1108.5jh", 0x0f8000, 0x008000, CRC(9815eda6) SHA1(89a80c67f4b3426e7516cd1179d5712779ef5db7) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136047-1225.4t", 0x000000, 0x004000, CRC(264eda88) SHA1(f0f5fe87741e0e17117085cf45f700090a02cb94) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1887,7 +1883,7 @@ ROM_START( 720gr1 ) ROM_LOAD( "136047-1135.2b", 0x008000, 0x004000, CRC(b1f157d0) SHA1(26355324d49baa02acb777940d7f49d074a75fe5) ) ROM_LOAD( "136047-1136.2cd", 0x00c000, 0x004000, CRC(dad40e6d) SHA1(a94bc1b5f0a5218e9e44cd32f2ca6268b48072c2) ) - ROM_REGION( 0x40000, "gfx1", 0 ) + ROM_REGION( 0x40000, "tiles", 0 ) ROM_LOAD( "136047-1121.6a", 0x000000, 0x008000, CRC(7adb5f9a) SHA1(8b4dba6c7ecd9d1c03c5d87326b5971ad1cb8863) ) ROM_LOAD( "136047-1122.6b", 0x008000, 0x008000, CRC(41b60141) SHA1(a426a0a5f6d4b500571731b3ce5ce8acb5e1db92) ) ROM_LOAD( "136047-1123.7a", 0x010000, 0x008000, CRC(501881d5) SHA1(f38b13774c45eb5b48c87c4410afe4bd311cf3c7) ) @@ -1897,7 +1893,7 @@ ROM_START( 720gr1 ) ROM_LOAD( "136047-1119.7d", 0x030000, 0x008000, CRC(8f7b20e5) SHA1(9f0928a442f63c66350e66b35b1503fe4f9d8e33) ) ROM_LOAD( "136047-1120.7c", 0x038000, 0x008000, CRC(46af6d35) SHA1(c3c2b131245f1231839b3649c117bf5bbace0641) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136047-1109.6t", 0x020000, 0x008000, CRC(0a46b693) SHA1(77a743816663a8b8fe6bd9aa2dd0a4e570071068) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136047-1110.6sr", 0x028000, 0x008000, CRC(457d7e38) SHA1(9ac8e5b49e8f61cb8ce4d739462d17049c966a5d) ) @@ -1931,7 +1927,7 @@ ROM_START( 720gr1 ) ROM_LOAD( "136047-1108.5jh", 0x0f8000, 0x008000, CRC(9815eda6) SHA1(89a80c67f4b3426e7516cd1179d5712779ef5db7) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136047-1225.4t", 0x000000, 0x004000, CRC(264eda88) SHA1(f0f5fe87741e0e17117085cf45f700090a02cb94) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -1954,7 +1950,7 @@ ROM_START( ssprint ) ROM_LOAD( "136042-419.2bc", 0x008000, 0x004000, CRC(b277915a) SHA1(e0e8cd713950f45352b7c1de986b5b0b5c1703b3) ) ROM_LOAD( "136042-420.2d", 0x00c000, 0x004000, CRC(170b2c53) SHA1(c6d5657da29cf637cea940406fcff9a7328964f8) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -1968,7 +1964,7 @@ ROM_START( ssprint ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -1978,7 +1974,7 @@ ROM_START( ssprint ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-118.6t", 0x000000, 0x004000, CRC(8489d113) SHA1(f8ead7954d9be95792fd7e9d2487957d1e194641) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2001,7 +1997,7 @@ ROM_START( ssprints ) ROM_LOAD( "136042-119.2bc", 0x008000, 0x004000, CRC(0c810231) SHA1(a5a637e12df7eae234fdc2d3957d122c196c65cd) ) ROM_LOAD( "136042-120.2d", 0x00c000, 0x004000, CRC(647b7481) SHA1(51b1b09919eee3d98e65d48e3a2af8321ccf8a02) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -2015,7 +2011,7 @@ ROM_START( ssprints ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2025,7 +2021,7 @@ ROM_START( ssprints ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-218.6t", 0x000000, 0x004000, CRC(8e500be1) SHA1(f21799bf97c8bf82328999cb912ad5f293035d55) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2048,7 +2044,7 @@ ROM_START( ssprintf ) ROM_LOAD( "136042-119.2bc", 0x008000, 0x004000, CRC(0c810231) SHA1(a5a637e12df7eae234fdc2d3957d122c196c65cd) ) ROM_LOAD( "136042-120.2d", 0x00c000, 0x004000, CRC(647b7481) SHA1(51b1b09919eee3d98e65d48e3a2af8321ccf8a02) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -2062,7 +2058,7 @@ ROM_START( ssprintf ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2072,7 +2068,7 @@ ROM_START( ssprintf ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-218.6t", 0x000000, 0x004000, CRC(8e500be1) SHA1(f21799bf97c8bf82328999cb912ad5f293035d55) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2095,7 +2091,7 @@ ROM_START( ssprintg ) ROM_LOAD( "136042-119.2bc", 0x008000, 0x004000, CRC(0c810231) SHA1(a5a637e12df7eae234fdc2d3957d122c196c65cd) ) ROM_LOAD( "136042-120.2d", 0x00c000, 0x004000, CRC(647b7481) SHA1(51b1b09919eee3d98e65d48e3a2af8321ccf8a02) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -2109,7 +2105,7 @@ ROM_START( ssprintg ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2119,7 +2115,7 @@ ROM_START( ssprintg ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-118.6t", 0x000000, 0x004000, CRC(8489d113) SHA1(f8ead7954d9be95792fd7e9d2487957d1e194641) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2142,7 +2138,7 @@ ROM_START( ssprint3 ) ROM_LOAD( "136042-319.2bc", 0x008000, 0x004000, CRC(c7f31c16) SHA1(cfacf22405da5e3cf95059ea6b9677a5a8471496) ) ROM_LOAD( "136042-320.2d", 0x00c000, 0x004000, CRC(9815ece9) SHA1(95239e15fe3e3f9a66e0f4dae365f763656cb70b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -2156,7 +2152,7 @@ ROM_START( ssprint3 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2166,7 +2162,7 @@ ROM_START( ssprint3 ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-118.6t", 0x000000, 0x004000, CRC(8489d113) SHA1(f8ead7954d9be95792fd7e9d2487957d1e194641) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2189,7 +2185,7 @@ ROM_START( ssprintg1 ) ROM_LOAD( "136042-119.2bc", 0x008000, 0x004000, CRC(0c810231) SHA1(a5a637e12df7eae234fdc2d3957d122c196c65cd) ) ROM_LOAD( "136042-120.2d", 0x00c000, 0x004000, CRC(647b7481) SHA1(51b1b09919eee3d98e65d48e3a2af8321ccf8a02) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -2203,7 +2199,7 @@ ROM_START( ssprintg1 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2213,7 +2209,7 @@ ROM_START( ssprintg1 ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-118.6t", 0x000000, 0x004000, CRC(8489d113) SHA1(f8ead7954d9be95792fd7e9d2487957d1e194641) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2236,7 +2232,7 @@ ROM_START( ssprint1 ) ROM_LOAD( "136042-119.2bc", 0x008000, 0x004000, CRC(0c810231) SHA1(a5a637e12df7eae234fdc2d3957d122c196c65cd) ) ROM_LOAD( "136042-120.2d", 0x00c000, 0x004000, CRC(647b7481) SHA1(51b1b09919eee3d98e65d48e3a2af8321ccf8a02) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136042-105.6a", 0x020000, 0x008000, CRC(911499fe) SHA1(d53139b3a94c4e3d2c0be9cd4be97256de6b2386) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136042-106.6b", 0x008000, 0x008000, CRC(a39b25ed) SHA1(d91b3e5a9d1b0ff56cb8e012c349b7c3d8a9b91d) ) @@ -2250,7 +2246,7 @@ ROM_START( ssprint1 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136042-103.7c", 0x058000, 0x008000, CRC(64d473a8) SHA1(12f4aa981d1ab2f9b5bffeda2d02fcf6b497f1e9) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136042-113.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136042-112.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136042-110.6jh", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2260,7 +2256,7 @@ ROM_START( ssprint1 ) ROM_LOAD( "136042-115.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136042-114.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136042-118.6t", 0x000000, 0x004000, CRC(8489d113) SHA1(f8ead7954d9be95792fd7e9d2487957d1e194641) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2283,7 +2279,7 @@ ROM_START( csprints ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2295,7 +2291,7 @@ ROM_START( csprints ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2305,7 +2301,7 @@ ROM_START( csprints ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2328,7 +2324,7 @@ ROM_START( csprint ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2340,7 +2336,7 @@ ROM_START( csprint ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2350,7 +2346,7 @@ ROM_START( csprint ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2373,7 +2369,7 @@ ROM_START( csprints1 ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2385,7 +2381,7 @@ ROM_START( csprints1 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2395,7 +2391,7 @@ ROM_START( csprints1 ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2418,7 +2414,7 @@ ROM_START( csprintf ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2430,7 +2426,7 @@ ROM_START( csprintf ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2440,7 +2436,7 @@ ROM_START( csprintf ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2463,7 +2459,7 @@ ROM_START( csprintg ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2475,7 +2471,7 @@ ROM_START( csprintg ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2485,7 +2481,7 @@ ROM_START( csprintg ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2508,7 +2504,7 @@ ROM_START( csprint2 ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2520,7 +2516,7 @@ ROM_START( csprint2 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2530,7 +2526,7 @@ ROM_START( csprint2 ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2553,7 +2549,7 @@ ROM_START( csprintg1 ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2565,7 +2561,7 @@ ROM_START( csprintg1 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2575,7 +2571,7 @@ ROM_START( csprintg1 ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2598,7 +2594,7 @@ ROM_START( csprint1 ) ROM_LOAD( "136045-1118.2bc", 0x008000, 0x004000, CRC(eba41b2f) SHA1(a0d6e9f4609f2587b0fad6845e75653c10bf4249) ) ROM_LOAD( "136045-1119.2d", 0x00c000, 0x004000, CRC(9e49043a) SHA1(ec467fe1cd59c51e43c3acd83d300f5b3309a47a) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136045-1105.6a", 0x000000, 0x008000, CRC(3773bfbb) SHA1(beca29d8b9296d723304aab391dd9589a830a150) ) ROM_LOAD( "136045-1106.6b", 0x008000, 0x008000, CRC(13a24886) SHA1(a1ac9ca04a60fdb38c6d81e451e5638bdb537c8f) ) ROM_LOAD( "136045-1101.7a", 0x030000, 0x008000, CRC(5a55f931) SHA1(b2f8e8f3488a9d3840ca9a15fa53896ae4013e0a) ) @@ -2610,7 +2606,7 @@ ROM_START( csprint1 ) ROM_CONTINUE( 0x050000, 0x008000 ) ROM_LOAD( "136045-1103.7c", 0x058000, 0x008000, CRC(8f8c9692) SHA1(57418c5dd3554055e5bce8c2a15f6f6fc3201d99) ) - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136045-1112.6l", 0x000000, 0x008000, CRC(f869b0fc) SHA1(d8bf0df492bbe5d228748be0976d8f68254ffb3f) ) ROM_LOAD( "136045-1111.6k", 0x008000, 0x008000, CRC(abcbc114) SHA1(5d11fdfd7ed968949d884f1245571aed052abe46) ) ROM_LOAD( "136045-1110.6hj", 0x010000, 0x008000, CRC(9e91e734) SHA1(d9424a46dec2885fdc1ebe973f7deebfcb6ff19e) ) @@ -2620,7 +2616,7 @@ ROM_START( csprint1 ) ROM_LOAD( "136045-1114.6n", 0x030000, 0x008000, CRC(fb5677d9) SHA1(fa3190af7eaf0ef738fd86a8280c1c0b0556415f) ) ROM_LOAD( "136045-1113.6m", 0x038000, 0x008000, CRC(35e70a8d) SHA1(953bb609143f2660e5e5ca980691b962c1e7a81e) ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136045-1117.6t", 0x000000, 0x004000, CRC(82da786d) SHA1(929cc4ebac3d4404e1a8b22b80aae975e0c9da85) ) ROM_REGION( 0x200, "eeprom", 0 ) @@ -2644,7 +2640,7 @@ ROM_START( apb ) ROM_LOAD( "136051-5135.2bc", 0x008000, 0x004000, CRC(ed6adb91) SHA1(b1f1f0d1bda445a53de798fb6847c605afe53e3c) ) ROM_LOAD( "136051-5136.2d", 0x00c000, 0x004000, CRC(341f8486) SHA1(4cea39c0d8551ce7193e51de341f7297a94b8d9b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -2660,7 +2656,7 @@ ROM_START( apb ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -2694,7 +2690,7 @@ ROM_START( apb ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -2715,7 +2711,7 @@ ROM_START( apb6 ) ROM_LOAD( "136051-5135.2bc", 0x008000, 0x004000, CRC(ed6adb91) SHA1(b1f1f0d1bda445a53de798fb6847c605afe53e3c) ) ROM_LOAD( "136051-5136.2d", 0x00c000, 0x004000, CRC(341f8486) SHA1(4cea39c0d8551ce7193e51de341f7297a94b8d9b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -2731,7 +2727,7 @@ ROM_START( apb6 ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -2765,7 +2761,7 @@ ROM_START( apb6 ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -2786,7 +2782,7 @@ ROM_START( apb5 ) ROM_LOAD( "136051-5135.2bc", 0x008000, 0x004000, CRC(ed6adb91) SHA1(b1f1f0d1bda445a53de798fb6847c605afe53e3c) ) ROM_LOAD( "136051-5136.2d", 0x00c000, 0x004000, CRC(341f8486) SHA1(4cea39c0d8551ce7193e51de341f7297a94b8d9b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -2802,7 +2798,7 @@ ROM_START( apb5 ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -2836,7 +2832,7 @@ ROM_START( apb5 ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -2857,7 +2853,7 @@ ROM_START( apb4 ) ROM_LOAD( "136051-5135.2bc", 0x008000, 0x004000, CRC(ed6adb91) SHA1(b1f1f0d1bda445a53de798fb6847c605afe53e3c) ) ROM_LOAD( "136051-5136.2d", 0x00c000, 0x004000, CRC(341f8486) SHA1(4cea39c0d8551ce7193e51de341f7297a94b8d9b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -2873,7 +2869,7 @@ ROM_START( apb4 ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -2907,7 +2903,7 @@ ROM_START( apb4 ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -2928,7 +2924,7 @@ ROM_START( apb3 ) ROM_LOAD( "136051-1135.2bc", 0x008000, 0x004000, CRC(e9692cea) SHA1(2b2d9638e012d326777e2e730e28cbacea6d9a72) ) ROM_LOAD( "136051-1136.2d", 0x00c000, 0x004000, CRC(92fc7657) SHA1(cfda3a191a5f7ee4157f9d226bcf3dd601cabee1) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -2944,7 +2940,7 @@ ROM_START( apb3 ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -2978,7 +2974,7 @@ ROM_START( apb3 ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -2999,7 +2995,7 @@ ROM_START( apb2 ) ROM_LOAD( "136051-1135.2bc", 0x008000, 0x004000, CRC(e9692cea) SHA1(2b2d9638e012d326777e2e730e28cbacea6d9a72) ) ROM_LOAD( "136051-1136.2d", 0x00c000, 0x004000, CRC(92fc7657) SHA1(cfda3a191a5f7ee4157f9d226bcf3dd601cabee1) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -3015,7 +3011,7 @@ ROM_START( apb2 ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -3049,7 +3045,7 @@ ROM_START( apb2 ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -3070,7 +3066,7 @@ ROM_START( apb1 ) ROM_LOAD( "136051-1135.2bc", 0x008000, 0x004000, CRC(e9692cea) SHA1(2b2d9638e012d326777e2e730e28cbacea6d9a72) ) ROM_LOAD( "136051-1136.2d", 0x00c000, 0x004000, CRC(92fc7657) SHA1(cfda3a191a5f7ee4157f9d226bcf3dd601cabee1) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -3086,7 +3082,7 @@ ROM_START( apb1 ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -3120,7 +3116,7 @@ ROM_START( apb1 ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -3141,7 +3137,7 @@ ROM_START( apbg ) ROM_LOAD( "136051-4135.2bc", 0x008000, 0x004000, CRC(b4ca24b2) SHA1(86461da310b334f6b32c0e079de6852792284cc6) ) ROM_LOAD( "136051-4136.2d", 0x00c000, 0x004000, CRC(11efaabf) SHA1(76446b09bf7cacd713ab88d58793460c9d1a8b9b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -3157,7 +3153,7 @@ ROM_START( apbg ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -3191,7 +3187,7 @@ ROM_START( apbg ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END @@ -3212,7 +3208,7 @@ ROM_START( apbf ) ROM_LOAD( "136051-5135.2bc", 0x008000, 0x004000, CRC(ed6adb91) SHA1(b1f1f0d1bda445a53de798fb6847c605afe53e3c) ) ROM_LOAD( "136051-5136.2d", 0x00c000, 0x004000, CRC(341f8486) SHA1(4cea39c0d8551ce7193e51de341f7297a94b8d9b) ) - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "136051-1118.6a", 0x000000, 0x008000, CRC(93752c49) SHA1(6b4ed2defab85ab4d4943bfdf43c04dd42cc2ec5) ) ROM_LOAD( "136051-1120.6bc", 0x028000, 0x008000, CRC(043086f8) SHA1(8920c8aab37d7b0ecfa17381c65cc00b9b99d4da) ) ROM_CONTINUE( 0x008000, 0x008000 ) @@ -3228,7 +3224,7 @@ ROM_START( apbf ) ROM_LOAD( "136051-1123.7cd", 0x078000, 0x008000, CRC(3c96c848) SHA1(a90a0c14ee5d5cdf60a1d3ecd9984b74c31b9f36) ) ROM_CONTINUE( 0x058000, 0x008000 ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136051-1105.6t", 0x020000, 0x008000, CRC(9b78a88e) SHA1(d7dff7a72041ebb7ff4f56da74cc7eb4b71bc5cc) ) ROM_CONTINUE( 0x000000, 0x008000 ) ROM_LOAD( "136051-1106.6rs", 0x028000, 0x008000, CRC(4787ff58) SHA1(35b276eb1ad1ce8b143485502430335c08aa9474) ) @@ -3262,7 +3258,7 @@ ROM_START( apbf ) ROM_LOAD( "136051-1112.5h", 0x0f8000, 0x008000, CRC(3af7c50f) SHA1(e100ec8a8aee643d3175a8f54cc7e9266cf50e42) ) ROM_CONTINUE( 0x0d8000, 0x008000 ) - ROM_REGION( 0x4000, "gfx3", 0 ) + ROM_REGION( 0x4000, "chars", 0 ) ROM_LOAD( "136051-1125.4t", 0x000000, 0x004000, CRC(05a0341c) SHA1(90b96e0645a01939c681a7a5fe5d236f3dfc71b7) ) ROM_END diff --git a/src/mame/atari/atarisy2.h b/src/mame/atari/atarisy2.h index 7906b8099ca..9aa1dd66519 100644 --- a/src/mame/atari/atarisy2.h +++ b/src/mame/atari/atarisy2.h @@ -45,6 +45,11 @@ public: , m_vmmu(*this, "vmmu") , m_playfieldt(*this, "playfieldt") , m_playfieldb(*this, "playfieldb") + , m_io_leta(*this, "LETA%u", 0U) + , m_io_select(*this, "SELECT") + , m_io_fake_joy_x(*this, "FAKE_JOY_X") + , m_io_fake_joy_y(*this, "FAKE_JOY_Y") + , m_io_fake_spinner(*this, "FAKE_SPINNER") , m_leds(*this, "led%u", 0U) { } @@ -67,8 +72,6 @@ protected: virtual void video_start() override ATTR_COLD; private: - void update_interrupts(); - required_device m_maincpu; required_device m_audiocpu; required_device m_gfxdecode; @@ -76,32 +79,40 @@ private: required_device m_mob; required_region_ptr m_slapstic_region; - uint8_t m_interrupt_enable = 0U; - required_device m_playfield_tilemap; required_device m_alpha_tilemap; required_shared_ptr m_xscroll; required_shared_ptr m_yscroll; - int8_t m_pedal_count = 0U; - required_device m_soundlatch; required_device m_mainlatch; required_device m_ym2151; required_device_array m_pokey; optional_device m_tms5220; - bool m_scanline_int_state = 0; - bool m_video_int_state = 0; - bool m_p2portwr_state = 0; - bool m_p2portrd_state = 0; - required_memory_bank_array<2> m_rombank; required_device m_slapstic; memory_view m_vmmu; required_shared_ptr m_playfieldt; required_shared_ptr m_playfieldb; + optional_ioport_array<4> m_io_leta; + optional_ioport m_io_select; + optional_ioport m_io_fake_joy_x; + optional_ioport m_io_fake_joy_y; + optional_ioport m_io_fake_spinner; + + output_finder<2> m_leds; + + uint8_t m_interrupt_enable = 0U; + + int8_t m_pedal_count = 0U; + + bool m_scanline_int_state = 0; + bool m_video_int_state = 0; + bool m_p2portwr_state = 0; + bool m_p2portrd_state = 0; + uint8_t m_sound_reset_state = 0U; emu_timer * m_yscroll_reset_timer = nullptr; @@ -116,7 +127,7 @@ private: int32_t m_spin_pos = 0; /* track fake position of spinner */ uint32_t m_spin_center_count = 0U; - output_finder<2> m_leds; + void update_interrupts(); void scanline_int_ack_w(uint8_t data); void video_int_ack_w(uint8_t data); @@ -141,7 +152,7 @@ private: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - uint32_t screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void vblank_int(int state); TIMER_CALLBACK_MEMBER(delayed_int_enable_w); TIMER_CALLBACK_MEMBER(reset_yscroll_callback); diff --git a/src/mame/atari/atarisy2_v.cpp b/src/mame/atari/atarisy2_v.cpp index f932e78983b..9430bbdaf9a 100644 --- a/src/mame/atari/atarisy2_v.cpp +++ b/src/mame/atari/atarisy2_v.cpp @@ -18,18 +18,18 @@ TILE_GET_INFO_MEMBER(atarisy2_state::get_alpha_tile_info) { - uint16_t data = m_alpha_tilemap->basemem_read(tile_index); - int code = data & 0x3ff; - int color = (data >> 13) & 0x07; + uint16_t const data = m_alpha_tilemap->basemem_read(tile_index); + int const code = data & 0x3ff; + int const color = (data >> 13) & 0x07; tileinfo.set(2, code, color, 0); } TILE_GET_INFO_MEMBER(atarisy2_state::get_playfield_tile_info) { - uint16_t data = tile_index < 020000/2 ? m_playfieldt[tile_index] : m_playfieldb[tile_index & (020000/2 - 1)]; - int code = (m_playfield_tile_bank[(data >> 10) & 1] << 10) | (data & 0x3ff); - int color = (data >> 11) & 7; + uint16_t const data = tile_index < 020000/2 ? m_playfieldt[tile_index] : m_playfieldb[tile_index & (020000/2 - 1)]; + int const code = (m_playfield_tile_bank[(data >> 10) & 1] << 10) | (data & 0x3ff); + int const color = (data >> 11) & 7; tileinfo.set(0, code, color, 0); tileinfo.category = (~data >> 14) & 3; } @@ -55,7 +55,6 @@ const atari_motion_objects_config atarisy2_state::s_mob_config = 0, /* maximum number of links to visit/scanline (0=all) */ 0x00, /* base palette entry */ - 0x40, /* maximum number of colors */ 15, /* transparent pen index */ {{ 0,0,0,0x07f8 }}, /* mask for the link */ @@ -93,7 +92,7 @@ void atarisy2_state::video_start() void atarisy2_state::xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t oldscroll = *m_xscroll; + uint16_t const oldscroll = *m_xscroll; uint16_t newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -124,7 +123,7 @@ TIMER_CALLBACK_MEMBER(atarisy2_state::reset_yscroll_callback) void atarisy2_state::yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t oldscroll = *m_yscroll; + uint16_t const oldscroll = *m_yscroll; uint16_t newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -213,7 +212,7 @@ void atarisy2_state::playfieldb_w(offs_t offset, uint16_t data, uint16_t mem_mas * *************************************/ -uint32_t atarisy2_state::screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t atarisy2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // start drawing m_mob->draw_async(cliprect); diff --git a/src/mame/atari/atarivad.cpp b/src/mame/atari/atarivad.cpp index 460762805f0..c2536fa435e 100644 --- a/src/mame/atari/atarivad.cpp +++ b/src/mame/atari/atarivad.cpp @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles /*************************************************************************** - atarivad.h + atarivad.cpp Atari VAD video controller device. @@ -69,7 +69,8 @@ void atari_vad_device::control_write(offs_t offset, uint16_t data, uint16_t mem_ uint16_t atari_vad_device::control_read(offs_t offset) { - logerror("vc_r(%02X)\n", offset); + if (!machine().side_effects_disabled()) + logerror("vc_r(%02X)\n", offset); // a read from offset 0 returns the current scanline // also sets bit 0x4000 if we're in VBLANK @@ -119,7 +120,7 @@ void atari_vad_device::playfield_upper_w(offs_t offset, uint16_t data, uint16_t void atari_vad_device::playfield_latched_lsb_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_playfield_tilemap->write16(offset, data, mem_mask); - if ((m_control[0x0a] & 0x80) != 0) + if (BIT(m_control[0x0a], 7)) m_playfield_tilemap->write16_ext(offset, m_control[0x1d], uint16_t(0x00ff)); } @@ -133,7 +134,7 @@ void atari_vad_device::playfield_latched_lsb_w(offs_t offset, uint16_t data, uin void atari_vad_device::playfield_latched_msb_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_playfield_tilemap->write16(offset, data, mem_mask); - if ((m_control[0x0a] & 0x80) != 0) + if (BIT(m_control[0x0a], 7)) m_playfield_tilemap->write16_ext(offset, m_control[0x1c], uint16_t(0xff00)); } @@ -147,7 +148,7 @@ void atari_vad_device::playfield_latched_msb_w(offs_t offset, uint16_t data, uin void atari_vad_device::playfield2_latched_msb_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_playfield2_tilemap->write16(offset, data, mem_mask); - if ((m_control[0x0a] & 0x80) != 0) + if (BIT(m_control[0x0a], 7)) m_playfield2_tilemap->write16_ext(offset, m_control[0x1c], uint16_t(0xff00)); } @@ -223,7 +224,7 @@ TIMER_CALLBACK_MEMBER(atari_vad_device::scanline_int) void atari_vad_device::internal_control_write(offs_t offset, uint16_t newword) { // switch off the offset - uint16_t oldword = m_control[offset]; + uint16_t const oldword = m_control[offset]; m_control[offset] = newword; switch (offset) { @@ -312,10 +313,10 @@ void atari_vad_device::internal_control_write(offs_t offset, uint16_t newword) // latch enable case 0x0a: // check for palette banking - if (m_palette_bank != (((newword & 0x0400) >> 10) ^ 1)) + if (m_palette_bank != BIT(~newword, 10)) { screen().update_partial(screen().vpos()); - m_palette_bank = ((newword & 0x0400) >> 10) ^ 1; + m_palette_bank = BIT(~newword, 10); } //if ((oldword & ~0x0080) != (newword & ~0x0080)) printf("Latch control = %04X\n", newword); break; @@ -410,7 +411,7 @@ TIMER_CALLBACK_MEMBER(atari_vad_device::update_tilerow) int scanline = param; // skip if out of bounds, or not enabled - if (scanline <= screen().visible_area().bottom() && (m_control[0x0a] & 0x2000) != 0 && m_alpha_tilemap != nullptr) + if (scanline <= screen().visible_area().bottom() && BIT(m_control[0x0a], 13) && m_alpha_tilemap != nullptr) { // iterate over non-visible alpha tiles in this row int offset = scanline / 8 * 64 + 48 + 2 * (scanline % 8); @@ -429,7 +430,7 @@ TIMER_CALLBACK_MEMBER(atari_vad_device::update_tilerow) } // update the timer to go off at the start of the next row - scanline += ((m_control[0x0a] & 0x2000) != 0) ? 1 : 8; + scanline += BIT(m_control[0x0a], 13) ? 1 : 8; if (scanline >= screen().height()) scanline = 0; m_tilerow_update_timer->adjust(screen().time_until_pos(scanline), scanline); diff --git a/src/mame/atari/badlands.cpp b/src/mame/atari/badlands.cpp index 4745c5b9655..5b6f06875de 100644 --- a/src/mame/atari/badlands.cpp +++ b/src/mame/atari/badlands.cpp @@ -177,7 +177,7 @@ Measurements - TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::sound_scanline) { - int scanline = param; + int const scanline = param; //address_space &space = m_audiocpu->space(AS_PROGRAM); // 32V @@ -198,7 +198,7 @@ void badlands_state::machine_reset() //scanline_timer_reset(*m_screen, 32); - membank("soundbank")->set_entry(0); + m_soundbank->set_entry(0); } @@ -212,7 +212,7 @@ void badlands_state::machine_reset() INTERRUPT_GEN_MEMBER(badlands_state::vblank_int) { // TODO: remove this hack - int pedal_state = ioport("PEDALS")->read(); + int const pedal_state = m_io_pedals->read(); /* update the pedals once per frame */ for (int i = 0; i < 2; i++) @@ -284,8 +284,8 @@ uint8_t badlands_state::audio_io_r() 0x02 = coin 2 0x01 = coin 1 */ - uint8_t result = ioport("AUDIO")->read(); - if (!(ioport("FE4000")->read() & 0x0080)) result ^= 0x90; + uint8_t result = m_io_audio->read(); + if (BIT(m_io_fe4000->read(), 7)) result ^= 0x90; result ^= 0x10; return result; @@ -306,7 +306,7 @@ void badlands_state::audio_io_w(uint8_t data) */ // update the bank - membank("soundbank")->set_entry((data >> 6) & 3); + m_soundbank->set_entry((data >> 6) & 3); machine().bookkeeping().coin_counter_w(0, BIT(data, 5)); machine().bookkeeping().coin_counter_w(1, BIT(data, 4)); m_ymsnd->reset_w(BIT(data, 0)); @@ -374,7 +374,7 @@ void badlands_state::audio_map(address_map &map) map(0x2806, 0x2806).mirror(0x5f9).rw(FUNC(badlands_state::audio_irqack_r), FUNC(badlands_state::audio_irqack_w)); map(0x2a02, 0x2a02).mirror(0x5f9).w(m_mainlatch, FUNC(generic_latch_8_device::write)); map(0x2a04, 0x2a04).mirror(0x5f9).w(FUNC(badlands_state::audio_io_w)); - map(0x3000, 0x3fff).bankr("soundbank"); + map(0x3000, 0x3fff).bankr(m_soundbank); map(0x4000, 0xffff).rom(); } @@ -408,8 +408,8 @@ static const gfx_layout badlands_molayout = }; static GFXDECODE_START( gfx_badlands ) - GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0, 8 ) - GFXDECODE_ENTRY( "gfx2", 0, badlands_molayout, 128, 8 ) + GFXDECODE_ENTRY( "tiles", 0, pflayout, 0, 8 ) + GFXDECODE_ENTRY( "sprites", 0, badlands_molayout, 128, 8 ) GFXDECODE_END @@ -485,7 +485,7 @@ ROM_START( badlands ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for 6502 code */ ROM_LOAD( "136074-1018.9c", 0x00000, 0x10000, CRC(a05fd146) SHA1(d97abbcf7897ca720cc18ff3a323f41cd3b23c34) ) - ROM_REGION( 0x60000, "gfx1", ROMREGION_INVERT ) + ROM_REGION( 0x60000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "136074-1012.4n", 0x000000, 0x10000, CRC(5d124c6c) SHA1(afebaaf90b3751f5e873fc4c45f1d5385ef86a6e) ) /* playfield */ ROM_LOAD( "136074-1013.2n", 0x010000, 0x10000, CRC(b1ec90d6) SHA1(8d4c7db8e1bf9c050f5869eb38fa573867fdc12b) ) ROM_LOAD( "136074-1014.4s", 0x020000, 0x10000, CRC(248a6845) SHA1(086ef0840b889e790ce3fcd09f98589aae932456) ) @@ -493,7 +493,7 @@ ROM_START( badlands ) ROM_LOAD( "136074-1016.4u", 0x040000, 0x10000, CRC(878f7c66) SHA1(31159bea5d6aac8100fca8f3860220b97d63e72e) ) ROM_LOAD( "136074-1017.2u", 0x050000, 0x10000, CRC(ad0071a3) SHA1(472b197e5d320b3424d8a8d8c051b1023a07ae08) ) - ROM_REGION( 0x30000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x30000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136074-1010.14r", 0x000000, 0x10000, CRC(c15f629e) SHA1(944e3479dce6e420cf9a3f4c1438c5ca66e5cb97) ) /* mo */ ROM_LOAD( "136074-1011.10r", 0x010000, 0x10000, CRC(fb0b6717) SHA1(694ab0f04d673682831a24027757d4b3c40a4e0e) ) ROM_LOAD( "136074-1019.14t", 0x020000, 0x10000, CRC(0e26bff6) SHA1(ee018dd37a27c7e7c16a57ea0d32aeb9cdf26bb4) ) @@ -518,7 +518,7 @@ ROM_END void badlands_state::init_badlands() { /* initialize the audio system */ - membank("soundbank")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x01000); + m_soundbank->configure_entries(0, 4, memregion("audiocpu")->base(), 0x01000); } diff --git a/src/mame/atari/badlands.h b/src/mame/atari/badlands.h index 130b3bfcee2..f307f34e478 100644 --- a/src/mame/atari/badlands.h +++ b/src/mame/atari/badlands.h @@ -44,6 +44,10 @@ public: , m_mainlatch(*this, "mainlatch") , m_ymsnd(*this, "ymsnd") , m_mob(*this, "mob") + , m_soundbank(*this, "soundbank") + , m_io_audio(*this, "AUDIO") + , m_io_pedals(*this, "PEDALS") + , m_io_fe4000(*this, "FE4000") { } void badlands(machine_config &config); @@ -69,6 +73,11 @@ private: optional_device m_mainlatch; optional_device m_ymsnd; optional_device m_mob; + optional_memory_bank m_soundbank; + + required_ioport m_io_audio; + required_ioport m_io_pedals; + required_ioport m_io_fe4000; uint16_t sound_busy_r(); void sound_reset_w(uint16_t data); diff --git a/src/mame/atari/badlands_v.cpp b/src/mame/atari/badlands_v.cpp index da51026d627..f35a4804c91 100644 --- a/src/mame/atari/badlands_v.cpp +++ b/src/mame/atari/badlands_v.cpp @@ -20,9 +20,9 @@ TILE_GET_INFO_MEMBER(badlands_state::get_playfield_tile_info) { - uint16_t data = m_playfield_tilemap->basemem_read(tile_index); - int code = (data & 0x1fff) + ((data & 0x1000) ? (m_playfield_tile_bank << 12) : 0); - int color = (data >> 13) & 0x07; + uint16_t const data = m_playfield_tilemap->basemem_read(tile_index); + int const code = (data & 0x1fff) + (BIT(data, 12) ? (m_playfield_tile_bank << 12) : 0); + int const color = (data >> 13) & 0x07; tileinfo.set(0, code, color, 0); } @@ -48,7 +48,6 @@ const atari_motion_objects_config badlands_state::s_mob_config = 0, /* maximum number of links to visit/scanline (0=all) */ 0x80, /* base palette entry */ - 0x80, /* maximum number of colors */ 0, /* transparent pen index */ {{ 0x003f }}, /* mask for the link */ @@ -85,10 +84,10 @@ void badlands_state::video_start() void badlands_state::badlands_pf_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) - if (m_playfield_tile_bank != (data & 1)) + if (m_playfield_tile_bank != BIT(data, 0)) { m_screen->update_partial(m_screen->vpos()); - m_playfield_tile_bank = data & 1; + m_playfield_tile_bank = BIT(data, 0); m_playfield_tilemap->mark_all_dirty(); } } diff --git a/src/mame/atari/badlandsbl.cpp b/src/mame/atari/badlandsbl.cpp index 4fc91cecc27..a53dd98ff83 100644 --- a/src/mame/atari/badlandsbl.cpp +++ b/src/mame/atari/badlandsbl.cpp @@ -94,7 +94,8 @@ void badlandsbl_state::bootleg_shared_w(offs_t offset, uint8_t data) uint8_t badlandsbl_state::sound_response_r() { - m_maincpu->set_input_line(2, CLEAR_LINE); + if (!machine().side_effects_disabled()) + m_maincpu->set_input_line(2, CLEAR_LINE); return m_sound_response; } @@ -105,7 +106,7 @@ void badlandsbl_state::bootleg_map(address_map &map) map(0x400000, 0x400005).rw(FUNC(badlandsbl_state::bootleg_shared_r), FUNC(badlandsbl_state::bootleg_shared_w)); map(0x400006, 0x400006).r(FUNC(badlandsbl_state::sound_response_r)); map(0x400008, 0x40000f).ram(); // breaks tilemap gfxs otherwise? - map(0x400010, 0x4000ff).ram().share("spriteram"); + map(0x400010, 0x4000ff).ram().share(m_spriteram); // sound comms? map(0xfc0000, 0xfc0001).r(FUNC(badlandsbl_state::badlandsb_unk_r)).nopw(); @@ -136,7 +137,7 @@ void badlandsbl_state::bootleg_main_irq_w(uint8_t data) void badlandsbl_state::bootleg_audio_map(address_map &map) { map(0x0000, 0x1fff).rom().region("audiorom", 0); - map(0x2000, 0x2005).ram().share("b_sharedram"); + map(0x2000, 0x2005).ram().share(m_b_sharedram); map(0x2006, 0x3fff).ram(); map(0x4000, 0xcfff).rom().region("audiorom", 0x4000); map(0xd400, 0xd400).w(FUNC(badlandsbl_state::bootleg_main_irq_w)); @@ -196,8 +197,8 @@ static const gfx_layout badlands_molayout = }; static GFXDECODE_START( gfx_badlandsb ) - GFXDECODE_ENTRY( "gfx1", 0, pflayout_bootleg, 0, 8 ) - GFXDECODE_ENTRY( "gfx2", 0, badlands_molayout, 128, 8 ) + GFXDECODE_ENTRY( "tiles", 0, pflayout_bootleg, 0, 8 ) + GFXDECODE_ENTRY( "sprites", 0, badlands_molayout, 128, 8 ) GFXDECODE_END @@ -274,7 +275,7 @@ ROM_START( badlandsb ) ROM_LOAD( "blb26.ic27", 0x00000, 0x10000, CRC(59503ab4) SHA1(ea5686ee28f6125c1394d687cc35c6322c8f900c) ) /* the 2nd half of 122,123,124 and 125 is identical to the first half and not used */ - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "13.ic123", 0x000000, 0x10000, CRC(55fac198) SHA1(055938f38cb7fc02ecaf35446b2598f7808baa1c) ) // alt set replaced bad rom ROM_LOAD( "blb37.ic92", 0x008000, 0x10000, CRC(9188db9f) SHA1(8f7dc2c4c0dec9a80b6214a2efaa0de0858de84c) ) ROM_LOAD( "blb38.ic125", 0x020000, 0x10000, CRC(4839dd54) SHA1(031efbc144e5e088be0f3576aa514c7c2b775f6d) ) @@ -285,7 +286,7 @@ ROM_START( badlandsb ) ROM_LOAD( "blb29.ic88", 0x068000, 0x10000, CRC(a9f280e5) SHA1(daff021d14f17da8c4469270a1e50e5a01d05d49) ) /* the 1st half of 67 & 68 are empty and not used */ - ROM_REGION( 0x40000, "gfx2", 0 ) + ROM_REGION( 0x40000, "sprites", 0 ) ROM_LOAD16_BYTE( "blb33.ic67", 0x10001, 0x10000, CRC(aebf9938) SHA1(3778aacbde07e5a5d010e41ab62d5b0db8632ad8) ) ROM_LOAD16_BYTE( "blb34.ic34", 0x00001, 0x10000, CRC(3eac30a5) SHA1(deefc668185bf30ad3eeba73853f97ce12b85293) ) ROM_LOAD16_BYTE( "blb39.ic68", 0x10000, 0x10000, CRC(f398f2d7) SHA1(1eef64680101888425490eb4d5b86072e59753cf) ) @@ -306,7 +307,7 @@ ROM_START( badlandsb2 ) ROM_LOAD( "3.ic27", 0x00000, 0x10000, CRC(08850eb5) SHA1(be169e8ccee275b72bcfca66cd126cc27af7a1d6) ) // only rom that differs from badlandsb /* the 2nd half of 122,123,124 and 125 is identical to the first half and not used */ - ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_REGION( 0x80000, "tiles", 0 ) ROM_LOAD( "13.ic123", 0x000000, 0x10000, CRC(55fac198) SHA1(055938f38cb7fc02ecaf35446b2598f7808baa1c) ) ROM_LOAD( "14.ic92", 0x008000, 0x10000, CRC(9188db9f) SHA1(8f7dc2c4c0dec9a80b6214a2efaa0de0858de84c) ) ROM_LOAD( "15.ic125", 0x020000, 0x10000, CRC(4839dd54) SHA1(031efbc144e5e088be0f3576aa514c7c2b775f6d) ) @@ -317,7 +318,7 @@ ROM_START( badlandsb2 ) ROM_LOAD( "6.ic88", 0x068000, 0x10000, CRC(a9f280e5) SHA1(daff021d14f17da8c4469270a1e50e5a01d05d49) ) /* the 1st half of 67 & 68 are empty and not used */ - ROM_REGION( 0x40000, "gfx2", 0 ) + ROM_REGION( 0x40000, "sprites", 0 ) ROM_LOAD16_BYTE( "10.ic67", 0x10001, 0x10000, CRC(aebf9938) SHA1(3778aacbde07e5a5d010e41ab62d5b0db8632ad8) ) ROM_LOAD16_BYTE( "11.ic34", 0x00001, 0x10000, CRC(3eac30a5) SHA1(deefc668185bf30ad3eeba73853f97ce12b85293) ) ROM_LOAD16_BYTE( "16.ic68", 0x10000, 0x10000, CRC(f398f2d7) SHA1(1eef64680101888425490eb4d5b86072e59753cf) ) diff --git a/src/mame/atari/batman.cpp b/src/mame/atari/batman.cpp index 8c339a5b202..39a5ad11295 100644 --- a/src/mame/atari/batman.cpp +++ b/src/mame/atari/batman.cpp @@ -136,7 +136,6 @@ const atari_motion_objects_config batman_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x03ff,0,0,0 }}, // mask for the link @@ -304,7 +303,7 @@ void batman_state::latch_w(offs_t offset, uint16_t data, uint16_t mem_mask) COMBINE_DATA(&m_latch_data); // bit 4 is connected to the /RESET pin on the 6502 - if (m_latch_data & 0x0010) + if (BIT(m_latch_data, 4)) m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, CLEAR_LINE); else m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -419,9 +418,9 @@ static const gfx_layout pfmolayout = static GFXDECODE_START( gfx_batman ) - GFXDECODE_ENTRY( "spr_tiles_2", 0, pfmolayout, 512, 32 ) // sprites & playfield - GFXDECODE_ENTRY( "spr_tiles_1", 0, pfmolayout, 256, 16 ) // sprites & playfield - GFXDECODE_ENTRY( "chars", 0, anlayout, 0, 64 ) // characters 8x8 + GFXDECODE_ENTRY( "tiles", 0, pfmolayout, 512, 32 ) // playfield + GFXDECODE_ENTRY( "sprites", 0, pfmolayout, 256, 16 ) // sprites + GFXDECODE_ENTRY( "chars", 0, anlayout, 0, 64 ) // characters GFXDECODE_END @@ -452,7 +451,7 @@ void batman_state::batman(machine_config &config) TILEMAP(config, "vad:playfield", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(batman_state::get_playfield_tile_info)); TILEMAP(config, "vad:playfield2", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64, 0).set_info_callback(FUNC(batman_state::get_playfield2_tile_info)); - TILEMAP(config, "vad:alpha", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(batman_state::get_alpha_tile_info)); + TILEMAP(config, "vad:alpha", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 30, 0).set_info_callback(FUNC(batman_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, batman_state::s_mob_config).set_gfxdecode("gfxdecode"); m_mob->set_xoffset(-1); @@ -497,7 +496,7 @@ ROM_START( batman ) ROM_REGION( 0x20000, "chars", 0 ) ROM_LOAD( "136085-2009.10m", 0x00000, 0x20000, CRC(a82d4923) SHA1(38e03eebd95347a383f3d7357462252961bd3c7f) ) - ROM_REGION( 0x100000, "spr_tiles_1", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136085-1010.13r", 0x000000, 0x20000, CRC(466e1365) SHA1(318530e8a97c1b6ee3e671e677fc7684df5cc3a8) ) // graphics, plane 0 ROM_LOAD( "136085-1014.14r", 0x020000, 0x20000, CRC(ef53475a) SHA1(9bfc66bb8dd02757e4a79a75928b260f4518a94b) ) ROM_LOAD( "136085-1011.13m", 0x040000, 0x20000, CRC(8cda5efc) SHA1(b0410f9bf1f38f5f1e9add15079b03d7f19b4c8f) ) // graphics, plane 1 @@ -507,7 +506,7 @@ ROM_START( batman ) ROM_LOAD( "136085-1013.13c", 0x0c0000, 0x20000, CRC(68b64975) SHA1(f3fb45dd74fc21dd2eece87e739c734963962f93) ) // graphics, plane 3 ROM_LOAD( "136085-1017.14c", 0x0e0000, 0x20000, CRC(e4af157b) SHA1(ddf9eff84c882a096f7e435a6227b32d31029f9e) ) - ROM_REGION( 0x100000, "spr_tiles_2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "136085-1018.15r", 0x000000, 0x20000, CRC(4c14f1e5) SHA1(2a65d0aafd944886d9e801c9de0f857f2e9db773) ) ROM_LOAD( "136085-1022.16r", 0x020000, 0x20000, CRC(7476a15d) SHA1(779f9aec114aa71a268a7a646d998c1593f55d08) ) ROM_LOAD( "136085-1019.15m", 0x040000, 0x20000, CRC(2046d9ec) SHA1(3b14b18545eac2e6cb1d3157ec1af251287b3e45) ) diff --git a/src/mame/atari/blstroid.cpp b/src/mame/atari/blstroid.cpp index 0b6e5fbedef..911cd0429a0 100644 --- a/src/mame/atari/blstroid.cpp +++ b/src/mame/atari/blstroid.cpp @@ -117,7 +117,6 @@ const atari_motion_objects_config blstroid_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x000, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0,0,0x0ff8,0 }}, // mask for the link @@ -173,7 +172,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(blstroid_state::scanline_update) // check for interrupts if (offset < 0x800) - if (m_playfield_tilemap->basemem_read(offset) & 0x8000) + if (BIT(m_playfield_tilemap->basemem_read(offset), 15)) { // FIXME: - the only thing this IRQ does it tweak the starting MO link // unfortunately, it does it too early for the given MOs! @@ -342,18 +341,6 @@ INPUT_PORTS_END * *************************************/ -static const gfx_layout pflayout = -{ - 16,8, - RGN_FRAC(1,1), - 4, - { 0, 1, 2, 3 }, - { 0,0, 4,4, 8,8, 12,12, 16,16, 20,20, 24,24, 28,28 }, - { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8 }, - 32*8 -}; - - static const gfx_layout molayout = { 16,8, @@ -368,8 +355,8 @@ static const gfx_layout molayout = static GFXDECODE_START( gfx_blstroid ) - GFXDECODE_ENTRY( "tiles", 0, pflayout, 256, 16 ) - GFXDECODE_ENTRY( "sprites", 0, molayout, 0, 16 ) + GFXDECODE_SCALE( "tiles", 0, gfx_8x8x4_packed_msb, 256, 16, 2, 1 ) + GFXDECODE_ENTRY( "sprites", 0, molayout, 0, 16 ) GFXDECODE_END diff --git a/src/mame/atari/cyberbal.cpp b/src/mame/atari/cyberbal.cpp index 3ba8c10ecc1..2fa559b4d72 100644 --- a/src/mame/atari/cyberbal.cpp +++ b/src/mame/atari/cyberbal.cpp @@ -234,7 +234,6 @@ const atari_motion_objects_config cyberbal_base_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x600, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0,0,0x07f8,0 }}, // mask for the link @@ -668,24 +667,13 @@ INPUT_PORTS_END * *************************************/ -static const gfx_layout pfanlayout = -{ - 16,8, - RGN_FRAC(1,1), - 4, - { 0, 1, 2, 3 }, - { 0,0, 4,4, 8,8, 12,12, 16,16, 20,20, 24,24, 28,28 }, - { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8 }, - 32*8 -}; - static const gfx_layout pfanlayout_interleaved = { - 16,8, + 8,8, RGN_FRAC(1,2), 4, { 0, 1, 2, 3 }, - { RGN_FRAC(1,2)+0,RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4,RGN_FRAC(1,2)+4, 0,0, 4,4, RGN_FRAC(1,2)+8,RGN_FRAC(1,2)+8, RGN_FRAC(1,2)+12,RGN_FRAC(1,2)+12, 8,8, 12,12 }, + { RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4, 0, 4, RGN_FRAC(1,2)+8, RGN_FRAC(1,2)+12, 8, 12 }, { 0*8, 2*8, 4*8, 6*8, 8*8, 10*8, 12*8, 14*8 }, 16*8 }; @@ -703,15 +691,15 @@ static const gfx_layout molayout = }; static GFXDECODE_START( gfx_cyberbal ) - GFXDECODE_ENTRY( "tiles", 0, pfanlayout, 0, 128 ) - GFXDECODE_ENTRY( "sprites", 0, molayout, 0x600, 16 ) - GFXDECODE_ENTRY( "chars", 0, pfanlayout, 0x780, 8 ) + GFXDECODE_SCALE( "tiles", 0, gfx_8x8x4_packed_msb, 0, 128, 2, 1 ) + GFXDECODE_ENTRY( "sprites", 0, molayout, 0x600, 16 ) + GFXDECODE_SCALE( "chars", 0, gfx_8x8x4_packed_msb, 0x780, 8, 2, 1 ) GFXDECODE_END static GFXDECODE_START( gfx_interleaved ) - GFXDECODE_ENTRY( "tiles", 0, pfanlayout_interleaved, 0, 128 ) + GFXDECODE_SCALE( "tiles", 0, pfanlayout_interleaved, 0, 128, 2, 1 ) GFXDECODE_ENTRY( "sprites", 0, molayout, 0x600, 16 ) - GFXDECODE_ENTRY( "chars", 0, pfanlayout_interleaved, 0x780, 8 ) + GFXDECODE_SCALE( "chars", 0, pfanlayout_interleaved, 0x780, 8, 2, 1 ) GFXDECODE_END diff --git a/src/mame/atari/cybstorm.cpp b/src/mame/atari/cybstorm.cpp index 494a9fac324..a3e664116ce 100644 --- a/src/mame/atari/cybstorm.cpp +++ b/src/mame/atari/cybstorm.cpp @@ -142,7 +142,6 @@ const atari_motion_objects_config cybstorm_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x1000, // base palette entry - 0x1000, // maximum number of colors 0, // transparent pen index {{ 0x03ff,0,0,0 }}, // mask for the link @@ -150,7 +149,7 @@ const atari_motion_objects_config cybstorm_state::s_mob_config = {{ 0,0,0x000f,0 }}, // mask for the color {{ 0,0,0xff80,0 }}, // mask for the X position {{ 0,0,0,0xff80 }}, // mask for the Y position - {{ 0,0,0,0x0070 }}, // mask for the width, in tiles*/ + {{ 0,0,0,0x0070 }}, // mask for the width, in tiles {{ 0,0,0,0x0007 }}, // mask for the height, in tiles {{ 0,0x8000,0,0 }}, // mask for the horizontal flip {{ 0 }}, // mask for the vertical flip @@ -306,11 +305,11 @@ void cybstorm_state::machine_start() void cybstorm_state::latch_w(offs_t offset, uint32_t data, uint32_t mem_mask) { - uint32_t oldword = m_latch_data; + uint32_t const oldword = m_latch_data; COMBINE_DATA(&m_latch_data); // bit 4 is connected to the /RESET pin on the 6502 - m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, m_latch_data & 0x00100000 ? CLEAR_LINE : ASSERT_LINE); + m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, BIT(m_latch_data, 20) ? CLEAR_LINE : ASSERT_LINE); // alpha bank is selected by the upper 4 bits if ((oldword ^ m_latch_data) & 0x00e00000) @@ -461,9 +460,9 @@ static const gfx_layout pflayout = static GFXDECODE_START( gfx_cybstorm ) - GFXDECODE_ENTRY( "spr_pf1", 0, pflayout, 0, 16 ) // sprites & playfield - GFXDECODE_ENTRY( "spr_pf2", 0, gfx_8x8x6_planar, 4096, 64 ) // sprites & playfield - GFXDECODE_ENTRY( "chars", 0, anlayout, 16384, 64 ) // characters 8x8 + GFXDECODE_ENTRY( "tiles", 0, pflayout, 0, 16 ) // playfield + GFXDECODE_ENTRY( "sprites", 0, gfx_8x8x6_planar, 4096, 64 ) // sprites + GFXDECODE_ENTRY( "chars", 0, anlayout, 16384, 64 ) // characters 8x8 GFXDECODE_END @@ -489,7 +488,7 @@ void cybstorm_state::round2(machine_config &config) m_vad->scanline_int_cb().set_inputline(m_maincpu, M68K_IRQ_4); TILEMAP(config, "vad:playfield", m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(cybstorm_state::get_playfield_tile_info)); TILEMAP(config, "vad:playfield2", m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64, 0).set_info_callback(FUNC(cybstorm_state::get_playfield2_tile_info)); - TILEMAP(config, "vad:alpha", m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(cybstorm_state::get_alpha_tile_info)); + TILEMAP(config, "vad:alpha", m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 30, 0).set_info_callback(FUNC(cybstorm_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, "vad:mob", 0, m_screen, cybstorm_state::s_mob_config).set_gfxdecode(m_gfxdecode); ADDRESS_MAP_BANK(config, "vadbank").set_map(&cybstorm_state::vadbank_map).set_options(ENDIANNESS_BIG, 16, 32, 0x90000); @@ -544,7 +543,7 @@ ROM_START( cybstorm ) ROM_REGION( 0x20000, "chars", 0 ) ROM_LOAD( "st_11.22.csalph.6c", 0x000000, 0x020000, CRC(bafa4bbe) SHA1(c033a952fab6eb3a06c44ba7f48e58b20fe144f0) ) - ROM_REGION( 0x400000, "spr_pf1", ROMREGION_INVERT ) + ROM_REGION( 0x400000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "st_11.22.pf0", 0x000000, 0x080000, CRC(0cf5874c) SHA1(1d739a3fc42baa5556aa22e051c873db9357396f) ) ROM_LOAD( "st_11.22.pf1", 0x080000, 0x080000, CRC(ee0a6a81) SHA1(7c36ccbcd51497ea8a872ddf7dabe2ceb0895408) ) ROM_LOAD( "st_11.22.pf2", 0x100000, 0x080000, CRC(03791514) SHA1(0688b55015f8d86ee92497cb7fcdfbdbfbc492a2) ) @@ -554,7 +553,7 @@ ROM_START( cybstorm ) ROM_LOAD( "st_11.22.pf6", 0x300000, 0x080000, CRC(58b3c0d9) SHA1(226ff2e948c5bb0ca150700a2f3426492fce79f7) ) ROM_LOAD( "st_11.22.pf7", 0x380000, 0x080000, CRC(f84b27ca) SHA1(a7812e18e15fad9992a59b0ebd177cb848a743bb) ) - ROM_REGION( 0xc00000, "spr_pf2", ROMREGION_INVERT ) + ROM_REGION( 0xc00000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "st_11.22.mo00", 0x000000, 0x080000, CRC(216ffdb9) SHA1(7e6418da1419d82e67bef9ae314781708ed62a76) ) ROM_LOAD( "st_11.22.mo01", 0x200000, 0x080000, CRC(af15908b) SHA1(9dc8dbf0288a084891bdd646cfb7b8c97b89cf2e) ) ROM_LOAD( "st_11.22.mo02", 0x400000, 0x080000, CRC(fc066982) SHA1(bbf258ff23619234cb31b4afab4eac1681cdeae0) ) diff --git a/src/mame/atari/eprom.cpp b/src/mame/atari/eprom.cpp index 8a06b6efa85..aaca7047a1f 100644 --- a/src/mame/atari/eprom.cpp +++ b/src/mame/atari/eprom.cpp @@ -86,7 +86,7 @@ private: required_device m_palette; required_shared_ptr m_paletteram; uint8_t m_screen_intensity = 0U; - uint8_t m_video_disable = 0U; + bool m_video_disable = false; static const atari_motion_objects_config s_mob_config; static const atari_motion_objects_config s_guts_mob_config; @@ -196,7 +196,6 @@ const atari_motion_objects_config eprom_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x03ff,0,0,0 }}, // mask for the link @@ -223,7 +222,7 @@ void eprom_state::video_start() save_item(NAME(m_video_disable)); m_screen_intensity = 0; - m_video_disable = 0; + m_video_disable = false; } @@ -241,7 +240,6 @@ const atari_motion_objects_config eprom_state::s_guts_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x03ff,0,0,0 }}, // mask for the link @@ -537,7 +535,7 @@ uint8_t eprom_state::adc_r(offs_t offset) if (!m_adc.found()) return 0xff; - uint8_t result = m_adc->data_r(); + uint8_t const result = m_adc->data_r(); if (!machine().side_effects_disabled()) m_adc->address_offset_start_w(offset, 0); return result; @@ -556,7 +554,7 @@ void eprom_state::eprom_latch_w(uint8_t data) if (m_extra.found()) { // bit 0: reset extra CPU - if (data & 1) + if (BIT(data, 0)) m_extra->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); else m_extra->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -565,7 +563,7 @@ void eprom_state::eprom_latch_w(uint8_t data) m_screen_intensity = (data & 0x1e) >> 1; // bit 5: video disable - m_video_disable = (data & 0x20); + m_video_disable = BIT(data, 5); } } @@ -579,9 +577,9 @@ void eprom_state::eprom_latch_w(uint8_t data) template void eprom_state::sync_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - u16 oldword = m_shared_ram[0xcc00 / 2]; + u16 const oldword = m_shared_ram[0xcc00 / 2]; COMBINE_DATA(&m_shared_ram[0xcc00 / 2]); - u16 newword = m_shared_ram[0xcc00 / 2]; + u16 const newword = m_shared_ram[0xcc00 / 2]; if ((oldword & 0xff00) != (newword & 0xff00)) (maincpu ? m_maincpu->yield() : m_extra->yield()); @@ -857,7 +855,7 @@ void eprom_state::eprom(machine_config &config) PALETTE(config, m_palette).set_entries(2048); TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(eprom_state::get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(eprom_state::get_alpha_tile_info)); + TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 31, 0).set_info_callback(FUNC(eprom_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, eprom_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); @@ -902,7 +900,7 @@ void eprom_state::klaxp(machine_config &config) PALETTE(config, m_palette).set_entries(2048); TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(eprom_state::get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(eprom_state::get_alpha_tile_info)); + TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 31, 0).set_info_callback(FUNC(eprom_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, eprom_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); @@ -951,7 +949,7 @@ void eprom_state::guts(machine_config &config) PALETTE(config, m_palette).set_entries(2048); TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(eprom_state::guts_get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(eprom_state::get_alpha_tile_info)); + TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 31, 0).set_info_callback(FUNC(eprom_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, eprom_state::s_guts_mob_config); m_mob->set_gfxdecode(m_gfxdecode); diff --git a/src/mame/atari/gauntlet.cpp b/src/mame/atari/gauntlet.cpp index 7961bd3094e..c4aea804973 100644 --- a/src/mame/atari/gauntlet.cpp +++ b/src/mame/atari/gauntlet.cpp @@ -278,7 +278,6 @@ const atari_motion_objects_config gauntlet_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0,0,0,0x03ff }}, // mask for the link @@ -482,7 +481,7 @@ uint8_t gauntlet_state::switch_6502_r() if (m_soundlatch->pending_r()) temp ^= 0x80; if (m_mainlatch->pending_r()) temp ^= 0x40; if (!m_tms5220->readyq_r()) temp ^= 0x20; - if (!(m_803008->read() & 0x0008)) temp ^= 0x10; + if (BIT(~m_803008->read(), 3)) temp ^= 0x10; return temp; } @@ -557,10 +556,10 @@ void gauntlet_state::main_map(address_map &map) map(0x902000, 0x903fff).mirror(0x2c8000).ram().share("mob"); map(0x904000, 0x904fff).mirror(0x2c8000).ram(); map(0x905000, 0x905f7f).mirror(0x2c8000).ram().w(m_alpha_tilemap, FUNC(tilemap_device::write16)).share("alpha"); - map(0x905f6e, 0x905f6f).mirror(0x2c8000).ram().w(FUNC(gauntlet_state::yscroll_w)).share("yscroll"); + map(0x905f6e, 0x905f6f).mirror(0x2c8000).ram().w(FUNC(gauntlet_state::yscroll_w)).share(m_yscroll); map(0x905f80, 0x905fff).mirror(0x2c8000).ram().share("mob:slip"); map(0x910000, 0x9107ff).mirror(0x2cf800).ram().w("palette", FUNC(palette_device::write16)).share("palette"); - map(0x930000, 0x930001).mirror(0x2cfffe).w(FUNC(gauntlet_state::xscroll_w)).share("xscroll"); + map(0x930000, 0x930001).mirror(0x2cfffe).w(FUNC(gauntlet_state::xscroll_w)).share(m_xscroll); } @@ -722,8 +721,8 @@ static const gfx_layout anlayout = static GFXDECODE_START( gfx_gauntlet ) - GFXDECODE_ENTRY( "gfx2", 0, gfx_8x8x4_planar, 256, 32 ) - GFXDECODE_ENTRY( "gfx1", 0, anlayout, 0, 64 ) + GFXDECODE_ENTRY( "spr_tiles", 0, gfx_8x8x4_planar, 256, 32 ) + GFXDECODE_ENTRY( "chars", 0, anlayout, 0, 64 ) GFXDECODE_END @@ -762,7 +761,7 @@ void gauntlet_state::base(machine_config &config) PALETTE(config, "palette").set_format(palette_device::IRGB_4444, 1024); TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(gauntlet_state::get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(gauntlet_state::get_alpha_tile_info)); + TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 31, 0).set_info_callback(FUNC(gauntlet_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, gauntlet_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); @@ -868,10 +867,10 @@ ROM_START( gauntlets ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -905,10 +904,10 @@ ROM_START( gauntlet ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -942,10 +941,10 @@ ROM_START( gauntletj ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -979,10 +978,10 @@ ROM_START( gauntletj12 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1016,10 +1015,10 @@ ROM_START( gauntletg ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1053,10 +1052,10 @@ ROM_START( gauntletr9 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1090,10 +1089,10 @@ ROM_START( gauntletgr8 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1127,10 +1126,10 @@ ROM_START( gauntletr7 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1164,10 +1163,10 @@ ROM_START( gauntletgr6 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1201,10 +1200,10 @@ ROM_START( gauntletr5 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1238,10 +1237,10 @@ ROM_START( gauntletr4 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1275,10 +1274,10 @@ ROM_START( gauntletgr3 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1312,10 +1311,10 @@ ROM_START( gauntletr2 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1349,10 +1348,10 @@ ROM_START( gauntletr1 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1386,10 +1385,10 @@ ROM_START( gauntlet2p ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1423,10 +1422,10 @@ ROM_START( gauntlet2pj ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1460,10 +1459,10 @@ ROM_START( gauntlet2pg ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1497,10 +1496,10 @@ ROM_START( gauntlet2pr3 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1534,10 +1533,10 @@ ROM_START( gauntlet2pj2 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1571,10 +1570,10 @@ ROM_START( gauntlet2pg1 ) ROM_LOAD( "136037-120.16r", 0x004000, 0x004000, CRC(6ee7f3cc) SHA1(b86676340b06f07c164690862c1f6f75f30c080b) ) ROM_LOAD( "136037-119.16s", 0x008000, 0x008000, CRC(fa19861f) SHA1(7568b4ab526bd5849f7ef70dfa6d1ef1f30c0abc) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136037-104.6p", 0x000000, 0x004000, CRC(6c276a1d) SHA1(ec383a8fdcb28efb86b7f6ba4a3306fea5a09d72) ) // 27128, second half 0x00 - ROM_REGION( 0x40000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x40000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136037-111.1a", 0x000000, 0x008000, CRC(91700f33) SHA1(fac1ce700c4cd46b643307998df781d637f193aa) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136037-113.1l", 0x010000, 0x008000, CRC(d497d0a8) SHA1(bb715bcec7f783dd04151e2e3b221a72133bf17d) ) @@ -1612,10 +1611,10 @@ ROM_START( gaunt2 ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136043-1104.6p", 0x000000, 0x004000, CRC(bddc3dfc) SHA1(2e1279041ed62fb28ac8a8909e8fedab2556f39e) ) // second half 0x00 - ROM_REGION( 0x60000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x60000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136043-1111.1a", 0x000000, 0x008000, CRC(09df6e23) SHA1(726984275c6a338c12ec0c4cc449f92f4a7a138c) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136043-1123.1c", 0x010000, 0x004000, CRC(e4c98f01) SHA1(a24bece3196d13c38e4acdbf62783860253ba67d) ) @@ -1661,10 +1660,10 @@ ROM_START( gaunt2g ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136043-1104.6p", 0x000000, 0x004000, CRC(bddc3dfc) SHA1(2e1279041ed62fb28ac8a8909e8fedab2556f39e) ) // second half 0x00 - ROM_REGION( 0x60000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x60000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136043-1111.1a", 0x000000, 0x008000, CRC(09df6e23) SHA1(726984275c6a338c12ec0c4cc449f92f4a7a138c) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136043-1123.1c", 0x010000, 0x004000, CRC(e4c98f01) SHA1(a24bece3196d13c38e4acdbf62783860253ba67d) ) @@ -1710,10 +1709,10 @@ ROM_START( gaunt22p ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136043-1104.6p", 0x000000, 0x004000, CRC(bddc3dfc) SHA1(2e1279041ed62fb28ac8a8909e8fedab2556f39e) ) // second half 0x00 - ROM_REGION( 0x60000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x60000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136043-1111.1a", 0x000000, 0x008000, CRC(09df6e23) SHA1(726984275c6a338c12ec0c4cc449f92f4a7a138c) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136043-1123.1c", 0x010000, 0x004000, CRC(e4c98f01) SHA1(a24bece3196d13c38e4acdbf62783860253ba67d) ) @@ -1759,10 +1758,10 @@ ROM_START( gaunt22p1 ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136043-1104.6p", 0x000000, 0x004000, CRC(bddc3dfc) SHA1(2e1279041ed62fb28ac8a8909e8fedab2556f39e) ) // second half 0x00 - ROM_REGION( 0x60000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x60000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136043-1111.1a", 0x000000, 0x008000, CRC(09df6e23) SHA1(726984275c6a338c12ec0c4cc449f92f4a7a138c) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136043-1123.1c", 0x010000, 0x004000, CRC(e4c98f01) SHA1(a24bece3196d13c38e4acdbf62783860253ba67d) ) @@ -1808,10 +1807,10 @@ ROM_START( gaunt22pg ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136043-1104.6p", 0x000000, 0x004000, CRC(bddc3dfc) SHA1(2e1279041ed62fb28ac8a8909e8fedab2556f39e) ) // second half 0x00 - ROM_REGION( 0x60000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x60000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136043-1111.1a", 0x000000, 0x008000, CRC(09df6e23) SHA1(726984275c6a338c12ec0c4cc449f92f4a7a138c) ) ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) ROM_LOAD( "136043-1123.1c", 0x010000, 0x004000, CRC(e4c98f01) SHA1(a24bece3196d13c38e4acdbf62783860253ba67d) ) @@ -1865,10 +1864,10 @@ ROM_START( vindctr2 ) ROM_LOAD( "136059-1160.16s", 0x004000, 0x004000, CRC(eef0a003) SHA1(4b1c0810e8c60e364051ed867fed0dc3a0b3a872) ) ROM_LOAD( "136059-1161.16r", 0x008000, 0x008000, CRC(68c74337) SHA1(13a9333e0b58ce771774632ecdfa8ca9c9664e57) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136059-1198.6p", 0x000000, 0x004000, CRC(f99b631a) SHA1(7a2430b6810c77b0f717d6e9d71823eadbcf6013) ) - ROM_REGION( 0xc0000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0xc0000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136059-1162.1a", 0x000000, 0x008000, CRC(dd3833ad) SHA1(e78a44b5f2033b618b5879a8a39bfdf428b5e4c7) ) ROM_LOAD( "136059-1166.1b", 0x008000, 0x008000, CRC(e2db50a0) SHA1(953e621f7312340dcbda9e4a727ebeba69ba7d4e) ) ROM_LOAD( "136059-1170.1c", 0x010000, 0x008000, CRC(f050ab43) SHA1(72fbba20b6c8a1838842084c07157cdc2fd923c1) ) @@ -1933,10 +1932,10 @@ ROM_START( vindctr2r2 ) ROM_LOAD( "136059-1160.16s", 0x004000, 0x004000, CRC(eef0a003) SHA1(4b1c0810e8c60e364051ed867fed0dc3a0b3a872) ) ROM_LOAD( "136059-1161.16r", 0x008000, 0x008000, CRC(68c74337) SHA1(13a9333e0b58ce771774632ecdfa8ca9c9664e57) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136059-1198.6p", 0x000000, 0x004000, CRC(f99b631a) SHA1(7a2430b6810c77b0f717d6e9d71823eadbcf6013) ) - ROM_REGION( 0xc0000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0xc0000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136059-1162.1a", 0x000000, 0x008000, CRC(dd3833ad) SHA1(e78a44b5f2033b618b5879a8a39bfdf428b5e4c7) ) ROM_LOAD( "136059-1166.1b", 0x008000, 0x008000, CRC(e2db50a0) SHA1(953e621f7312340dcbda9e4a727ebeba69ba7d4e) ) ROM_LOAD( "136059-1170.1c", 0x010000, 0x008000, CRC(f050ab43) SHA1(72fbba20b6c8a1838842084c07157cdc2fd923c1) ) @@ -2001,10 +2000,10 @@ ROM_START( vindctr2r1 ) ROM_LOAD( "136059-1160.16s", 0x004000, 0x004000, CRC(eef0a003) SHA1(4b1c0810e8c60e364051ed867fed0dc3a0b3a872) ) ROM_LOAD( "136059-1161.16r", 0x008000, 0x008000, CRC(68c74337) SHA1(13a9333e0b58ce771774632ecdfa8ca9c9664e57) ) - ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_REGION( 0x04000, "chars", 0 ) ROM_LOAD( "136059-1198.6p", 0x000000, 0x004000, CRC(f99b631a) SHA1(7a2430b6810c77b0f717d6e9d71823eadbcf6013) ) - ROM_REGION( 0xc0000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0xc0000, "spr_tiles", ROMREGION_INVERT ) ROM_LOAD( "136059-1162.1a", 0x000000, 0x008000, CRC(dd3833ad) SHA1(e78a44b5f2033b618b5879a8a39bfdf428b5e4c7) ) ROM_LOAD( "136059-1166.1b", 0x008000, 0x008000, CRC(e2db50a0) SHA1(953e621f7312340dcbda9e4a727ebeba69ba7d4e) ) ROM_LOAD( "136059-1170.1c", 0x010000, 0x008000, CRC(f050ab43) SHA1(72fbba20b6c8a1838842084c07157cdc2fd923c1) ) @@ -2063,7 +2062,7 @@ void gauntlet_state::init_gauntlet() void gauntlet_state::init_vindctr2() { - uint8_t *gfx2_base = memregion("gfx2")->base(); + uint8_t *gfx2_base = memregion("spr_tiles")->base(); std::vector data(0x8000); common_init(); @@ -2075,7 +2074,7 @@ void gauntlet_state::init_vindctr2() memcpy(&data[0], &gfx2_base[0x88000], 0x8000); for (int i = 0; i < 0x8000; i++) { - int srcoffs = (i & 0x4000) | ((i << 11) & 0x3800) | ((i >> 3) & 0x07ff); + int const srcoffs = (i & 0x4000) | ((i << 11) & 0x3800) | ((i >> 3) & 0x07ff); gfx2_base[0x88000 + i] = data[srcoffs]; } } diff --git a/src/mame/atari/klax.cpp b/src/mame/atari/klax.cpp index 1fd490fc5c9..61e020e6484 100644 --- a/src/mame/atari/klax.cpp +++ b/src/mame/atari/klax.cpp @@ -152,7 +152,6 @@ const atari_motion_objects_config klax_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x000, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -396,7 +395,7 @@ void klax_state::klax_base(machine_config &config) GFXDECODE(config, m_gfxdecode, "palette", gfx_klax); PALETTE(config, "palette").set_format(palette_device::IRGB_1555, 512).set_membits(8); - TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 32); + TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 60, 32); m_playfield_tilemap->set_info_callback(FUNC(klax_state::get_playfield_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, klax_state::s_mob_config); diff --git a/src/mame/atari/marblmd2.cpp b/src/mame/atari/marblmd2.cpp index b806269ddbb..8b7852024bb 100644 --- a/src/mame/atari/marblmd2.cpp +++ b/src/mame/atari/marblmd2.cpp @@ -146,7 +146,7 @@ void marblmd2_state::latch_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_latch_data); - if (m_latch_data & 0x0010) + if (BIT(m_latch_data, 4)) m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, CLEAR_LINE); else m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -274,8 +274,8 @@ static const gfx_layout molayout = static GFXDECODE_START( gfx_mm2 ) - GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0x0, 1 ) - GFXDECODE_ENTRY( "gfx2", 0, molayout, 0x0, 0x10 ) + GFXDECODE_ENTRY( "tiles", 0, pflayout, 0x0, 1 ) + GFXDECODE_ENTRY( "sprites", 0, molayout, 0x0, 0x10 ) GFXDECODE_END @@ -293,7 +293,6 @@ const atari_motion_objects_config marblmd2_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x000, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x03ff,0,0,0 }}, // mask for the link @@ -365,7 +364,7 @@ ROM_START( marblmd2 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "aud0.12c", 0x00000, 0x10000, CRC(89a8d90a) SHA1(cd73483d0bcfe2c8134d005c4417975f9a2cb658) ) - ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_REGION( 0x100000, "tiles", 0 ) ROM_LOAD( "pf0l.3p", 0x00000, 0x20000, CRC(a4fe377a) SHA1(a8a1a8027da778e5ad406a65814eec999b0f81af) ) ROM_LOAD( "pf1l.3m", 0x20000, 0x20000, CRC(5dc7aaa8) SHA1(4fb815e9bcf6bcdf1b7976a3dea2b6d1dd6a8f6b) ) ROM_LOAD( "pf2l.3k", 0x40000, 0x20000, CRC(0c7c5f74) SHA1(26f1d36f70f4e8354537d0d67764a1c9be35e8f7) ) @@ -375,7 +374,7 @@ ROM_START( marblmd2 ) ROM_LOAD( "pf2h.1k", 0xc0000, 0x20000, CRC(18323df9) SHA1(9c4add4733bcfe7202b53d86f1bca4b9d207e22a) ) ROM_LOAD( "pf3h.1j", 0xe0000, 0x20000, CRC(05d86ef8) SHA1(47eefd7112a3a3be16f0b4496cf034c8f7a69b1b) ) - ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_REGION( 0x80000, "sprites", 0 ) ROM_LOAD( "mo0l.7p", 0x00000, 0x20000, CRC(950d95a3) SHA1(3f38da7b6eeaa87cc84b98c9d535468b0c060f6d) ) ROM_LOAD( "mo1l.10p", 0x20000, 0x20000, CRC(b62b6ebf) SHA1(3781cd81780c10cd245871bb8f7b6260f7bb53b7) ) ROM_LOAD( "mo0h.12p", 0x40000, 0x20000, CRC(e47d92b0) SHA1(7953e8342450c02408e4d90f132144d55de2f491) ) diff --git a/src/mame/atari/offtwall.cpp b/src/mame/atari/offtwall.cpp index 69ef9547d81..18eae556511 100644 --- a/src/mame/atari/offtwall.cpp +++ b/src/mame/atari/offtwall.cpp @@ -134,7 +134,6 @@ const atari_motion_objects_config offtwall_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -212,8 +211,8 @@ void offtwall_state::io_latch_w(offs_t offset, uint16_t data, uint16_t mem_mask) if (ACCESSING_BITS_0_7) { // bit 4 resets the sound CPU - m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); - if (!(data & 0x10)) + m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, BIT(data, 4) ? CLEAR_LINE : ASSERT_LINE); + if (BIT(~data, 4)) m_jsa->reset(); } @@ -261,8 +260,11 @@ void offtwall_state::io_latch_w(offs_t offset, uint16_t data, uint16_t mem_mask) uint16_t offtwall_state::bankswitch_r(offs_t offset) { // this is the table lookup; the bank is determined by the address that was requested - m_bank_offset = (offset & 3) * 0x1000; - LOGBANKSW("Bankswitch index %d -> %04X\n", offset, m_bank_offset); + if (!machine().side_effects_disabled()) + { + m_bank_offset = (offset & 3) * 0x1000; + LOGBANKSW("Bankswitch index %d -> %04X\n", offset, m_bank_offset); + } return m_bankswitch_base[offset]; } @@ -271,7 +273,8 @@ uint16_t offtwall_state::bankswitch_r(offs_t offset) uint16_t offtwall_state::bankrom_r(address_space &space, offs_t offset) { // this is the banked ROM read - logerror("Banked ROM read: %06X: %04X\n", m_maincpu->pcbase(), offset); + if (!machine().side_effects_disabled()) + logerror("Banked ROM read: %06X: %04X\n", m_maincpu->pcbase(), offset); /* if the values are $3e000 or $3e002 are being read by code just below the ROM bank area, we need to return the correct value to give the proper checksum */ @@ -315,29 +318,32 @@ uint16_t offtwall_state::spritecache_count_r(offs_t offset) // if this read is coming from $99f8 or $9992, it's in the sprite copy loop if (prevpc == 0x99f8 || prevpc == 0x9992) { - uint16_t *data = &m_spritecache_count[-0x100]; - int const oldword = m_spritecache_count[0]; - int count = oldword >> 8; - int width = 0; - - // compute the current total width - for (int i = 0; i < count; i++) - width += 1 + ((data[i * 4 + 1] >> 4) & 7); - - // if we're less than 39, keep adding dummy sprites until we hit it - if (width <= 38) + if (!machine().side_effects_disabled()) { - while (width <= 38) - { - data[count * 4 + 0] = (42 * 8) << 7; - data[count * 4 + 1] = ((30 * 8) << 7) | (7 << 4); - data[count * 4 + 2] = 0; - width += 8; - count++; - } + uint16_t *data = &m_spritecache_count[-0x100]; + int const oldword = m_spritecache_count[0]; + int count = oldword >> 8; + int width = 0; - // update the final count in memory - m_spritecache_count[0] = (count << 8) | (oldword & 0xff); + // compute the current total width + for (int i = 0; i < count; i++) + width += 1 + ((data[i * 4 + 1] >> 4) & 7); + + // if we're less than 39, keep adding dummy sprites until we hit it + if (width <= 38) + { + while (width <= 38) + { + data[count * 4 + 0] = (42 * 8) << 7; + data[count * 4 + 1] = ((30 * 8) << 7) | (7 << 4); + data[count * 4 + 2] = 0; + width += 8; + count++; + } + + // update the final count in memory + m_spritecache_count[0] = (count << 8) | (oldword & 0xff); + } } } @@ -522,7 +528,7 @@ void offtwall_state::offtwall(machine_config &config) ATARI_VAD(config, m_vad, 0, "screen"); m_vad->scanline_int_cb().set_inputline(m_maincpu, M68K_IRQ_4); - TILEMAP(config, "vad:playfield", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(offtwall_state::get_playfield_tile_info)); + TILEMAP(config, "vad:playfield", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_COLS, 62, 64).set_info_callback(FUNC(offtwall_state::get_playfield_tile_info)); ATARI_MOTION_OBJECTS(config, "vad:mob", 0, "screen", offtwall_state::s_mob_config).set_gfxdecode("gfxdecode"); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/atari/rampart.cpp b/src/mame/atari/rampart.cpp index 2c354726ab3..b7bc568ff79 100644 --- a/src/mame/atari/rampart.cpp +++ b/src/mame/atari/rampart.cpp @@ -120,7 +120,6 @@ const atari_motion_objects_config rampart_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -265,20 +264,20 @@ void rampart_state::latch_w(offs_t offset, u16 data, u16 mem_mask) // upper byte being modified? if (ACCESSING_BITS_8_15) { - if (data & 0x1000) + if (BIT(data, 12)) LOGCOLBANK("Color bank set to 1!\n"); - machine().bookkeeping().coin_counter_w(0, (data >> 9) & 1); - machine().bookkeeping().coin_counter_w(1, (data >> 8) & 1); + machine().bookkeeping().coin_counter_w(0, BIT(data, 9)); + machine().bookkeeping().coin_counter_w(1, BIT(data, 8)); } // lower byte being modified? if (ACCESSING_BITS_0_7) { - m_oki->set_output_gain(ALL_OUTPUTS, (data & 0x0020) ? 1.0f : 0.0f); - if (!(data & 0x0010)) + m_oki->set_output_gain(ALL_OUTPUTS, BIT(data, 5) ? 1.0f : 0.0f); + if (BIT(~data, 4)) m_oki->reset(); m_ym2413->set_output_gain(ALL_OUTPUTS, ((data >> 1) & 7) / 7.0f); - if (!(data & 0x0001)) + if (BIT(~data, 0)) m_ym2413->reset(); } } diff --git a/src/mame/atari/relief.cpp b/src/mame/atari/relief.cpp index aa2de782cd4..7530d615d47 100644 --- a/src/mame/atari/relief.cpp +++ b/src/mame/atari/relief.cpp @@ -205,7 +205,6 @@ const atari_motion_objects_config relief_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -340,7 +339,7 @@ void relief_state::machine_reset() uint16_t relief_state::special_port2_r() { int result = m_260010->read(); - if (!(result & 0x0080) || m_screen->hblank()) result ^= 0x0001; + if (BIT(~result, 7) || m_screen->hblank()) result ^= 0x0001; return result; } diff --git a/src/mame/atari/shuuz.cpp b/src/mame/atari/shuuz.cpp index 7d349fcb7bb..4dc135d5443 100644 --- a/src/mame/atari/shuuz.cpp +++ b/src/mame/atari/shuuz.cpp @@ -120,7 +120,6 @@ const atari_motion_objects_config shuuz_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x000, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -229,7 +228,7 @@ void shuuz_state::latch_w(uint16_t data) // TODO uint16_t shuuz_state::leta_r(offs_t offset) { // trackball -- rotated 45 degrees? - int const which = offset & 1; + int const which = BIT(offset, 0); // when reading the even ports, do a real analog port update if (which == 0) @@ -256,7 +255,7 @@ uint16_t shuuz_state::special_port0_r() { int result = m_system->read(); - if ((result & 0x0800) && get_hblank()) + if (BIT(result, 11) && get_hblank()) result &= ~0x0800; return result; @@ -380,8 +379,8 @@ static const gfx_layout pfmolayout = static GFXDECODE_START( gfx_shuuz ) - GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 16 ) // sprites & playfield - GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 0, 16 ) // sprites & playfield + GFXDECODE_ENTRY( "tiles", 0, pfmolayout, 256, 16 ) // playfield + GFXDECODE_ENTRY( "sprites", 0, pfmolayout, 0, 16 ) // sprites GFXDECODE_END @@ -408,7 +407,7 @@ void shuuz_state::shuuz(machine_config &config) ATARI_VAD(config, m_vad, 0, m_screen); m_vad->scanline_int_cb().set_inputline(m_maincpu, M68K_IRQ_4); - TILEMAP(config, "vad:playfield", m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(shuuz_state::get_playfield_tile_info)); + TILEMAP(config, "vad:playfield", m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 62, 64).set_info_callback(FUNC(shuuz_state::get_playfield_tile_info)); ATARI_MOTION_OBJECTS(config, "vad:mob", 0, m_screen, shuuz_state::s_mob_config).set_gfxdecode(m_gfxdecode); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); @@ -438,13 +437,13 @@ ROM_START( shuuz ) ROM_LOAD16_BYTE( "136083-4010.23p", 0x00000, 0x20000, CRC(1c2459f8) SHA1(4b8daf196e3ba17cf958a3c1af4e4dacfb79b9e7) ) ROM_LOAD16_BYTE( "136083-4011.13p", 0x00001, 0x20000, CRC(6db53a85) SHA1(7f9b3ea78fa65221931bfdab1aa5f1913ffed753) ) - ROM_REGION( 0x080000, "gfx1", ROMREGION_INVERT ) + ROM_REGION( 0x080000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "136083-2030.43x", 0x000000, 0x20000, CRC(8ecf1ed8) SHA1(47143f1eaf43027c5301eb6009d8a56a98328894) ) ROM_LOAD( "136083-2032.20x", 0x020000, 0x20000, CRC(5af184e6) SHA1(630969466c606d1f51da81911fb365a4cac4685c) ) ROM_LOAD( "136083-2031.87x", 0x040000, 0x20000, CRC(72e9db63) SHA1(be13830b38c2603bbd6b875abdc1675788a60b24) ) ROM_LOAD( "136083-2033.65x", 0x060000, 0x20000, CRC(8f552498) SHA1(7fd323f3b30747a8645d7a9676fdf8f973b6632a) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136083-1020.43u", 0x000000, 0x20000, CRC(d21ad039) SHA1(5389745eff6690c1890f98a9630869b1084fb2f3) ) ROM_LOAD( "136083-1022.20u", 0x020000, 0x20000, CRC(0c10bc90) SHA1(11272757ecad42a4fae49046bd1b01d5ff7f7d4f) ) ROM_LOAD( "136083-1024.43m", 0x040000, 0x20000, CRC(adb09347) SHA1(5294dfb3d4aa83525795ca03c2f328ab9a666baf) ) @@ -472,13 +471,13 @@ ROM_START( shuuz2 ) ROM_LOAD16_BYTE( "136083-23p.rom", 0x00000, 0x20000, CRC(98aec4e7) SHA1(8cbe6e7835ecf0ef74a2de723ef970a63d3bddd1) ) ROM_LOAD16_BYTE( "136083-13p.rom", 0x00001, 0x20000, CRC(dd9d5d5c) SHA1(0bde6be55532c232b1d27824c2ce61f33501cbb0) ) - ROM_REGION( 0x080000, "gfx1", ROMREGION_INVERT ) + ROM_REGION( 0x080000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "136083-2030.43x", 0x000000, 0x20000, CRC(8ecf1ed8) SHA1(47143f1eaf43027c5301eb6009d8a56a98328894) ) ROM_LOAD( "136083-2032.20x", 0x020000, 0x20000, CRC(5af184e6) SHA1(630969466c606d1f51da81911fb365a4cac4685c) ) ROM_LOAD( "136083-2031.87x", 0x040000, 0x20000, CRC(72e9db63) SHA1(be13830b38c2603bbd6b875abdc1675788a60b24) ) ROM_LOAD( "136083-2033.65x", 0x060000, 0x20000, CRC(8f552498) SHA1(7fd323f3b30747a8645d7a9676fdf8f973b6632a) ) - ROM_REGION( 0x100000, "gfx2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136083-1020.43u", 0x000000, 0x20000, CRC(d21ad039) SHA1(5389745eff6690c1890f98a9630869b1084fb2f3) ) ROM_LOAD( "136083-1022.20u", 0x020000, 0x20000, CRC(0c10bc90) SHA1(11272757ecad42a4fae49046bd1b01d5ff7f7d4f) ) ROM_LOAD( "136083-1024.43m", 0x040000, 0x20000, CRC(adb09347) SHA1(5294dfb3d4aa83525795ca03c2f328ab9a666baf) ) diff --git a/src/mame/atari/skullxbo.cpp b/src/mame/atari/skullxbo.cpp index c29872858e5..c308ee2c827 100644 --- a/src/mame/atari/skullxbo.cpp +++ b/src/mame/atari/skullxbo.cpp @@ -64,8 +64,6 @@ public: void skullxbo(machine_config &config); - void init_skullxbo(); - protected: virtual void machine_start() override ATTR_COLD; @@ -149,7 +147,6 @@ const atari_motion_objects_config skullxbo_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x000, // base palette entry - 0x200, // maximum number of colors 0, // transparent pen index {{ 0x00ff,0,0,0 }}, // mask for the link @@ -546,12 +543,12 @@ INPUT_PORTS_END static const gfx_layout pflayout = { - 16,8, + 8,8, RGN_FRAC(1,2), 4, { 0, 1, 2, 3 }, - { RGN_FRAC(1,2)+0,RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4,RGN_FRAC(1,2)+4, 0,0, 4,4, - RGN_FRAC(1,2)+8,RGN_FRAC(1,2)+8, RGN_FRAC(1,2)+12,RGN_FRAC(1,2)+12, 8,8, 12,12 }, + { RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4, 0, 4, + RGN_FRAC(1,2)+8, RGN_FRAC(1,2)+12, 8, 12 }, { 0*8, 2*8, 4*8, 6*8, 8*8, 10*8, 12*8, 14*8 }, 16*8 }; @@ -559,11 +556,11 @@ static const gfx_layout pflayout = static const gfx_layout anlayout = { - 16,8, + 8,8, RGN_FRAC(1,1), 2, { 0, 1 }, - { 0,0, 2,2, 4,4, 6,6, 8,8, 10,10, 12,12, 14,14 }, + { 0, 2, 4, 6, 8, 10, 12, 14 }, { 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16 }, 8*16 }; @@ -583,8 +580,8 @@ static const gfx_layout molayout = static GFXDECODE_START( gfx_skullxbo ) GFXDECODE_ENTRY( "sprites", 0, molayout, 0x000, 32 ) - GFXDECODE_ENTRY( "playfield", 0, pflayout, 0x200, 16 ) - GFXDECODE_ENTRY( "chars", 0, anlayout, 0x300, 16 ) + GFXDECODE_SCALE( "playfield", 0, pflayout, 0x200, 16, 2, 1 ) + GFXDECODE_SCALE( "chars", 0, anlayout, 0x300, 16, 2, 1 ) GFXDECODE_END @@ -612,7 +609,7 @@ void skullxbo_state::skullxbo(machine_config &config) PALETTE(config, "palette").set_format(palette_device::IRGB_1555, 2048); TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 16, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(skullxbo_state::get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 16, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(skullxbo_state::get_alpha_tile_info)); + TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 16, 8, TILEMAP_SCAN_ROWS, 64, 31, 0).set_info_callback(FUNC(skullxbo_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, skullxbo_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); @@ -657,7 +654,7 @@ ROM_START( skullxbo ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136072-1149.1b", 0x00000, 0x10000, CRC(8d730e7a) SHA1(b89fb9cadcf813ea5cba55f1efcdcdd2517944c7) ) - ROM_REGION( 0x190000, "sprites", 0 ) + ROM_REGION( 0x190000, "sprites", ROMREGION_ERASE00 ) ROM_LOAD( "136072-1102.13r", 0x000000, 0x010000, CRC(90becdfa) SHA1(aa5aaeda70e137518a9e58906daed66fa563b27e) ) ROM_LOAD( "136072-1104.28r", 0x010000, 0x010000, CRC(33609071) SHA1(6d9671a9edbdd28c1e360017253dab5dd858dbe7) ) ROM_LOAD( "136072-1106.41r", 0x020000, 0x010000, CRC(71962e9f) SHA1(4e6017ede5ce2fec7f6e25eadfc4070f3296ff2f) ) @@ -720,7 +717,7 @@ ROM_START( skullxbo4 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136072-1149.1b", 0x00000, 0x10000, CRC(8d730e7a) SHA1(b89fb9cadcf813ea5cba55f1efcdcdd2517944c7) ) - ROM_REGION( 0x190000, "sprites", 0 ) + ROM_REGION( 0x190000, "sprites", ROMREGION_ERASE00 ) ROM_LOAD( "136072-1102.13r", 0x000000, 0x010000, CRC(90becdfa) SHA1(aa5aaeda70e137518a9e58906daed66fa563b27e) ) ROM_LOAD( "136072-1104.28r", 0x010000, 0x010000, CRC(33609071) SHA1(6d9671a9edbdd28c1e360017253dab5dd858dbe7) ) ROM_LOAD( "136072-1106.41r", 0x020000, 0x010000, CRC(71962e9f) SHA1(4e6017ede5ce2fec7f6e25eadfc4070f3296ff2f) ) @@ -783,7 +780,7 @@ ROM_START( skullxbo3 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136072-1149.1b", 0x00000, 0x10000, CRC(8d730e7a) SHA1(b89fb9cadcf813ea5cba55f1efcdcdd2517944c7) ) - ROM_REGION( 0x190000, "sprites", 0 ) + ROM_REGION( 0x190000, "sprites", ROMREGION_ERASE00 ) ROM_LOAD( "136072-1102.13r", 0x000000, 0x010000, CRC(90becdfa) SHA1(aa5aaeda70e137518a9e58906daed66fa563b27e) ) ROM_LOAD( "136072-1104.28r", 0x010000, 0x010000, CRC(33609071) SHA1(6d9671a9edbdd28c1e360017253dab5dd858dbe7) ) ROM_LOAD( "136072-1106.41r", 0x020000, 0x010000, CRC(71962e9f) SHA1(4e6017ede5ce2fec7f6e25eadfc4070f3296ff2f) ) @@ -846,7 +843,7 @@ ROM_START( skullxbo2 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136072-1149.1b", 0x00000, 0x10000, CRC(8d730e7a) SHA1(b89fb9cadcf813ea5cba55f1efcdcdd2517944c7) ) - ROM_REGION( 0x190000, "sprites", 0 ) + ROM_REGION( 0x190000, "sprites", ROMREGION_ERASE00 ) ROM_LOAD( "136072-1102.13r", 0x000000, 0x010000, CRC(90becdfa) SHA1(aa5aaeda70e137518a9e58906daed66fa563b27e) ) ROM_LOAD( "136072-1104.28r", 0x010000, 0x010000, CRC(33609071) SHA1(6d9671a9edbdd28c1e360017253dab5dd858dbe7) ) ROM_LOAD( "136072-1106.41r", 0x020000, 0x010000, CRC(71962e9f) SHA1(4e6017ede5ce2fec7f6e25eadfc4070f3296ff2f) ) @@ -909,7 +906,7 @@ ROM_START( skullxbo1 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136072-1149.1b", 0x00000, 0x10000, CRC(8d730e7a) SHA1(b89fb9cadcf813ea5cba55f1efcdcdd2517944c7) ) - ROM_REGION( 0x190000, "sprites", 0 ) + ROM_REGION( 0x190000, "sprites", ROMREGION_ERASE00 ) ROM_LOAD( "136072-1102.13r", 0x000000, 0x010000, CRC(90becdfa) SHA1(aa5aaeda70e137518a9e58906daed66fa563b27e) ) ROM_LOAD( "136072-1104.28r", 0x010000, 0x010000, CRC(33609071) SHA1(6d9671a9edbdd28c1e360017253dab5dd858dbe7) ) ROM_LOAD( "136072-1106.41r", 0x020000, 0x010000, CRC(71962e9f) SHA1(4e6017ede5ce2fec7f6e25eadfc4070f3296ff2f) ) @@ -958,18 +955,6 @@ ROM_START( skullxbo1 ) ROM_END - -/************************************* - * - * ROM decoding - * - *************************************/ - -void skullxbo_state::init_skullxbo() -{ - memset(memregion("sprites")->base() + 0x170000, 0, 0x20000); -} - } // anonymous namespace @@ -979,8 +964,8 @@ void skullxbo_state::init_skullxbo() * *************************************/ -GAME( 1989, skullxbo, 0, skullxbo, skullxbo, skullxbo_state, init_skullxbo, ROT0, "Atari Games", "Skull & Crossbones (rev 5)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, skullxbo4, skullxbo, skullxbo, skullxbo, skullxbo_state, init_skullxbo, ROT0, "Atari Games", "Skull & Crossbones (rev 4)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, skullxbo3, skullxbo, skullxbo, skullxbo, skullxbo_state, init_skullxbo, ROT0, "Atari Games", "Skull & Crossbones (rev 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, skullxbo2, skullxbo, skullxbo, skullxbo, skullxbo_state, init_skullxbo, ROT0, "Atari Games", "Skull & Crossbones (rev 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, skullxbo1, skullxbo, skullxbo, skullxbo, skullxbo_state, init_skullxbo, ROT0, "Atari Games", "Skull & Crossbones (rev 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, skullxbo, 0, skullxbo, skullxbo, skullxbo_state, empty_init, ROT0, "Atari Games", "Skull & Crossbones (rev 5)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, skullxbo4, skullxbo, skullxbo, skullxbo, skullxbo_state, empty_init, ROT0, "Atari Games", "Skull & Crossbones (rev 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, skullxbo3, skullxbo, skullxbo, skullxbo, skullxbo_state, empty_init, ROT0, "Atari Games", "Skull & Crossbones (rev 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, skullxbo2, skullxbo, skullxbo, skullxbo, skullxbo_state, empty_init, ROT0, "Atari Games", "Skull & Crossbones (rev 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, skullxbo1, skullxbo, skullxbo, skullxbo, skullxbo_state, empty_init, ROT0, "Atari Games", "Skull & Crossbones (rev 1)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/atari/thunderj.cpp b/src/mame/atari/thunderj.cpp index 344dcc68d26..8f794d8ed80 100644 --- a/src/mame/atari/thunderj.cpp +++ b/src/mame/atari/thunderj.cpp @@ -158,7 +158,6 @@ const atari_motion_objects_config thunderj_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0x03ff,0,0,0 }}, // mask for the link @@ -366,7 +365,7 @@ void thunderj_state::latch_w(offs_t offset, uint16_t data, uint16_t mem_mask) if (ACCESSING_BITS_0_7) { // 0 means hold CPU 2's reset low - if (data & 1) + if (BIT(data, 0)) m_extra->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); else m_extra->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -496,9 +495,9 @@ static const gfx_layout anlayout = static GFXDECODE_START( gfx_thunderj ) - GFXDECODE_ENTRY( "sprites_tiles1", 0, gfx_8x8x4_planar, 512, 96 ) - GFXDECODE_ENTRY( "sprites_tiles2", 0, gfx_8x8x4_planar, 256, 112 ) - GFXDECODE_ENTRY( "chars", 0, anlayout, 0, 512 ) + GFXDECODE_ENTRY( "tiles", 0, gfx_8x8x4_planar, 512, 96 ) + GFXDECODE_ENTRY( "sprites", 0, gfx_8x8x4_planar, 256, 112 ) + GFXDECODE_ENTRY( "chars", 0, anlayout, 0, 512 ) GFXDECODE_END @@ -533,7 +532,7 @@ void thunderj_state::thunderj(machine_config &config) m_vad->scanline_int_cb().set(FUNC(thunderj_state::scanline_int_write_line)); TILEMAP(config, "vad:playfield", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(thunderj_state::get_playfield_tile_info)); TILEMAP(config, "vad:playfield2", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64, 0).set_info_callback(FUNC(thunderj_state::get_playfield2_tile_info)); - TILEMAP(config, "vad:alpha", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(thunderj_state::get_alpha_tile_info)); + TILEMAP(config, "vad:alpha", "gfxdecode", 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 30, 0).set_info_callback(FUNC(thunderj_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, "vad:mob", 0, m_screen, thunderj_state::s_mob_config).set_gfxdecode("gfxdecode"); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); @@ -582,7 +581,7 @@ ROM_START( thunderj ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136076-2015.1b", 0x00000, 0x10000, CRC(d8feb7fb) SHA1(684ebf2f0c0df742c98e7f45f74de86a11c8d6e8) ) // Rev 2 program ROM - ROM_REGION( 0x100000, "sprites_tiles1", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "136076-1021.5s", 0x000000, 0x10000, CRC(d8432766) SHA1(04e7d820974c0890fde1257b4710cf7b520d7d48) ) // graphics, plane 0 */ ROM_LOAD( "136076-1025.5r", 0x010000, 0x10000, CRC(839feed5) SHA1(c683ef5b78f8fd63dd557a630544f1e21aebe665) ) ROM_LOAD( "136076-1029.3p", 0x020000, 0x10000, CRC(fa887662) SHA1(5d19022e8d40be86b85d0bcc28c97207ab9ec403) ) @@ -600,7 +599,7 @@ ROM_START( thunderj ) ROM_LOAD( "136076-1032.14p", 0x0e0000, 0x10000, CRC(f639161a) SHA1(cc2549f7fdd251fa44735a6cd5fdb8ffb97948be) ) ROM_LOAD( "136076-1036.16p", 0x0f0000, 0x10000, CRC(b342443d) SHA1(fa7865f8a90c0e761e1cc5e155931d0574f2d81c) ) - ROM_REGION( 0x100000, "sprites_tiles2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136076-1037.2s", 0x000000, 0x10000, CRC(07addba6) SHA1(4a3286ee570bf4263944854bf959c8ef114cc123) ) ROM_LOAD( "136076-1041.2r", 0x010000, 0x10000, CRC(1e9c29e4) SHA1(e4afa2c469bfa22504cba5dfd23704c5c2bb33c4) ) ROM_LOAD( "136076-1045.34s", 0x020000, 0x10000, CRC(e7235876) SHA1(0bb03baec1de3e520dc270a3ed44bec953e08c00) ) @@ -658,7 +657,7 @@ ROM_START( thunderja ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "136076-2015.1b", 0x00000, 0x10000, CRC(d8feb7fb) SHA1(684ebf2f0c0df742c98e7f45f74de86a11c8d6e8) ) // Rev 2 program ROM - ROM_REGION( 0x100000, "sprites_tiles1", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "tiles", ROMREGION_INVERT ) ROM_LOAD( "136076-1021.5s", 0x000000, 0x10000, CRC(d8432766) SHA1(04e7d820974c0890fde1257b4710cf7b520d7d48) ) // graphics, plane 0 */ ROM_LOAD( "136076-1025.5r", 0x010000, 0x10000, CRC(839feed5) SHA1(c683ef5b78f8fd63dd557a630544f1e21aebe665) ) ROM_LOAD( "136076-1029.3p", 0x020000, 0x10000, CRC(fa887662) SHA1(5d19022e8d40be86b85d0bcc28c97207ab9ec403) ) @@ -676,7 +675,7 @@ ROM_START( thunderja ) ROM_LOAD( "136076-1032.14p", 0x0e0000, 0x10000, CRC(f639161a) SHA1(cc2549f7fdd251fa44735a6cd5fdb8ffb97948be) ) ROM_LOAD( "136076-1036.16p", 0x0f0000, 0x10000, CRC(b342443d) SHA1(fa7865f8a90c0e761e1cc5e155931d0574f2d81c) ) - ROM_REGION( 0x100000, "sprites_tiles2", ROMREGION_INVERT ) + ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) ROM_LOAD( "136076-1037.2s", 0x000000, 0x10000, CRC(07addba6) SHA1(4a3286ee570bf4263944854bf959c8ef114cc123) ) ROM_LOAD( "136076-1041.2r", 0x010000, 0x10000, CRC(1e9c29e4) SHA1(e4afa2c469bfa22504cba5dfd23704c5c2bb33c4) ) ROM_LOAD( "136076-1045.34s", 0x020000, 0x10000, CRC(e7235876) SHA1(0bb03baec1de3e520dc270a3ed44bec953e08c00) ) diff --git a/src/mame/atari/toobin.cpp b/src/mame/atari/toobin.cpp index feef7540984..d2fcb9ae39a 100644 --- a/src/mame/atari/toobin.cpp +++ b/src/mame/atari/toobin.cpp @@ -152,7 +152,6 @@ const atari_motion_objects_config toobin_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0,0,0x00ff,0 }}, // mask for the link @@ -191,7 +190,7 @@ void toobin_state::video_start() void toobin_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_paletteram[offset]); - uint16_t newword = m_paletteram[offset]; + uint16_t const newword = m_paletteram[offset]; { int red = (((newword >> 10) & 31) * 224) >> 5; @@ -203,7 +202,7 @@ void toobin_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) if (blue) blue += 38; m_palette->set_pen_color(offset & 0x3ff, rgb_t(red, green, blue)); - if (!(newword & 0x8000)) + if (BIT(~newword, 15)) m_palette->set_pen_contrast(offset & 0x3ff, m_brightness); else m_palette->set_pen_contrast(offset & 0x3ff, 1.0); @@ -218,7 +217,7 @@ void toobin_state::intensity_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_brightness = (double)(~data & 0x1f) / 31.0; for (int i = 0; i < 0x400; i++) - if (!BIT(m_paletteram[i], 15)) + if (BIT(~m_paletteram[i], 15)) m_palette->set_pen_contrast(i, m_brightness); } } @@ -501,9 +500,9 @@ static const gfx_layout molayout = static GFXDECODE_START( gfx_toobin ) - GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0, 16 ) - GFXDECODE_ENTRY( "gfx2", 0, molayout, 256, 16 ) - GFXDECODE_ENTRY( "gfx3", 0, anlayout, 512, 64 ) + GFXDECODE_ENTRY( "tiles", 0, pflayout, 0, 16 ) + GFXDECODE_ENTRY( "sprites", 0, molayout, 256, 16 ) + GFXDECODE_ENTRY( "chars", 0, anlayout, 512, 64 ) GFXDECODE_END @@ -516,7 +515,7 @@ GFXDECODE_END void toobin_state::toobin(machine_config &config) { - static constexpr XTAL MASTER_CLOCK = 32_MHz_XTAL; + constexpr XTAL MASTER_CLOCK = 32_MHz_XTAL; // basic machine hardware m68010_device &maincpu(M68010(config, m_maincpu, MASTER_CLOCK / 4)); @@ -576,7 +575,7 @@ ROM_START( toobin ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "1141-2k.061", 0x00000, 0x10000, CRC(c0dcce1a) SHA1(285c13f08020cf5827eca2afcc2fa8a3a0a073e0) ) - ROM_REGION( 0x080000, "gfx1", 0 ) + ROM_REGION( 0x080000, "tiles", 0 ) ROM_LOAD( "1101-1a.061", 0x000000, 0x010000, CRC(02696f15) SHA1(51856c331c45d287e574e2e4013b62a6472ad720) ) ROM_LOAD( "1102-2a.061", 0x010000, 0x010000, CRC(4bed4262) SHA1(eda16ece14cb60012edbe006b2839986d082822e) ) ROM_LOAD( "1103-4a.061", 0x020000, 0x010000, CRC(e62b037f) SHA1(9a2341b822265269c07b65c4bc0fbc760c1bd456) ) @@ -586,7 +585,7 @@ ROM_START( toobin ) ROM_LOAD( "1107-4b.061", 0x060000, 0x010000, CRC(fe6f6aed) SHA1(11bd17be3c9fe409db8268cb17515040bfd92ee2) ) ROM_LOAD( "1108-5b.061", 0x070000, 0x010000, CRC(26fe71e1) SHA1(cac22f969c943e184a58d7bb62072f93273638de) ) - ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_REGION( 0x200000, "sprites", 0 ) ROM_LOAD( "1143-10a.061", 0x000000, 0x020000, CRC(211c1049) SHA1(fcf4d9321b2871723a10b7607069da83d3402723) ) ROM_LOAD( "1144-13a.061", 0x020000, 0x020000, CRC(ef62ed2c) SHA1(c2c21023b2f559b8a63e6ae9c59c33a3055cc465) ) ROM_LOAD( "1145-16a.061", 0x040000, 0x020000, CRC(067ecb8a) SHA1(a42e4602e1de1cc83a30a901a9adb5519f426cff) ) @@ -612,7 +611,7 @@ ROM_START( toobin ) ROM_LOAD( "1132-25b.061", 0x1b0000, 0x010000, CRC(c79f8ffc) SHA1(6e90044755097387011e7cc04548bedb399b7cc3) ) ROM_RELOAD( 0x1f0000, 0x010000 ) - ROM_REGION( 0x004000, "gfx3", 0 ) + ROM_REGION( 0x004000, "chars", 0 ) ROM_LOAD( "1142-20h.061", 0x000000, 0x004000, CRC(a6ab551f) SHA1(6a11e16f3965416c81737efcb81e751484ba5ace) ) ROM_END @@ -631,7 +630,7 @@ ROM_START( toobine ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "1141-2k.061", 0x00000, 0x10000, CRC(c0dcce1a) SHA1(285c13f08020cf5827eca2afcc2fa8a3a0a073e0) ) - ROM_REGION( 0x080000, "gfx1", 0 ) + ROM_REGION( 0x080000, "tiles", 0 ) ROM_LOAD( "1101-1a.061", 0x000000, 0x010000, CRC(02696f15) SHA1(51856c331c45d287e574e2e4013b62a6472ad720) ) ROM_LOAD( "1102-2a.061", 0x010000, 0x010000, CRC(4bed4262) SHA1(eda16ece14cb60012edbe006b2839986d082822e) ) ROM_LOAD( "1103-4a.061", 0x020000, 0x010000, CRC(e62b037f) SHA1(9a2341b822265269c07b65c4bc0fbc760c1bd456) ) @@ -641,7 +640,7 @@ ROM_START( toobine ) ROM_LOAD( "1107-4b.061", 0x060000, 0x010000, CRC(fe6f6aed) SHA1(11bd17be3c9fe409db8268cb17515040bfd92ee2) ) ROM_LOAD( "1108-5b.061", 0x070000, 0x010000, CRC(26fe71e1) SHA1(cac22f969c943e184a58d7bb62072f93273638de) ) - ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_REGION( 0x200000, "sprites", 0 ) ROM_LOAD( "1143-10a.061", 0x000000, 0x020000, CRC(211c1049) SHA1(fcf4d9321b2871723a10b7607069da83d3402723) ) ROM_LOAD( "1144-13a.061", 0x020000, 0x020000, CRC(ef62ed2c) SHA1(c2c21023b2f559b8a63e6ae9c59c33a3055cc465) ) ROM_LOAD( "1145-16a.061", 0x040000, 0x020000, CRC(067ecb8a) SHA1(a42e4602e1de1cc83a30a901a9adb5519f426cff) ) @@ -667,7 +666,7 @@ ROM_START( toobine ) ROM_LOAD( "1132-25b.061", 0x1b0000, 0x010000, CRC(c79f8ffc) SHA1(6e90044755097387011e7cc04548bedb399b7cc3) ) ROM_RELOAD( 0x1f0000, 0x010000 ) - ROM_REGION( 0x004000, "gfx3", 0 ) + ROM_REGION( 0x004000, "chars", 0 ) ROM_LOAD( "1142-20h.061", 0x000000, 0x004000, CRC(a6ab551f) SHA1(6a11e16f3965416c81737efcb81e751484ba5ace) ) ROM_END @@ -686,7 +685,7 @@ ROM_START( toobing ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "1141-2k.061", 0x00000, 0x10000, CRC(c0dcce1a) SHA1(285c13f08020cf5827eca2afcc2fa8a3a0a073e0) ) - ROM_REGION( 0x080000, "gfx1", 0 ) + ROM_REGION( 0x080000, "tiles", 0 ) ROM_LOAD( "1101-1a.061", 0x000000, 0x010000, CRC(02696f15) SHA1(51856c331c45d287e574e2e4013b62a6472ad720) ) ROM_LOAD( "1102-2a.061", 0x010000, 0x010000, CRC(4bed4262) SHA1(eda16ece14cb60012edbe006b2839986d082822e) ) ROM_LOAD( "1103-4a.061", 0x020000, 0x010000, CRC(e62b037f) SHA1(9a2341b822265269c07b65c4bc0fbc760c1bd456) ) @@ -696,7 +695,7 @@ ROM_START( toobing ) ROM_LOAD( "1107-4b.061", 0x060000, 0x010000, CRC(fe6f6aed) SHA1(11bd17be3c9fe409db8268cb17515040bfd92ee2) ) ROM_LOAD( "1108-5b.061", 0x070000, 0x010000, CRC(26fe71e1) SHA1(cac22f969c943e184a58d7bb62072f93273638de) ) - ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_REGION( 0x200000, "sprites", 0 ) ROM_LOAD( "1143-10a.061", 0x000000, 0x020000, CRC(211c1049) SHA1(fcf4d9321b2871723a10b7607069da83d3402723) ) ROM_LOAD( "1144-13a.061", 0x020000, 0x020000, CRC(ef62ed2c) SHA1(c2c21023b2f559b8a63e6ae9c59c33a3055cc465) ) ROM_LOAD( "1145-16a.061", 0x040000, 0x020000, CRC(067ecb8a) SHA1(a42e4602e1de1cc83a30a901a9adb5519f426cff) ) @@ -722,7 +721,7 @@ ROM_START( toobing ) ROM_LOAD( "1132-25b.061", 0x1b0000, 0x010000, CRC(c79f8ffc) SHA1(6e90044755097387011e7cc04548bedb399b7cc3) ) ROM_RELOAD( 0x1f0000, 0x010000 ) - ROM_REGION( 0x004000, "gfx3", 0 ) + ROM_REGION( 0x004000, "chars", 0 ) ROM_LOAD( "1142-20h.061", 0x000000, 0x004000, CRC(a6ab551f) SHA1(6a11e16f3965416c81737efcb81e751484ba5ace) ) ROM_END @@ -741,7 +740,7 @@ ROM_START( toobin2e ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "1141-2k.061", 0x00000, 0x10000, CRC(c0dcce1a) SHA1(285c13f08020cf5827eca2afcc2fa8a3a0a073e0) ) - ROM_REGION( 0x080000, "gfx1", 0 ) + ROM_REGION( 0x080000, "tiles", 0 ) ROM_LOAD( "1101-1a.061", 0x000000, 0x010000, CRC(02696f15) SHA1(51856c331c45d287e574e2e4013b62a6472ad720) ) ROM_LOAD( "1102-2a.061", 0x010000, 0x010000, CRC(4bed4262) SHA1(eda16ece14cb60012edbe006b2839986d082822e) ) ROM_LOAD( "1103-4a.061", 0x020000, 0x010000, CRC(e62b037f) SHA1(9a2341b822265269c07b65c4bc0fbc760c1bd456) ) @@ -751,7 +750,7 @@ ROM_START( toobin2e ) ROM_LOAD( "1107-4b.061", 0x060000, 0x010000, CRC(fe6f6aed) SHA1(11bd17be3c9fe409db8268cb17515040bfd92ee2) ) ROM_LOAD( "1108-5b.061", 0x070000, 0x010000, CRC(26fe71e1) SHA1(cac22f969c943e184a58d7bb62072f93273638de) ) - ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_REGION( 0x200000, "sprites", 0 ) ROM_LOAD( "1143-10a.061", 0x000000, 0x020000, CRC(211c1049) SHA1(fcf4d9321b2871723a10b7607069da83d3402723) ) ROM_LOAD( "1144-13a.061", 0x020000, 0x020000, CRC(ef62ed2c) SHA1(c2c21023b2f559b8a63e6ae9c59c33a3055cc465) ) ROM_LOAD( "1145-16a.061", 0x040000, 0x020000, CRC(067ecb8a) SHA1(a42e4602e1de1cc83a30a901a9adb5519f426cff) ) @@ -777,7 +776,7 @@ ROM_START( toobin2e ) ROM_LOAD( "1132-25b.061", 0x1b0000, 0x010000, CRC(c79f8ffc) SHA1(6e90044755097387011e7cc04548bedb399b7cc3) ) ROM_RELOAD( 0x1f0000, 0x010000 ) - ROM_REGION( 0x004000, "gfx3", 0 ) + ROM_REGION( 0x004000, "chars", 0 ) ROM_LOAD( "1142-20h.061", 0x000000, 0x004000, CRC(a6ab551f) SHA1(6a11e16f3965416c81737efcb81e751484ba5ace) ) ROM_END @@ -796,7 +795,7 @@ ROM_START( toobin2 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "1141-2k.061", 0x00000, 0x10000, CRC(c0dcce1a) SHA1(285c13f08020cf5827eca2afcc2fa8a3a0a073e0) ) - ROM_REGION( 0x080000, "gfx1", 0 ) + ROM_REGION( 0x080000, "tiles", 0 ) ROM_LOAD( "1101-1a.061", 0x000000, 0x010000, CRC(02696f15) SHA1(51856c331c45d287e574e2e4013b62a6472ad720) ) ROM_LOAD( "1102-2a.061", 0x010000, 0x010000, CRC(4bed4262) SHA1(eda16ece14cb60012edbe006b2839986d082822e) ) ROM_LOAD( "1103-4a.061", 0x020000, 0x010000, CRC(e62b037f) SHA1(9a2341b822265269c07b65c4bc0fbc760c1bd456) ) @@ -806,7 +805,7 @@ ROM_START( toobin2 ) ROM_LOAD( "1107-4b.061", 0x060000, 0x010000, CRC(fe6f6aed) SHA1(11bd17be3c9fe409db8268cb17515040bfd92ee2) ) ROM_LOAD( "1108-5b.061", 0x070000, 0x010000, CRC(26fe71e1) SHA1(cac22f969c943e184a58d7bb62072f93273638de) ) - ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_REGION( 0x200000, "sprites", 0 ) ROM_LOAD( "1143-10a.061", 0x000000, 0x020000, CRC(211c1049) SHA1(fcf4d9321b2871723a10b7607069da83d3402723) ) ROM_LOAD( "1144-13a.061", 0x020000, 0x020000, CRC(ef62ed2c) SHA1(c2c21023b2f559b8a63e6ae9c59c33a3055cc465) ) ROM_LOAD( "1145-16a.061", 0x040000, 0x020000, CRC(067ecb8a) SHA1(a42e4602e1de1cc83a30a901a9adb5519f426cff) ) @@ -832,7 +831,7 @@ ROM_START( toobin2 ) ROM_LOAD( "1132-25b.061", 0x1b0000, 0x010000, CRC(c79f8ffc) SHA1(6e90044755097387011e7cc04548bedb399b7cc3) ) ROM_RELOAD( 0x1f0000, 0x010000 ) - ROM_REGION( 0x004000, "gfx3", 0 ) + ROM_REGION( 0x004000, "chars", 0 ) ROM_LOAD( "1142-20h.061", 0x000000, 0x004000, CRC(a6ab551f) SHA1(6a11e16f3965416c81737efcb81e751484ba5ace) ) ROM_END @@ -851,7 +850,7 @@ ROM_START( toobin1 ) ROM_REGION( 0x10000, "jsa:cpu", 0 ) // 6502 code ROM_LOAD( "1141-2k.061", 0x00000, 0x10000, CRC(c0dcce1a) SHA1(285c13f08020cf5827eca2afcc2fa8a3a0a073e0) ) - ROM_REGION( 0x080000, "gfx1", 0 ) + ROM_REGION( 0x080000, "tiles", 0 ) ROM_LOAD( "1101-1a.061", 0x000000, 0x010000, CRC(02696f15) SHA1(51856c331c45d287e574e2e4013b62a6472ad720) ) ROM_LOAD( "1102-2a.061", 0x010000, 0x010000, CRC(4bed4262) SHA1(eda16ece14cb60012edbe006b2839986d082822e) ) ROM_LOAD( "1103-4a.061", 0x020000, 0x010000, CRC(e62b037f) SHA1(9a2341b822265269c07b65c4bc0fbc760c1bd456) ) @@ -861,7 +860,7 @@ ROM_START( toobin1 ) ROM_LOAD( "1107-4b.061", 0x060000, 0x010000, CRC(fe6f6aed) SHA1(11bd17be3c9fe409db8268cb17515040bfd92ee2) ) ROM_LOAD( "1108-5b.061", 0x070000, 0x010000, CRC(26fe71e1) SHA1(cac22f969c943e184a58d7bb62072f93273638de) ) - ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_REGION( 0x200000, "sprites", 0 ) ROM_LOAD( "1143-10a.061", 0x000000, 0x020000, CRC(211c1049) SHA1(fcf4d9321b2871723a10b7607069da83d3402723) ) ROM_LOAD( "1144-13a.061", 0x020000, 0x020000, CRC(ef62ed2c) SHA1(c2c21023b2f559b8a63e6ae9c59c33a3055cc465) ) ROM_LOAD( "1145-16a.061", 0x040000, 0x020000, CRC(067ecb8a) SHA1(a42e4602e1de1cc83a30a901a9adb5519f426cff) ) @@ -887,7 +886,7 @@ ROM_START( toobin1 ) ROM_LOAD( "1132-25b.061", 0x1b0000, 0x010000, CRC(c79f8ffc) SHA1(6e90044755097387011e7cc04548bedb399b7cc3) ) ROM_RELOAD( 0x1f0000, 0x010000 ) - ROM_REGION( 0x004000, "gfx3", 0 ) + ROM_REGION( 0x004000, "chars", 0 ) ROM_LOAD( "1142-20h.061", 0x000000, 0x004000, CRC(a6ab551f) SHA1(6a11e16f3965416c81737efcb81e751484ba5ace) ) ROM_END diff --git a/src/mame/atari/vindictr.cpp b/src/mame/atari/vindictr.cpp index 566d1f7fb9d..65da4e05e7b 100644 --- a/src/mame/atari/vindictr.cpp +++ b/src/mame/atari/vindictr.cpp @@ -135,7 +135,6 @@ const atari_motion_objects_config vindictr_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x100, // maximum number of colors 0, // transparent pen index {{ 0,0,0,0x03ff }}, // mask for the link @@ -525,7 +524,7 @@ void vindictr_state::vindictr(machine_config &config) PALETTE(config, m_palette).set_entries(2048*8); TILEMAP(config, m_playfield_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_COLS, 64, 64).set_info_callback(FUNC(vindictr_state::get_playfield_tile_info)); - TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 32, 0).set_info_callback(FUNC(vindictr_state::get_alpha_tile_info)); + TILEMAP(config, m_alpha_tilemap, m_gfxdecode, 2, 8, 8, TILEMAP_SCAN_ROWS, 64, 31, 0).set_info_callback(FUNC(vindictr_state::get_alpha_tile_info)); ATARI_MOTION_OBJECTS(config, m_mob, 0, m_screen, vindictr_state::s_mob_config); m_mob->set_gfxdecode(m_gfxdecode); diff --git a/src/mame/atari/xybots.cpp b/src/mame/atari/xybots.cpp index 1ab50bd5599..0a5045f1a4d 100644 --- a/src/mame/atari/xybots.cpp +++ b/src/mame/atari/xybots.cpp @@ -131,7 +131,6 @@ const atari_motion_objects_config xybots_state::s_mob_config = 0, // maximum number of links to visit/scanline (0=all) 0x100, // base palette entry - 0x300, // maximum number of colors 0, // transparent pen index {{ 0x3f }}, // mask for the link (dummy) @@ -243,7 +242,9 @@ void xybots_state::video_int_ack_w(uint16_t data) uint16_t xybots_state::special_port1_r() { int result = m_ffe200->read(); - result ^= m_h256 ^= 0x0400; + result ^= m_h256 ^ 0x0400; + if (!machine().side_effects_disabled()) + m_h256 ^= 0x0400; return result; }