From 3f61f68f22bd5545d4d65ad7f78b7426fe1e8c34 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 1 Jan 2017 22:04:04 -0800
Subject: [PATCH] GBA: Fix multiboot ROM loading

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

diff --git a/CHANGES b/CHANGES
index 461248c44..261370424 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ Bugfixes:
  - GBA Memory: Improve initial skipped BIOS state
  - GBA BIOS: Implement BitUnPack
  - ARM7: Fix MLA/*MULL/*MLAL timing
+ - GBA: Fix multiboot ROM loading
 Misc:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers
diff --git a/src/gba/core.c b/src/gba/core.c
index 52b7be0d9..397cdcb7d 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -198,6 +198,9 @@ static void _GBACoreSetAVStream(struct mCore* core, struct mAVStream* stream) {
 }
 
 static bool _GBACoreLoadROM(struct mCore* core, struct VFile* vf) {
+	if (GBAIsMB(vf)) {
+		return GBALoadMB(core->board, vf);
+	}
 	return GBALoadROM(core->board, vf);
 }