From 0ac446bedad95bf1d422691a16f5670a6758ff28 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Fri, 16 Dec 2022 22:12:24 -0800
Subject: [PATCH] Check gba->mbVf for force skipping the BIOS (#2754)

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

diff --git a/CHANGES b/CHANGES
index d06564d26..04ab3c850 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ Emulation fixes:
  - GBA Video: Ignore disabled backgrounds as OBJ blend target (fixes mgba.io/i/2489)
  - GBA Video: Disable BG target 1 blending when OBJ blending (fixes mgba.io/i/2722)
 Other fixes:
+ - GBA: Fix forceskip BIOS logic for multiboot ROMs (fixes mgba.io/i/2753)
  - Qt: Manually split filename to avoid overzealous splitting (fixes mgba.io/i/2681)
  - Qt: Expand criteria for tag branch names (fixes mgba.io/i/2679)
  - Qt: Fix scanning specific e-Reader dotcodes (fixes mgba.io/i/2693)
diff --git a/src/gba/core.c b/src/gba/core.c
index 68ea66c79..b44c8aa5c 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->romVf && GBAIsMB(gba->romVf);
+	bool forceSkip = gba->mbVf;
 	if (!(forceSkip || core->opts.skipBios) && (gba->romVf || gba->memory.rom) && gba->pristineRomSize >= 0xA0 && gba->biosVf) {
 		uint32_t crc = doCrc32(&gba->memory.rom[1], 0x9C);
 		if (crc != LOGO_CRC32) {