ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB: Partially fix timing for skipped BIOS

This commit is contained in:
Vicki Pfau 2020-06-16 22:25:43 -07:00
parent 1402593855
commit 673f4aa149
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -5,6 +5,7 @@ Features:
Emulation fixes:
- ARM: Fix ALU reading PC after shifting
- ARM: Fix STR storing PC after address calculation
- GB: Partially fix timing for skipped BIOS
- GB MBC: Fix MBC1 mode changing behavior
- GB MBC: Fix MBC1 RAM enable bit selection
- GB MBC: Fix MBC2 bit selection

29
src/gb/gb.c
View File

@ -502,8 +502,8 @@ void GBSkipBIOS(struct GB* gb) {
cpu->e = 0x00;
cpu->h = 0xC0;
cpu->l = 0x60;
gb->timer.internalDiv = 0xABC;
nextDiv = 4;
gb->timer.internalDiv = 0xD85;
nextDiv = 8;
break;
case GB_MODEL_MGB:
cpu->a = 0xFF;
@ -522,34 +522,31 @@ void GBSkipBIOS(struct GB* gb) {
cpu->e = 0x00;
cpu->h = 0xC0;
cpu->l = 0x60;
gb->timer.internalDiv = 0xABC;
nextDiv = 4;
gb->timer.internalDiv = 0xD84;
nextDiv = 8;
break;
case GB_MODEL_AGB:
cpu->a = 0x11;
cpu->b = 1;
cpu->f.packed = 0x00;
cpu->c = 0;
cpu->e = 0x08;
cpu->h = 0;
cpu->l = 0x7C;
gb->timer.internalDiv = 0x1EA;
nextDiv = 0xC;
break;
// Fall through
case GB_MODEL_CGB:
cpu->a = 0x11;
if (gb->model == GB_MODEL_AGB) {
cpu->f.packed = 0x00;
} else {
cpu->f.packed = 0x80;
}
cpu->c = 0;
cpu->h = 0;
if (cart->cgb & 0x80) {
cpu->d = 0xFF;
cpu->e = 0x56;
cpu->l = 0x0D;
gb->timer.internalDiv = 0x2F0;
} else {
cpu->e = 0x08;
cpu->l = 0x7C;
gb->timer.internalDiv = 0x260;
}
gb->timer.internalDiv = 0x1EA;
nextDiv = 0xC;
break;
}
@ -557,8 +554,10 @@ void GBSkipBIOS(struct GB* gb) {
cpu->sp = 0xFFFE;
cpu->pc = 0x100;
gb->timer.nextDiv = GB_DMG_DIV_PERIOD * (16 - nextDiv);
mTimingDeschedule(&gb->timing, &gb->timer.event);
mTimingSchedule(&gb->timing, &gb->timer.event, 0);
mTimingSchedule(&gb->timing, &gb->timer.event, gb->timer.nextDiv);
GBIOWrite(gb, REG_LCDC, 0x91);
GBVideoSkipBIOS(&gb->video);