From 42d80dba36c8beb6fcd3bbaf3b34bcb5527da14b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 28 Jun 2024 10:25:15 -0400
Subject: [PATCH] dismiss fishing rod from menu when changing items

---
 Items/fishing_rod.asm | 19 +++++++++++++++++++
 Menu/menu.asm         |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/Items/fishing_rod.asm b/Items/fishing_rod.asm
index 0431b3d..5b7aa68 100644
--- a/Items/fishing_rod.asm
+++ b/Items/fishing_rod.asm
@@ -554,4 +554,23 @@ Sprite_Floater_Draw:
 WigglingTable:
 db 08, -10, 06, -8, 12, -14, 18, -20, 10, -12, 04, -6, 08,-10, 14,-16, 08, -10, 06, -8, 12, -14, 18, -20, 10, -12, 04, -6, 08,-10, 14,-16
 
+DismissRodFromMenu:
+{
+  STZ.w $0300
+  STZ.b $3D
+  LDA #$00
+  STA.l $7F5BA2
+  LDA.l $7F5BA3 : TAX
+  STZ.w $0DD0, X
+  STZ.b $5E
+  STZ.w $0300
+  STZ.b $3D
+  STZ.w $0350
+  STZ.w $037A
+  LDA.b $3A
+  AND.b #$BF
+  STA.b $3A
+  RTL
+}
+
 print  "End of Items/fishing_rod.asm      ", pc
\ No newline at end of file
diff --git a/Menu/menu.asm b/Menu/menu.asm
index d852c97..e9bd827 100644
--- a/Menu/menu.asm
+++ b/Menu/menu.asm
@@ -77,6 +77,9 @@ Menu_Entry:
 Menu_InitGraphics:
 {
   LDA.w $0780 : STA.w $00
+  LDA.w $0202 : CMP.b #$10 : BNE .not_fishing
+    JSL DismissRodFromMenu
+  .not_fishing
   INC $0200
 }