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

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

Plus attempt to update standing items

bookofmudora.asm

@@ -4,6 +4,7 @@
 LoadLibraryItemGFX:
 		LDA.l LibraryItem_Player : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID
         %GetPossiblyEncryptedItem(LibraryItem, SpriteItemValues)
+        JSL.l AttemptItemSubstitution
         JSL.l ResolveLootIDLong
         STA.w SpriteID, X
         JSL.l PrepDynamicTile_loot_resolved
@@ -32,9 +33,17 @@ LoadBonkItemGFX_inner:
 	LDA.b #$00 : STA.l RedrawFlag
 	JSR LoadBonkItem_Player : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID
 	JSR LoadBonkItem
+        JSL.l AttemptItemSubstitution
+        JSL.l ResolveLootIDLong
         STA.w SpriteItemType, X
         STA.w SpriteID, X
 	JSL.l PrepDynamicTile
+        PHA : PHX
+        LDA.w SpriteID,X : TAX
+        LDA.l SpriteProperties_standing_width,X : BNE +
+                LDA.b #$00 : STA.l SpriteOAM : STA.l SpriteOAM+8
+        +
+        PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
 DrawBonkItemGFX: 
@@ -44,7 +53,7 @@ DrawBonkItemGFX:
         BRA .done ; don't draw on the init frame
 
 	.skipInit
-        JSR LoadBonkItem
+        LDA.w SpriteID,X
         JSL.l DrawDynamicTileNoShadow
 
         .done