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

restrict song menu based on ocarina save ram

Browse Source
This commit is contained in:
scawful
2024-07-05 16:31:02 -04:00
parent 54bc1ef0a4
commit da4b529f9a
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Items/ocarina.asm
View File

@@ -395,7 +395,7 @@ 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 #$05 CMP.b #$04
BCS .wrap_to_min BCS .wrap_to_min
.update_song .update_song
RTL RTL

21
Menu/menu.asm
View File

@@ -544,6 +544,23 @@ Menu_SongMenu:
LDA.w $030F : CMP.b #$04 : BEQ .reset LDA.w $030F : CMP.b #$04 : BEQ .reset
INC.w $030F INC.w $030F
LDA $030F ; load incremented Song RAM
CMP.b #$05
BCS .wrap_to_min
.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 : JMP .continue
.set_max_to_3
LDA #$03 : STA $030F : JMP .continue
.set_max_to_2
LDA #$02 : STA $030F : JMP .continue
.wrap_to_min
LDA #$01 : STA $030F
BRA .continue BRA .continue
.move_left .move_left
@@ -551,12 +568,16 @@ Menu_SongMenu:
JSR SongMenu_DeleteCursor JSR SongMenu_DeleteCursor
LDA.w $030F : CMP.b #$01 : BEQ .reset LDA.w $030F : CMP.b #$01 : BEQ .reset
DEC.w $030F DEC.w $030F
LDA $030F
CMP #$00 : BEQ .wrap_to_max
BRA .continue BRA .continue
.reset .reset
LDA #$01 : STA $030F LDA #$01 : STA $030F
.continue .continue
JSR Menu_DrawItemName JSR Menu_DrawItemName
SEP #$30 SEP #$30
LDA.w $030F LDA.w $030F