ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA: Fix multiboot ROM loading

This commit is contained in:
Jeffrey Pfau 2017-01-01 22:04:04 -08:00
parent 180418a74f
commit 3f61f68f22
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -12,6 +12,7 @@ Bugfixes:
- GBA Memory: Improve initial skipped BIOS state - GBA Memory: Improve initial skipped BIOS state
- GBA BIOS: Implement BitUnPack - GBA BIOS: Implement BitUnPack
- ARM7: Fix MLA/*MULL/*MLAL timing - ARM7: Fix MLA/*MULL/*MLAL timing
- GBA: Fix multiboot ROM loading
Misc: Misc:
- SDL: Remove scancode key input - SDL: Remove scancode key input
- GBA Video: Clean up unused timers - GBA Video: Clean up unused timers

3
src/gba/core.c
View File

@ -198,6 +198,9 @@ static void _GBACoreSetAVStream(struct mCore* core, struct mAVStream* stream) {
} }
static bool _GBACoreLoadROM(struct mCore* core, struct VFile* vf) { static bool _GBACoreLoadROM(struct mCore* core, struct VFile* vf) {
if (GBAIsMB(vf)) {
return GBALoadMB(core->board, vf);
}
return GBALoadROM(core->board, vf); return GBALoadROM(core->board, vf);
} }