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

fix: disable flute in rain state (except glitched modes)

Browse Source 
fix(msu): GTBK music in DR
This commit is contained in:
Randall Rupper
2023-11-15 14:30:44 -07:00
parent 1290751307
commit 62356f0159
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
inventory.asm
View File

@@ -820,6 +820,20 @@ UpgradeFlute:
LDA.b #$03 : STA FluteEquipment ; upgrade primary inventory
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: