diff --git a/CHANGES b/CHANGES index 76721375d..b19f2da83 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ 0.5.3: (Future) Bugfixes: - ARM7: Fix MLA/*MULL/*MLAL timing + - GBA: Fix multiboot ROM loading 0.5.2: (2016-12-31) Bugfixes: diff --git a/src/gba/core.c b/src/gba/core.c index e4d7beef6..4b1f6da67 100644 --- a/src/gba/core.c +++ b/src/gba/core.c @@ -193,6 +193,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); }