alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Another WRAM label pass

Browse Source 
Deleted compression.asm
This commit is contained in:
cassidoxa
2022-11-22 00:36:39 -05:00
parent 788cceaab9
commit 09d15f3294
63 changed files with 1438 additions and 1317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
quickswap.asm
View File

@@ -4,28 +4,28 @@ 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.b #$30 : BEQ .done
LDA.b Joy1B_New : AND.b #$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
LDA.w ItemCursor : BEQ .done ; Skip everything if we don't have any items
LDY.b #$14
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
LDX.w ItemCursor : BRA .special_swap
+
BIT.b #$10 : BEQ + ; Only pressed R
JSR.w RCode
LDA.b $F2 : BIT.b #$20 : BNE .special_swap ; Still holding L from a previous frame
LDA.b Joy1B_All : BIT.b #$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
LDA.b Joy1B_All : BIT #$10 : BNE .special_swap ; Still holding R from a previous frame
BRA .store
.special_swap
@@ -36,21 +36,21 @@ QuickSwap:
CPX.b #$0D : BEQ + ; flute
CPX.b #$10 : BEQ + ; bottle
BRA .store
+ STX.w $0202 : JSL ProcessMenuButtons_y_pressed
+ STX.w ItemCursor : JSL ProcessMenuButtons_y_pressed
.store
LDA.b #$20 : STA.w $012F
STX.w $0202
LDA.b #$20 : STA.w SFX3
STX.w ItemCursor
JSL HUD_RefreshIconLong
PLX
.done
LDA.b $F6 : AND.b #$40 ;what we wrote over
LDA.b Joy1B_New : AND.b #$40 ;what we wrote over
RTL
RCode:
LDX.w $0202
LDA.b $F2 : BIT.b #$20 : BNE ++ ; Still holding L from a previous frame
LDX.w ItemCursor
LDA.b Joy1B_All : BIT.b #$20 : BNE ++ ; Still holding L from a previous frame
LDA.l InventoryTracking+1 : AND.b #$FE : STA.l InventoryTracking+1
BRA +
++
@@ -66,8 +66,8 @@ RCode:
RTS
LCode:
LDX.w $0202
LDA.b $F2 : BIT #$10 : BNE ++ ; Still holding R from a previous frame
LDX.w ItemCursor
LDA.b Joy1B_All : BIT #$10 : BNE ++ ; Still holding R from a previous frame
LDA.l InventoryTracking+1 : AND.b #$FE : STA.l InventoryTracking+1
BRA +
++