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

move color song note icons to song menu

Browse Source
This commit is contained in:
scawful
2024-07-05 16:03:23 -04:00
parent 56f51239aa
commit 54bc1ef0a4
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Menu/menu.asm
View File

@@ -125,7 +125,6 @@ Menu_UploadRight:
JSR Menu_DrawPlaytimeLabel JSR Menu_DrawPlaytimeLabel
JSR Menu_DrawHeartPieces JSR Menu_DrawHeartPieces
JSR Menu_DrawMusicNotes
JSR Menu_DrawQuestStatus JSR Menu_DrawQuestStatus
JSR Menu_DrawAreaNameTXT JSR Menu_DrawAreaNameTXT
JSR DrawLocationName JSR DrawLocationName
@@ -525,6 +524,10 @@ Menu_MagicBagCursorPositions:
Menu_SongMenu: Menu_SongMenu:
{ {
REP #$30
JSR Menu_DrawMusicNotes
INC $0207 INC $0207
LDA.w $030F : BEQ .continue LDA.w $030F : BEQ .continue
ASL : TAY ASL : TAY
@@ -564,7 +567,6 @@ Menu_SongMenu:
JSR Submenu_Return JSR Submenu_Return
SEP #$20 SEP #$20
LDA.b #$22 : STA.w $0116 LDA.b #$22 : STA.w $0116
LDA.b #$01 : STA.b $17 LDA.b #$01 : STA.b $17

21
Menu/menu_draw.asm
View File

@@ -203,6 +203,10 @@ Menu_DrawHeartPieces:
Menu_DrawMusicNotes: Menu_DrawMusicNotes:
{ {
SEP #$30
LDA.b #$7E : STA.b $0A ; Set up the bank of our indirect address
REP #$30
LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0001 : BCC .no_storms LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0001 : BCC .no_storms
LDA.w #$0002 : BRA .draw_storms LDA.w #$0002 : BRA .draw_storms
.no_storms .no_storms
@@ -210,7 +214,7 @@ Menu_DrawMusicNotes:
.draw_storms .draw_storms
STA.w MusicNoteValue STA.w MusicNoteValue
LDA.w #MusicNoteValue LDA.w #MusicNoteValue
LDX.w #menu_offset(17,20) LDX.w #menu_offset(9,5)
LDY.w #QuarterNoteGFX LDY.w #QuarterNoteGFX
JSR DrawMenuItem JSR DrawMenuItem
@@ -221,7 +225,7 @@ Menu_DrawMusicNotes:
.draw_healing .draw_healing
STA.w MusicNoteValue STA.w MusicNoteValue
LDA.w #MusicNoteValue LDA.w #MusicNoteValue
LDX.w #menu_offset(17,17) LDX.w #menu_offset(9,9)
LDY.w #QuarterNoteGFX LDY.w #QuarterNoteGFX
JSR DrawMenuItem JSR DrawMenuItem
@@ -232,7 +236,18 @@ Menu_DrawMusicNotes:
.draw_soaring .draw_soaring
STA.w MusicNoteValue STA.w MusicNoteValue
LDA.w #MusicNoteValue LDA.w #MusicNoteValue
LDX.w #menu_offset(17,14) LDX.w #menu_offset(9,13)
LDY.w #QuarterNoteGFX
JSR DrawMenuItem
LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0004 : BCC .no_songs
LDA.w #$05 : BRA .draw_songs
.no_songs
LDA.w #$01
.draw_songs
STA.w MusicNoteValue
LDA.w #MusicNoteValue
LDX.w #menu_offset(9,17)
LDY.w #QuarterNoteGFX LDY.w #QuarterNoteGFX
JSR DrawMenuItem JSR DrawMenuItem