From 8987e6dfdc053a5280e143615b05140916a2e0b1 Mon Sep 17 00:00:00 2001
From: Angelo Salese <angelosa@users.noreply.github.com>
Date: Sat, 21 Aug 2010 19:50:40 +0000
Subject: [PATCH] Toaplan2: Removed tile limit hack, not needed now since VDP
 is mixed properly [David Haywood]

---
 src/mame/video/gp9001.c   | 18 ------------------
 src/mame/video/gp9001.h   |  1 -
 src/mame/video/toaplan2.c |  7 -------
 3 files changed, 26 deletions(-)

diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index d4b84886143..160cfcb33c4 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -251,13 +251,6 @@ static TILE_GET_INFO_DEVICE( get_top0_tile_info )
 	{
 		tile_number = ( vdp->gp9001_gfxrom_bank[(tile_number >> 13) & 7] << 13 ) | ( tile_number & 0x1fff );
 	}
-	else
-	{
-		if (tile_number>vdp->tile_limit)
-		{
-			tile_number = 0;
-		}
-	}
 
 	color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
 	SET_TILE_INFO_DEVICE(
@@ -285,11 +278,6 @@ static TILE_GET_INFO_DEVICE( get_fg0_tile_info )
 	{
 		tile_number = ( vdp->gp9001_gfxrom_bank[(tile_number >> 13) & 7] << 13 ) | ( tile_number & 0x1fff );
 	}
-	else
-	{
-		if (tile_number>vdp->tile_limit) tile_number = 0;
-	}
-
 
 	color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
 	SET_TILE_INFO_DEVICE(
@@ -313,10 +301,6 @@ static TILE_GET_INFO_DEVICE( get_bg0_tile_info )
 	{
 		tile_number = ( vdp->gp9001_gfxrom_bank[(tile_number >> 13) & 7] << 13 ) | ( tile_number & 0x1fff );
 	}
-	else
-	{
-		if (tile_number>vdp->tile_limit) tile_number = 0;
-	}
 
 	color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
 	SET_TILE_INFO_DEVICE(
@@ -404,8 +388,6 @@ void gp9001vdp_device::device_reset()
 	top_flip = 0;
 	sprite_flip = 0;
 
-	tile_limit = 0xffff;
-
 	/* debug */
 	display_bg = 1;
 	display_fg = 1;
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index 7c33c8ef1d0..7c89d6c1058 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -50,7 +50,6 @@ public:
 	UINT8 top_flip;
 	UINT8 sprite_flip;
 
-	UINT16 tile_limit; // prevent bad tile in Batsugun, might be something like the CPS1 tile addressing limits?
 	int	   tile_region; // we also use this to figure out which vdp we're using in some debug logging features
 	tilemap_t *top_tilemap, *fg_tilemap, *bg_tilemap;
 
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index 1ff79f684a0..be8dc361525 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -510,9 +510,6 @@ VIDEO_UPDATE( batrider )
 
 
 
-/* How do the dual VDP games mix? The internal mixing of each VDP chip is independent, if you view only a single
-   VDP then the priorities for that VDP are correct, however, it is completely unclear how the priorities of the
-   two VDPs should actually mix together, as a result these games are broken for now. */
 VIDEO_UPDATE( dogyuun )
 {
 #ifdef DUAL_SCREEN_VDPS
@@ -526,10 +523,6 @@ VIDEO_UPDATE( dogyuun )
 
 VIDEO_UPDATE( batsugun )
 {
-	toaplan2_state *state = screen->machine->driver_data<toaplan2_state>();
-	state->vdp1->tile_limit = 0x1fff; // 0x2000-0x3fff seem to be for sprites only? (corruption on level 1 otherwise)
-
-
 #ifdef DUAL_SCREEN_VDPS
 	VIDEO_UPDATE_CALL( toaplan2 );
 #else