Fix remain overrides to be consolidated to one function. (#89)

Z3DR · Jul 19, 2024 · 3150cab · 3150cab
1 parent 4973f69
commit 3150cab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/code/mm.ld b/code/mm.ld
@@ -432,7 +432,7 @@ SECTIONS{
     *(.patch_OverrideItem00Init)
   }
 
-  .patch_OverrideRemainSpawn 0x3DE1A0 : {
+  .patch_OverrideRemainSpawn 0x389E7C : {
     *(.patch_OverrideRemainSpawn)
   }
 
@@ -552,15 +552,6 @@ SECTIONS{
     *(.patch_LoadExtData)
   }
 
-  .patch_OverrideRemainSpawnTwo 0x4ABF10 : {
-    *(.patch_OverrideRemainSpawnTwo)
-  }
-
-  .patch_OverrideRemainSpawnThree 0x4ABF20 : {
-    *(.patch_OverrideRemainSpawnThree)
-  }
-
-
   .patch_RemoveKafeiItemFromExtSlot 0x4AD1B8 : {
     *(.patch_RemoveKafeiItemFromExtSlot)
   }

diff --git a/code/source/asm/item_override_hooks.s b/code/source/asm/item_override_hooks.s
@@ -160,7 +160,6 @@ hook_CheckOshExtData:
 hook_OverrideRemainSpawn:
     push {r1-r12,lr}
     bl ItemOverride_CheckBossStatus
-    cmp r0,#0x0
     pop {r1-r12,lr}
     bx lr
 

diff --git a/code/source/asm/item_override_patches.s b/code/source/asm/item_override_patches.s
@@ -70,17 +70,7 @@ patch_OverrideQuiverArcheryTwo:
 .section .patch_OverrideRemainSpawn
 .global patch_OverrideRemainSpawn
 patch_OverrideRemainSpawn:
-    bl hook_OverrideRemainSpawn
-
-.section .patch_OverrideRemainSpawnTwo
-.global patch_OverrideRemainSpawnTwo
-patch_OverrideRemainSpawnTwo:
-    bl hook_OverrideRemainSpawn
-
-.section .patch_OverrideRemainSpawnThree
-.global patch_OverrideRemainSpawnThree
-patch_OverrideRemainSpawnThree:
-    bl hook_OverrideRemainSpawn
+    b hook_OverrideRemainSpawn
 
 .section .patch_OverrideWalletSpiderHouseTwo
 .global patch_OverrideWalletSpiderHouseTwo