From 2f33f163a418afe389c5cfa9276151a828ec78a2 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 23 Jan 2010 08:15:02 +0000
Subject: [PATCH] Get Grandia III working again.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2493 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/Sif.cpp          | 5 ++---
 pcsx2/Vif_Commands.cpp | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pcsx2/Sif.cpp b/pcsx2/Sif.cpp
index 1bde16ca0e..aaa640a4de 100644
--- a/pcsx2/Sif.cpp
+++ b/pcsx2/Sif.cpp
@@ -223,7 +223,6 @@ __forceinline void SIF1EEDma(int &cycles, int &psxCycles, bool &done)
 			}
 		}
 	}
-	
 	if (sif1dma->qwc > 0)
 	{
 		// There's some data ready to transfer into the fifo..
@@ -290,8 +289,8 @@ __forceinline void SIF0IOPDma(int &cycles, int &psxCycles, bool &done)
 			done = false;
 		}
 	}
-	
-	if (sif0.counter > 0)
+	//if (sif0.counter > 0)
+	else
 	{
 		// There's some data ready to transfer into the fifo..
 		int wTransfer = min(sif0.counter, FIFO_SIF_W - sif0.fifo.size); // HW_DMA9_BCR >> 16;
diff --git a/pcsx2/Vif_Commands.cpp b/pcsx2/Vif_Commands.cpp
index 81e092703a..68a30dcf9a 100644
--- a/pcsx2/Vif_Commands.cpp
+++ b/pcsx2/Vif_Commands.cpp
@@ -25,6 +25,8 @@
 #define  vifX		(idx ? vif1 : vif0)
 #define  vifXRegs	(idx ? (vif1Regs) : (vif0Regs))
 #define  vif1Only()	{ if (!idx) { vifCMD_Null<idx>(); return; } }
+
+_vifT void vifCMD_Null();
 
 _f void vuExecMicro(int idx, u32 addr) {
 	VURegs* VU = nVif[idx].VU;