From 14f6147ae9a191fd82d6b871b47de8c9f88538ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?=
 <happppp@users.noreply.github.com>
Date: Thu, 1 Sep 2011 17:43:28 +0000
Subject: [PATCH] disable ugly sianniv hack, the game does not work either way

---
 src/emu/video/psx.c     | 18 ++++++++----------
 src/mame/includes/psx.h | 10 ++++++----
 src/mame/machine/psx.c  |  2 --
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c
index d1a55a20060..797c3f082dd 100644
--- a/src/emu/video/psx.c
+++ b/src/emu/video/psx.c
@@ -3637,18 +3637,16 @@ void psxgpu_device::vblank(screen_device &screen, bool vblank_state)
 {
 	if( vblank_state )
 	{
-	#if defined( MAME_DEBUG )
+#if defined( MAME_DEBUG )
 		DebugCheckKeys();
-	#endif
+#endif
 
-		psx_state *p_psx = screen.machine().driver_data<psx_state>();
-		if(p_psx->b_need_sianniv_vblank_hack)
-		{
-	/// HACK: find out what this is for?
-			UINT32 pc = cpu_get_pc(screen.machine().device("maincpu"));
-			if((pc >= 0x80010018 && pc <= 0x80010028) || pc == 0x8002a4f0)
-				return;
-		}
+#if 0
+		// HACK for sianniv: find out what this is for?
+		UINT32 pc = cpu_get_pc(screen.machine().device("maincpu"));
+		if((pc >= 0x80010018 && pc <= 0x80010028) || pc == 0x8002a4f0)
+			return;
+#endif
 
 		n_gpustatus ^= ( 1L << 31 );
 
diff --git a/src/mame/includes/psx.h b/src/mame/includes/psx.h
index 17a1c7debdc..036165b2feb 100644
--- a/src/mame/includes/psx.h
+++ b/src/mame/includes/psx.h
@@ -20,10 +20,10 @@ public:
 	size_t m_n_psxramsize;
 
 	UINT32 n_com_delay;
-	int b_need_sianniv_vblank_hack;
 };
 
 
+// mame/machine/psx.c
 extern void psx_driver_init( running_machine &machine );
 WRITE32_HANDLER( psx_com_delay_w );
 READ32_HANDLER( psx_com_delay_r );
@@ -31,12 +31,14 @@ extern void psx_irq_set( running_machine &, UINT32 );
 extern void psx_sio_install_handler( running_machine &, int, psx_sio_handler );
 extern void psx_sio_input( running_machine &, int, int, int );
 
-PALETTE_INIT( psx );
-SCREEN_UPDATE( psx );
 READ32_HANDLER( psx_gpu_r );
 WRITE32_HANDLER( psx_gpu_w );
-INTERRUPT_GEN( psx_vblank );
 extern void psx_lightgun_set( running_machine &, int, int );
 
+// emu/video/psx.c
+PALETTE_INIT( psx );
+SCREEN_UPDATE( psx );
+INTERRUPT_GEN( psx_vblank );
+
 #define PSX_H ( 1 )
 #endif
diff --git a/src/mame/machine/psx.c b/src/mame/machine/psx.c
index 15738b63eb1..eb100474c18 100644
--- a/src/mame/machine/psx.c
+++ b/src/mame/machine/psx.c
@@ -28,8 +28,6 @@ void psx_driver_init( running_machine &machine )
 {
 	psx_state *p_psx = machine.driver_data<psx_state>();
 
-	p_psx->b_need_sianniv_vblank_hack = !strcmp(machine.system().name, "sianniv");
-
 	p_psx->m_p_n_psxram = (UINT32 *)memory_get_shared(machine, "share1", p_psx->m_n_psxramsize);
 }