all repos — mgba @ 3f61f68f22bd5545d4d65ad7f78b7426fe1e8c34

mGBA Game Boy Advance Emulator

GBA: Fix multiboot ROM loading
Jeffrey Pfau jeffrey@endrift.com
Sun, 01 Jan 2017 22:04:04 -0800
commit

3f61f68f22bd5545d4d65ad7f78b7426fe1e8c34

parent

180418a74f035dfd8b7bddb2a437b9ed9b528d3a

2 files changed, 4 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -12,6 +12,7 @@ - GB Timer: Improve DIV reset behavior

- 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
M src/gba/core.csrc/gba/core.c

@@ -198,6 +198,9 @@ }

} static bool _GBACoreLoadROM(struct mCore* core, struct VFile* vf) { + if (GBAIsMB(vf)) { + return GBALoadMB(core->board, vf); + } return GBALoadROM(core->board, vf); }