Shield handling for pots and enemy drops and a few more NPCs

pikit.asm

@@ -74,7 +74,11 @@ LinkAwaken:
 	RTL
 
 BigChest_ShieldCheck:
+	PHY
+	LDY.b $0C
 	JSL ShieldCheck
+	STY.b $0C
+	PLY
 	BCC .no_open
 	LDA.l BigKeyField
 	AND.l BitMasks, X
@@ -82,7 +86,11 @@ BigChest_ShieldCheck:
 	RTL
 
 SmallChest_ShieldCheck:
+	PHY
+	LDY.b $0C
 	JSL ShieldCheck
+	STY.b $0C
+	PLY
 	BCC .no_open
 	LDA.w DungeonID
 	ORA.w RoomFlagMask, Y
@@ -93,7 +101,7 @@ ShieldCheck:
 	PHP
 	REP #$30
 	PHX
-	LDA.b $0C
+	TYA
 	AND.w #$00FF
 	TAX
 	LDA.l PikitItemList, X
@@ -110,8 +118,7 @@ ShieldCheck:
 	BNE .already_have_shield
 	TXA
 	STA.l PikitItem
-	LDA.w #$0004
-	STA.b $0C
+	LDY.w #$0004
 	PLX
 	PLP
 	SEC