GBA Core: Fix booting into BIOS when skip BIOS is enabled

This commit is contained in:
Vicki Pfau 2024-12-14 22:28:08 -08:00
parent c9083715e6
commit 7e1e7d2253
2 changed files with 2 additions and 1 deletions

View File

@ -1,5 +1,6 @@
0.10.5: (Future)
Other fixes:
- GBA Core: Fix booting into BIOS when skip BIOS is enabled
- GBA Hardware: Fix loading states unconditionally overwriting GPIO memory
0.10.4: (2024-12-07)

View File

@ -700,7 +700,7 @@ static void _GBACoreReset(struct mCore* core) {
#endif
ARMReset(core->cpu);
bool forceSkip = gba->mbVf || core->opts.skipBios;
bool forceSkip = gba->mbVf || (core->opts.skipBios && (gba->romVf || gba->memory.rom));
if (!forceSkip && (gba->romVf || gba->memory.rom) && gba->pristineRomSize >= 0xA0 && gba->biosVf) {
uint32_t crc = doCrc32(&gba->memory.rom[1], 0x9C);
if (crc != LOGO_CRC32) {