c4452389bb
fixed boss swords incrementing the wrong sword when bossed drop swords quick swap support officially enabled and permitting in non-race modes in all generators
98 lines
2.2 KiB
NASM
98 lines
2.2 KiB
NASM
; Thanks to Kazuto for developing the original QS code that inspired this one
|
|
|
|
QuickSwap:
|
|
; We perform all other checks only if we are pushing L or R in order to have minimal
|
|
; perf impact, since this runs every frame
|
|
|
|
LDA.b $F6 : AND #$30 : BEQ .done
|
|
|
|
XBA ; stash away the value for after the checks.
|
|
|
|
LDA.l QuickSwapFlag : BEQ .done
|
|
LDA.w $0202 : BEQ .done ; Skip everything if we don't have any items
|
|
|
|
;TODO add romtype and race rom checks here
|
|
LDA.l TournamentSeed : BEQ +
|
|
LDA.l GameType : AND.b #$02 : BNE +
|
|
BRA .done
|
|
+
|
|
|
|
PHX
|
|
XBA ; restore the stashed value
|
|
CMP.b #$30 : BNE +
|
|
; If prossing both L and R this frame, then go directly to the special swap code
|
|
LDX.w $0202 : BRA .special_swap
|
|
+
|
|
BIT #$10 : BEQ + ; Only pressed R
|
|
JSR.w RCode
|
|
LDA.b $F2 : BIT #$20 : BNE .special_swap ; Still holding L from a previous frame
|
|
BRA .store
|
|
+
|
|
; Only pressed L
|
|
JSR.w LCode
|
|
LDA.b $F2 : BIT #$10 : BNE .special_swap ; Still holding R from a previous frame
|
|
BRA .store
|
|
|
|
.special_swap
|
|
CPX.b #$02 : BEQ + ; boomerang
|
|
CPX.b #$01 : BEQ + ; bow
|
|
CPX.b #$05 : BEQ + ; powder
|
|
CPX.b #$0D : BEQ + ; flute
|
|
BRA .store
|
|
+ STX $0202 : JSL ProcessMenuButtons_y_pressed
|
|
|
|
.store
|
|
LDA.b #$20 : STA.w $012F
|
|
STX $0202
|
|
|
|
JSL HUD_RefreshIconLong
|
|
PLX
|
|
|
|
.done
|
|
LDA.b $F6 : AND.b #$40 ;what we wrote over
|
|
RTL
|
|
RCode:
|
|
LDA.w $0202 : TAX
|
|
-
|
|
CPX.b #$0F : BNE + ; incrementing into bottle
|
|
LDX.b #$00 : BRA ++
|
|
+ CPX.b #$10 : BNE + ; incrementing bottle
|
|
LDA.l $7EF34F : TAX
|
|
-- : ++
|
|
CPX.b #$04 : BEQ .noMoreBottles
|
|
INX
|
|
LDA.l $7EF35B,X : BEQ --
|
|
TXA : STA.l $7EF34F
|
|
LDX #$10
|
|
RTS
|
|
.noMoreBottles
|
|
LDX #$11
|
|
BRA .nextItem
|
|
+ CPX.b #$14 : BNE + : LDX.b #$00 ;will wrap around to 1
|
|
+ INX
|
|
.nextItem
|
|
JSL.l IsItemAvailable : BEQ -
|
|
RTS
|
|
|
|
LCode:
|
|
LDA.w $0202 : TAX
|
|
-
|
|
CPX.b #$11 : BNE + ; decrementing into bottle
|
|
LDX.b #$05 : BRA ++
|
|
+ CPX.b #$10 : BNE + ; decrementing bottle
|
|
LDA.l $7EF34F : TAX
|
|
-- : ++
|
|
CPX.b #$01 : BEQ .noMoreBottles
|
|
DEX
|
|
LDA.l $7EF35B,X : BEQ --
|
|
TXA : STA.l $7EF34F
|
|
LDX.b #$10
|
|
RTS
|
|
.noMoreBottles
|
|
LDX.b #$0F : BRA .nextItem
|
|
+ CPX.b #$01 : BNE + : LDX.b #$15 ; will wrap around to $14
|
|
+ DEX
|
|
.nextItem
|
|
JSL.l IsItemAvailable : BEQ -
|
|
RTS
|