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

Fix Ocarina song menu select logic

Browse Source
This commit is contained in:
scawful
2024-10-23 13:43:46 -04:00
parent ede8c0cdb0
commit 84178d350e
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Menu/menu.asm
View File

@@ -530,14 +530,15 @@ Menu_SongMenu:
JSR Menu_DrawMusicNotes JSR Menu_DrawMusicNotes
INC $0207 INC $0207
LDA.w CurrentSong : BEQ .continue LDA.w CurrentSong : BEQ +
ASL : TAY ASL : TAY
LDA.b $F4 LDA.b $F4
LSR : BCS .move_right LSR : BCS .move_right
LSR : BCS .move_left LSR : BCS .move_left
LSR : BCS .move_down LSR : BCS .move_down
LSR : BCS .move_up LSR : BCS .move_up
BRA .continue +
JMP .continue
.move_right .move_right
.move_up .move_up
@@ -547,8 +548,20 @@ Menu_SongMenu:
LDA.w CurrentSong : CMP.b #$04 : BEQ .reset LDA.w CurrentSong : CMP.b #$04 : BEQ .reset
INC.w CurrentSong INC.w CurrentSong
LDA.w CurrentSong LDA.w CurrentSong
CMP.b #$04 PHA
BCS .wrap_to_min LDA $7EF34C : CMP.b #$01 : BEQ .max_1
CMP.b #$02 : BEQ .max_2
CMP.b #$03 : BEQ .max_3
PLA
CMP.b #$05 : BCS .wrap_to_min
JMP .continue
.max_1
PLA : CMP.b #$02 : BCS .wrap_to_min
.max_2
PLA : CMP.b #$03 : BCS .wrap_to_min
JMP .continue
.max_3
PLA : CMP.b #$04 : BCS .wrap_to_min
JMP .continue JMP .continue
.wrap_to_max .wrap_to_max
LDA $7EF34C : CMP.b #$01 : BEQ .wrap_to_min LDA $7EF34C : CMP.b #$01 : BEQ .wrap_to_min