Final fix for counting hera key

This commit is contained in:
aerinon
2021-02-17 11:52:10 -07:00
parent be3960bedb
commit 5f1ea34646

View File

@@ -244,7 +244,7 @@ IncrementSmallKeysNoPrimary:
LDA $1B : BEQ + ; skip room check if outdoors LDA $1B : BEQ + ; skip room check if outdoors
PHP : REP #$20 ; set 16-bit accumulator PHP : REP #$20 ; set 16-bit accumulator
LDA $048E : CMP.w #$0087 : BNE ++ ; hera basement LDA $048E : CMP.w #$0087 : BNE ++ ; hera basement
PLP : PHY : LDY.b #24 : JSL.l FullInventoryExternal PLP : PHY : LDY.b #$24 : JSL.l FullInventoryExternal
JSR CountChestKey : PLY : BRA + JSR CountChestKey : PLY : BRA +
++ ++
PLP PLP
@@ -264,7 +264,6 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CountChestKey: ; called by neighbor functions CountChestKey: ; called by neighbor functions
PHA : PHX PHA : PHX
CPY #24 : BEQ + ; hera basement key
CPY #$24 : BEQ + ; small key for this dungeon - use $040C CPY #$24 : BEQ + ; small key for this dungeon - use $040C
CPY #$A0 : !BLT .end ; Ignore most items CPY #$A0 : !BLT .end ; Ignore most items
CPY #$AE : !BGE .end ; Ignore reserved key and generic key CPY #$AE : !BGE .end ; Ignore reserved key and generic key