From 630832a186e673c1bf24140715728dc83d56f5dc Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 14 Jan 2023 18:04:14 -0600
Subject: [PATCH] Begin building song selection cursor

---
 Menu/menu.asm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/Menu/menu.asm b/Menu/menu.asm
index 4d3434a..8d2f597 100644
--- a/Menu/menu.asm
+++ b/Menu/menu.asm
@@ -176,8 +176,8 @@ Menu_ItemScreen:
   INC $0207
   LDA.w $0202 : BEQ .no_inputs
 
-  ASL : TAY 
-  LDA.b $F4
+  ; Scroll through joypad 1 inputs 
+  ASL : TAY : LDA.b $F4 
   LSR : BCS .move_right
   LSR : BCS .move_left
   LSR : BCS .move_down
@@ -206,8 +206,8 @@ Menu_ItemScreen:
 
 .draw_cursor
   LDA.b #$20 : STA.w $012F ; cursor move sound effect 
-.no_inputs
 
+.no_inputs
   SEP #$30
   LDA.w $0202
   ASL : TAY
@@ -276,6 +276,72 @@ incsrc "menu_scroll.asm"
 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_DeleteCursor
+  JSR Menu_FindNextItem
+  BRA .draw_cursor
+  
+.move_left
+  JSR Menu_DeleteCursor
+  JSR Menu_FindPrevItem
+  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-2, 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
 }