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

fix: shopsanity repeatable item fix

Browse Source
This commit is contained in:
Randall Rupper
2024-01-02 17:57:33 -07:00
parent 55f18eb108
commit 97f3c527b0
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
inventory.asm
View File

@@ -195,6 +195,7 @@ ShopCheck:
CMP.w #271 : BEQ .nocount ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop CMP.w #271 : BEQ .nocount ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop
CMP.w #272 : BEQ .nocount ; red shield shop CMP.w #272 : BEQ .nocount ; red shield shop
CMP.w #284 : BEQ .nocount ; bomb shop CMP.w #284 : BEQ .nocount ; bomb shop
CMP.w #265 : BEQ .nocount ; potion shop - powder is flagged as "ShopEnableCount" in CollectPowder
; these room contain pots so you must check the quadrant as well for pottery lottery ; these room contain pots so you must check the quadrant as well for pottery lottery
CMP.w #287 : BNE + : LDA.b $A9 : CMP.w #$0201 : BEQ .nocount ; kakariko shop CMP.w #287 : BNE + : LDA.b $A9 : CMP.w #$0201 : BEQ .nocount ; kakariko shop
LDA.b RoomIndex LDA.b RoomIndex
@@ -651,19 +652,18 @@ RTL
; CollectPowder: ; CollectPowder:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CollectPowder: CollectPowder:
LDY.w SpriteID, X ; Retrieve stored item type LDY.w SpriteID, X ; Retrieve stored item type
BNE + BNE +
; if for any reason the item value is 0 reload it, just in case ; if for any reason the item value is 0 reload it, just in case
%GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) : TAY %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) : TAY
+ + PHA
PHA LDA WitchItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
LDA WitchItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID LDA.b #$01 : STA.l ShopEnableCount
LDA.b #$01 : STA.l ShopEnableCount PLA
PLA STZ.w ItemReceiptMethod ; item from NPC
STZ.w ItemReceiptMethod ; item from NPC JSL.l Link_ReceiveItem
JSL.l Link_ReceiveItem PHA : LDA.b #$00 : STA.l ShopEnableCount : STA.l PowderFlag : PLA
PHA : LDA.b #$00 : STA.l ShopEnableCount : STA.l PowderFlag : PLA JSL.l ItemSet_Powder
JSL.l ItemSet_Powder
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------