alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Fix crystals lock for aga door

Browse Source 
Totally untested, may not even assemble.
This commit is contained in:
Kevin Cathcart
2018-09-02 09:59:01 -04:00
committed by GitHub
parent 9155d43a50
commit 6dc8991b99
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
entrances.asm
View File

@@ -8,22 +8,21 @@ LockAgahnimDoors:
;#$0 = Never Locked ;#$0 = Never Locked
LDA.w #$0000 : RTL LDA.w #$0000 : RTL
+ : CMP.w #$0001 : BNE + + : CMP.w #$0001 : BNE +
JSR.w OldLockAgahnimDoors : RTL LDA $7EF3C5 : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip
JSR.w LockAgahnimDoorsCore : RTL
+ : CMP.w #$0002 : BNE + + : CMP.w #$0002 : BNE +
LDA $7EF37A : AND.w #$007F : CMP.w #$007F : BEQ .unlock LDA $7EF37A : AND.w #$007F : CMP.w #$007F : BEQ .unlock
LDA.w #$0001 JSR.w LockAgahnimDoorsCore : RTL
RTL
+ +
.unlock .unlock
LDA.w #$0000 ; fallback to never locked LDA.w #$0000 ; fallback to never locked
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OldLockAgahnimDoors: LockAgahnimDoorsCore:
LDA $7EF3C5 : AND.w #$000F : CMP.w #$0002 : !BGE + ; if we rescued zelda, skip LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip
LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip CMP.w #2088 : !BGE + ; door too rat right, skip
CMP.w #2088 : !BGE + ; door too rat right, skip LDA $20 : CMP.w #1720 : !BGE + ; door too low, skip
LDA $20 : CMP.w #1720 : !BGE + ; door too low, skip LDA.w #$0001
LDA.w #$0001
RTS RTS
+ +
LDA.w #$0000 LDA.w #$0000