scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove book activation for zora waterfall overlay event

Browse Source
This commit is contained in:
scawful
2024-06-18 17:34:20 -04:00
parent c340485a35
commit c643fb8a91
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Overworld/overlays.asm
View File

@@ -63,8 +63,15 @@ org $07866D
; SEP #$20 ; SEP #$20
; ================================================ ; ================================================
; Overlays $04C6
; 01 - Zora Temple (OW 1E)
; 02 - Kalyxo Castle Bridge
; 03 - Tail Palace
; 04 - TODO: Shrines
; 05 - TODO: Fortress of Secrets
;Desert Book activation trigger ; LinkItem_Book
; Desert Book activation trigger
org $07A484 ; LDA $02ED : BNE BRANCH_BETA org $07A484 ; LDA $02ED : BNE BRANCH_BETA
NOP #01 NOP #01
JML NewDesertCheck JML NewDesertCheck
@@ -81,20 +88,10 @@ NewDesertCheck:
; STZ $9A ; STZ $9A
; STZ.w $012D ; STZ.w $012D
LDA $8A : CMP.b #$1E : BEQ .zora LDA $8A : CMP.b #$1B : BEQ .castle
CMP.b #$1B : BEQ .castle JMP +
CMP.b #$2F : BEQ .tail_palace
JMP + ; returnPos
.tail_palace
LDA.b #$03 : STA.w $04C6
JMP .continue
.castle .castle
LDA.b #$02 : STA.w $04C6 LDA.b #$02 : STA.w $04C6
JMP .continue
.zora
LDA.b #$01 : STA.w $04C6 ; set entrance animation
.continue
STZ.b $B0 STZ.b $B0
STZ.b $C8 STZ.b $C8