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

GB: Fix BIOS skipping VRAM and palette for GBC

This commit is contained in:
Vicki Pfau 2022-02-08 23:41:58 -08:00
parent 0676769b68
commit 4f844bcdc3
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gb/gb.c
View File

@ -608,15 +608,13 @@ void GBSkipBIOS(struct GB* gb) {
output1 |= (byte & 0x01) << 0;
output1 |= output1 << 1;
if (gb->model < GB_MODEL_CGB) {
GBPatch8(cpu, 0x8010 + i * 8, output0, NULL, 0);
GBPatch8(cpu, 0x8012 + i * 8, output0, NULL, 0);
GBPatch8(cpu, 0x8014 + i * 8, output1, NULL, 0);
GBPatch8(cpu, 0x8016 + i * 8, output1, NULL, 0);
} else {
GBPatch8(cpu, 0x8380 + i * 2, output0, NULL, 0);
GBPatch8(cpu, 0x8381 + i * 2, output1, NULL, 0);
}
GBPatch8(cpu, 0x8010 + i * 8, output0, NULL, 0);
GBPatch8(cpu, 0x8012 + i * 8, output0, NULL, 0);
GBPatch8(cpu, 0x8014 + i * 8, output1, NULL, 0);
GBPatch8(cpu, 0x8016 + i * 8, output1, NULL, 0);
}
for (i = 0; i < sizeof(_registeredTrademark); ++i) {
GBPatch8(cpu, 0x8190 + i * 2, _registeredTrademark[i], NULL, 0);
}
if (gb->model < GB_MODEL_CGB) {
for (i = 0; i < 12; ++i) {
@ -624,16 +622,6 @@ void GBSkipBIOS(struct GB* gb) {
GBPatch8(cpu, 0x9924 + i, i + 13, NULL, 0);
}
GBPatch8(cpu, 0x9910, 0x19, NULL, 0);
for (i = 0; i < sizeof(_registeredTrademark); ++i) {
GBPatch8(cpu, 0x8191 + i * 2, _registeredTrademark[i], NULL, 0);
}
} else {
for (i = 0; i < 7; ++i) {
GBPatch8(cpu, 0x99A7 + i, i + 0x38, NULL, 0);
}
for (i = 0; i < sizeof(_registeredTrademark); ++i) {
GBPatch8(cpu, 0x83E1 + i * 2, _registeredTrademark[i], NULL, 0);
}
}
if (gb->memory.mbcType == GB_UNL_SACHEN_MMC2) {

5
src/gb/video.c
View File

@ -521,6 +521,11 @@ void GBVideoSkipBIOS(struct GBVideo* video) {
int32_t next;
if (video->p->model & GB_MODEL_CGB) {
int i;
for (i = 0; i < 0x40; ++i) {
video->palette[i] = 0x7FFF;
video->renderer->writePalette(video->renderer, i, video->palette[i]);
}
video->ly = GB_VIDEO_VERTICAL_PIXELS;
video->p->memory.io[GB_REG_LY] = video->ly;
video->stat = GBRegisterSTATClearLYC(video->stat);