From 025b4941f367c0f7e4ddf8dde0c3e8ad58294b3d Mon Sep 17 00:00:00 2001 From: ken Date: Tue, 16 Mar 2021 22:23:06 -0700 Subject: [PATCH] don't require both shoulders twice; causes too much lag --- inventory.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inventory.asm b/inventory.asm index bbc7058..865b6d8 100644 --- a/inventory.asm +++ b/inventory.asm @@ -124,9 +124,9 @@ RTL ;ProcessBottleMenu: ;-------------------------------------------------------------------------------- ProcessBottleMenu: - 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 $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 @@ -139,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 ;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------