From 5feb121ab9c21e6c6003bac303fc2330e8253128 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 5 Jul 2024 13:58:57 -0400 Subject: [PATCH] add song of time to L/R ocarina switch --- Items/ocarina.asm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Items/ocarina.asm b/Items/ocarina.asm index 9e7ab43..6d8dfcb 100644 --- a/Items/ocarina.asm +++ b/Items/ocarina.asm @@ -362,11 +362,13 @@ ResetOcarinaFlag: ; 01 - Song of Storms ; 02 - Song of Healing ; 03 - Song of Soaring +; 04 - Song of Time ; Values at $7EF34C determine scrolling behavior ; 01 - No scrolling allowed ; 02 - Scroll between two songs ; 03 - Scroll between three songs +; 04 - Scroll between four songs UpdateFluteSong_Long: { @@ -393,13 +395,17 @@ UpdateFluteSong_Long: ; R Button Pressed - Increment song INC $030F ; increment $030F Song RAM LDA $030F ; load incremented Song RAM - CMP.b #$04 + CMP.b #$05 BCS .wrap_to_min .update_song RTL .wrap_to_max 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 .set_max_to_2