alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hera basement cage counting multiple times, again

Browse Source
This commit is contained in:
aerinon
2024-06-17 17:17:07 -06:00
parent 6e327c951f
commit aa3c8a232b
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
keydrop/standing_items.asm
View File

@@ -664,12 +664,7 @@ KeyGet:
+ LDY.w $0E80, X + LDY.w $0E80, X
LDA.w SprItemIndex, X : STA.w SpawnedItemIndex LDA.w SprItemIndex, X : STA.w SpawnedItemIndex
LDA.w SprItemFlags, X : STA.w SpawnedItemFlag LDA.w SprItemFlags, X : STA.w SpawnedItemFlag
LDA.b RoomIndex : CMP.b #$87 : BNE + ;check for hera cage STY.b Scrap00
LDA.w SpawnedItemFlag : BNE + ; if it came from a pot, it's fine
JSR ShouldKeyBeCountedForDungeon : BCC ++
JSL CountChestKeyLong
++ PLA : RTL
+ STY.b Scrap00
LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID : BNE .receive STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID : BNE .receive
PHX PHX
@@ -695,18 +690,6 @@ KeyGet:
KeyTable: KeyTable:
db $A0, $A0, $A2, $A3, $A4, $A5, $A6, $A7, $A8, $A9, $AA, $AB, $AC, $AD 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: BigKeyGet:
LDY.w $0E80, X LDY.w $0E80, X
CPY.b #$32 : BNE + CPY.b #$32 : BNE +