From a966511e1e1128ee7716886bb13097b9fda7f527 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 18 Feb 2022 22:15:31 -0800 Subject: [PATCH] GBA: Fix expected entry point for multiboot ELFs (fixes #2450) --- src/gba/gba.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gba/gba.c b/src/gba/gba.c index 86b597dc2..2fd1fbe7a 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -582,7 +582,7 @@ bool GBAIsROM(struct VFile* vf) { uint32_t entry = ELFEntry(elf); bool isGBA = true; isGBA = isGBA && ELFMachine(elf) == EM_ARM; - isGBA = isGBA && (entry == BASE_CART0 || entry == BASE_WORKING_RAM); + isGBA = isGBA && (entry == BASE_CART0 || entry == BASE_WORKING_RAM + 0xC0); ELFClose(elf); return isGBA; } @@ -641,7 +641,7 @@ bool GBAIsMB(struct VFile* vf) { #ifdef USE_ELF struct ELF* elf = ELFOpen(vf); if (elf) { - bool isMB = ELFEntry(elf) == BASE_WORKING_RAM; + bool isMB = ELFEntry(elf) == BASE_WORKING_RAM + 0xC0; ELFClose(elf); return isMB; }