diff --git a/hooks.asm b/hooks.asm index 092b530..13a92f3 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1299,6 +1299,9 @@ org $08D395 ; <- 45395 - ancilla_bird_travel_intro.asm : 253 JSL.l UpgradeFlute NOP #2 ;-------------------------------------------------------------------------------- +org $07A408 ; LDA.l $7EF34C +JSL.l FluteCallForDuck +;-------------------------------------------------------------------------------- org $05E4D7 ; <- 2E4D7 - sprite_witch.asm : 213 JSL.l RemoveMushroom NOP #2 diff --git a/inventory.asm b/inventory.asm index 167c7ed..60e180a 100644 --- a/inventory.asm +++ b/inventory.asm @@ -824,6 +824,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: ;--------------------------------------------------------------------------------