From fb12372ae3e5b71b9c2fc07657bd2601f842709e Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 10 Feb 2020 18:08:07 -0800
Subject: [PATCH] GBA: Automatically skip BIOS for multiboot ROMs

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

diff --git a/CHANGES b/CHANGES
index d3122f5c6..234cffb8c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ Other fixes:
  - Debugger: Don't skip undefined instructions when debugger attached
  - FFmpeg: Fix crash when -strict -2 is needed for vcodec or container
  - FFmpeg: Disallow recording video with no audio nor video
+ - GBA: Automatically skip BIOS for multiboot ROMs
  - Qt: Only dynamically reset video scale if a game is running
  - Qt: Fix race condition with proxied video events
  - Qt: Force OpenGL paint engine creation thread (fixes mgba.io/i/1642)
diff --git a/src/gba/core.c b/src/gba/core.c
index ab64241a9..46cf7f5e5 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -636,7 +636,7 @@ static void _GBACoreReset(struct mCore* core) {
 #endif
 
 	ARMReset(core->cpu);
-	if (core->opts.skipBios && (gba->romVf || gba->memory.rom)) {
+	if ((core->opts.skipBios && (gba->romVf || gba->memory.rom)) || (gba->romVf && GBAIsMB(gba->romVf))) {
 		GBASkipBIOS(core->board);
 	}
 }