From ee8cc0295545a4f646a28dd75c041920be8e338d Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 28 Jun 2024 00:17:34 -0400 Subject: [PATCH] rename HaltLinkWhenUsingItems for fishing rod, move position slightly --- Items/fishing_rod.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Items/fishing_rod.asm b/Items/fishing_rod.asm index d455f93..0431b3d 100644 --- a/Items/fishing_rod.asm +++ b/Items/fishing_rod.asm @@ -75,7 +75,7 @@ LinkItem_FishingRod: JSR CheckYButtonPress BCC FishingRodExit - JSR AltLinkUsingItem + LDA.b $67 AND.b #$F0 STA.b $67 @@ -96,6 +96,7 @@ LinkItem_FishingRod: .holding_y + JSR HaltLinkWhenUsingItems LDA.b #$26 : STA.w $0107 ; Sword DMA to Floater Hammer @@ -249,7 +250,7 @@ CheckYButtonPress: } -AltLinkUsingItem: +HaltLinkWhenUsingItems: { LDA.b $AD : CMP.b #$02 : BNE .skip