Attempt to re-write standing items using the new decompressed gfx.

Fix a few bus left over from merge

events.asm

@@ -282,5 +282,5 @@ PostItemAnimation:
         SEP #$20
 
         STZ.w ItemReceiptMethod : LDA.w AncillaGet, X ; thing we wrote over to get here
-RTL
+JML Ancilla_ReceiveItem_optimus+6
 ;--------------------------------------------------------------------------------

hooks.asm

@@ -1892,7 +1892,6 @@ JSL AllowSQ
 org $88C45F ; <- 4445F - ancilla_recieve_item.asm:157 (STZ $02E9 : LDA $0C5E, X)
 Ancilla_ReceiveItem_optimus:
 JML PostItemAnimation : NOP #2
-; todo - JML vs JSL
 
 org $88C548 ; <- 44548 - ancilla_recieve_item.asm:297 (CMP.b #$28 : BNE .dontGiveRupees)
 JML.l Multiworld_Ancilla_ReceiveItem_stillInMotion

keydrop/dynamic_si_vram.asm

@@ -32,19 +32,22 @@ RequestStandingItemVRAMSlot:
 	STA.w SprItemGFX,X
 
 
-	; decompress graphics
 	PHX
-	LDX.w DynamicDropQueue
-
-	REP #$20
-	LDA.w #DynamicDropGFX-$7E9000
-	STA.l TileUploadOffsetOverride
-	SEP #$20
-
 	LDA.w DynamicDropQueue
-	JSL.l GetSpriteID
-	JSL.l GetAnimatedSpriteTile_variable
+	; unsure about substitution rules here, because they aren't skipped properly for MW yet
+;	JSL AttemptItemSubstitutionLong
+	JSL ResolveLootIDLong
+	ASL : TAX : LDA.l StandingItemGraphicsOffsets,X
+	LDX.w ItemQueuePtr
+	STA.w ItemGFXQueue,X
 
+	PLX : PHX
+	REP #$20
+	LDA.l FreeUWGraphics,X
+	LDX.w ItemQueuePtr
+	STA.w ItemTargetQueue,X
+	SEP #$20
+	TXA : INC #2 : STA.w ItemQueuePtr
 	SEP #$30
 	PLX
 

keydrop/standing_items.asm

@@ -43,8 +43,8 @@ org $86d18d ; <- 3518D - sprite_absorbable.asm : 274 (LDA $7EF36F : INC A : STA
 org $86f9f3 ; bank06.asm : 6732 (JSL Sprite_LoadProperties)
 	JSL LoadProperties_PreserveCertainProps
 
-org $808BAA ; NMI hook
-	JSL TransferPotGFX
+;org $808BAA ; NMI hook
+;	JSL TransferPotGFX
 
 org $86828A
 	JSL CheckSprite_Spawn
@@ -602,7 +602,7 @@ SpriteKeyPrep:
 					BRA +
 		.continue
 		LDA.w SpawnedItemIndex : STA SprItemIndex, X
-		LDA.w SpawnedItemMWPlayer : STA SprItemMWPlayer, X
+		LDA.w SpawnedItemMWPlayer : STA SprItemMWPlayer, X : STA.w !MULTIWORLD_SPRITEITEM_PLAYER_ID
 		LDA.w SpawnedItemFlag : STA SprItemFlags, X : BEQ +
 		LDA.l SpawnedItemID : STA $0E80, X
 		PHA

newitems.asm

@@ -118,7 +118,7 @@ ProcessEventItems:
 RTS
 ;--------------------------------------------------------------------------------
 AddReceivedItemExpanded:
-PHA : PHX
+	PHA : PHX
 		LDA.l RemoteItems : BEQ + : LDA !MULTIWORLD_ITEM_PLAYER_ID : BEQ +
 			LDA.w ItemReceiptMethod : BEQ ++ : CMP.b #$03 : BNE +++ : ++
 				; fromTextOrObject
@@ -129,7 +129,7 @@ PHA : PHX
 			STZ.w ItemReceiptID : STZ.w $02D9 : STZ.w ItemReceiptMethod
 			PHY : LDY.b #$00 : JSL AddInventory : PLY
 			PLX : PLA : RTL
-		+
+		+ PLX : PLA
         JSR.w ResolveReceipt
         PHB : PHK
 JML AddReceivedItem+2
@@ -647,7 +647,7 @@ ItemBehavior:
         RTS
 
 ResolveReceipt:
-
+		PHA : PHX
         PHK : PLB
         JSL.l PreItemGet
         LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE +

tables.asm

@@ -115,7 +115,7 @@ org $B08038 ; PC 0x180038
 LampConeSewers:
 db $01 ; #$00 = Off - #$01 = On (default)
 ;--------------------------------------------------------------------------------
-org $308039 ; PC 0x180039
+org $B08039 ; PC 0x180039
 ItemCounterHUD:
 db $00 ; $00 = Off | $01 = Display TotalItemCounter / TotalItemCount display on HUD
 ;--------------------------------------------------------------------------------
@@ -2774,13 +2774,6 @@ dw #$0800          ; Yellow
 
 org $B0F032
 
-;--------------------------------------------------------------------------------
-; 0x187032 - 187FFF (unused)
-;--------------------------------------------------------------------------------
-org $B0F010
-MaxItemCounter:
-dw $00D8  ; 216 default
-
 pushpc
 
 ;--------------------------------------------------------------------------------