fix: hera basement cage counting multiple times, again
This commit is contained in:
@@ -664,12 +664,7 @@ KeyGet:
|
||||
+ LDY.w $0E80, X
|
||||
LDA.w SprItemIndex, X : STA.w SpawnedItemIndex
|
||||
LDA.w SprItemFlags, X : STA.w SpawnedItemFlag
|
||||
LDA.b RoomIndex : CMP.b #$87 : BNE + ;check for hera cage
|
||||
LDA.w SpawnedItemFlag : BNE + ; if it came from a pot, it's fine
|
||||
JSR ShouldKeyBeCountedForDungeon : BCC ++
|
||||
JSL CountChestKeyLong
|
||||
++ PLA : RTL
|
||||
+ STY.b Scrap00
|
||||
STY.b Scrap00
|
||||
LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
|
||||
STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID : BNE .receive
|
||||
PHX
|
||||
@@ -695,18 +690,6 @@ KeyGet:
|
||||
KeyTable:
|
||||
db $A0, $A0, $A2, $A3, $A4, $A5, $A6, $A7, $A8, $A9, $AA, $AB, $AC, $AD
|
||||
|
||||
; Input Y - the item type
|
||||
ShouldKeyBeCountedForDungeon:
|
||||
PHX
|
||||
LDA.w DungeonID : CMP.b #$FF : BEQ .done
|
||||
LSR : TAX
|
||||
TYA : CMP.w KeyTable, X : BNE +
|
||||
- PLX : SEC : RTS
|
||||
+ CMP.b #$24 : BEQ -
|
||||
.done
|
||||
PLX : CLC : RTS
|
||||
|
||||
|
||||
BigKeyGet:
|
||||
LDY.w $0E80, X
|
||||
CPY.b #$32 : BNE +
|
||||
|
||||
Reference in New Issue
Block a user