diff --git a/Menu/menu.asm b/Menu/menu.asm index 0bc87cc..bd7f53b 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -95,10 +95,10 @@ Menu_UploadRight: JSR Menu_DrawTriforceIcons JSR Menu_DrawPendantIcons - JSR DrawPlaytimeLabel + JSR Menu_DrawPlaytimeLabel - JSR DrawHeartPieces - JSR DrawMusicNotes + JSR Menu_DrawHeartPieces + JSR Menu_DrawMusicNotes JSR Menu_DrawQuestStatus JSR Menu_DrawAreaNameTXT JSR DrawLocationName diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index e80ce05..72c2e6f 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -167,7 +167,7 @@ Menu_DrawPendantIcons: ; E000 is T = 0 ; E100 would be T = 16 -DrawHeartPieces: +Menu_DrawHeartPieces: { ; Empty heart containter LDX.w #$2484 : STX.w $149E ; top left @@ -194,7 +194,7 @@ DrawHeartPieces: ; ========================================================= -DrawMusicNotes: +Menu_DrawMusicNotes: { LDA.w #$02 STA.w MusicNoteValue @@ -268,7 +268,7 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - ;; next row + ; Row 2 ------------------------------------------------- LDA.w #$7EF34B LDX.w #menu_offset(10,3) @@ -300,7 +300,8 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - ;; next row + ; Row 3 ------------------------------------------------- + LDA.l $7EF34C : CMP.w #$0000 : BEQ .no_ocarina LDA.w $030F : BNE .spoof_ocarina LDA #$0001 ; Multi-songs not unlocked yet @@ -345,7 +346,7 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - ;; next row + ; Row 4 ------------------------------------------------- LDA.w #$7EF349 LDX.w #menu_offset(16,3) diff --git a/Menu/menu_text.asm b/Menu/menu_text.asm index 2d891f0..9be390f 100644 --- a/Menu/menu_text.asm +++ b/Menu/menu_text.asm @@ -63,7 +63,7 @@ DrawScrollsLabel: PlaytimeLabel: dw "PLAYTIME:_" -DrawPlaytimeLabel: +Menu_DrawPlaytimeLabel: { LDX.w #$10 @@ -110,7 +110,8 @@ Menu_ItemNames: dw "___OCARINA____ " dw "_SECRET_TOME__ " dw "___SOMARIA____ " - dw "____BYRNA_____ " + ; dw "____BYRNA_____ " + dw "_FISHING_ROD__ " dw "_ROCS_FEATHER_ " dw "____BOTTLE____ " dw "__DEKU_MASK___ "