implement remote item checks

2020-01-18 06:38:47 +01:00
parent c3c5ba9d53
commit 2a5e305fc6
6 changed files with 70 additions and 15 deletions
--- a/newitems.asm
+++ b/newitems.asm
@@ -434,19 +434,28 @@ RTL
 AddReceivedItemExpanded:
 {
 	PHA : PHX
+		LDA RemoteItems : BEQ + : LDA !MULTIWORLD_ITEM_PLAYER_ID : BEQ +
+			LDA $02E9 : BEQ ++ : CMP #$03 : BNE +++ : ++
+				; fromTextOrObject
+				LDA $0345 : BEQ ++ : LDA.b #$04 : ++ : STA $5D ; Restore Link to his swimming state
+				STZ $02DA : STZ $037B : STZ $02E4
+				LDA #$0E : STA $012F
+			+++
+			STZ $02D8 : STZ $02D9 : STZ $02E9
+			PHY : LDY.b #$00 : JSL AddInventory : PLY
+			PLX : PLA : RTL
+		+
+		
 		JSL.l PreItemGet

-		LDA $02D8 : PHA ; Item Value
 		LDA !MULTIWORLD_ITEM_PLAYER_ID : BNE +
-			PLA
+			LDA $02D8
 			JSR AttemptItemSubstitution
 			STA $02D8

 			JSR IncrementItemCounters
-			BRA ++
 		+
-		PLA
-		++
+		LDA $02D8 ; Item Value
 		
 		CMP.b #$16 : BEQ .bottle ; Bottle
 		CMP.b #$2B : BEQ .bottle ; Red Potion w/bottle