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

add song of time to L/R ocarina switch

Browse Source
This commit is contained in:
scawful
2024-07-05 13:58:57 -04:00
parent ea1c5c3645
commit 5feb121ab9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Items/ocarina.asm
View File

@@ -362,11 +362,13 @@ ResetOcarinaFlag:
; 01 - Song of Storms ; 01 - Song of Storms
; 02 - Song of Healing ; 02 - Song of Healing
; 03 - Song of Soaring ; 03 - Song of Soaring
; 04 - Song of Time
; Values at $7EF34C determine scrolling behavior ; Values at $7EF34C determine scrolling behavior
; 01 - No scrolling allowed ; 01 - No scrolling allowed
; 02 - Scroll between two songs ; 02 - Scroll between two songs
; 03 - Scroll between three songs ; 03 - Scroll between three songs
; 04 - Scroll between four songs
UpdateFluteSong_Long: UpdateFluteSong_Long:
{ {
@@ -393,13 +395,17 @@ UpdateFluteSong_Long:
; R Button Pressed - Increment song ; R Button Pressed - Increment song
INC $030F ; increment $030F Song RAM INC $030F ; increment $030F Song RAM
LDA $030F ; load incremented Song RAM LDA $030F ; load incremented Song RAM
CMP.b #$04 CMP.b #$05
BCS .wrap_to_min BCS .wrap_to_min
.update_song .update_song
RTL RTL
.wrap_to_max .wrap_to_max
LDA $7EF34C : CMP.b #$02 : BEQ .set_max_to_2 LDA $7EF34C : CMP.b #$02 : BEQ .set_max_to_2
CMP.b #$03 : BEQ .set_max_to_3
LDA #$04 : STA $030F : RTL
.set_max_to_3
LDA #$03 : STA $030F : RTL LDA #$03 : STA $030F : RTL
.set_max_to_2 .set_max_to_2