Merge "Fix learning Saria's song multiple times" (#2573)

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	data/generated/patch_symbols.json
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

Author: fenhl

ASM/build/asm_symbols.txt

@@ -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
 
 ;==================================================================================================
 

ASM/src/cutscenes.asm

@@ -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
@@ -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"

ASM/src/hacks.asm

@@ -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)

ASM/src/hacks/z_en_sa.asm

@@ -3,6 +3,7 @@
 * Fix a crash that could occur on Wii VC when starting a cutscene while climbing a ladder.
 * Fix a visual bug where ice traps appear very large if Link is wearing the Bunny Hood or hovering using the Hover Boots.
 * Fix a vanilla bug where the player can become unable to move when the Hookshot is pulled but fails to load.
+* Fix a bug where the item on the `Song from Saria` location could be obtained multiple times by savewarping on the first frame after obtaining it, then returning to the location.
 
 # 9.1