From 9ac2156945ce43ed35b4192b192c66b0a35e5329 Mon Sep 17 00:00:00 2001
From: Randall Rupper <Randall.Rupper@FamilySearch.org>
Date: Wed, 22 Nov 2023 13:13:44 -0700
Subject: [PATCH] fix: MW item substitution

---
 newitems.asm | 2 +-
 npcitems.asm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/newitems.asm b/newitems.asm
index 463409d..dff195e 100644
--- a/newitems.asm
+++ b/newitems.asm
@@ -1076,7 +1076,7 @@ RTS
 ;--------------------------------------------------------------------------------
 AttemptItemSubstitution:
         PHX : PHA
-        LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE .exit
+        LDA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID : BNE .exit
         LDX.b #$00
         -
                 LDA.l ItemSubstitutionRules, X
diff --git a/npcitems.asm b/npcitems.asm
index 2f43af7..bcd332a 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -185,6 +185,7 @@ RTL
 ; Randomize Zora King
 ;--------------------------------------------------------------------------------
 LoadZoraKingItemGFX:
+		LDA.l ZoraItem_Player : : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
         LDA.l $9DE1C3 ; location randomizer writes zora item to
         JSL.l AttemptItemSubstitution
         JSL.l ResolveLootIDLong