Include option to enable restoration twinmold.

code/include/rnd/boss.h

@@ -18,6 +18,9 @@ extern "C" {
 
 namespace rnd {
   void FixBosses();
-}  // namespace rnd
+  extern "C" {
+    u8 IsTwinmoldSetToRestoration();
+  }
+} // namespace rnd 
 
 #endif

code/include/rnd/settings.h

@@ -402,6 +402,7 @@ namespace rnd {
     u8 enableFastMaskTransform;
     u8 enableFastOcarina;
     u8 enableFastArrowSwap;
+    u8 twinmoldRestoration;
 
     // Cutscene Skips
     u8 skipHMSCutscenes;

code/source/asm/boss_hooks.s

@@ -7,4 +7,17 @@ hook_PostActorCalc:
   bl PostActorCalc @ found in main.cpp
   pop {r0-r12,lr}
   add r3,r5,#0x10
+  bx lr
+
+.global hook_TwinmoldConsistentDamage
+hook_TwinmoldConsistentDamage:
+  push {r0-r12, lr}
+  bl IsTwinmoldSetToRestoration
+  cmp r0,#0x1
+  beq restorationTwinmold
+  pop {r0-r12,lr}
+  sub r0,r2,r0
+  bx lr
+restorationTwinmold:
+  pop {r0-r12,lr}
   bx lr

code/source/asm/boss_patches.s

@@ -1,6 +1,13 @@
 .arm
 
+
 .section .patch_PostActorCalc
 .global patch_PostActorCalc
 patch_PostActorCalc:
-  bl hook_PostActorCalc
+  bl hook_PostActorCalc
+
+@ Remove call from twinmold->life -= twinmold_min_damage.
+.section .patch_TwinmoldConsistentDamage
+.global patch_TwinmoldConsistentDamage
+patch_TwinmoldConsistentDamage:
+    bl hook_TwinmoldConsistentDamage

code/source/asm/patches.s

@@ -192,12 +192,6 @@ patch_ItemCloseOnSelect:
 patch_HandleOcarinaHooks:
     b hook_HandleOcarina
 
-@ Remove call from twinmold->life -= twinmold_min_damage.
-.section .patch_TwinmoldConsistentDamage
-.global patch_TwinmoldConsistentDamage
-patch_TwinmoldConsistentDamage:
-    nop
-
 .section .patch_FasterBlockMovement
 .global patch_FasterBlockMovement
 patch_FasterBlockMovement:

code/source/rnd/boss.cpp

@@ -88,6 +88,13 @@ namespace rnd {
       state->red_prev_hit_counter = red_twinmold->hit_counter;
   }
   void FixBosses() {
-    FixTwinmold();
+    if (IsTwinmoldSetToRestoration())
+      FixTwinmold();
+  }
+
+  extern "C" {
+    u8 IsTwinmoldSetToRestoration() {
+      return gSettingsContext.twinmoldRestoration;
+    }
   }
 }  // namespace rnd