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

Fix a few bus left over from merge
This commit is contained in:
aerinon
2023-08-23 16:06:31 -06:00
parent 2a789b04e4
commit f1dda4a8c0
6 changed files with 21 additions and 26 deletions

View File

@@ -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 +