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

Fix double flute song

Browse Source
This commit is contained in:
Kevin Cathcart
2018-09-23 00:23:01 -04:00
parent e123c6a95f
commit 115873f5cb
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flute.asm
View File

@@ -91,8 +91,15 @@ FreeDuckCheck:
LDA.b #$37 LDA.b #$37
JSL AddWeathervaneExplosion JSL AddWeathervaneExplosion
BRA .skipSong
.done .done
SEP #$20 SEP #$20
LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer
LDA.b #$13
RTL
.skipSong
SEP #$20
LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer
LDA.b #$00
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

5
hooks.asm
View File

@@ -1966,7 +1966,10 @@ JSL.l Overworld_LoadNewTiles
NOP #$02 NOP #$02
;================================================================================ ;================================================================================
org $07A3E2 ;<- 3A3E2 Bank07.asm:5764 (LDA.b #$80 : STA $03F0) org $07A3E2 ;<- 3A3E2 Bank07.asm:5764 (LDA.b #$80 : STA $03F0)
JSL.l FreeDuckCheck : NOP JSL.l FreeDuckCheck : BEQ +
NOP
skip 3 ; a JSR we need to keep
+
;================================================================================ ;================================================================================
org $07A9AC ; <- 3A9AC - Bank07.asm:6628 (LDA $0C : ORA $0E : STA $00 : AND.b #$0C : BEQ BRANCH_BETA) org $07A9AC ; <- 3A9AC - Bank07.asm:6628 (LDA $0C : ORA $0E : STA $00 : AND.b #$0C : BEQ BRANCH_BETA)
JML.l MirrorBonk JML.l MirrorBonk