From 5becb44f95d96cc429bc7034e7219e28111508fc Mon Sep 17 00:00:00 2001
From: Justin Scofield <47263509+scawful@users.noreply.github.com>
Date: Wed, 5 Oct 2022 23:52:14 -0500
Subject: [PATCH] menu work

---
 Menu/menu.asm             | 14 ++++++++++++--
 Menu/menu_select_item.asm |  7 ++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Menu/menu.asm b/Menu/menu.asm
index 053cd92..b3b4b7d 100644
--- a/Menu/menu.asm
+++ b/Menu/menu.asm
@@ -326,6 +326,16 @@ Menu_CheckBottle:
   RTS 
 }
 
+Menu_HookItems:
+{
+  STZ.w $7F5021
+  LDA.w $0202 : CMP.b #$13 : BNE .not_wolf_mask
+  LDA.b #$0001 : STA.w $7F5021
+
+.not_wolf_mask
+  RTS
+}
+
 ; =============================================================================
 ; 09 MENU EXIT 
 
@@ -333,8 +343,8 @@ Menu_Exit:
 {
   ; set $0303 by using $0202 to index table on exit
   ; JSR Menu_CheckBottle
-  LDY.w $0202 : BEQ .no_item
-  DEY 
+  JSR Menu_HookItems
+  LDY.w $0202 : BEQ .no_item : DEY 
   LDA.w Menu_ItemIndex, Y
   STA.w $0303
 
diff --git a/Menu/menu_select_item.asm b/Menu/menu_select_item.asm
index 7745120..d619b58 100644
--- a/Menu/menu_select_item.asm
+++ b/Menu/menu_select_item.asm
@@ -1,18 +1,19 @@
 ; =============================================================================
 ;  Item Selection Code
 
+; Decides which function to jump to.
 Menu_ItemIndex:
   ;  Bow,    Boomerang, Hookshot, Bombs,   Deku,       Bottle 1
   db $03,    $02,       $0E,      $01,     $11,        $0B 
   ;  Hammer, Lamp,      Fire Rod, Ice Rod, Zora,       Bottle 2
   db $04,    $09,       $05,      $06,     $0F,        $4B 
   ;  Wolf,   Feather,   Somaria,  Byrna,   Bunny Hood, Bottle3
-  db $0B,    $07,       $12,      $0D,     $10,        $8B 
+  db $08,    $07,       $12,      $0D,     $10,        $8B 
   ;  Powder, Book,      Ocarina,  Mirror,  Stone Mask, Bottle4
   db $0A,    $0C,       $08,      $14,     $13,        $CB 
 
 ; -----------------------------------------------------------------------------
-
+; Decides which graphics is drawn 
 Menu_AddressIndex:
   db $7EF340 ; bow
   db $7EF341 ; boom
@@ -26,7 +27,7 @@ Menu_AddressIndex:
   db $7EF346 ; icerod 
   db $7EF347 ; Zora Mask
   db $7EF35D ; bottle2
-  db $7EF34F ; shovel
+  db $7EF34C ; shovel 7EF34F
   db $7EF34D ; feather 
   db $7EF350 ; somaria
   db $7EF351 ; byrna