cleanup portal rod code

This commit is contained in:
scawful
2024-06-29 14:48:36 -04:00
parent 7db29009d5
commit 998423bac2

View File

@@ -14,7 +14,6 @@ LinkItem_PortalRod:
JSR Link_CheckNewY_ButtonPress : BCC .return
LDX.b #$00
JSR LinkItem_EvaluateMagicCost : BCC .insufficient_mp
LDA.b #$30 : JSR $802F ; Sfx3
JSL LinkItem_FirePortal
@@ -22,9 +21,6 @@ LinkItem_PortalRod:
JSR $AE65 ; HaltLinkWhenUsingItems
; What's the point of this?
; LDA $67 : AND.b #$F0 : STA $67
DEC $3D : BPL .return
LDA $0300 : INC A : STA $0300 : TAX
@@ -33,8 +29,8 @@ LinkItem_PortalRod:
CPX.b #$03 : BNE .return
STZ $5E
STZ $0300
STZ $5E
STZ $3D
LDA $0301 : AND.b #$FE : STA $0301
@@ -183,25 +179,16 @@ ScrollToPortal:
STZ $02
LDA $22 : CMP $7EC186 : BEQ .set_x : BCC .x_low
DEC $02
DEC A : CMP $7EC186 : BEQ .set_x
DEC $02
DEC A
BRA .set_x
.x_low
INC $02
INC A : CMP $7EC186 : BEQ .set_x
INC $02
INC A
.set_x
@@ -209,39 +196,25 @@ ScrollToPortal:
STA $22
LDA $20 : CMP $7EC184 : BEQ .set_y : BCC .y_low
DEC $00
DEC A : CMP $7EC184 : BEQ .set_y
DEC $00
DEC A
BRA .set_y
.y_low
INC $00
INC A : CMP $7EC184 : BEQ .set_y
INC $00
INC A
.set_y
STA $20
CMP $7EC184 : BNE .delay_advance
LDA $22 : CMP $7EC186 : BNE .delay_advance
INC $B0
STZ $46
.delay_advance
SEP #$20
@@ -252,9 +225,7 @@ ScrollToPortal:
JSL Overworld_OperateCameraScroll_Long ; $13B90 IN ROM
LDA $0416 : BEQ .exit
JSL Overworld_ScrollMap_Long ; $17273 IN ROM
.exit
RTL