Add menu input for seashells, honeycombs, deku sticks

Menu/menu.asm

@@ -9,7 +9,6 @@
 ;  - Custom HUD with new magic meter
 ; =========================================================
 
-
 pushpc
 ; update in game hud colors
 org $1BD662 : dw hexto555($814f16), hexto555($552903)
@@ -146,7 +145,6 @@ Menu_UploadLeft:
   JSR DrawYItems
   JSR Menu_DrawSelect
   JSR Menu_DrawItemName
-  
   ; INSERT PALETTE -------
 
   LDX.w #$3E
@@ -155,9 +153,7 @@ Menu_UploadLeft:
     STA.l $7EC502, X
     DEX : DEX
   BPL .loop
-  
   SEP #$30
-  
   ;-----------------------
 
   LDA.b #$22 : STA.w $0116
@@ -284,7 +280,6 @@ Menu_ScrollTo:
   JSR Menu_ScrollHorizontal
   BCC .not_done
     INC.w $0200
-
   .not_done
   RTS
 }
@@ -297,7 +292,6 @@ incsrc "menu_scroll.asm"
 Menu_StatsScreen:
 {
   JSR Menu_CheckHScroll
-
   RTS
 }
 
@@ -309,7 +303,6 @@ Menu_ScrollFrom:
   JSR Menu_ScrollHorizontal
   BCC .not_done
     JMP Menu_InitItemScreen
-
   .not_done
   RTS
 }
@@ -486,25 +479,21 @@ Menu_MagicBag:
   LSR : BCS .move_up
   BRA .continue
 
+  .move_up
   .move_right
     LDA.w $020B : CMP.b #$03 : BCS .zero
     INC.w $020B
     BRA .continue
 
+  .move_down
   .move_left
     LDA.w $020B : CMP.b #$00 : BEQ .continue
     DEC.w $020B
     BRA .continue
 
-  .move_down
-
-  .move_up
-
   .zero
-    STZ.w $020B
+  STZ.w $020B
-
   .continue
-
   LDA.w $020B
   ASL : TAY
   REP #$10
@@ -522,6 +511,9 @@ Menu_MagicBagCursorPositions:
   dw menu_offset(8,6)   ; banana
   dw menu_offset(8,10)  ; pineapple
   dw menu_offset(8,14)  ; goron rock meat
+  dw menu_offset(12,6)  ; seashells
+  dw menu_offset(12,10) ; honeycombs
+  dw menu_offset(12,14) ; deku sticks
 
 ; =========================================================
 ; 0D MENU SONG MENU
@@ -532,7 +524,7 @@ Menu_SongMenu:
   JSR Menu_DrawMusicNotes
 
   INC $0207
-  LDA.w $030F : BEQ .continue
+  LDA.w CurrentSong : BEQ .continue
   ASL : TAY
   LDA.b $F4
   LSR : BCS .move_right
@@ -546,10 +538,9 @@ Menu_SongMenu:
     REP   #$30
     LDX.w Menu_SongIconCursorPositions-2, Y
     JSR Menu_DeleteCursor_AltEntry
-    LDA.w $030F : CMP.b #$04 : BEQ .reset
+    LDA.w CurrentSong : CMP.b #$04 : BEQ .reset
-      
+      INC.w CurrentSong
-      INC.w $030F
+      LDA.w CurrentSong
-      LDA $030F        ; load incremented Song RAM
       CMP.b #$04
       BCS .wrap_to_min
       JMP .continue
@@ -557,17 +548,16 @@ Menu_SongMenu:
       LDA $7EF34C : CMP.b #$01 : BEQ .wrap_to_min
                     CMP.b #$02 : BEQ .set_max_to_2
                     CMP.b #$03 : BEQ .set_max_to_3
-      LDA #$04 : STA $030F : JMP .continue
+      LDA #$04 : STA.w CurrentSong : JMP .continue
 
       .set_max_to_3
-      LDA #$03 : STA $030F : JMP .continue
+      LDA #$03 : STA.w CurrentSong : JMP .continue
 
       .set_max_to_2
-      LDA #$02 : STA $030F : JMP .continue
+      LDA #$02 : STA.w CurrentSong : JMP .continue
 
       .wrap_to_min
-      LDA #$01 : STA $030F
+      LDA #$01 : STA.w CurrentSong
-      
       BRA .continue
 
   .move_left
@@ -575,22 +565,19 @@ Menu_SongMenu:
     REP   #$30
     LDX.w Menu_SongIconCursorPositions-2, Y
     JSR Menu_DeleteCursor_AltEntry
-    
+    LDA.w CurrentSong : CMP.b #$01 : BEQ .reset
-    LDA.w $030F : CMP.b #$01 : BEQ .reset
+      DEC.w CurrentSong
-      DEC.w $030F
+      LDA.w CurrentSong
-      LDA $030F
       CMP #$00 : BEQ .wrap_to_max
       BRA .continue
-
+    .reset
-  .reset
+    LDA #$01 : STA.w CurrentSong
-    LDA #$01 : STA $030F
 
   .continue
 
-
   JSR Menu_DrawItemName
   SEP #$30
-  LDA.w $030F
+  LDA.w CurrentSong
   ASL : TAY
   REP #$10
   LDX.w Menu_SongIconCursorPositions-2, Y
@@ -679,7 +666,6 @@ RingMenu_StoreRingToSlotStack:
   LDA.b $00 : CMP.l RingSlot2 : BEQ .return
   LDA.b $00 : CMP.l RingSlot3 : BEQ .return
   PHA
-  
   ; Check the SRAM for an available ring slot
   ; If none is available we shift the stack
   ; $7EF38C-7EF38E (Size 03)