From 35ac41a37e298441aeb97afc27e449f1d2556640 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sun, 19 May 2019 15:05:58 -0700
Subject: [PATCH] GBA: Fix skipping BIOS on irregularly sized ROMs

---
 CHANGES        | 1 +
 src/gba/core.c | 2 +-
 src/gba/gba.c  | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index fd6b1686d..4136a51a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ Other fixes:
  - FFmpeg: Improve initialization reliability and cleanup
  - Wii: Fix aspect ratio (fixes mgba.io/i/500)
  - FFmpeg: Fix audio conversion producing gaps
+ - GBA: Fix skipping BIOS on irregularly sized ROMs
 Misc:
  - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323)
  - Qt: Improve camera initialization
diff --git a/src/gba/core.c b/src/gba/core.c
index 05225bc56..9f8e0d633 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -445,7 +445,7 @@ static void _GBACoreReset(struct mCore* core) {
 #endif
 
 	ARMReset(core->cpu);
-	if (core->opts.skipBios && gba->isPristine) {
+	if (core->opts.skipBios && (gba->romVf || gba->memory.rom)) {
 		GBASkipBIOS(core->board);
 	}
 }
diff --git a/src/gba/gba.c b/src/gba/gba.c
index ba946f0d7..05a5aa715 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -218,10 +218,6 @@ void GBAReset(struct ARMCore* cpu) {
 	if (gba->pristineRomSize > SIZE_CART0) {
 		GBAMatrixReset(gba);
 	}
-
-	if (!gba->romVf && gba->memory.rom) {
-		GBASkipBIOS(gba);
-	}
 }
 
 void GBASkipBIOS(struct GBA* gba) {