Merged in DR v1.4.1.6

2024-02-23 11:34:04 -06:00
parent 75fd81ab57 16d249859f
commit 59eb254116
23 changed files with 192 additions and 185 deletions
--- a/utilities.asm
+++ b/utilities.asm
@@ -67,7 +67,7 @@ PrepDynamicTile:
 	CMP.b #$34 : BCC + : CMP.b #$36+1 : BCS + : BRA ++ ; if rupees, don't draw to OAM
 		+ JSL TransferItemReceiptToBuffer_using_ReceiptID
 			SEP #$30
-    ++ LDA.b #$00 : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID  ; clear player id
+    ++ LDA.b #$00 : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID  ; clear player id
 	PLB : PLY : PLX
 RTL
        .loot_resolved
@@ -229,7 +229,7 @@ PrepDrawRemoteItemSprite:
 			RTS
 		++
 		STA.l !MULTIWORLD_SCOUT_LOCATION
-		LDA.b #$00 : STA.b !MULTIWORLD_SPRITEITEM_PLAYER_ID
+		LDA.b #$00 : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
 		LDA.b #$6B
 		RTS
 	+