X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxcounters.c;h=18bd6a4e367f8cd5ade8a12cb8d06bceaabaf881;hb=4b2392bb;hp=c90ffdce95dd3f4daf3fd6fff3550ddeaff30f6c;hpb=43614ebdf8232541c602f1befc519a006296ede1;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index c90ffdce..18bd6a4e 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -23,7 +23,8 @@
 
 #include "psxcounters.h"
 #include "gpu.h"
-#include "debug.h"
+//#include "debug.h"
+#define DebugVSync()
 
 /******************************************************************************/
 
@@ -357,17 +358,23 @@ void psxRcntUpdate()
             }
         }
         
-        // Update lace. (with InuYasha fix)
-        if( hSyncCount >= (Config.VSyncWA ? HSyncTotal[Config.PsxType] / BIAS : HSyncTotal[Config.PsxType]) )
+        // Update lace.
+        if( hSyncCount >= HSyncTotal[Config.PsxType] )
         {
+            u32 status, field = 0;
             rcnts[3].cycleStart += Config.PsxType ? PSXCLK / 50 : PSXCLK / 60;
             hSyncCount = 0;
             frame_counter++;
 
             gpuSyncPluginSR();
-            if ((HW_GPU_STATUS & SWAP32(PSXGPU_ILACE_BITS)) == SWAP32(PSXGPU_ILACE_BITS))
-                HW_GPU_STATUS |= SWAP32(frame_counter << 31);
-            GPU_vBlank(0, SWAP32(HW_GPU_STATUS) >> 31);
+            status = SWAP32(HW_GPU_STATUS) | PSXGPU_FIELD;
+            if ((status & PSXGPU_ILACE_BITS) == PSXGPU_ILACE_BITS) {
+                field = frame_counter & 1;
+                status |= field << 31;
+                status ^= field << 13;
+            }
+            HW_GPU_STATUS = SWAP32(status);
+            GPU_vBlank(0, field);
         }
 
         scheduleRcntBase();
@@ -375,7 +382,7 @@ void psxRcntUpdate()
 
     psxRcntSet();
 
-#ifndef NDEBUG
+#if 0 //ndef NDEBUG
     DebugVSync();
 #endif
 }
@@ -419,18 +426,6 @@ u32 psxRcntRcount( u32 index )
 
     count = _psxRcntRcount( index );
 
-    // Parasite Eve 2 fix.
-    if( Config.RCntFix )
-    {
-        if( index == 2 )
-        {
-            if( rcnts[index].counterState == CountToTarget )
-            {
-                count /= BIAS;
-            }
-        }
-    }
-
     verboseLog( 2, "[RCNT %i] rcount: %x\n", index, count );
 
     return count;