From fd08fd19a184998617c0d4eab9b364ba5cc08953 Mon Sep 17 00:00:00 2001 From: Mow <32942550+taxicat1@users.noreply.github.com> Date: Fri, 9 Jan 2026 09:39:23 -0500 Subject: [PATCH] Handle BLX branches in CardiTryReadCardDmaPatch (#91) --- arm9/source/patches/arm9/sdk2to4/CardiTryReadCardDmaPatch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm9/source/patches/arm9/sdk2to4/CardiTryReadCardDmaPatch.cpp b/arm9/source/patches/arm9/sdk2to4/CardiTryReadCardDmaPatch.cpp index b7a4a60..d5977d9 100644 --- a/arm9/source/patches/arm9/sdk2to4/CardiTryReadCardDmaPatch.cpp +++ b/arm9/source/patches/arm9/sdk2to4/CardiTryReadCardDmaPatch.cpp @@ -167,7 +167,7 @@ bool CardiTryReadCardDmaPatch::FindPatchTarget(PatchContext& patchContext) static u32 getArmBlAddress(const u32* instructionPointer) { u32 blInstruction = *instructionPointer; - return (u32)instructionPointer + 8 + ((int)((blInstruction & 0xFFFFFF) << 8) >> 6); + return (u32)instructionPointer + 8 + ((int)((blInstruction & 0xFFFFFF) << 8) >> 6) + ((blInstruction >> 24) == 0xFA ? 1 : 0); } void CardiTryReadCardDmaPatch::ApplyPatch(PatchContext& patchContext)