From d7190c797f43c53d48fa9d39b013e109ca356b7b Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Sat, 6 Jul 2019 10:09:26 -0400 Subject: [PATCH] Fix Castle tower door in inverted --- entrances.asm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/entrances.asm b/entrances.asm index b09f5b1..5996858 100644 --- a/entrances.asm +++ b/entrances.asm @@ -12,18 +12,20 @@ LockAgahnimDoors: JSR.w LockAgahnimDoorsCore : RTL + : CMP.w #$0002 : BNE + JSR.w LockAgahnimDoorsCore : BEQ .unlock + PHX : PHY SEP #$30 JSL.l CheckEnoughCrystalsForTower REP #$30 - BEQ .crystalOrUnlock + PLY : PLX + !BGE .crystalOrUnlock LDA #$0001 : RTL .crystalOrUnlock LDA InvertedMode : AND.w #$00FF : BEQ .unlock LDA $7EF2C3 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not - LDA $0308 : AND.w #$0080 : BEQ + ;If we are holding an item + LDA $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item LDA #$0001 : RTL ;Keep the door locked - + + ++ SEP #$30 JSL $099B6F ;Add tower break seal LDA $7EF2C3 : ORA #$20 : STA $7EF2C3 ; activate GT overlay