From 8bc0802f37423a44535098acee436527f5879701 Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Thu, 4 Sep 2025 08:30:10 -0400 Subject: [PATCH 1/3] Point Light Fixes Signed-off-by: Isaac Marovitz --- MarathonRecomp/patches/misc_patches.cpp | 4 +++ MarathonRecompLib/config/Marathon.toml | 40 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/MarathonRecomp/patches/misc_patches.cpp b/MarathonRecomp/patches/misc_patches.cpp index 8096aec78..8516a722e 100644 --- a/MarathonRecomp/patches/misc_patches.cpp +++ b/MarathonRecomp/patches/misc_patches.cpp @@ -113,3 +113,7 @@ PPC_FUNC(sub_824A6EA8) __imp__sub_824A6EA8(ctx, base); } + +void SkipSPAABBTree() {} + +void SkipUpdateOptimisation() {} diff --git a/MarathonRecompLib/config/Marathon.toml b/MarathonRecompLib/config/Marathon.toml index c0dc500bf..b1dd359c4 100644 --- a/MarathonRecompLib/config/Marathon.toml +++ b/MarathonRecompLib/config/Marathon.toml @@ -289,3 +289,43 @@ jump_address_on_true = 0x821A2988 name = "ControllableSpinkick" address = 0x821A7A04 jump_address_on_true = 0x821A7A08 + +[[midasm_hook]] +name = "SkipSPAABBTree" +address = 0x8258DBC4 +jump_address = 0x8258DBE0 + +[[midasm_hook]] +name = "SkipSPAABBTree" +address = 0x8258DF60 +jump_address = 0x8258DF7C + +[[midasm_hook]] +name = "SkipSPAABBTree" +address = 0x8258E29C +jump_address = 0x8258E2B8 + +[[midasm_hook]] +name = "SkipSPAABBTree" +address = 0x8258E598 +jump_address = 0x8258E5B4 + +[[midasm_hook]] +name = "SkipUpdateOptimisation" +address = 0x8258DC28 +jump_address = 0x8258DC2C + +[[midasm_hook]] +name = "SkipUpdateOptimisation" +address = 0x8258DFC4 +jump_address = 0x8258DFC8 + +[[midasm_hook]] +name = "SkipUpdateOptimisation" +address = 0x8258E304 +jump_address = 0x8258E308 + +[[midasm_hook]] +name = "SkipUpdateOptimisation" +address = 0x8258E600 +jump_address = 0x8258E604 From 7f9d88b56365f8828d7e7f60dba1250d168fcfdf Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Thu, 4 Sep 2025 16:46:17 -0400 Subject: [PATCH 2/3] Hyper suggestions Signed-off-by: Isaac Marovitz --- MarathonRecomp/patches/misc_patches.cpp | 4 +--- MarathonRecompLib/config/Marathon.toml | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/MarathonRecomp/patches/misc_patches.cpp b/MarathonRecomp/patches/misc_patches.cpp index 8516a722e..cda64792b 100644 --- a/MarathonRecomp/patches/misc_patches.cpp +++ b/MarathonRecomp/patches/misc_patches.cpp @@ -114,6 +114,4 @@ PPC_FUNC(sub_824A6EA8) __imp__sub_824A6EA8(ctx, base); } -void SkipSPAABBTree() {} - -void SkipUpdateOptimisation() {} +void NOP() {} diff --git a/MarathonRecompLib/config/Marathon.toml b/MarathonRecompLib/config/Marathon.toml index b1dd359c4..146155e17 100644 --- a/MarathonRecompLib/config/Marathon.toml +++ b/MarathonRecompLib/config/Marathon.toml @@ -290,42 +290,50 @@ name = "ControllableSpinkick" address = 0x821A7A04 jump_address_on_true = 0x821A7A08 +# Skip SPAABBTree initalisation for point light search [[midasm_hook]] -name = "SkipSPAABBTree" +name = "NOP" address = 0x8258DBC4 jump_address = 0x8258DBE0 +# Skip SPAABBTree initalisation for point light search [[midasm_hook]] -name = "SkipSPAABBTree" +name = "NOP" address = 0x8258DF60 jump_address = 0x8258DF7C +# Skip SPAABBTree initalisation for point light search [[midasm_hook]] -name = "SkipSPAABBTree" +name = "NOP" address = 0x8258E29C jump_address = 0x8258E2B8 +# Skip SPAABBTree initalisation for point light search [[midasm_hook]] -name = "SkipSPAABBTree" +name = "NOP" address = 0x8258E598 jump_address = 0x8258E5B4 +# Skip point light update optimisation [[midasm_hook]] -name = "SkipUpdateOptimisation" +name = "NOP" address = 0x8258DC28 jump_address = 0x8258DC2C +# Skip point light update optimisation [[midasm_hook]] -name = "SkipUpdateOptimisation" +name = "NOP" address = 0x8258DFC4 jump_address = 0x8258DFC8 +# Skip point light update optimisation [[midasm_hook]] -name = "SkipUpdateOptimisation" +name = "NOP" address = 0x8258E304 jump_address = 0x8258E308 +# Skip point light update optimisation [[midasm_hook]] -name = "SkipUpdateOptimisation" +name = "NOP" address = 0x8258E600 jump_address = 0x8258E604 From f3a71a8d5cda9ae025a7a1e84e737573b933b20f Mon Sep 17 00:00:00 2001 From: Isaac Marovitz Date: Thu, 4 Sep 2025 16:48:20 -0400 Subject: [PATCH 3/3] Fix typo Signed-off-by: Isaac Marovitz --- MarathonRecompLib/config/Marathon.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MarathonRecompLib/config/Marathon.toml b/MarathonRecompLib/config/Marathon.toml index 146155e17..852886a90 100644 --- a/MarathonRecompLib/config/Marathon.toml +++ b/MarathonRecompLib/config/Marathon.toml @@ -290,25 +290,25 @@ name = "ControllableSpinkick" address = 0x821A7A04 jump_address_on_true = 0x821A7A08 -# Skip SPAABBTree initalisation for point light search +# Skip SPAABBTree initialisation for point light search [[midasm_hook]] name = "NOP" address = 0x8258DBC4 jump_address = 0x8258DBE0 -# Skip SPAABBTree initalisation for point light search +# Skip SPAABBTree initialisation for point light search [[midasm_hook]] name = "NOP" address = 0x8258DF60 jump_address = 0x8258DF7C -# Skip SPAABBTree initalisation for point light search +# Skip SPAABBTree initialisation for point light search [[midasm_hook]] name = "NOP" address = 0x8258E29C jump_address = 0x8258E2B8 -# Skip SPAABBTree initalisation for point light search +# Skip SPAABBTree initialisation for point light search [[midasm_hook]] name = "NOP" address = 0x8258E598