From 83465e39af7078b7b2be4dcad345b9e74bf679c8 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 16 Dec 2022 15:14:33 -0700 Subject: [PATCH] Fix for blocked entrance doors --- doorrando/overrides.asm | 2 +- goalitem.asm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm index 09b8c64..7a443d7 100644 --- a/doorrando/overrides.asm +++ b/doorrando/overrides.asm @@ -122,7 +122,7 @@ RainPrevention: PHA LDA ProgressIndicator : AND #$00FF : CMP #$0002 : !BGE .done ; only in rain states (0 or 1) LDA.l ProgressFlags : AND #$0004 : BNE .done ; zelda's been rescued - LDA.l BlockSanctuaryDoorInRain : BEQ .done ;flagged + LDA.l BlockSanctuaryDoorInRain : BEQ + ;flagged LDA $A0 : CMP #$0012 : BNE + ;we're in the sanctuary LDA.l FollowerIndicator : AND #$00FF : CMP #$0001 : BEQ .done ; zelda is following LDA $00 : AND #$00FF : CMP #$00A1 : BNE .done ; position is a1 diff --git a/goalitem.asm b/goalitem.asm index 255688c..d4a003f 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -100,6 +100,7 @@ CheckGanonVulnerability: .bosses_only JMP CheckForCrystalBossesDefeated +; 0a = Check Item counter .completionist REP #$20 LDA.l TotalItemCounter : CMP.l MaxItemCounter