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.
Z3DR · Jul 11, 2024 · 702dbc5 · 702dbc5
1 parent 39bacdb
commit 702dbc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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