Fix Tablet items

Ensure that standing overworld items will never load the null item.
2018-07-26 19:00:25 -04:00
parent a3418a2ca6
commit a4a0ef8d04
4 changed files with 19 additions and 1 deletions
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -156,6 +156,10 @@ ItemSet_Mushroom:
 	PHA
 		LDA !NPC_FLAGS_2 : ORA.b #$10 : STA !NPC_FLAGS_2
 		LDY $0DA0, X ; Retrieve stored item type
+		BNE +
+			; if for any reason the item value is 0 reload it, just in case
+			%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues) : TAY
+		+
 	PLA
 	;LDY.b #$29
 	STZ $02E9 ; thing we wrote over - the mushroom is an npc for item purposes apparently