From 4aa3c44fe27489ab779a02e7ba8498d691ab2ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?=
 <happppp@users.noreply.github.com>
Date: Wed, 29 May 2013 19:41:34 +0000
Subject: [PATCH] oisipuzl sprite layer offset was wrong

---
 src/mame/drivers/seta.c  |  2 +-
 src/mame/includes/seta.h |  1 +
 src/mame/video/seta.c    | 30 ++++++++++++++++++++----------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 177b2ad608c..6af8128740b 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -8032,7 +8032,7 @@ static MACHINE_CONFIG_START( setaroul, seta_state )
 	MCFG_PALETTE_LENGTH(512)
 	MCFG_PALETTE_INIT_OVERRIDE(seta_state,setaroul)
 
-	MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer)
+	MCFG_VIDEO_START_OVERRIDE(seta_state,setaroul_1_layer)
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 49c73bad6d0..3c24615e546 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -179,6 +179,7 @@ public:
 	TILE_GET_INFO_MEMBER(get_tile_info_3);
 	DECLARE_VIDEO_START(seta_no_layers);
 	DECLARE_VIDEO_START(twineagl_1_layer);
+	DECLARE_VIDEO_START(setaroul_1_layer);
 	DECLARE_VIDEO_START(seta_1_layer);
 	DECLARE_MACHINE_RESET(calibr50);
 	DECLARE_PALETTE_INIT(usclssic);
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 53e49c8df06..bbe682ef097 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -190,8 +190,8 @@ static const game_offset game_offsets[] =
 	{ "daioha",   {  1,  1 }, { -1, -1 } }, // "
 	{ "msgundam", {  0,  0 }, { -2, -2 } }, // correct (test grid, banpresto logo)
 	{ "msgundam1",{  0,  0 }, { -2, -2 } }, // "
-	{ "oisipuzl", {  0,  0 }, { -1, -1 } }, // correct (test mode) flip screen not supported?
-	{ "triplfun", {  0,  0 }, { -1, -1 } }, // "
+	{ "oisipuzl", {  1,  1 }, { -1, -1 } }, // correct (test mode) flip screen not supported?
+	{ "triplfun", {  1,  1 }, { -1, -1 } }, // "
 	{ "wrofaero", {  0,  0 }, {  0,  0 } }, // unknown
 	{ "jjsquawk", {  1,  1 }, { -1, -1 } }, // correct (test mode)
 	{ "jjsquawkb",{  1,  1 }, { -1, -1 } }, // "
@@ -466,6 +466,15 @@ VIDEO_START_MEMBER(seta_state,seta_2_layers)
 	m_tilemap_3->set_transparent_pen(0);
 }
 
+VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers)
+{
+	VIDEO_START_CALL_MEMBER(seta_2_layers);
+	m_tilemaps_flip = 1;
+
+	// position kludges
+	machine().device<seta001_device>("spritegen")->set_fg_yoffsets( -0x12, 0x0e );
+}
+
 
 /* 1 layer */
 VIDEO_START_MEMBER(seta_state,seta_1_layer)
@@ -488,6 +497,15 @@ VIDEO_START_MEMBER(seta_state,seta_1_layer)
 	m_tilemap_1->set_transparent_pen(0);
 }
 
+VIDEO_START_MEMBER(seta_state,setaroul_1_layer)
+{
+	VIDEO_START_CALL_MEMBER(seta_1_layer);
+
+	// position kludges
+	machine().device<seta001_device>("spritegen")->set_fg_yoffsets( -0x12, 0x0e );
+	machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x1, -0x1 );
+}
+
 VIDEO_START_MEMBER(seta_state,twineagl_1_layer)
 {
 	VIDEO_START_CALL_MEMBER( seta_no_layers );
@@ -538,11 +556,6 @@ VIDEO_START_MEMBER(seta_state,seta_no_layers)
 
 }
 
-VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers)
-{
-	VIDEO_START_CALL_MEMBER(seta_2_layers);
-	m_tilemaps_flip = 1;
-}
 
 
 /***************************************************************************
@@ -1038,9 +1051,6 @@ UINT32 seta_state::screen_update_setaroul(screen_device &screen, bitmap_ind16 &b
 {
 	bitmap.fill(0x0, cliprect);
 
-	machine().device<seta001_device>("spritegen")->set_fg_yoffsets( -0x12, 0x0e );
-	machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x1, -0x1 );
-
 	seta_layers_update(screen, bitmap, cliprect, 0x800, 1 );
 
 	return 0;