From 879b02387ed125904d04ad4cac1393ca6903a2f0 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Wed, 29 May 2024 16:16:05 -0500
Subject: [PATCH] Fixed issue with HP refill canceling out of post-boss
 cutscene

---
 dungeondrops.asm | 20 ++++++++++++++++++++
 hooks.asm        |  1 +
 2 files changed, 21 insertions(+)

diff --git a/dungeondrops.asm b/dungeondrops.asm
index b7388ec..cdc64fa 100644
--- a/dungeondrops.asm
+++ b/dungeondrops.asm
@@ -419,6 +419,26 @@ SetDungeonCompleted:
         +
 RTS
 
+MaybeSkipHeartRefill:
+        LDA.w CurrentControlRequest : CMP.b #$13 : BNE .vanilla
+        LDA.l HeartPieceQuarter : BNE +
+                ; increase health
+                LDA.l MaximumHealth : CMP.b #$A0 : BEQ .reset_skip
+                CLC : ADC.b #$08 : STA.l MaximumHealth
+        +
+        .reset_skip
+        LDA.b #$00 ; just to ensure the MaximumHealth doesn't flow outside
+        BRA .skip
+
+        .vanilla
+        LDA.l HeartPieceQuarter : BEQ .do ; what we wrote over
+.skip
+CLC
+RTL
+.do
+SEC
+RTL
+
 ClearMultiworldText:
         PHP : PHX 
                 SEP #$30
diff --git a/hooks.asm b/hooks.asm
index 54d6f2e..ccf806e 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1047,6 +1047,7 @@ org $8799EA : JML SetItemPose
 org $88C415 : JSL PendantMusicCheck
 BCS Ancilla22_ItemReceipt_is_pendant : BRA Ancilla22_ItemReceipt_wait_for_music
 ;org $88C452 : JSL MaybeKeepLootID : NOP #2 DR overwrote hook see RetrieveBunnyState
+org $88C469 : JSL MaybeSkipHeartRefill : db $90 ;BCC
 org $88C61D : JSL AnimatePrizeCutscene : NOP
 org $88C622 : BCC ItemReceipt_Animate_continue
 org $88C6BA : JSL CheckPoseItemCoordinates