Fixed issue with HP refill canceling out of post-boss cutscene
This commit is contained in:
@@ -419,6 +419,26 @@ SetDungeonCompleted:
|
|||||||
+
|
+
|
||||||
RTS
|
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:
|
ClearMultiworldText:
|
||||||
PHP : PHX
|
PHP : PHX
|
||||||
SEP #$30
|
SEP #$30
|
||||||
|
|||||||
@@ -1047,6 +1047,7 @@ org $8799EA : JML SetItemPose
|
|||||||
org $88C415 : JSL PendantMusicCheck
|
org $88C415 : JSL PendantMusicCheck
|
||||||
BCS Ancilla22_ItemReceipt_is_pendant : BRA Ancilla22_ItemReceipt_wait_for_music
|
BCS Ancilla22_ItemReceipt_is_pendant : BRA Ancilla22_ItemReceipt_wait_for_music
|
||||||
;org $88C452 : JSL MaybeKeepLootID : NOP #2 DR overwrote hook see RetrieveBunnyState
|
;org $88C452 : JSL MaybeKeepLootID : NOP #2 DR overwrote hook see RetrieveBunnyState
|
||||||
|
org $88C469 : JSL MaybeSkipHeartRefill : db $90 ;BCC
|
||||||
org $88C61D : JSL AnimatePrizeCutscene : NOP
|
org $88C61D : JSL AnimatePrizeCutscene : NOP
|
||||||
org $88C622 : BCC ItemReceipt_Animate_continue
|
org $88C622 : BCC ItemReceipt_Animate_continue
|
||||||
org $88C6BA : JSL CheckPoseItemCoordinates
|
org $88C6BA : JSL CheckPoseItemCoordinates
|
||||||
|
|||||||
Reference in New Issue
Block a user