summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/tetrisp2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/tetrisp2.cpp')
-rw-r--r--src/mame/drivers/tetrisp2.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index c47fa444207..137ef555341 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -301,7 +301,7 @@ WRITE16_MEMBER(tetrisp2_state::tetrisp2_coincounter_w)
***************************************************************************/
-static ADDRESS_MAP_START( tetrisp2_map, AS_PROGRAM, 16, tetrisp2_state )
+ADDRESS_MAP_START(tetrisp2_state::tetrisp2_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -356,7 +356,7 @@ WRITE16_MEMBER(tetrisp2_state::nndmseal_b20000_w)
// popmessage("%04x",data);
}
-static ADDRESS_MAP_START( nndmseal_map, AS_PROGRAM, 16, tetrisp2_state )
+ADDRESS_MAP_START(tetrisp2_state::nndmseal_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -399,7 +399,7 @@ static ADDRESS_MAP_START( nndmseal_map, AS_PROGRAM, 16, tetrisp2_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockn1_map, AS_PROGRAM, 16, tetrisp2_state )
+ADDRESS_MAP_START(tetrisp2_state::rockn1_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -431,7 +431,7 @@ static ADDRESS_MAP_START( rockn1_map, AS_PROGRAM, 16, tetrisp2_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockn2_map, AS_PROGRAM, 16, tetrisp2_state )
+ADDRESS_MAP_START(tetrisp2_state::rockn2_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -463,7 +463,7 @@ static ADDRESS_MAP_START( rockn2_map, AS_PROGRAM, 16, tetrisp2_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rocknms_main_map, AS_PROGRAM, 16, tetrisp2_state )
+ADDRESS_MAP_START(tetrisp2_state::rocknms_main_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -496,7 +496,7 @@ static ADDRESS_MAP_START( rocknms_main_map, AS_PROGRAM, 16, tetrisp2_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rocknms_sub_map, AS_PROGRAM, 16, tetrisp2_state )
+ADDRESS_MAP_START(tetrisp2_state::rocknms_sub_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram2") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -644,7 +644,7 @@ WRITE16_MEMBER(stepstag_state::stepstag_button_leds_w)
// Main CPU
-static ADDRESS_MAP_START( stepstag_map, AS_PROGRAM, 16, stepstag_state )
+ADDRESS_MAP_START(stepstag_state::stepstag_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
@@ -683,7 +683,7 @@ static ADDRESS_MAP_START( stepstag_map, AS_PROGRAM, 16, stepstag_state )
ADDRESS_MAP_END
// Sub CPU (sprites)
-static ADDRESS_MAP_START( stepstag_sub_map, AS_PROGRAM, 16, stepstag_state )
+ADDRESS_MAP_START(stepstag_state::stepstag_sub_map)
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -727,7 +727,7 @@ static ADDRESS_MAP_START( stepstag_sub_map, AS_PROGRAM, 16, stepstag_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vjdash_map, AS_PROGRAM, 16, stepstag_state )
+ADDRESS_MAP_START(stepstag_state::vjdash_map)
AM_IMPORT_FROM(stepstag_map)
ADDRESS_MAP_END