Fixed issue with HP refill canceling out of post-boss cutscene

2024-05-29 16:16:05 -05:00
parent 07b0333d51
commit 879b02387e
2 changed files with 21 additions and 0 deletions
--- 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