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

Merge branch 'OWMain' into overworld_kara

Browse Source
This commit is contained in:
karafruit
2023-02-26 14:30:05 -06:00
parent ec6231955d 750c412f59
commit bfbc180ff3
10 changed files with 375 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
inventory.asm
View File

@@ -337,9 +337,9 @@ AddInventory:
LDA PreMirrorLocations : INC : STA PreMirrorLocations ; Increment Pre Mirror Counter
SEP #$20
+
LDA FluteEquipment : BNE + ; Check for Mirror
LDA FluteEquipment : BNE + ; Check for Flute
REP #$20
LDA PreFluteLocations : INC : STA PreFluteLocations ; Increment Pre Mirror Counter
LDA PreFluteLocations : INC : STA PreFluteLocations ; Increment Pre Flute Counter
SEP #$20
+
REP #$20
@@ -841,6 +841,22 @@ UpgradeFlute:
RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
; FluteCallForDuck:
;--------------------------------------------------------------------------------
; sets A to #$02 to ignore summoning the duck
FluteCallForDuck:
LDA.l WarningFlags : AND.b #$20 : BNE .vanilla ; glitched modes allowed flute in rain state
LDA.l ProgressIndicator : CMP.b #$02 : BCS .vanilla ; must rescue Zelda first
.noDuck
LDA.b #$02 : RTL
.vanilla
LDA.l FluteEquipment ; what we wrote over
RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
; CheckKeys:
;--------------------------------------------------------------------------------