Fixed issue where Aga Door flag prevented TF Cutscene

This commit is contained in:
codemann8
2023-06-29 19:28:49 -05:00
parent cac3ecf4ef
commit 144817fe90

View File

@@ -121,6 +121,9 @@ pushpc
org $0589B1
MasterSword_ConditionalHandleReceipt_DoReceipt:
org $0588DF
JSL MasterSword_CheckIfPulled : PLX : NOP #2
db $90 ; BCC instead of BEQ
org $05890E
JSL MasterSword_ConditionalActivateCutscene
org $05895F
@@ -134,6 +137,12 @@ pushpc
JSL MasterSword_ConditionalHandleReceipt : NOP #2
pullpc
MasterSword_CheckIfPulled:
CPX.b #$80 : BEQ +
- CLC : RTL ; not on pedestal screen, continue with cutscene
+ LDA.l $7EF280,X : AND.b #$40 ; what we wrote over
BEQ - : SEC : RTL
MasterSword_ConditionalActivateCutscene:
LDA.w $0D90,X : BNE .specialCutscene
JML Sprite_CheckDamageToPlayerSameLayerLong ; what we wrote over