alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update entrances.asm"

Browse Source 
This reverts commit f4a336db9e.
This commit is contained in:
cassidy
2021-05-22 12:46:35 -04:00
parent b09b214ac0
commit 327f08ce35
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
entrances.asm
View File

@@ -4,7 +4,9 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
LockAgahnimDoors: LockAgahnimDoors:
LDA.l AgahnimDoorStyle : AND.w #$00FF LDA.l AgahnimDoorStyle : AND.w #$00FF
BEQ .exit ; don't need to load 0, because we'd have it if we reached here BNE +
;#$0 = Never Locked
LDA.w #$0000 : RTL
+ : CMP.w #$0001 : BNE + + : CMP.w #$0001 : BNE +
LDA $7EF3C5 : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip LDA $7EF3C5 : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip
JSR.w LockAgahnimDoorsCore : RTL JSR.w LockAgahnimDoorsCore : RTL
@@ -35,7 +37,7 @@ LockAgahnimDoors:
.unlock .unlock
LDA.w #$0000 ; fallback to never locked LDA.w #$0000 ; fallback to never locked
.exit
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
LockAgahnimDoorsCore: LockAgahnimDoorsCore:
@@ -202,14 +204,14 @@ RTL
AnimatedEntranceFix: ;when an entrance animation tries to start AnimatedEntranceFix: ;when an entrance animation tries to start
PHA PHA
LDA.l InvertedMode : BEQ + ;If we are in inverted mode LDA.l InvertedMode : BEQ + ;If we are in inverted mode
PLA LDA $8A : AND.b #$40 : BNE + ;and in the light world
BIT $8A : BVS ++ ; and in the light world PLA
STZ $04C6 ; skip it. STZ $04C6 ; skip it.
LDA #$00 LDA #$00
RTL RTL
+ +
PLA PLA
++ STA $02E4 ;what we wrote over STA $02E4 ;what we wrote over
STA $0FC1 ;what we wrote over STA $0FC1 ;what we wrote over
STA $0710 ;what we wrote over STA $0710 ;what we wrote over
RTL RTL