Attempt to improve handling of thumb signatures in CardiTaskThreadPatch

2026-06-08 04:07:17 +02:00 · 2025-12-26 12:39:10 +01:00
parent e58a55b81c
commit c8898ff13c
2 changed files with 84 additions and 60 deletions
--- a/arm9/source/patches/arm7/sdk2to4/CardiTaskThreadPatch.h
+++ b/arm9/source/patches/arm7/sdk2to4/CardiTaskThreadPatch.h
@@ -10,12 +10,18 @@ public:
    enum class PatchVariant : u16
    {
        None,
-        A,
-        B,
-        C,
-        D,
-        E,
-        F
+        ArmA,
+        ArmB,
+        ArmC,
+        ArmD,
+        ArmE,
+        ArmF,
+        ThumbA,
+        ThumbB,
+        ThumbC,
+        ThumbD,
+        ThumbE,
+        ThumbF
    };

    bool FindPatchTarget(PatchContext& patchContext) override;
@@ -23,7 +29,6 @@ public:

 private:
    u32* _cardiTaskThread = nullptr;
-    u16 _thumb = false;
    PatchVariant _patchVariant = PatchVariant::None;

    bool CheckSignature(const PatchContext& patchContext, const FunctionSignature& signature);