From 50ff7683ab702efbeda617a22af2b34c68b1a0b1 Mon Sep 17 00:00:00 2001 From: "randall.rupper" Date: Mon, 8 Jun 2020 09:51:43 -0600 Subject: [PATCH] Add PHX/PLX in a better spot to prevent CountBottles from overwritting X --- newitems.asm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/newitems.asm b/newitems.asm index 8325f0b..03b3549 100755 --- a/newitems.asm +++ b/newitems.asm @@ -1098,13 +1098,15 @@ AttemptItemSubstitution: RTS ;-------------------------------------------------------------------------------- CountBottles: - LDX.b #$00 - LDA $7EF35C : BEQ ++ : INX - ++ : LDA $7EF35D : BEQ ++ : INX - ++ : LDA $7EF35E : BEQ ++ : INX - ++ : LDA $7EF35F : BEQ ++ : INX - ++ - TXA + PHX + LDX.b #$00 + LDA $7EF35C : BEQ ++ : INX + ++ : LDA $7EF35D : BEQ ++ : INX + ++ : LDA $7EF35E : BEQ ++ : INX + ++ : LDA $7EF35F : BEQ ++ : INX + ++ + TXA + PLX RTS ;-------------------------------------------------------------------------------- ActivateGoal: