The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-22 18:49:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Carl.Kenner 2009-03-20 12:20:24 +00:00
parent 0f833a9d87
commit 5a653343ff
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/vba/gb/GB.cpp
View File

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