Cleanup jump feather and sword collect asm
This commit is contained in:
@@ -3,13 +3,13 @@
|
||||
|
||||
org $07AFF8 ; LinkItem_BugCatchingNet
|
||||
{
|
||||
BIT $3A : BVS .return ;if Y or B are already pressed
|
||||
LDA $6C : BNE .return ; if we are standing in a dooray or not
|
||||
; Link_CheckNewY_ButtonPress
|
||||
JSR $B073 : BCC .return ; Check if we just pressed Y Button
|
||||
JSL LinkItem_JumpFeather
|
||||
BIT $3A : BVS .return ;if Y or B are already pressed
|
||||
LDA $6C : BNE .return ; if we are standing in a dooray or not
|
||||
; Link_CheckNewY_ButtonPress
|
||||
JSR $B073 : BCC .return ; Check if we just pressed Y Button
|
||||
JSL LinkItem_JumpFeather
|
||||
.return
|
||||
RTS
|
||||
RTS
|
||||
}
|
||||
|
||||
; =========================================================
|
||||
|
||||
@@ -5,49 +5,34 @@ org $86F725
|
||||
pullpc
|
||||
collectSword:
|
||||
{
|
||||
ADC #$00
|
||||
STA $09
|
||||
LDA $79
|
||||
BEQ $01
|
||||
RTL
|
||||
ADC #$00 : STA $09
|
||||
LDA $79 : BEQ $01
|
||||
RTL
|
||||
|
||||
LDA $0E20, x
|
||||
SEC
|
||||
SBC #$D8
|
||||
BCS $01
|
||||
RTL
|
||||
LDA $0E20, X : SEC : SBC #$D8 : BCS $01
|
||||
RTL
|
||||
|
||||
LDA $0E20, x
|
||||
SEC
|
||||
SBC #$E7
|
||||
BCC $01
|
||||
RTL
|
||||
LDA $0E20, X : SEC : SBC #$E7 : BCC $01
|
||||
RTL
|
||||
|
||||
PHY
|
||||
LDY $3C
|
||||
BPL $02
|
||||
PLY
|
||||
RTL
|
||||
LDY $3C : BPL $02 : PLY
|
||||
RTL
|
||||
|
||||
LDA $F571, y
|
||||
BEQ $02
|
||||
PLY
|
||||
RTL
|
||||
LDA $F571, Y : BEQ $02
|
||||
PLY
|
||||
RTL
|
||||
|
||||
PHX
|
||||
LDA $2F
|
||||
ASL A
|
||||
ASL A
|
||||
ASL A
|
||||
CLC
|
||||
ADC $3C
|
||||
CLC : ADC $3C
|
||||
TAX
|
||||
INX
|
||||
LDY #$00
|
||||
LDA $45
|
||||
CLC
|
||||
ADC $F46D, x
|
||||
BPL $01
|
||||
LDY #$00 : LDA $45
|
||||
CLC : ADC $F46D, X : BPL $01
|
||||
DEY
|
||||
CLC
|
||||
ADC $22
|
||||
|
||||
Reference in New Issue
Block a user