Merge remote-tracking branch 'baserom/master' into MergeDecompression

# Conflicts:
#	events.asm
#	newitems.asm
#	shopkeeper.asm
#	tables.asm

Plus attempt to update standing items

newitems.asm

@@ -449,7 +449,10 @@ ItemBehavior:
         RTS
 
         .single_arrow
-        INC.w UpdateHUD
+        LDA.l ArrowMode : BEQ +
+                LDA.l CurrentArrows : INC : STA.l CurrentArrows ; Should be sole write to this address
+                INC.w UpdateHUD                                 ; in retro/rupee bow mode.
+        +
         RTS
 
         .rupoor
@@ -641,7 +644,12 @@ ItemBehavior:
 
         .pendant
         SEP #$20
-        LDA.l PendantCounter : INC : STA.l PendantCounter
+        LSR
+        SEC : SBC.b #$37
+        TAX
+        LDA.w PendantMasks,X : AND.l PendantsField : BNE +
+                LDA.l PendantCounter : INC : STA.l PendantCounter
+        +
         RTS
 
         .dungeon_crystal
@@ -660,9 +668,12 @@ ItemBehavior:
                 DEX
         BPL -
         SEP #$20
-        ORA.l CrystalsField : STA.l CrystalsField
-        LDA.l CrystalCounter : INC : STA.l CrystalCounter
-
+        TAX
+        AND.l CrystalsField : BNE +
+                TXA
+                ORA.l CrystalsField : STA.l CrystalsField
+                LDA.l CrystalCounter : INC : STA.l CrystalCounter
+        +
         .done
         RTS
 
@@ -673,7 +684,7 @@ ResolveReceipt:
         LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE +
         LDA.w ItemReceiptID
         .get_item
-        JSR.w AttemptItemSubstitution
+        JSL.l AttemptItemSubstitution
         JSR.w HandleBowTracking
         +
         LDA.w ItemReceiptID
@@ -1037,7 +1048,7 @@ AttemptItemSubstitution:
         BRA -
         .exit
         PLA : PLX
-RTS
+RTL
 ;--------------------------------------------------------------------------------
 CountBottles:
         PHX
@@ -1145,6 +1156,8 @@ dw $0004 ; EP
 dw $0002 ; HC
 dw $0000 ; Sewers
 
+PendantMasks:
+db $04, 01, 02
 
 NewItemsChecks:
 	CMP.b #$B2 : BNE + ; Fairy