Skip to content

Fix learning Saria's song multiple times #2573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fenhl merged 1 commit into from
May 31, 2026
Merged

Fix learning Saria's song multiple times #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,851 changes: 1,426 additions & 1,425 deletions ASM/build/asm_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ASM/build/bundle.o
View file
Open in desktop
Binary file not shown.
1,445 changes: 723 additions & 722 deletions ASM/build/c_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions ASM/src/cutscenes.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,19 @@ override_saria_song_check:
;==================================================================================================

set_saria_song_flag:
lh v0, 0xa4(t6) ; v0 = scene
li t0, SAVE_CONTEXT
lbu t0,7532(a1) ; play->csCtx.state
bnez t0,@@Return ; If not CS state idle, continue
li t0,0x56 ; SFM scene id
lh t1,164(a1) ; play->sceneId
bnel t0,t1,@@Return ; If not SFM, continue
nop
la t0, SAVE_CONTEXT ; If SFM and CS state idle = finished Saria's song CS
lb t1, 0x0EDF(t0)
ori t1, t1, 0x80
sb t1, 0x0EDF(t0)
ori t1, t1, 0x80 ; 0x80 Saria flag
sb t1, 0x0EDF(t0) ; Save item received flag
@@Return:
jr ra
nop
move a2,a1 ; displaced

;==================================================================================================

Expand Down
9 changes: 1 addition & 8 deletions ASM/src/hacks.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,14 +1391,6 @@ nop
.orga 0xD12F78
li t7, 0

;li v1, 5
.orga 0xE29388
j override_saria_song_check

;lh v0, 0xa4(t6) ; v0 = scene
.orga 0xE2A044
jal set_saria_song_flag

; li a1, 3
.orga 0xDB532C
jal override_song_of_time
Expand Down Expand Up @@ -4162,3 +4154,4 @@ DemoEffect_DrawJewel_AfterHook:
.include "hacks/ovl_en_okarina_tag.asm"
.include "hacks/sound.asm"
.include "hacks/z_player.asm"
.include "hacks/z_en_sa.asm"
12 changes: 12 additions & 0 deletions ASM/src/hacks/z_en_sa.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.headersize (0x80aa8bc0 - 0x00e28a10)

;li v1, 5
.orga 0xE29388 ; in func_80AF5DFC
j override_saria_song_check

; Set flag for player having received Saria's item
; Replaces sw s1,32(sp)
; move a2,a1
.org 0x80aa9f84 ; in func_80AF68E4
jal set_saria_song_flag
sw s1,32(sp)
2 changes: 1 addition & 1 deletion data/generated/patch_symbols.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading