From 702dbc5a03381581006143a763f9e05b68c5dadb Mon Sep 17 00:00:00 2001 From: PhlexPlexico Date: Wed, 10 Jul 2024 19:59:26 -0600 Subject: [PATCH] Fix Boss Remain Override and Skulltula Override (#80) * Remove spidertoken override temporarily. Not needed since skullsanity isn't quite ready yet appside. * Fix get item overrides for boss remains and skulltula tokens. --- code/mm.ld | 2 +- code/source/asm/item_override_hooks.s | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/mm.ld b/code/mm.ld index 70b621d..1876359 100644 --- a/code/mm.ld +++ b/code/mm.ld @@ -312,7 +312,7 @@ SECTIONS{ *(.patch_CheckDungeonSmallKeys) } - .patch_OverrideRemainGetItem 0x2347F8 : { + .patch_OverrideRemainGetItem 0x2347FC : { *(.patch_OverrideRemainGetItem) } diff --git a/code/source/asm/item_override_hooks.s b/code/source/asm/item_override_hooks.s index 3a57f51..2c80727 100644 --- a/code/source/asm/item_override_hooks.s +++ b/code/source/asm/item_override_hooks.s @@ -64,8 +64,7 @@ hook_OverrideRemainGetItem: cmp r2,#0x0 pop {r2} bne 0x23406C - cmp r2,#0x3 - bhi 0x234878 + ldr r0,[r0,#-0x174] bx lr @@ -99,10 +98,9 @@ hook_RemoveSkulltulaTokenGetItem: cmp r0,#0x0 pop {r0-r12,lr} beq skulltulaNotOverridden - bx lr + b 0x233C64 @branch back up to other checks. skulltulaNotOverridden: - cmp r4, #0x6E - beq 0x233CB8 + ldr r1,[r7,#0x1F8] bx lr .global hook_OverrideTextID