GBA: Fix skipping BIOS on irregularly sized ROMs

This commit is contained in:
Vicki Pfau 2019-05-19 15:05:58 -07:00
parent 1a800c4dca
commit 35ac41a37e
3 changed files with 2 additions and 5 deletions

View File

@ -24,6 +24,7 @@ Other fixes:
- FFmpeg: Improve initialization reliability and cleanup - FFmpeg: Improve initialization reliability and cleanup
- Wii: Fix aspect ratio (fixes mgba.io/i/500) - Wii: Fix aspect ratio (fixes mgba.io/i/500)
- FFmpeg: Fix audio conversion producing gaps - FFmpeg: Fix audio conversion producing gaps
- GBA: Fix skipping BIOS on irregularly sized ROMs
Misc: Misc:
- Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323) - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323)
- Qt: Improve camera initialization - Qt: Improve camera initialization

View File

@ -445,7 +445,7 @@ static void _GBACoreReset(struct mCore* core) {
#endif #endif
ARMReset(core->cpu); ARMReset(core->cpu);
if (core->opts.skipBios && gba->isPristine) { if (core->opts.skipBios && (gba->romVf || gba->memory.rom)) {
GBASkipBIOS(core->board); GBASkipBIOS(core->board);
} }
} }

View File

@ -218,10 +218,6 @@ void GBAReset(struct ARMCore* cpu) {
if (gba->pristineRomSize > SIZE_CART0) { if (gba->pristineRomSize > SIZE_CART0) {
GBAMatrixReset(gba); GBAMatrixReset(gba);
} }
if (!gba->romVf && gba->memory.rom) {
GBASkipBIOS(gba);
}
} }
void GBASkipBIOS(struct GBA* gba) { void GBASkipBIOS(struct GBA* gba) {