From 5a653343ff30d3333dea1a089c6955a82132d31e Mon Sep 17 00:00:00 2001
From: "Carl.Kenner" <Carl.Kenner@ab33defa-829a-11dd-99d6-6900107db72b>
Date: Fri, 20 Mar 2009 12:20:24 +0000
Subject: [PATCH] Update r154 broke mono GB games. This fixes them, but means
 issue 70 is now only half fixed. So... mono gameboy games all work, and
 colorised games sort of work, but have random background tiles in the wrong
 palette. I'll have to continue fixing issue 70 later. Sorry for breaking
 something before.

---
 source/vba/gb/GB.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/vba/gb/GB.cpp b/source/vba/gb/GB.cpp
index dd8b93f..094d304 100644
--- a/source/vba/gb/GB.cpp
+++ b/source/vba/gb/GB.cpp
@@ -4589,9 +4589,9 @@ void gbEmulate(int ticksToStop)
 
     if (register_LCDCBusy)
     {
-      //register_LCDCBusy-=clockTicks;
-      //if (register_LCDCBusy<0)
-      //  register_LCDCBusy = 0;
+      register_LCDCBusy-=clockTicks;
+      if (register_LCDCBusy<0)
+        register_LCDCBusy = 0;
     }
 
 
@@ -4847,7 +4847,7 @@ void gbEmulate(int ticksToStop)
             framesToSkip = 9; // try 6 FPS during speedup
           //gbLcdTicksDelayed = gbLcdTicks+1;
           gbLCDChangeHappened = false;
-          switch(gbLcdMode) {
+          switch(gbLcdModeDelayed) {
             case 0:
             {
               // H-Blank
@@ -4878,7 +4878,7 @@ void gbEmulate(int ticksToStop)
                 }
 
                 gbLcdTicksDelayed += GBLCD_MODE_1_CLOCK_TICKS;
-                gbLcdMode = 1;
+                gbLcdModeDelayed = 1;
 
                 gbFrameCount++;
                 systemFrame();
@@ -4951,7 +4951,7 @@ void gbEmulate(int ticksToStop)
               } else {
                 // go the the OAM being accessed mode
                 gbLcdTicksDelayed += GBLCD_MODE_2_CLOCK_TICKS;
-                gbLcdMode = 2;
+                gbLcdModeDelayed = 2;
                 gbInt48Signal &= ~3;
               }
             }
@@ -4966,7 +4966,7 @@ void gbEmulate(int ticksToStop)
               oldRegister_WY = register_WY;
 
               gbLcdTicksDelayed += GBLCD_MODE_2_CLOCK_TICKS;
-              gbLcdMode = 2;
+              gbLcdModeDelayed = 2;
 
               // reset the window line
               gbWindowLine = -1;
@@ -4977,7 +4977,7 @@ void gbEmulate(int ticksToStop)
               // OAM being accessed mode
               // next mode is OAM and VRAM in use
               gbLcdTicksDelayed += GBLCD_MODE_3_CLOCK_TICKS+gbSpritesTicks[299];
-              gbLcdMode = 3;
+              gbLcdModeDelayed = 3;
             }
             break;
             case 3:
@@ -5010,7 +5010,7 @@ void gbEmulate(int ticksToStop)
                 }
               }
               gbLcdTicksDelayed += GBLCD_MODE_0_CLOCK_TICKS-gbSpritesTicks[299];
-              gbLcdMode = 0;
+              gbLcdModeDelayed = 0;
             }
             break;
           }
@@ -5037,7 +5037,7 @@ void gbEmulate(int ticksToStop)
           }
           gbLcdLYIncrementTicksDelayed += GBLY_INCREMENT_CLOCK_TICKS;
 
-          if (gbLcdMode == 1)
+          if (gbLcdModeDelayed == 1)
           {
 
             if(register_LY == 153)