Ocarina Songs (Healing, Soaring, Storms)

Menu/menu.asm

@@ -287,71 +287,6 @@ Menu_StatsScreen:
 {
   JSR Menu_CheckHScroll
 
-;   ; Increase selector time and check music RAM 
-;   INC $0207 : LDA.w $02D5 : BEQ .no_inputs
-
-;   ; Scroll through joypad 1 inputs 
-;   ASL : TAY : LDA.b $F4 
-;   LSR : BCS .move_right
-;   LSR : BCS .move_left
-;   BRA .no_inputs
-
-; .move_right
-;   JSR Menu_DeleteSongCursor
-;   JSR Menu_FindNextSong
-;   BRA .draw_cursor
-  
-; .move_left
-;   JSR Menu_DeleteSongCursor
-;   JSR Menu_FindPrevSong
-;   BRA .draw_cursor
-
-; .draw_cursor
-;   LDA.b #$20 : STA.w $012F ; cursor move sound effect 
-
-; .no_inputs
-;   SEP #$30
-;   LDA.w $02D5
-;   ASL : TAY
-;   REP #$10
-;   LDX.w Menu_OcarinaSongPositions, Y
-
-;   LDA.b #$20 : BIT.w $0207
-
-;   REP #$20
-
-;   BEQ .no_delete 
-
-;   LDA.w #$20F5
-;   STA.w $1108, X
-;   STA.w $1148, X
-;   STA.w $114E, X 
-;   STA.w $110E, X 
-;   STA.w $11C8, X 
-;   STA.w $1188, X
-;   STA.w $118E, X 
-;   STA.w $11CE, X 
-;   BRA .done
-
-; .no_delete 
-
-;   LDA.w #$3060 : STA.w $1108, X ; corner 
-;   LDA.w #$3070 : STA.w $1148, X
-
-;   LDA.w #$7060 : STA.w $110E, X ; corner 
-;   LDA.w #$7070 : STA.w $114E, X
-
-;   LDA.w #$3070 : STA.w $1188, X 
-;   LDA.w #$B060 : STA.w $11C8, X ; corner 
-
-;   LDA.w #$7070 : STA.w $118E, X 
-;   LDA.w #$F060 : STA.w $11CE, X ; corner 
-
-; .done
-;   SEP #$20
-;   LDA.b #$22 : STA.w $0116
-;   LDA.b #$01 : STA.b $17
-
   RTS
 }
 

Menu/menu_hud.asm

@@ -198,6 +198,7 @@ HUD_Update:
 
   ; If the key digit is blank, also blank out the key icon.
   STA $7EC724
+
 .dontBlankKeyIcon
   SEP #$30
 
@@ -335,8 +336,13 @@ HUD_UpdateItemBox:
   LDA.w #$0004
 .loadBottleContent
   TXY : TAX : LDA $7EF35B, X : AND.w #$00FF : TYX
-  
+
 .bottleNotEquipped  
+  CPX.w #$000D : BNE .fluteNotEquipped
+  LDA $030F
+
+.fluteNotEquipped
+
   STA $02
   TXA : DEC A : ASL A : TAX
   LDA $FA93, X : STA $04
@@ -434,11 +440,19 @@ HudItems:
   ; hammer, lamp, fire rod, Ice Rod, mirror, bottle2
   dw $F701, $F6F1, $F6A1, $F6B1, $F7C9, $F751
   ; flute, book, somaria, byrna, feather, bottle3
-  dw $F711, $F741, $F799,  $F7A9, $F731, $F751
+  dw $F859, $F741, $F799,  $F7A9, $F731, $F751
   ; deku,   zora,  wolf,  bunny,  stne 
   dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751
 }
 
+; F711
+; Ocarina
+org $0DF859
+  dw $2CD4, $2CD5, $2CE4, $2CE5 
+  dw $2CD4, $2CD5, $2CE4, $2CE5 ; Blue 
+  dw $3CD4, $3CD5, $3CE4, $3CE5 ; Green
+  dw $24D4, $24D5, $24E4, $24E5 ; Red
+
 org $0DF751
   dw $20F5, $20F5, $20F5, $20F5 ; No bottle
   dw $2044, $2045, $2046, $2047 ; Mushroom

Menu/menu_select_item.asm

@@ -181,73 +181,4 @@ Menu_InitItemScreen:
   LDA.b #$04
   STA.w $0200
   RTS
-}
-
-; =============================================================================
-;  Song Selection Code
-
-; -----------------------------------------------------------------------------
-
-Menu_SongAddressIndex:
-  db $01
-  db $02
-  db $03
-
-; -----------------------------------------------------------------------------
-
-Menu_OcarinaSongPositions:
-  dw menu_offset(16,12) ; song of 
-  dw menu_offset(16,15) ; song of 
-  dw menu_offset(16,18) ; song of 
-
-; -----------------------------------------------------------------------------
-
-Menu_FindNextSong:
-{
-  LDY.w $02D5 : INY 
-  CPY.b #$03 : BCC .no_reset 
-  LDY.b #$01 
-.no_reset 
-  STY.w $02D5
-  LDX.w Menu_SongAddressIndex-1, Y
-  LDA.l $7EF407, X
-  BEQ Menu_FindNextSong
-  RTS
-}
-
-; -----------------------------------------------------------------------------
-
-Menu_FindPrevSong:
-{
-  LDY.w $02D5 : DEY : BNE .no_reset 
-  LDY.b #$02
-.no_reset 
-  STY.w $02D5
-  LDX.w Menu_SongAddressIndex-1, Y
-  LDA.l $7EF407, X
-  BEQ Menu_FindPrevSong
-  RTS
-}
-
-; -----------------------------------------------------------------------------
-
-Menu_DeleteSongCursor:
-{
-  REP #$30
-  LDX.w Menu_OcarinaSongPositions-2, Y
-
-  LDA.w #$20F5
-  STA.w $1422, X
-  STA.w $1462, X
-  STA.w $14A2, X
-  STA.w $14E2, X
-  STA.w $11C8, X
-  STA.w $1188, X
-  STA.w $118E, X
-  STA.w $11CE, X
-  SEP #$30
-  STZ $0207
-  RTS 
-}
-
-; -----------------------------------------------------------------------------
+}