scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename NewBugCatchingNet to CatchBottle

Browse Source
This commit is contained in:
scawful
2024-03-09 08:40:05 -05:00
parent 890806519c
commit 422c00fd2c
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Items/all_items.asm
View File

@@ -1,7 +1,6 @@
; Inherits Free Space from Bank07 ; Inherits Free Space from Bank07
incsrc "Items/bottle_net.asm" incsrc "Items/bottle_net.asm"
print "End of Items/bottle_net.asm ", pc
incsrc "Items/ocarina.asm" incsrc "Items/ocarina.asm"
print "End of Items/ocarina.asm ", pc print "End of Items/ocarina.asm ", pc

8
Items/bottle_net.asm
View File

@@ -32,7 +32,7 @@ LinkItem_NewBottle:
.empty_bottle .empty_bottle
; Otherwise, prepare and call the LinkItem_BugCatchingNet routine ; Otherwise, prepare and call the LinkItem_BugCatchingNet routine
JSR LinkItem_NewBugCatchingNet JSR LinkItem_CatchBottle
.exit .exit
RTS RTS
@@ -42,7 +42,7 @@ warnpc $07A249
pullpc pullpc
print " LinkItem_NewBugCatchingNet ", pc print " LinkItem_CatchBottle ", pc
; ============================================================================= ; =============================================================================
@@ -59,7 +59,7 @@ pose_offset:
db $1E ; right db $1E ; right
; *$3AFF8-$3B072 LOCAL ; *$3AFF8-$3B072 LOCAL
LinkItem_NewBugCatchingNet: LinkItem_CatchBottle:
{ {
BIT $3A : BVS .y_press BIT $3A : BVS .y_press
@@ -214,4 +214,6 @@ LinkGoBeep:
LDA.b #$3C : JSR Player_DoSfx2 LDA.b #$3C : JSR Player_DoSfx2
BRA LinkItem_Bottles_bottle_exit BRA LinkItem_Bottles_bottle_exit
} }
print "End of Items/bottle_net.asm ", pc
pushpc pushpc

5
Items/fishing_rod.asm
View File

@@ -393,7 +393,6 @@ Sprite_Floater:
LDA.w $0DB0, X : BEQ .noFishOnLine ; do we already have a fish on line? LDA.w $0DB0, X : BEQ .noFishOnLine ; do we already have a fish on line?
.fishOnlineWait .fishOnlineWait
LDA.w $0DF0, X : BNE .stillwiggling LDA.w $0DF0, X : BNE .stillwiggling
print pc
STZ.w $0DB0, X ; no more fish on line took too much time STZ.w $0DB0, X ; no more fish on line took too much time
JSL $0DBA71 : AND.b #$7F ; GetRandomInt JSL $0DBA71 : AND.b #$7F ; GetRandomInt
CLC : ADC.b #$7F : STA.w $0EE0, X ; reset timer wait until fish is on line CLC : ADC.b #$7F : STA.w $0EE0, X ; reset timer wait until fish is on line
@@ -526,4 +525,6 @@ Sprite_Floater_Draw:
WigglingTable: 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 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