diff --git a/Items/all_items.asm b/Items/all_items.asm index 732d096..ecd6b39 100644 --- a/Items/all_items.asm +++ b/Items/all_items.asm @@ -1,7 +1,6 @@ ; Inherits Free Space from Bank07 incsrc "Items/bottle_net.asm" -print "End of Items/bottle_net.asm ", pc incsrc "Items/ocarina.asm" print "End of Items/ocarina.asm ", pc diff --git a/Items/bottle_net.asm b/Items/bottle_net.asm index 94462c7..1aa5d96 100644 --- a/Items/bottle_net.asm +++ b/Items/bottle_net.asm @@ -32,7 +32,7 @@ LinkItem_NewBottle: .empty_bottle ; Otherwise, prepare and call the LinkItem_BugCatchingNet routine - JSR LinkItem_NewBugCatchingNet + JSR LinkItem_CatchBottle .exit RTS @@ -42,7 +42,7 @@ warnpc $07A249 pullpc -print " LinkItem_NewBugCatchingNet ", pc +print " LinkItem_CatchBottle ", pc ; ============================================================================= @@ -59,7 +59,7 @@ pose_offset: db $1E ; right ; *$3AFF8-$3B072 LOCAL -LinkItem_NewBugCatchingNet: +LinkItem_CatchBottle: { BIT $3A : BVS .y_press @@ -214,4 +214,6 @@ LinkGoBeep: LDA.b #$3C : JSR Player_DoSfx2 BRA LinkItem_Bottles_bottle_exit } + +print "End of Items/bottle_net.asm ", pc pushpc \ No newline at end of file diff --git a/Items/fishing_rod.asm b/Items/fishing_rod.asm index f0d56c6..96a3ffc 100644 --- a/Items/fishing_rod.asm +++ b/Items/fishing_rod.asm @@ -393,7 +393,6 @@ Sprite_Floater: LDA.w $0DB0, X : BEQ .noFishOnLine ; do we already have a fish on line? .fishOnlineWait LDA.w $0DF0, X : BNE .stillwiggling - print pc STZ.w $0DB0, X ; no more fish on line took too much time JSL $0DBA71 : AND.b #$7F ; GetRandomInt CLC : ADC.b #$7F : STA.w $0EE0, X ; reset timer wait until fish is on line @@ -526,4 +525,6 @@ 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 \ No newline at end of file +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 + +print "End of Items/fishing_rod.asm ", pc \ No newline at end of file