diff --git a/events.asm b/events.asm index a1df980..ba5c4ba 100644 --- a/events.asm +++ b/events.asm @@ -265,9 +265,19 @@ PostItemAnimation: LDA.b #$00 : STA.l TextBoxDefer + + LDA.w ItemReceiptMethod : CMP.b #$01 : BNE + + LDA.b LinkDirection : BEQ + + JSL IncrementChestTurnCounter + + + LDA.b IndoorsFlag : BEQ + REP #$20 : LDA.b RoomIndex : STA.l !MULTIWORLD_ROOMID : SEP #$20 LDA.w RoomItemsTaken : STA.l !MULTIWORLD_ROOMDATA + + + LDA $1B : BEQ + + REP #$20 : LDA $A0 : STA !MULTIWORLD_ROOMID : SEP #$20 + LDA $0403 : STA !MULTIWORLD_ROOMDATA + LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BEQ + @@ -275,12 +285,7 @@ PostItemAnimation: LDA.b #$00 : STA.l !MULTIWORLD_ITEM_PLAYER_ID PLB JML Ancilla_ReceiveItem_objectFinished - + - - LDA.w ItemReceiptMethod : CMP.b #$01 : BNE + - LDA.b LinkDirection : BEQ + - JSL IncrementChestTurnCounter - + + + REP #$20 PEA.w $7E00 PLB : PLB