alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102 from kedNalatacId/quickswap_bottle_y_pressed

Browse Source 
Quickswap bottle y pressed
This commit is contained in:
KatDevsGames
2021-04-02 13:17:57 -05:00
committed by GitHub
parent b84921e255 025b4941f3
commit 362e9d3b14
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inventory.asm
View File

@@ -124,7 +124,9 @@ RTL
;ProcessBottleMenu:
;--------------------------------------------------------------------------------
ProcessBottleMenu:
LDA $F4 : AND #$40 : BEQ .y_not_pressed ; skip if Y is not down
; LDA $F6 : AND #$30 : CMP.b #$30 : BEQ .double_shoulder_pressed
; LDA $F4 : AND #$40 : BEQ .y_not_pressed ; skip if Y is not down
; .double_shoulder_pressed
LDA $7EF34F ; check bottle state
BEQ .no_bottles ; skip if we have no bottles
PHX
@@ -137,9 +139,9 @@ ProcessBottleMenu:
.no_bottles
LDA #$00 ; pretend like the controller state was 0 from the overridden load
RTL
.y_not_pressed
LDA $F4 : AND.b #$0C ; thing we wrote over - load controller state
RTL
; .y_not_pressed
; LDA $F4 : AND.b #$0C ; thing we wrote over - load controller state
;RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------