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

don't require both shoulders twice; causes too much lag

Browse Source
This commit is contained in:
ken
2021-03-16 22:23:06 -07:00
parent a19c72a062
commit 025b4941f3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inventory.asm
View File

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