Merged in DR v1.4.1.6

2024-02-23 11:34:04 -06:00
parent 75fd81ab57 16d249859f
commit 8135e9085f
12 changed files with 159 additions and 150 deletions
--- a/newitems.asm
+++ b/newitems.asm
@@ -731,20 +731,15 @@ ResolveReceipt:
        PHA : PHX
        PHK : PLB
        JSL PreItemGet
-        LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE +
-        LDA.w ItemReceiptID
-        .get_item
+        LDA.l !MULTIWORLD_ITEM_PLAYER_ID : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
+        LDA.w ItemReceiptID : STA.l !MULTIWORLD_ITEM_ID
        JSL AttemptItemSubstitution
        JSR HandleBowTracking
-        +
-        LDA.w ItemReceiptID
-        STA.l !MULTIWORLD_ITEM_ID
        JSR ResolveLootID
-        .have_item
        STA.w ItemReceiptID
        LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE +
-        LDA.w ItemReceiptID
-        JSR IncrementItemCounters
+                LDA.w ItemReceiptID
+                JSR IncrementItemCounters
        +
        PLX : PLA
        RTS