From 8f289c8e0a6a1d45c16ecb1bb03a9308f7e34107 Mon Sep 17 00:00:00 2001 From: sporchia Date: Tue, 25 Sep 2018 22:30:06 -0400 Subject: [PATCH] per feedback --- entrances.asm | 4 +++- goalitem.asm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/entrances.asm b/entrances.asm index 60f3ca1..9a82970 100644 --- a/entrances.asm +++ b/entrances.asm @@ -12,8 +12,10 @@ LockAgahnimDoors: JSR.w LockAgahnimDoorsCore : RTL + : CMP.w #$0002 : BNE + JSR.w LockAgahnimDoorsCore : BEQ .unlock + SEP #$30 JSL.l CheckEnoughCrystals : BEQ .crystalOrUnlock ; I think the registers might be wrong for this - LDA #$0001 : RTL + REP #$30 + LDA #$0001 : RTL .crystalOrUnlock LDA InvertedMode : AND.w #$00FF : BEQ .unlock diff --git a/goalitem.asm b/goalitem.asm index f177763..bc4c977 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -48,7 +48,7 @@ CheckGanonVulnerability: BRA .success + : CMP #$06 : BNE + ;#$06 = Require "NumberOfCrystalsRequired" Crystals - JSR CheckEnoughCrystals : BNE .fail + JSR CheckEnoughCrystals : BCC .fail BRA .success + .fail : CLC : RTL