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

cleanup portal rod code

Browse Source
This commit is contained in:
scawful
2024-06-29 14:48:36 -04:00
parent 7db29009d5
commit 998423bac2
1 changed files with 68 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Items/portal_rod.asm
View File

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