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

Cleanup portal_rod.asm

Browse Source
This commit is contained in:
scawful
2024-10-01 17:36:28 -04:00
parent 1c5dadd4f8
commit 1c677e0470
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Items/portal_rod.asm
View File

@@ -16,23 +16,16 @@ LinkItem_PortalRod:
JSR LinkItem_EvaluateMagicCost : BCC .insufficient_mp
LDA.b #$30 : JSR $802F ; Sfx3
JSL LinkItem_FirePortal
.y_button_held
JSR $AE65 ; HaltLinkWhenUsingItems
DEC $3D : BPL .return
LDA $0300 : INC A : STA $0300 : TAX
LDA RodAnimationTimer, X : STA $3D
CPX.b #$03 : BNE .return
STZ $0300
STZ $5E
STZ $3D
LDA $0301 : AND.b #$FE : STA $0301
.insufficient_mp
@@ -116,7 +109,6 @@ LinkItem_FirePortal:
LDA $2F : CMP.b #$02 : BEQ .facing_down
LDA $2F : CMP.b #$04 : BEQ .facing_left
LDA $2F : CMP.b #$06 : BEQ .facing_right
; Portal Spawn Location
.facing_up
@@ -139,7 +131,6 @@ LinkItem_FirePortal:
.return
; Delay the spin attack for some amount of time?
LDA RodAnimationTimer : STA $3D
STZ $2E
STZ $0300 : STZ $0301
LDA.b #$01 : TSB $0301