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

Fix Ocarina/BottleNet/BunnyHood bugs. Conflicting free space

Browse Source
This commit is contained in:
scawful
2024-02-23 12:09:08 -05:00
parent ff5b06dc21
commit b377e36eaf
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Items/bottle_net.asm
View File

@@ -214,3 +214,4 @@ LinkGoBeep:
LDA.b #$3C : JSR Player_DoSfx2 LDA.b #$3C : JSR Player_DoSfx2
BRA LinkItem_Bottles_bottle_exit BRA LinkItem_Bottles_bottle_exit
} }
pushpc

2
Items/fishing_rod.asm
View File

@@ -1,5 +1,3 @@
lorom
;===================================================== ;=====================================================
; Fishing system for alttp V1.0 ; Fishing system for alttp V1.0
;----------------------------------------------------- ;-----------------------------------------------------

4
Items/ice_rod.asm
View File

@@ -14,7 +14,7 @@ org $088A5D
org $0EFBA0 ; main code org $0EFBA0 ; main code
LinkItem_IceRod: LinkItem_IceRod:
{ {
; load native value ; load native value
STA $03E4, X : TAY STA $03E4, X : TAY
; check if you're on overworld ; check if you're on overworld
@@ -129,7 +129,7 @@ org $0EFC80
; bug fix to stop gliding on shallow water when leaving ice tile ; bug fix to stop gliding on shallow water when leaving ice tile
org $07DD1B org $07DD1B
JSL $0EFC90 JSL $0EFC90
nop RTS
org $0EFC90 org $0EFC90
LDA $0A LDA $0A

20
Items/ocarina.asm
View File

@@ -99,7 +99,7 @@ LinkItem_FluteHook:
; ========================================================= ; =========================================================
; Free Space Bank07 ; Free Space Bank07
org $07DCD7 pullpc
ReturnFromFluteHook: ReturnFromFluteHook:
RTS RTS
@@ -108,10 +108,9 @@ ReturnFromFluteHook:
LinkItem_NewFlute: LinkItem_NewFlute:
{ {
; Code for the flute item (with or without the bird activated) ; Code for the flute item (with or without the bird activated)
BIT.b $3A : BVC .y_button_not_held
BIT $3A : BVC .y_button_not_held DEC.w $03F0 : LDA.w $03F0 : BNE ReturnFromFluteHook
DEC $03F0 : LDA $03F0 : BNE ReturnFromFluteHook LDA.b $3A : AND.b #$BF : STA.b $3A
LDA $3A : AND.b #$BF : STA $3A
.y_button_not_held .y_button_not_held
@@ -120,7 +119,7 @@ LinkItem_NewFlute:
JSR Link_CheckNewY_ButtonPress : BCC ReturnFromFluteHook JSR Link_CheckNewY_ButtonPress : BCC ReturnFromFluteHook
; Success... play the flute. ; Success... play the flute.
LDA.b #$80 : STA $03F0 LDA.b #$80 : STA.w $03F0
LDA $030F LDA $030F
CMP.b #$01 : BEQ .song_of_soaring CMP.b #$01 : BEQ .song_of_soaring
@@ -129,12 +128,11 @@ LinkItem_NewFlute:
.song_of_healing .song_of_healing
LDA.b #$13 : JSR Player_DoSfx2 LDA.b #$13 : JSR Player_DoSfx2
LDA #$01 : STA $FE LDA.b #$01 : STA $FE
RTS RTS
.song_of_storms .song_of_storms
; Play the Song of Storms SFX ; Play the Song of Storms SFX
; LDA.b #$12 : JSR Player_DoSfx2
LDA.b #$18 : JSR Player_DoSfx1 LDA.b #$18 : JSR Player_DoSfx1
JSL OcarinaEffect_SummonStorms JSL OcarinaEffect_SummonStorms
RTS RTS
@@ -143,13 +141,13 @@ LinkItem_NewFlute:
LDA.b #$3E : JSR Player_DoSfx2 LDA.b #$3E : JSR Player_DoSfx2
; Are we indoors? ; Are we indoors?
LDA $1B : BNE .return LDA.b $1B : BNE .return
; Are we in the dark world? The flute doesn't work there. ; Are we in the dark world? The flute doesn't work there.
LDA $8A : AND.b #$40 : BNE .return LDA.b $8A : AND.b #$40 : BNE .return
; Also doesn't work in special areas like Master Sword area. ; Also doesn't work in special areas like Master Sword area.
LDA $10 : CMP.b #$0B : BEQ .return LDA.b $10 : CMP.b #$0B : BEQ .return
LDX.b #$04 LDX.b #$04

9
Masks/bunny_hood.asm
View File

@@ -46,13 +46,16 @@ print "End of Bunny Hood GFX ", pc
; ============================================================================= ; =============================================================================
; Bunny Hood Speed Modification ; Bunny Hood Speed Modification
org $87E330 org $07E330
JSR $FD66 JSR Link_CheckForBunnyRun
CLC CLC
org $87FD66 ; org $87FD66
pullpc
Link_CheckForBunnyRun:
JSL LinkState_BunnyHoodRun JSL LinkState_BunnyHoodRun
RTS RTS
pushpc
org $20AF20 org $20AF20
LinkState_BunnyHoodRun: LinkState_BunnyHoodRun: