alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Change how hera basement key is counted to not count Byrna

Browse Source
This commit is contained in:
aerinon
2020-12-09 14:28:12 -07:00
parent b3fcd2192e
commit a9bddea1b4
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stats.asm
View File

@@ -216,14 +216,11 @@ RTL
IncrementSmallKeysNoPrimary: IncrementSmallKeysNoPrimary:
STA $7EF36F ; thing we wrote over, write small key count STA $7EF36F ; thing we wrote over, write small key count
PHX PHX
LDA !LOCK_STATS : BNE +
JSL AddInventory_incrementKeyLong
+
JSL.l UpdateKeys JSL.l UpdateKeys
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
@@ -244,7 +241,6 @@ RTL
CountChestKey: ; called by neighbor functions CountChestKey: ; called by neighbor functions
PHA : PHX PHA : PHX
LDA !MULTIWORLD_ITEM_PLAYER_ID : bne .end LDA !MULTIWORLD_ITEM_PLAYER_ID : bne .end
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