Removed 'type' parameter from tilemap_create

src/emu/tilemap.c

@@ -288,14 +288,11 @@ void tilemap_init(running_machine *machine)
     tilemap_create - allocate a new tilemap
 -------------------------------------------------*/
 
-tilemap *tilemap_create(tile_get_info_callback tile_get_info, tilemap_mapper_callback mapper, tilemap_type type, int tilewidth, int tileheight, int cols, int rows)
+tilemap *tilemap_create(tile_get_info_callback tile_get_info, tilemap_mapper_callback mapper, int tilewidth, int tileheight, int cols, int rows)
 {
 	tilemap *tmap;
 	int group;
 
-	/* just to avoid an 'unused variable' warning */
-	(void)type;
-
 	/* allocate the tilemap itself */
 	tmap = malloc_or_die(sizeof(tilemap));
 	memset(tmap, 0, sizeof(tilemap));

src/emu/tilemap.h

@@ -104,13 +104,6 @@
             column and row to a memory index; several standard mappers
             are provided, with tilemap_scan_rows being the most common
 
-        type = the type of tilemap this is;
-
-            TILEMAP_TYPE_PEN - this is the most common type,
-                and means that transparency is determined by taking the
-                raw pen value and looking it up in a table to determine
-                which layer(s) each pixel belongs to
-
         tilewidth = the width, in pixels, of each individual tile
 
         tileheight = the height, in pixels, of each individual tile
@@ -198,7 +191,6 @@
             tmap = tilemap_create(
                     my_get_info,            // pointer to your get_info
                     tilemap_scan_rows,      // standard row-major mapper
-                    TILEMAP_TYPE_PEN, // transparency from pens
                     8,8,                    // 8x8 tiles
                     64,32);                 // 64 columns, 32 rows
 
@@ -248,8 +240,7 @@
             transparent pen for them; this no longer works.
 
         TILEMAP_TRANSPARENT: This described a tilemap with a single
-            transparent pen. To create the same effect, make a new tilemap
+            transparent pen. To create the same effect, call
-            of type TILEMAP_TYPE_PEN, and then call
             tilemap_set_transparent_pen() to specify which pen is
             transparent; all other pens will map to layer 0.
 
@@ -263,8 +254,7 @@
             also allowed for you to choose one of 4 mappings on a per-tile
             basis. All of this functionality is now expanded: you can
             specify one of 3 layers and can choose from one of 256 mappings
-            on a per-tile basis. You just create a tilemap of type
+            on a per-tile basis. You just call tilemap_set_transmask(),
-            TILEMAP_TYPE_PEN and call tilemap_set_transmask(),
             which still exists but maps onto the new behavior. The "front"
             layer is now "layer 0" and the "back" layer is now "layer 1".
 
@@ -393,20 +383,12 @@ typedef UINT32 tilemap_memory_index;
 typedef struct _tilemap tilemap;
 
 
-/* tilemap types */
-enum _tilemap_type
-{
-	TILEMAP_TYPE_PEN,				/* pen-to-layer mapping is determined by pen lookup */
-};
-typedef enum _tilemap_type tilemap_type;
-
-
 /* tile_data is filled in by the get_tile_info callback */
 typedef struct _tile_data tile_data;
 struct _tile_data
 {
 	const UINT8 *	pen_data;		/* required */
-	const UINT8 *	mask_data;		/* required for TILEMAP_TYPE_PEN */
+	const UINT8 *	mask_data;		/* required */
 	pen_t			palette_base;	/* defaults to 0 */
 	UINT8 			category;		/* defaults to 0; range from 0..15 */
 	UINT8			group;			/* defaults to 0; range from 0..TILEMAP_NUM_GROUPS */
@@ -445,7 +427,7 @@ void tilemap_init(running_machine *machine);
 /* ----- tilemap creation and configuration ----- */
 
 /* create a new tilemap; note that tilemaps are tracked by the core so there is no dispose */
-tilemap *tilemap_create(tile_get_info_callback tile_get_info, tilemap_mapper_callback mapper, tilemap_type type, int tilewidth, int tileheight, int cols, int rows);
+tilemap *tilemap_create(tile_get_info_callback tile_get_info, tilemap_mapper_callback mapper, int tilewidth, int tileheight, int cols, int rows);
 
 /* specify a parameter to be passed into the tile_get_info callback */
 void tilemap_set_user_data(tilemap *tmap, void *user_data);

src/mame/drivers/1945kiii.c

@@ -76,7 +76,7 @@ static TILE_GET_INFO( get_k3_bg_tile_info )
 
 static VIDEO_START(k3)
 {
-	k3_bg_tilemap = tilemap_create(get_k3_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,      16, 16, 32,64);
+	k3_bg_tilemap = tilemap_create(get_k3_bg_tile_info,tilemap_scan_rows,16, 16, 32,64);
 }
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect)

src/mame/drivers/acommand.c

@@ -148,8 +148,8 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
 
 static VIDEO_START( acommand )
 {
-	tx_tilemap = tilemap_create(ac_get_tx_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,8,8,512,32);
+	tx_tilemap = tilemap_create(ac_get_tx_tile_info,tilemap_scan_cols,8,8,512,32);
-	bg_tilemap = tilemap_create(ac_get_bg_tile_info,bg_scan,TILEMAP_TYPE_PEN,16,16,256,16);
+	bg_tilemap = tilemap_create(ac_get_bg_tile_info,bg_scan,16,16,256,16);
 
 	ac_vregs = auto_malloc(0x80);
 

src/mame/drivers/bestleag.c

@@ -71,9 +71,9 @@ static TILEMAP_MAPPER( bsb_bg_scan )
 
 static VIDEO_START(bestleag)
 {
-	tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,8,8,256, 32);
+	tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,256, 32);
-	bg_tilemap = tilemap_create(get_bg_tile_info,bsb_bg_scan,TILEMAP_TYPE_PEN,16,16,128, 64);
+	bg_tilemap = tilemap_create(get_bg_tile_info,bsb_bg_scan,16,16,128, 64);
-	fg_tilemap = tilemap_create(get_fg_tile_info,bsb_bg_scan,TILEMAP_TYPE_PEN,16,16,128, 64);
+	fg_tilemap = tilemap_create(get_fg_tile_info,bsb_bg_scan,16,16,128, 64);
 
 	tilemap_set_transparent_pen(tx_tilemap,15);
 	tilemap_set_transparent_pen(fg_tilemap,15);

src/mame/drivers/bigfghtr.c

@@ -162,9 +162,9 @@ static TILE_GET_INFO( get_tx_tile_info )
 
 static VIDEO_START( bigfghtr )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,16,16,64,32);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,16,16,64,32);
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,16,16,64,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_cols,16,16,64,32);
-	tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,8,8,64,32);
+	tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_cols,8,8,64,32);
 
 	tilemap_set_transparent_pen(fg_tilemap,0xf);
 	tilemap_set_transparent_pen(tx_tilemap,0xf);

src/mame/drivers/bishjan.c

@@ -68,10 +68,10 @@ static TILE_GET_INFO( get_tile_info2 )	{	SET_TILE_INFO(0, bishjan_videoram2[ til
 static VIDEO_START(bishjan)
 {
 	tmap1 = tilemap_create(	get_tile_info1, tilemap_scan_rows,
-							TILEMAP_TYPE_PEN, 8,8, 0x80,0x40	);
+							 8,8, 0x80,0x40	);
 
 	tmap2 = tilemap_create(	get_tile_info2, tilemap_scan_rows,
-							TILEMAP_TYPE_PEN, 8,8, 0x80,0x40	);
+							 8,8, 0x80,0x40	);
 
 	tilemap_set_transparent_pen(tmap1, 0);
 	tilemap_set_transparent_pen(tmap2, 0);

src/mame/drivers/bnstars.c

@@ -467,18 +467,18 @@ static WRITE32_HANDLER( ms32_spramx_w )
 
 static VIDEO_START(bnstars)
 {
-	ms32_tx_tilemap[0] = tilemap_create(get_ms32_tx0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,64);
+	ms32_tx_tilemap[0] = tilemap_create(get_ms32_tx0_tile_info,tilemap_scan_rows, 8, 8,64,64);
-	ms32_tx_tilemap[1] = tilemap_create(get_ms32_tx1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,64);
+	ms32_tx_tilemap[1] = tilemap_create(get_ms32_tx1_tile_info,tilemap_scan_rows, 8, 8,64,64);
 	tilemap_set_transparent_pen(ms32_tx_tilemap[0],0);
 	tilemap_set_transparent_pen(ms32_tx_tilemap[1],0);
 
-	ms32_bg_tilemap[0] = tilemap_create(get_ms32_bg0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,64,64);
+	ms32_bg_tilemap[0] = tilemap_create(get_ms32_bg0_tile_info,tilemap_scan_rows,16,16,64,64);
-	ms32_bg_tilemap[1] = tilemap_create(get_ms32_bg1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,64,64);
+	ms32_bg_tilemap[1] = tilemap_create(get_ms32_bg1_tile_info,tilemap_scan_rows,16,16,64,64);
 	tilemap_set_transparent_pen(ms32_bg_tilemap[0],0);
 	tilemap_set_transparent_pen(ms32_bg_tilemap[1],0);
 
-	ms32_roz_tilemap[0] = tilemap_create(get_ms32_roz0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,128,128);
+	ms32_roz_tilemap[0] = tilemap_create(get_ms32_roz0_tile_info,tilemap_scan_rows,16,16,128,128);
-	ms32_roz_tilemap[1] = tilemap_create(get_ms32_roz1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,128,128);
+	ms32_roz_tilemap[1] = tilemap_create(get_ms32_roz1_tile_info,tilemap_scan_rows,16,16,128,128);
 	tilemap_set_transparent_pen(ms32_roz_tilemap[0],0);
 	tilemap_set_transparent_pen(ms32_roz_tilemap[1],0);
 

src/mame/drivers/calorie.c

@@ -109,8 +109,8 @@ static TILE_GET_INFO( get_fg_tile_info )
 
 static VIDEO_START( calorie )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     16,16,16,16);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,16,16,16,16);
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,32,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8, 8,32,32);
 
 	tilemap_set_transparent_pen(fg_tilemap,0);
 }

src/mame/drivers/cball.c

@@ -28,7 +28,7 @@ static WRITE8_HANDLER( cball_vram_w )
 
 static VIDEO_START( cball )
 {
-	bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 }
 
 

src/mame/drivers/cherrym.c

@@ -98,7 +98,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
 static VIDEO_START(cm)
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 64, 32);
+		8, 8, 64, 32);
 }
 
 static VIDEO_UPDATE(cm)

src/mame/drivers/cherrym2.c

@@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START(cm2)
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		8, 8, 32, 32);
 }
 
 static VIDEO_UPDATE(cm2)

src/mame/drivers/cntsteer.c

@@ -82,8 +82,8 @@ static TILE_GET_INFO( get_fg_tile_info )
 
 static VIDEO_START( zerotrgt )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,       TILEMAP_TYPE_PEN,     16,16,64,64);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,       16,16,64,64);
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows_flip_x,TILEMAP_TYPE_PEN, 8, 8,32,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows_flip_x,8, 8,32,32);
 
 	tilemap_set_transparent_pen(fg_tilemap,0);
 

src/mame/drivers/coinmstr.c

@@ -533,7 +533,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( coinmstr )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8, 46, 64);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 8, 8, 46, 64);
 }
 
 static VIDEO_UPDATE( coinmstr )

src/mame/drivers/couple.c

@@ -65,7 +65,7 @@ static TILE_GET_INFO( get_tile_info )
 
 static VIDEO_START( couple )
 {
-	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
+	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,64,32);
 }
 
 static VIDEO_UPDATE( couple )

src/mame/drivers/cowrace.c

@@ -34,7 +34,7 @@ static TILE_GET_INFO( get_tile_info )
 static VIDEO_START( cowrace )
 {
 	tmap = tilemap_create(	get_tile_info, tilemap_scan_rows,
-							TILEMAP_TYPE_PEN, 8,8, 0x20,0x20	);
+							8,8, 0x20,0x20	);
 
 	tilemap_set_transparent_pen(tmap, 0);
 }

src/mame/drivers/cshooter.c

@@ -139,7 +139,7 @@ static WRITE8_HANDLER(cshooter_txram_w)
 
 static VIDEO_START(cshooter)
 {
-	cshooter_txtilemap = tilemap_create(get_cstx_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32, 32);
+	cshooter_txtilemap = tilemap_create(get_cstx_tile_info,tilemap_scan_rows, 8,8,32, 32);
 	tilemap_set_transparent_pen(cshooter_txtilemap, 3);
 }
 

src/mame/drivers/cultures.c

@@ -43,9 +43,9 @@ static TILE_GET_INFO( get_bg0_tile_info )
 
 static VIDEO_START( cultures )
 {
-	bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,512,512);
+	bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,512,512);
-	bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,512,512);
+	bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,8,8,512,512);
-	bg0_tilemap = tilemap_create(get_bg0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8, 64,128);
+	bg0_tilemap = tilemap_create(get_bg0_tile_info,tilemap_scan_rows,8,8, 64,128);
 
 	tilemap_set_transparent_pen(bg1_tilemap,0);
 	tilemap_set_transparent_pen(bg0_tilemap,0);

src/mame/drivers/cybertnk.c

@@ -193,7 +193,7 @@ static TILE_GET_INFO( get_tx_tile_info )
 
 static VIDEO_START( cybertnk )
 {
-	tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,128,32);
+	tx_tilemap = tilemap_create(get_tx_tile_info,tilemap_scan_rows,8,8,128,32);
 }
 
 static VIDEO_UPDATE( cybertnk )

src/mame/drivers/dacholer.c

@@ -255,8 +255,8 @@ static TILE_GET_INFO( get_fg_tile_info )
 
 static VIDEO_START( dacholer )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     8,8,32,32);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,32,32);
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,32,32);
 
 	tilemap_set_transparent_pen(fg_tilemap,0);
 }

src/mame/drivers/darkhors.c

@@ -139,10 +139,10 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
 static VIDEO_START( darkhors )
 {
 	darkhors_tmap			=	tilemap_create(	get_tile_info_0, tilemap_scan_rows,
-												TILEMAP_TYPE_PEN, 16,16, 0x40,0x40	);
+												16,16, 0x40,0x40	);
 
 	darkhors_tmap2			=	tilemap_create(	get_tile_info_1, tilemap_scan_rows,
-												TILEMAP_TYPE_PEN, 16,16, 0x40,0x40	);
+												16,16, 0x40,0x40	);
 
 	tilemap_set_transparent_pen(darkhors_tmap, 0);
 	tilemap_set_transparent_pen(darkhors_tmap2, 0);

src/mame/drivers/ddayjlc.c

@@ -342,7 +342,7 @@ static TILE_GET_INFO( get_tile_info_bg )
 
 static VIDEO_START( ddayjlc )
 {
-	bg_tilemap = tilemap_create(get_tile_info_bg,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	bg_tilemap = tilemap_create(get_tile_info_bg,tilemap_scan_rows,8,8,32,32);
 }
 
 static VIDEO_UPDATE( ddayjlc )

src/mame/drivers/dreamwld.c

@@ -143,8 +143,8 @@ static TILE_GET_INFO( get_dreamwld_bg2_tile_info )
 
 static VIDEO_START(dreamwld)
 {
-	dreamwld_bg_tilemap = tilemap_create(get_dreamwld_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,      16, 16, 64,32);
+	dreamwld_bg_tilemap = tilemap_create(get_dreamwld_bg_tile_info,tilemap_scan_rows, 16, 16, 64,32);
-	dreamwld_bg2_tilemap = tilemap_create(get_dreamwld_bg2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,      16, 16, 64,32);
+	dreamwld_bg2_tilemap = tilemap_create(get_dreamwld_bg2_tile_info,tilemap_scan_rows, 16, 16, 64,32);
 	tilemap_set_transparent_pen(dreamwld_bg2_tilemap,0);
 	dreamwld_tilebankold[0] = dreamwld_tilebankold[1] = -1;
 	dreamwld_tilebank[0] = dreamwld_tilebank[1] = 0;

src/mame/drivers/drtomy.c

@@ -91,8 +91,8 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
 
 static VIDEO_START( drtomy )
 {
-	tilemap_bg = tilemap_create(get_tile_info_bg,tilemap_scan_rows,TILEMAP_TYPE_PEN,      16,16,32,32);
+	tilemap_bg = tilemap_create(get_tile_info_bg,tilemap_scan_rows,16,16,32,32);
-	tilemap_fg = tilemap_create(get_tile_info_fg,tilemap_scan_rows,TILEMAP_TYPE_PEN, 16,16,32,32);
+	tilemap_fg = tilemap_create(get_tile_info_fg,tilemap_scan_rows,16,16,32,32);
 
 	tilemap_set_transparent_pen(tilemap_fg,0);
 }

src/mame/drivers/drw80pkr.c

@@ -108,7 +108,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( drw80pkr )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 40, 25);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25);
 }
 
 static VIDEO_UPDATE( drw80pkr )

src/mame/drivers/dunhuang.c

@@ -95,10 +95,10 @@ static TILE_GET_INFO( get_tile_info2 )
 static VIDEO_START(dunhuang)
 {
 	tmap = tilemap_create(	get_tile_info, tilemap_scan_rows,
-							TILEMAP_TYPE_PEN, 8,8, 0x40,0x20	);
+							8,8, 0x40,0x20	);
 
 	tmap2 = tilemap_create(	get_tile_info2, tilemap_scan_rows,
-							TILEMAP_TYPE_PEN, 8,32, 0x40,0x8	);
+							8,32, 0x40,0x8	);
 
 	tilemap_set_transparent_pen(tmap,   0);
 	tilemap_set_transparent_pen(tmap2,  0);

src/mame/drivers/dynadice.c

@@ -174,8 +174,8 @@ static TILE_GET_INFO( get_tile_info )
 static VIDEO_START( dynadice )
 {
 	/* pacman - style videoram layout */
-	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32);
-	top_tilemap = tilemap_create(get_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,8,8,2,32);
+	top_tilemap = tilemap_create(get_tile_info,tilemap_scan_cols,8,8,2,32);
 	tilemap_set_scrollx(bg_tilemap, 0, -16 );
 }
 

src/mame/drivers/egghunt.c

@@ -145,7 +145,7 @@ static WRITE8_HANDLER( egghunt_atram_w )
 
 static VIDEO_START(egghunt)
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64, 32);
 	egghunt_bgram = auto_malloc(0x1000);
 	egghunt_spram = auto_malloc(0x1000);
 }

src/mame/drivers/ettrivia.c

@@ -194,8 +194,8 @@ static TILE_GET_INFO( get_tile_info_fg )
 
 static VIDEO_START( ettrivia )
 {
-	bg_tilemap = tilemap_create( get_tile_info_bg,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32 );
+	bg_tilemap = tilemap_create( get_tile_info_bg,tilemap_scan_rows,8,8,64,32 );
-	fg_tilemap = tilemap_create( get_tile_info_fg,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32 );
+	fg_tilemap = tilemap_create( get_tile_info_fg,tilemap_scan_rows,8,8,64,32 );
 
 	tilemap_set_transparent_pen(fg_tilemap,0);
 }

src/mame/drivers/good.c

@@ -70,8 +70,8 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( good )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 16, 16, 32,32);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows, 16, 16, 32,32);
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 16, 16, 32,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows, 16, 16, 32,32);
 	tilemap_set_transparent_pen(fg_tilemap,0xf);
 }
 

src/mame/drivers/gstream.c

@@ -326,9 +326,9 @@ static TILE_GET_INFO( get_gs3_tile_info )
 
 static VIDEO_START(gstream)
 {
-	gstream_tilemap1 = tilemap_create(get_gs1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 32, 32,16,16);
+	gstream_tilemap1 = tilemap_create(get_gs1_tile_info,tilemap_scan_rows, 32, 32,16,16);
-	gstream_tilemap2 = tilemap_create(get_gs2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 32, 32,16,16);
+	gstream_tilemap2 = tilemap_create(get_gs2_tile_info,tilemap_scan_rows, 32, 32,16,16);
-	gstream_tilemap3 = tilemap_create(get_gs3_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 32, 32,16,16);
+	gstream_tilemap3 = tilemap_create(get_gs3_tile_info,tilemap_scan_rows, 32, 32,16,16);
 
 	tilemap_set_transparent_pen(gstream_tilemap1,0);
 	tilemap_set_transparent_pen(gstream_tilemap2,0);

src/mame/drivers/hitme.c

@@ -56,13 +56,13 @@ static WRITE8_HANDLER( hitme_vidram_w )
 
 static VIDEO_START(hitme)
 {
-	hitme_tilemap = tilemap_create(get_hitme_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8,10, 40,19);
+	hitme_tilemap = tilemap_create(get_hitme_tile_info,tilemap_scan_rows, 8,10, 40,19);
 }
 
 
 static VIDEO_START(barricad)
 {
-	hitme_tilemap = tilemap_create(get_hitme_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8,8, 32,24);
+	hitme_tilemap = tilemap_create(get_hitme_tile_info,tilemap_scan_rows, 8,8, 32,24);
 }
 
 

src/mame/drivers/hornet.c

@@ -324,13 +324,13 @@ static int K037122_vh_start(running_machine *machine, int chip)
 
 	if (chip == 0)
 	{
-		K037122_layer[chip][0] = tilemap_create(K037122_0_tile_info_layer0, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 256, 64);
+		K037122_layer[chip][0] = tilemap_create(K037122_0_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64);
-		K037122_layer[chip][1] = tilemap_create(K037122_0_tile_info_layer1, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 128, 64);
+		K037122_layer[chip][1] = tilemap_create(K037122_0_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64);
 	}
 	else
 	{
-		K037122_layer[chip][0] = tilemap_create(K037122_1_tile_info_layer0, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 256, 64);
+		K037122_layer[chip][0] = tilemap_create(K037122_1_tile_info_layer0, tilemap_scan_rows, 8, 8, 256, 64);
-		K037122_layer[chip][1] = tilemap_create(K037122_1_tile_info_layer1, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 128, 64);
+		K037122_layer[chip][1] = tilemap_create(K037122_1_tile_info_layer1, tilemap_scan_rows, 8, 8, 128, 64);
 	}
 
 	tilemap_set_transparent_pen(K037122_layer[chip][0], 0);

src/mame/drivers/igs_180.c

@@ -18,7 +18,7 @@ static TILE_GET_INFO( get_fg_tile_info )
 
 static VIDEO_START(igs_180)
 {
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32);
 }
 
 static VIDEO_UPDATE(igs_180)

src/mame/drivers/igs_m027.c

@@ -132,10 +132,10 @@ static WRITE32_HANDLER( igs_pallete32_w )
 
 static VIDEO_START(igs_majhong)
 {
-	igs_tx_tilemap= tilemap_create(get_tx_tilemap_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	igs_tx_tilemap= tilemap_create(get_tx_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32);
 	tilemap_set_transparent_pen(igs_tx_tilemap,15);
-	igs_bg_tilemap= tilemap_create(get_bg_tilemap_tile_info,tilemap_scan_rows,0, 8, 8,64,32);
+	igs_bg_tilemap= tilemap_create(get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32);
-	//igs_bg_tilemap= tilemap_create(get_bg_tilemap_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	//igs_bg_tilemap= tilemap_create(get_bg_tilemap_tile_info,tilemap_scan_rows, 8, 8,64,32);
 	//tilemap_set_transparent_pen(igs_bg_tilemap,15);
 	logerror("Video START OK!\n");
 }

src/mame/drivers/jackpool.c

@@ -142,9 +142,9 @@ static const gfx_layout tiles8x8_layout =
 
 static VIDEO_START(jackpool)
 {
-	jackpool_layer0_tilemap = tilemap_create(get_jackpool_layer0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	jackpool_layer0_tilemap = tilemap_create(get_jackpool_layer0_tile_info,tilemap_scan_rows, 8, 8,64,32);
-	jackpool_layer1_tilemap = tilemap_create(get_jackpool_layer1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	jackpool_layer1_tilemap = tilemap_create(get_jackpool_layer1_tile_info,tilemap_scan_rows, 8, 8,64,32);
-	jackpool_layer2_tilemap = tilemap_create(get_jackpool_layer2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	jackpool_layer2_tilemap = tilemap_create(get_jackpool_layer2_tile_info,tilemap_scan_rows, 8, 8,64,32);
 
 	tilemap_set_transparent_pen(jackpool_layer0_tilemap,0);
 	tilemap_set_transparent_pen(jackpool_layer2_tilemap,0);

src/mame/drivers/jalmah.c

@@ -180,10 +180,10 @@ static TILE_GET_INFO( get_sc1_tile_info )
 
 static VIDEO_START( jalmah )
 {
-	sc0_tilemap = tilemap_create(get_sc0_tile_info,bg_scan,TILEMAP_TYPE_PEN,16,16,256,32);
+	sc0_tilemap = tilemap_create(get_sc0_tile_info,bg_scan,16,16,256,32);
-	sc1_tilemap = tilemap_create(get_sc1_tile_info,bg_scan,TILEMAP_TYPE_PEN,16,16,256,32);
+	sc1_tilemap = tilemap_create(get_sc1_tile_info,bg_scan,16,16,256,32);
-	sc2_tilemap = tilemap_create(get_sc2_tile_info,bg_scan,TILEMAP_TYPE_PEN,16,16,256,32);
+	sc2_tilemap = tilemap_create(get_sc2_tile_info,bg_scan,16,16,256,32);
-	sc3_tilemap = tilemap_create(get_sc3_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,8,8,256,32);
+	sc3_tilemap = tilemap_create(get_sc3_tile_info,tilemap_scan_cols,8,8,256,32);
 
 	jm_scrollram = auto_malloc(0x80);
 	jm_vregs = auto_malloc(0x40);

src/mame/drivers/jollyjgr.c

@@ -273,7 +273,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( jollyjgr )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 
 	tilemap_set_transparent_pen(bg_tilemap, 0);
 	tilemap_set_scroll_cols(bg_tilemap, 32);

src/mame/drivers/koikoi.c

@@ -211,7 +211,7 @@ static PALETTE_INIT( koikoi ) //wrong
 
 static VIDEO_START(koikoi)
 {
-	koikoi_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	koikoi_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32);
 }
 
 static VIDEO_UPDATE(koikoi)

src/mame/drivers/laserbat.c

@@ -504,7 +504,7 @@ static TILE_GET_INFO( get_tile_info )
 
 static VIDEO_START( laserbat )
 {
-	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32);
 
 	videoram = (UINT8 *)auto_malloc(0x400);
 	colorram = (UINT8 *)auto_malloc(0x400);

src/mame/drivers/limenko.c

@@ -275,9 +275,9 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
 
 static VIDEO_START( limenko )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     8,8,128,64);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,128,64);
-	md_tilemap = tilemap_create(get_md_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,128,64);
+	md_tilemap = tilemap_create(get_md_tile_info,tilemap_scan_rows,8,8,128,64);
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,128,64);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,128,64);
 
 	tilemap_set_transparent_pen(md_tilemap,0);
 	tilemap_set_transparent_pen(fg_tilemap,0);

src/mame/drivers/looping.c

@@ -175,7 +175,7 @@ static VIDEO_START( looping )
 {
 	looping_state *state = machine->driver_data;
 
-	state->bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8,8, 32,32);
+	state->bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8,8, 32,32);
 
 	tilemap_set_scroll_cols(state->bg_tilemap, 0x20);
 }

src/mame/drivers/ltcasino.c

@@ -36,7 +36,7 @@ static TILE_GET_INFO( get_ltcasino_tile_info )
 
 static VIDEO_START(ltcasino)
 {
-	ltcasino_tilemap = tilemap_create(get_ltcasino_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	ltcasino_tilemap = tilemap_create(get_ltcasino_tile_info,tilemap_scan_rows,8, 8,64,32);
 }
 
 

src/mame/drivers/lucky8.c

@@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START(lucky8)
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 64, 32);
+		8, 8, 64, 32);
 }
 
 static VIDEO_UPDATE(lucky8)

src/mame/drivers/madalien.c

@@ -175,27 +175,27 @@ static VIDEO_START( madalien )
 	crtc6845_config(0, &crtc6845_intf);
 
 	tilemap_fg = tilemap_create(get_tile_info_FG,
-		tilemap_scan_cols_flip_x, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		tilemap_scan_cols_flip_x, 8, 8, 32, 32);
 
 	tilemap_set_transparent_pen(tilemap_fg, 0);
 
 	tilemap_edge1[0] = tilemap_create(get_tile_info_BG,
-		scan_mode0, TILEMAP_TYPE_PEN, 16, 16, 16, 8);
+		scan_mode0, 16, 16, 16, 8);
 	tilemap_edge1[1] = tilemap_create(get_tile_info_BG,
-		scan_mode1, TILEMAP_TYPE_PEN, 16, 16, 16, 8);
+		scan_mode1, 16, 16, 16, 8);
 	tilemap_edge1[2] = tilemap_create(get_tile_info_BG,
-		scan_mode2, TILEMAP_TYPE_PEN, 16, 16, 32, 8);
+		scan_mode2, 16, 16, 32, 8);
 	tilemap_edge1[3] = tilemap_create(get_tile_info_BG,
-		scan_mode3, TILEMAP_TYPE_PEN, 16, 16, 32, 8);
+		scan_mode3, 16, 16, 32, 8);
 
 	tilemap_edge2[0] = tilemap_create(get_tile_info_BG,
-		scan_mode0, TILEMAP_TYPE_PEN, 16, 16, 16, 8);
+		scan_mode0, 16, 16, 16, 8);
 	tilemap_edge2[1] = tilemap_create(get_tile_info_BG,
-		scan_mode1, TILEMAP_TYPE_PEN, 16, 16, 16, 8);
+		scan_mode1, 16, 16, 16, 8);
 	tilemap_edge2[2] = tilemap_create(get_tile_info_BG,
-		scan_mode2, TILEMAP_TYPE_PEN, 16, 16, 32, 8);
+		scan_mode2, 16, 16, 32, 8);
 	tilemap_edge2[3] = tilemap_create(get_tile_info_BG,
-		scan_mode3, TILEMAP_TYPE_PEN, 16, 16, 32, 8);
+		scan_mode3, 16, 16, 32, 8);
 
 	update_edges(0);
 

src/mame/drivers/magic10.c

@@ -295,9 +295,9 @@ static TILE_GET_INFO( get_layer2_tile_info )
 
 static VIDEO_START( magic10 )
 {
-	layer0_tilemap = tilemap_create(get_layer0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     16,16,32,32);
+	layer0_tilemap = tilemap_create(get_layer0_tile_info,tilemap_scan_rows,16,16,32,32);
-	layer1_tilemap = tilemap_create(get_layer1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,32,32);
+	layer1_tilemap = tilemap_create(get_layer1_tile_info,tilemap_scan_rows,16,16,32,32);
-	layer2_tilemap = tilemap_create(get_layer2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,64);
+	layer2_tilemap = tilemap_create(get_layer2_tile_info,tilemap_scan_rows, 8, 8,64,64);
 
 	tilemap_set_transparent_pen(layer1_tilemap,0);
 	tilemap_set_transparent_pen(layer2_tilemap,0);

src/mame/drivers/magicfly.c

@@ -364,7 +364,7 @@ static TILE_GET_INFO( get_magicfly_tile_info )
 static VIDEO_START(magicfly)
 {
 	bg_tilemap = tilemap_create(get_magicfly_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 29);
+		8, 8, 32, 29);
 }
 
 static TILE_GET_INFO( get_7mezzo_tile_info )
@@ -396,7 +396,7 @@ static TILE_GET_INFO( get_7mezzo_tile_info )
 static VIDEO_START( 7mezzo )
 {
 	bg_tilemap = tilemap_create(get_7mezzo_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 29);
+		8, 8, 32, 29);
 }
 
 static VIDEO_UPDATE( magicfly )

src/mame/drivers/marinedt.c

@@ -450,7 +450,7 @@ static TILE_GET_INFO( get_tile_info )
 
 static VIDEO_START( marinedt )
 {
-	tx_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8,32,32);
+	tx_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8,32,32);
 
 	tilemap_set_transparent_pen(tx_tilemap, 0);
 	tilemap_set_scrolldx(tx_tilemap, 0, 4*8);

src/mame/drivers/merit.c

@@ -732,7 +732,7 @@ static TILE_GET_INFO( get_tile_info_bg )
 
 static VIDEO_START( merit )
 {
-	bg_tilemap = tilemap_create(get_tile_info_bg,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
+	bg_tilemap = tilemap_create(get_tile_info_bg,tilemap_scan_rows,8,8,64,32);
 }
 
 static VIDEO_UPDATE( merit )

src/mame/drivers/mgolf.c

@@ -35,7 +35,7 @@ static WRITE8_HANDLER( mgolf_vram_w )
 
 static VIDEO_START( mgolf )
 {
-	bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 }
 
 

src/mame/drivers/midas.c

@@ -67,7 +67,7 @@ static TILE_GET_INFO( get_tile_info )
 static VIDEO_START( livequiz )
 {
 	tmap = tilemap_create(	get_tile_info, tilemap_scan_cols,
-							TILEMAP_TYPE_PEN, 8,8, 0x80,0x20	);
+							8,8, 0x80,0x20	);
 
 	tilemap_set_transparent_pen(tmap, 0);
 }

src/mame/drivers/miniboy7.c

@@ -167,7 +167,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START( miniboy7 )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 37, 37);
+		8, 8, 37, 37);
 }
 
 static VIDEO_UPDATE( miniboy7 )

src/mame/drivers/mogura.c

@@ -55,7 +55,7 @@ static TILE_GET_INFO( get_mogura_tile_info )
 
 static VIDEO_START( mogura )
 {
-	mogura_tilemap = tilemap_create(get_mogura_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64, 32);
+	mogura_tilemap = tilemap_create(get_mogura_tile_info,tilemap_scan_rows,8,8,64, 32);
 }
 
 static VIDEO_UPDATE( mogura )

src/mame/drivers/mwarr.c

@@ -310,10 +310,10 @@ static TILE_GET_INFO( get_tx_tile_info )
 
 static VIDEO_START( mwarr )
 {
-	bg_tilemap    = tilemap_create(get_bg_tile_info,   tilemap_scan_cols,TILEMAP_TYPE_PEN,      16, 16,64,16);
+	bg_tilemap    = tilemap_create(get_bg_tile_info,   tilemap_scan_cols, 16, 16,64,16);
-	mlow_tilemap  = tilemap_create(get_mlow_tile_info, tilemap_scan_cols,TILEMAP_TYPE_PEN, 16, 16,64,16);
+	mlow_tilemap  = tilemap_create(get_mlow_tile_info, tilemap_scan_cols, 16, 16,64,16);
-	mhigh_tilemap = tilemap_create(get_mhigh_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN, 16, 16,64,16);
+	mhigh_tilemap = tilemap_create(get_mhigh_tile_info,tilemap_scan_cols, 16, 16,64,16);
-	tx_tilemap    = tilemap_create(get_tx_tile_info,   tilemap_scan_rows,TILEMAP_TYPE_PEN,  8,  8,64,32);
+	tx_tilemap    = tilemap_create(get_tx_tile_info,   tilemap_scan_rows,  8,  8,64,32);
 
 	sprites_buffer = auto_malloc(sizeof(UINT16) * 0x800);
 

src/mame/drivers/namcoic.c

@@ -62,14 +62,14 @@ namco_tilemap_init( int gfxbank, void *maskBaseAddr,
 	mTilemapInfo.videoram = auto_malloc( 0x10000*2 );
 
 		/* four scrolling tilemaps */
-		mTilemapInfo.tmap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+		mTilemapInfo.tmap[0] = tilemap_create(get_tile_info0,tilemap_scan_rows,8,8,64,64);
-		mTilemapInfo.tmap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+		mTilemapInfo.tmap[1] = tilemap_create(get_tile_info1,tilemap_scan_rows,8,8,64,64);
-		mTilemapInfo.tmap[2] = tilemap_create(get_tile_info2,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+		mTilemapInfo.tmap[2] = tilemap_create(get_tile_info2,tilemap_scan_rows,8,8,64,64);
-		mTilemapInfo.tmap[3] = tilemap_create(get_tile_info3,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+		mTilemapInfo.tmap[3] = tilemap_create(get_tile_info3,tilemap_scan_rows,8,8,64,64);
 
 		/* two non-scrolling tilemaps */
-		mTilemapInfo.tmap[4] = tilemap_create(get_tile_info4,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,36,28);
+		mTilemapInfo.tmap[4] = tilemap_create(get_tile_info4,tilemap_scan_rows,8,8,36,28);
-		mTilemapInfo.tmap[5] = tilemap_create(get_tile_info5,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,36,28);
+		mTilemapInfo.tmap[5] = tilemap_create(get_tile_info5,tilemap_scan_rows,8,8,36,28);
 
 		/* define offsets for scrolling */
 		for( i=0; i<4; i++ )
@@ -1136,7 +1136,6 @@ namco_roz_init( int gfxbank, int maskregion )
 			mRozTilemap[i] = tilemap_create(
 				roz_info[i],
 				namco_roz_scan,
-				TILEMAP_TYPE_PEN,
 				16,16,
 				256,256 );
 		}
@@ -1624,7 +1623,6 @@ namco_road_init(running_machine *machine, int gfxbank )
 				machine->gfx[gfxbank] = pGfx;
 				mpRoadTilemap = tilemap_create(
 					get_road_info,tilemap_scan_rows,
-					TILEMAP_TYPE_PEN,
 					ROAD_TILE_SIZE,ROAD_TILE_SIZE,
 					ROAD_COLS,ROAD_ROWS);
 

src/mame/drivers/namcos23.c

@@ -370,7 +370,7 @@ static WRITE32_HANDLER( namcos23_textram_w )
 
 static VIDEO_START( ss23 )
 {
-	bgtilemap = tilemap_create( TextTilemapGetInfo,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,64,64 );
+	bgtilemap = tilemap_create( TextTilemapGetInfo,tilemap_scan_rows,16,16,64,64 );
 	tilemap_set_transparent_pen( bgtilemap, 0xf );
 }
 

src/mame/drivers/nmg5.c

@@ -799,8 +799,8 @@ static TILE_GET_INFO( bg_get_tile_info ) { get_tile_info(machine,tileinfo,tile_i
 
 static VIDEO_START( nmg5 )
 {
-	bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     8,8,64,64);
+	bg_tilemap = tilemap_create(bg_get_tile_info,tilemap_scan_rows,8,8,64,64);
-	fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+	fg_tilemap = tilemap_create(fg_get_tile_info,tilemap_scan_rows,8,8,64,64);
 
 	tilemap_set_transparent_pen(fg_tilemap,0);
 }

src/mame/drivers/nwk-tr.c

@@ -248,21 +248,21 @@ int K001604_vh_start(running_machine *machine, int chip)
 	{
 		int roz_tile_size = K001604_roz_size[chip] ? 16 : 8;
 		int roz_width = K001604_layer_size ? 64 : 128;
-		K001604_layer_8x8[chip][0] = tilemap_create(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_0, TILEMAP_TYPE_PEN, 8, 8, 64, 64);
+		K001604_layer_8x8[chip][0] = tilemap_create(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_0, 8, 8, 64, 64);
-		K001604_layer_8x8[chip][1] = tilemap_create(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_1, TILEMAP_TYPE_PEN, 8, 8, 64, 64);
+		K001604_layer_8x8[chip][1] = tilemap_create(K001604_0_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 8, 8, 64, 64);
 
-		K001604_layer_roz[chip][0] = tilemap_create(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_0, TILEMAP_TYPE_PEN, roz_tile_size, roz_tile_size, roz_width, 64);
+		K001604_layer_roz[chip][0] = tilemap_create(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_0, roz_tile_size, roz_tile_size, roz_width, 64);
-		K001604_layer_roz[chip][1] = tilemap_create(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_1, TILEMAP_TYPE_PEN, roz_tile_size, roz_tile_size, 64, 64);
+		K001604_layer_roz[chip][1] = tilemap_create(K001604_0_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 64);
 	}
 	else
 	{
 		int roz_tile_size = K001604_roz_size[chip] ? 16 : 8;
 		int roz_width = K001604_layer_size ? 64 : 128;
-		K001604_layer_8x8[chip][0] = tilemap_create(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_0, TILEMAP_TYPE_PEN, 8, 8, 64, 64);
+		K001604_layer_8x8[chip][0] = tilemap_create(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_0, 8, 8, 64, 64);
-		K001604_layer_8x8[chip][1] = tilemap_create(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_1, TILEMAP_TYPE_PEN, 8, 8, 64, 64);
+		K001604_layer_8x8[chip][1] = tilemap_create(K001604_1_tile_info_layer_8x8, K001604_scan_layer_8x8_1, 8, 8, 64, 64);
 
-		K001604_layer_roz[chip][0] = tilemap_create(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_0, TILEMAP_TYPE_PEN, roz_tile_size, roz_tile_size, roz_width, 64);
+		K001604_layer_roz[chip][0] = tilemap_create(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_0, roz_tile_size, roz_tile_size, roz_width, 64);
-		K001604_layer_roz[chip][1] = tilemap_create(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_1, TILEMAP_TYPE_PEN, roz_tile_size, roz_tile_size, 64, 64);
+		K001604_layer_roz[chip][1] = tilemap_create(K001604_1_tile_info_layer_roz, K001604_scan_layer_roz_1, roz_tile_size, roz_tile_size, 64, 64);
 	}
 
 	tilemap_set_transparent_pen(K001604_layer_8x8[chip][0], 0);

src/mame/drivers/olibochu.c

@@ -89,7 +89,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START( olibochu )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		8, 8, 32, 32);
 }
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect)

src/mame/drivers/onetwo.c

@@ -242,7 +242,7 @@ GFXDECODE_END
 
 static VIDEO_START( onetwo )
 {
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32);
 }
 
 static VIDEO_UPDATE( onetwo )

src/mame/drivers/panicr.c

@@ -188,9 +188,9 @@ ADDRESS_MAP_END
 
 static VIDEO_START( panicr )
 {
-	bgtilemap = tilemap_create( get_bgtile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,1024,16 );
+	bgtilemap = tilemap_create( get_bgtile_info,tilemap_scan_rows,16,16,1024,16 );
 
-	txttilemap = tilemap_create( get_txttile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32 );
+	txttilemap = tilemap_create( get_txttile_info,tilemap_scan_rows,8,8,32,32 );
 	colortable_configure_tilemap_groups(machine->colortable, txttilemap, machine->gfx[0], 0);
 }
 

src/mame/drivers/peplus.c

@@ -623,7 +623,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( peplus )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 40, 25);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25);
 	palette_ram = auto_malloc(0x3000);
 	memset(palette_ram, 0, 0x3000);
 }

src/mame/drivers/pipeline.c

@@ -91,8 +91,8 @@ static TILE_GET_INFO( get_tile_info2 )
 static VIDEO_START ( pipeline )
 {
 	palram=auto_malloc(0x1000);
-	tilemap1 = tilemap_create( get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32 );
+	tilemap1 = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,64,32 );
-	tilemap2 = tilemap_create( get_tile_info2,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32 );
+	tilemap2 = tilemap_create( get_tile_info2,tilemap_scan_rows,8,8,64,32 );
 	tilemap_set_transparent_pen(tilemap2,0);
 }
 

src/mame/drivers/pkscram.c

@@ -226,9 +226,9 @@ static TIMER_CALLBACK( scanline_callback )
 
 static VIDEO_START( pkscramble )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN,      8, 8,32,32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8,32,32);
-	md_tilemap = tilemap_create(get_md_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8,32,32);
+	md_tilemap = tilemap_create(get_md_tile_info, tilemap_scan_rows, 8, 8,32,32);
-	fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8,32,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8,32,32);
 
 	tilemap_set_transparent_pen(md_tilemap,15);
 	tilemap_set_transparent_pen(fg_tilemap,15);

src/mame/drivers/pmpoker.c

@@ -416,7 +416,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START( pmpoker )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 29);
+		8, 8, 32, 29);
 }
 
 static VIDEO_UPDATE( pmpoker )

src/mame/drivers/powerbal.c

@@ -364,7 +364,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
 
 static VIDEO_START( powerbal )
 {
-	bg_tilemap = tilemap_create(powerbal_get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,64,32);
+	bg_tilemap = tilemap_create(powerbal_get_bg_tile_info,tilemap_scan_rows,8, 8,64,32);
 
 	xoffset = -20;
 

src/mame/drivers/ppmast93.c

@@ -329,8 +329,8 @@ static TILE_GET_INFO( get_ppmast93_fg_tile_info )
 
 static VIDEO_START( ppmast93 )
 {
-	ppmast93_bg_tilemap = tilemap_create(get_ppmast93_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32, 32);
+	ppmast93_bg_tilemap = tilemap_create(get_ppmast93_bg_tile_info,tilemap_scan_rows,8,8,32, 32);
-	ppmast93_fg_tilemap = tilemap_create(get_ppmast93_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32, 32);
+	ppmast93_fg_tilemap = tilemap_create(get_ppmast93_fg_tile_info,tilemap_scan_rows,8,8,32, 32);
 
 	tilemap_set_transparent_pen(ppmast93_fg_tilemap,0);
 }

src/mame/drivers/pturn.c

@@ -119,9 +119,9 @@ static TILE_GET_INFO( get_pturn_bg_tile_info )
 
 static VIDEO_START(pturn)
 {
-	pturn_fgmap = tilemap_create(get_pturn_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,32,32);
+	pturn_fgmap = tilemap_create(get_pturn_tile_info,tilemap_scan_rows,8, 8,32,32);
 	tilemap_set_transparent_pen(pturn_fgmap,0);
-	pturn_bgmap = tilemap_create(get_pturn_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,32,32*8);
+	pturn_bgmap = tilemap_create(get_pturn_bg_tile_info,tilemap_scan_rows,8, 8,32,32*8);
 	tilemap_set_transparent_pen(pturn_bgmap,0);
 }
 

src/mame/drivers/rabbit.c

@@ -346,10 +346,10 @@ static VIDEO_START(rabbit)
 	memset(rabbit_tilemap_ram[2], 0, 0x20000);
 	memset(rabbit_tilemap_ram[3], 0, 0x20000);
 
-	rabbit_tilemap[0] = tilemap_create(get_rabbit_tilemap0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     16, 16, 128,32);
+	rabbit_tilemap[0] = tilemap_create(get_rabbit_tilemap0_tile_info,tilemap_scan_rows,16, 16, 128,32);
-	rabbit_tilemap[1] = tilemap_create(get_rabbit_tilemap1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     16, 16, 128,32);
+	rabbit_tilemap[1] = tilemap_create(get_rabbit_tilemap1_tile_info,tilemap_scan_rows,16, 16, 128,32);
-	rabbit_tilemap[2] = tilemap_create(get_rabbit_tilemap2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     16, 16, 128,32);
+	rabbit_tilemap[2] = tilemap_create(get_rabbit_tilemap2_tile_info,tilemap_scan_rows,16, 16, 128,32);
-	rabbit_tilemap[3] = tilemap_create(get_rabbit_tilemap3_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     8, 8, 128,32);
+	rabbit_tilemap[3] = tilemap_create(get_rabbit_tilemap3_tile_info,tilemap_scan_rows, 8,  8, 128,32);
 	tilemap_set_transparent_pen(rabbit_tilemap[0],0x0);
 	tilemap_set_transparent_pen(rabbit_tilemap[1],0x0);
 	tilemap_set_transparent_pen(rabbit_tilemap[2],0x0);
@@ -1136,10 +1136,10 @@ static VIDEO_START(tmmjprd)
 	memset(rabbit_tilemap_ram[2], 0, 0x20000);
 	memset(rabbit_tilemap_ram[3], 0, 0x20000);
 
-	rabbit_tilemap[0] = tilemap_create(get_tmmjprd_tilemap0_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     8, 8, 64, 64);
+	rabbit_tilemap[0] = tilemap_create(get_tmmjprd_tilemap0_tile_info,tilemap_scan_rows, 8, 8, 64, 64);
-	rabbit_tilemap[1] = tilemap_create(get_tmmjprd_tilemap1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     16, 16, 64, 64);
+	rabbit_tilemap[1] = tilemap_create(get_tmmjprd_tilemap1_tile_info,tilemap_scan_rows,16, 16, 64, 64);
-	rabbit_tilemap[2] = tilemap_create(get_tmmjprd_tilemap2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     16, 16, 64, 64);
+	rabbit_tilemap[2] = tilemap_create(get_tmmjprd_tilemap2_tile_info,tilemap_scan_rows,16, 16, 64, 64);
-	rabbit_tilemap[3] = tilemap_create(get_tmmjprd_tilemap3_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN ,     16, 16, 64, 64);
+	rabbit_tilemap[3] = tilemap_create(get_tmmjprd_tilemap3_tile_info,tilemap_scan_rows,16, 16, 64, 64);
 	tilemap_set_transparent_pen(rabbit_tilemap[0],0x0);
 	tilemap_set_transparent_pen(rabbit_tilemap[1],0x0);
 	tilemap_set_transparent_pen(rabbit_tilemap[2],0x0);

src/mame/drivers/raiden2.c

@@ -252,10 +252,10 @@ static void set_scroll(tilemap *tm, int plane)
 
 static VIDEO_START( raiden2 )
 {
-	text_layer       = tilemap_create(get_text_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN,  8, 8, 64,32 );
+	text_layer       = tilemap_create(get_text_tile_info, tilemap_scan_rows,  8, 8, 64,32 );
-	background_layer = tilemap_create(get_back_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 16,16, 32,32 );
+	background_layer = tilemap_create(get_back_tile_info, tilemap_scan_rows, 16,16, 32,32 );
-	midground_layer  = tilemap_create(get_mid_tile_info,  tilemap_scan_rows, TILEMAP_TYPE_PEN, 16,16, 32,32 );
+	midground_layer  = tilemap_create(get_mid_tile_info,  tilemap_scan_rows, 16,16, 32,32 );
-	foreground_layer = tilemap_create(get_fore_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 16,16, 32,32 );
+	foreground_layer = tilemap_create(get_fore_tile_info, tilemap_scan_rows, 16,16, 32,32 );
 
 	tilemap_set_transparent_pen(midground_layer, 15);
 	tilemap_set_transparent_pen(foreground_layer, 15);

src/mame/drivers/rcasino.c

@@ -103,7 +103,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START(rcasino)
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		8, 8, 32, 32);
 }
 
 static VIDEO_UPDATE(rcasino)

src/mame/drivers/rmhaihai.c

@@ -59,7 +59,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START( rmhaihai )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 64, 32);
+		8, 8, 64, 32);
 }
 
 static VIDEO_UPDATE( rmhaihai )

src/mame/drivers/safarir.c

@@ -156,8 +156,8 @@ static TILE_GET_INFO( get_fg_tile_info )
 
 static VIDEO_START( safarir )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
-	fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 
 	tilemap_set_transparent_pen(fg_tilemap, 0);
 }

src/mame/drivers/sbowling.c

@@ -103,7 +103,7 @@ static VIDEO_UPDATE(sbowling)
 static VIDEO_START(sbowling)
 {
 	tmpbitmap = auto_bitmap_alloc(32*8,32*8,machine->screen[0].format);
-	sb_tilemap = tilemap_create(get_sb_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	sb_tilemap = tilemap_create(get_sb_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 }
 
 static WRITE8_HANDLER( pix_shift_w )

src/mame/drivers/sbrkout.c

@@ -286,7 +286,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( sbrkout )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 }
 
 

src/mame/drivers/skyarmy.c

@@ -99,7 +99,7 @@ static PALETTE_INIT( skyarmy )
 
 static VIDEO_START( skyarmy )
 {
-        skyarmy_tilemap = tilemap_create(get_skyarmy_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+        skyarmy_tilemap = tilemap_create(get_skyarmy_tile_info,tilemap_scan_rows,8,8,32,32);
         tilemap_set_scroll_cols(skyarmy_tilemap,32);
 }
 

src/mame/drivers/skylncr.c

@@ -72,10 +72,10 @@ static VIDEO_START( skylncr )
 {
 
 	tmap = tilemap_create(	get_tile_info, tilemap_scan_rows,
-							TILEMAP_TYPE_PEN, 8,8, 0x40,0x20	);
+							8,8, 0x40,0x20	);
 
 	tmap2 = tilemap_create(	get_tile_info2, skylncr_tilemap_scan_pages,
-							TILEMAP_TYPE_PEN, 8,32,
+							8,32,
 							TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y );
 
 	tilemap_set_transparent_pen(tmap,  0);

src/mame/drivers/statriv2.c

@@ -126,7 +126,7 @@ static WRITE8_HANDLER( statriv2_videoram_w )
 
 static VIDEO_START (statriv2)
 {
-	statriv2_tilemap = tilemap_create(get_statriv2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,16,64, 16);
+	statriv2_tilemap = tilemap_create(get_statriv2_tile_info,tilemap_scan_rows,8,16,64, 16);
 }
 
 static VIDEO_UPDATE (statriv2)

src/mame/drivers/supdrapo.c

@@ -251,7 +251,7 @@ static TILE_GET_INFO( get_tile_info )
 
 static VIDEO_START( supdrapo )
 {
-	fg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	fg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,32);
 }
 
 static VIDEO_UPDATE( supdrapo )

src/mame/drivers/superdq.c

@@ -55,7 +55,7 @@ static TILE_GET_INFO( get_tile_info )
 
 static VIDEO_START( superdq )
 {
-	superdq_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	superdq_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows, 8, 8, 32, 32);
 
 	add_exit_callback(machine, video_cleanup);
 }

src/mame/drivers/suprgolf.c

@@ -62,7 +62,7 @@ static MACHINE_RESET( suprgolf )
 
 static VIDEO_START( suprgolf )
 {
-	suprgolf_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32 );
+	suprgolf_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 );
 }
 
 static VIDEO_UPDATE( suprgolf )

src/mame/drivers/talbot.c

@@ -155,7 +155,7 @@ static TILE_GET_INFO( get_tile_info_bg )
 
 static VIDEO_START( talbot )
 {
-	bg_tilemap = tilemap_create(get_tile_info_bg, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_tile_info_bg, tilemap_scan_rows, 8, 8, 32, 32);
 }
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect)

src/mame/drivers/tattack.c

@@ -49,7 +49,7 @@ static VIDEO_UPDATE( tattack )
 
 static VIDEO_START( tattack )
 {
-		tmap = tilemap_create( get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32 );
+		tmap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 );
 }
 
 static ADDRESS_MAP_START( mem, ADDRESS_SPACE_PROGRAM, 8 )

src/mame/drivers/tecmosys.c

@@ -401,7 +401,7 @@ ADDRESS_MAP_END
 
 static VIDEO_START(deroon)
 {
-	txt_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32*2,32*2);
+	txt_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32*2,32*2);
 	tilemap_set_transparent_pen(txt_tilemap,0);
 }
 

src/mame/drivers/trvmadns.c

@@ -264,7 +264,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( trvmadns )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 
 	tilemap_set_transparent_pen(bg_tilemap,1);
 }

src/mame/drivers/vmetal.c

@@ -396,9 +396,9 @@ static TILE_GET_INFO( get_vmetal_mid2tilemap_tile_info )
 
 static VIDEO_START(varia)
 {
-	vmetal_texttilemap = tilemap_create(get_vmetal_texttilemap_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,      8, 8, 256,256);
+	vmetal_texttilemap = tilemap_create(get_vmetal_texttilemap_tile_info,tilemap_scan_rows, 8, 8, 256,256);
-	vmetal_mid1tilemap = tilemap_create(get_vmetal_mid1tilemap_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,      16,16, 256,256);
+	vmetal_mid1tilemap = tilemap_create(get_vmetal_mid1tilemap_tile_info,tilemap_scan_rows,16,16, 256,256);
-	vmetal_mid2tilemap = tilemap_create(get_vmetal_mid2tilemap_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,      16,16, 256,256);
+	vmetal_mid2tilemap = tilemap_create(get_vmetal_mid2tilemap_tile_info,tilemap_scan_rows,16,16, 256,256);
 	tilemap_set_transparent_pen(vmetal_texttilemap,0);
 	tilemap_set_transparent_pen(vmetal_mid1tilemap,0);
 	tilemap_set_transparent_pen(vmetal_mid2tilemap,0);

src/mame/drivers/vroulet.c

@@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 static VIDEO_START(vroulet)
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		8, 8, 32, 32);
 }
 
 static VIDEO_UPDATE(vroulet)

src/mame/drivers/wallc.c

@@ -127,7 +127,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( wallc )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_y,	TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_cols_flip_y,	8, 8, 32, 32);
 }
 
 static VIDEO_UPDATE( wallc )

src/mame/drivers/wilytowr.c

@@ -155,10 +155,10 @@ static TILE_GET_INFO( get_fg_tile_info )
 static VIDEO_START( wilytowr )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		8, 8, 32, 32);
 
 	fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		8, 8, 32, 32);
 
 	tilemap_set_scroll_cols(bg_tilemap, 32);
 	tilemap_set_transparent_pen(fg_tilemap, 0);

src/mame/drivers/wink.c

@@ -270,7 +270,7 @@ static TILE_GET_INFO( get_bg_tile_info )
 
 static VIDEO_START( wink )
 {
-	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
 }
 
 static VIDEO_UPDATE( wink )

src/mame/drivers/witch.c

@@ -680,9 +680,9 @@ GFXDECODE_END
 
 static VIDEO_START(witch)
 {
-	gfx0a_tilemap = tilemap_create(get_gfx0a_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	gfx0a_tilemap = tilemap_create(get_gfx0a_tile_info,tilemap_scan_rows,8,8,32,32);
-	gfx0b_tilemap = tilemap_create(get_gfx0b_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	gfx0b_tilemap = tilemap_create(get_gfx0b_tile_info,tilemap_scan_rows,8,8,32,32);
-	gfx1_tilemap = tilemap_create(get_gfx1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	gfx1_tilemap = tilemap_create(get_gfx1_tile_info,tilemap_scan_rows,8,8,32,32);
 
 	tilemap_set_transparent_pen(gfx0a_tilemap,0);
 	tilemap_set_transparent_pen(gfx0b_tilemap,0);

src/mame/drivers/yumefuda.c

@@ -73,7 +73,7 @@ static TILE_GET_INFO( y_get_bg_tile_info )
 
 static VIDEO_START( yumefuda )
 {
-	bg_tilemap = tilemap_create(y_get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	bg_tilemap = tilemap_create(y_get_bg_tile_info,tilemap_scan_rows,8,8,32,32);
 }
 
 static VIDEO_UPDATE( yumefuda )

src/mame/video/1942.c

@@ -132,8 +132,8 @@ static TILE_GET_INFO( get_bg_tile_info )
 ***************************************************************************/
 VIDEO_START( 1942 )
 {
-	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 8, 8,32,32);
+	fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows, 8, 8,32,32);
-	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,TILEMAP_TYPE_PEN,     16,16,32,16);
+	bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_cols,     16,16,32,16);
 
 	tilemap_set_transparent_pen(fg_tilemap,0);
 

src/mame/video/1943.c

@@ -181,13 +181,13 @@ static TILE_GET_INFO( c1943_get_fg_tile_info )
 VIDEO_START( 1943 )
 {
 	bg2_tilemap = tilemap_create(c1943_get_bg2_tile_info, tilemap_scan_cols,
-		TILEMAP_TYPE_PEN, 32, 32, 2048, 8);
+		 32, 32, 2048, 8);
 
 	bg_tilemap = tilemap_create(c1943_get_bg_tile_info, tilemap_scan_cols,
-		TILEMAP_TYPE_PEN, 32, 32, 2048, 8);
+		 32, 32, 2048, 8);
 
 	fg_tilemap = tilemap_create(c1943_get_fg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 8, 8, 32, 32);
+		 8, 8, 32, 32);
 
 	colortable_configure_tilemap_groups(machine->colortable, bg_tilemap, machine->gfx[1], 0x0f);
 	tilemap_set_transparent_pen(fg_tilemap, 0);

src/mame/video/40love.c

@@ -110,7 +110,7 @@ VIDEO_START( fortyl )
 	pixel_bitmap1 = auto_bitmap_alloc(256,256,machine->screen[0].format);
 	pixel_bitmap2 = auto_bitmap_alloc(256,256,machine->screen[0].format);
 
-	background  = tilemap_create(get_bg_tile_info, tilemap_scan_rows,TILEMAP_TYPE_PEN, 8,8,64,32);
+	background  = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 8,8,64,32);
 
 	tilemap_set_scroll_rows(background,32);
 	tilemap_set_transparent_pen(background,0);

src/mame/video/4enraya.c

@@ -29,7 +29,7 @@ static TILE_GET_INFO( get_tile_info )
 
 VIDEO_START( 4enraya )
 {
-	bg_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32 );
+	bg_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,8,8,32,32 );
 }
 
 VIDEO_UPDATE( 4enraya)

src/mame/video/actfancr.c

@@ -87,9 +87,9 @@ static void register_savestate(void)
 
 VIDEO_START( actfancr )
 {
-	pf1_tilemap = tilemap_create(get_tile_info,actfancr_scan,TILEMAP_TYPE_PEN,16,16,256,16);
+	pf1_tilemap = tilemap_create(get_tile_info,actfancr_scan,16,16,256,16);
-	pf1_alt_tilemap = tilemap_create(get_tile_info,actfancr_scan2,TILEMAP_TYPE_PEN,16,16,128,32);
+	pf1_alt_tilemap = tilemap_create(get_tile_info,actfancr_scan2,16,16,128,32);
-	pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,8,8,32,32);
 
 	tilemap_set_transparent_pen(pf2_tilemap,0);
 
@@ -98,8 +98,8 @@ VIDEO_START( actfancr )
 
 VIDEO_START( triothep )
 {
-	pf1_tilemap = tilemap_create(get_trio_tile_info,triothep_scan,TILEMAP_TYPE_PEN,16,16,32,32);
+	pf1_tilemap = tilemap_create(get_trio_tile_info,triothep_scan,16,16,32,32);
-	pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32);
+	pf2_tilemap = tilemap_create(get_pf2_tile_info,tilemap_scan_rows,8,8,32,32);
 
 	tilemap_set_transparent_pen(pf2_tilemap,0);
 

src/mame/video/aeroboto.c

@@ -42,7 +42,7 @@ static TILE_GET_INFO( get_tile_info )
 
 VIDEO_START( aeroboto )
 {
-	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,64);
+	bg_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32,64);
 
 	tilemap_set_transparent_pen(bg_tilemap,0);
 

src/mame/video/aerofgt.c

@@ -95,7 +95,7 @@ static TILE_GET_INFO( get_bg2_tile_info )
 
 VIDEO_START( pspikes )
 {
-	bg1_tilemap = tilemap_create(get_pspikes_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
+	bg1_tilemap = tilemap_create(get_pspikes_tile_info,tilemap_scan_rows,8,8,64,32);
 	/* no bg2 in this game */
 
 	sprite_gfx = 1;
@@ -104,8 +104,8 @@ VIDEO_START( pspikes )
 
 VIDEO_START( karatblz )
 {
-	bg1_tilemap = tilemap_create(karatblz_bg1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     8,8,64,64);
+	bg1_tilemap = tilemap_create(karatblz_bg1_tile_info,tilemap_scan_rows,     8,8,64,64);
-	bg2_tilemap = tilemap_create(karatblz_bg2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+	bg2_tilemap = tilemap_create(karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64);
 
 	tilemap_set_transparent_pen(bg2_tilemap,15);
 
@@ -118,8 +118,8 @@ VIDEO_START( spinlbrk )
 {
 	int i;
 
-	bg1_tilemap = tilemap_create(spinlbrk_bg1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     8,8,64,64);
+	bg1_tilemap = tilemap_create(spinlbrk_bg1_tile_info,tilemap_scan_rows,     8,8,64,64);
-	bg2_tilemap = tilemap_create(karatblz_bg2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+	bg2_tilemap = tilemap_create(karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64);
 
 	tilemap_set_transparent_pen(bg2_tilemap,15);
 
@@ -143,8 +143,8 @@ VIDEO_START( spinlbrk )
 
 VIDEO_START( turbofrc )
 {
-	bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,     8,8,64,64);
+	bg1_tilemap = tilemap_create(get_bg1_tile_info,tilemap_scan_rows,     8,8,64,64);
-	bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,64);
+	bg2_tilemap = tilemap_create(get_bg2_tile_info,tilemap_scan_rows,8,8,64,64);
 
 	tilemap_set_transparent_pen(bg2_tilemap,15);
 
@@ -155,7 +155,7 @@ VIDEO_START( turbofrc )
 
 VIDEO_START( wbbc97 )
 {
-	bg1_tilemap = tilemap_create(get_pspikes_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
+	bg1_tilemap = tilemap_create(get_pspikes_tile_info,tilemap_scan_rows,8,8,64,32);
 	/* no bg2 in this game */
 
 	tilemap_set_transparent_pen(bg1_tilemap,15);

src/mame/video/airbustr.c

@@ -116,10 +116,10 @@ static TILE_GET_INFO( get_bg_tile_info )
 VIDEO_START( airbustr )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 16, 16, 32, 32);
+		 16, 16, 32, 32);
 
 	fg_tilemap = tilemap_create(get_fg_tile_info, tilemap_scan_rows,
-		TILEMAP_TYPE_PEN, 16, 16, 32, 32);
+		 16, 16, 32, 32);
 
 	sprites_bitmap = auto_bitmap_alloc(machine->screen[0].width,machine->screen[0].height,machine->screen[0].format);
 	tilemap_set_transparent_pen(fg_tilemap, 0);