From 7e1e7d225375db8c79db56fed518c7fd7689f252 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 14 Dec 2024 22:28:08 -0800
Subject: [PATCH] GBA Core: Fix booting into BIOS when skip BIOS is enabled

---
 CHANGES        | 1 +
 src/gba/core.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index eb818acfc..b08e39490 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/src/gba/core.c b/src/gba/core.c
index 08d20f3e7..5401c1205 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -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) {