From 611b644e29040b52fb420fd60b5d71d5b4965cc0 Mon Sep 17 00:00:00 2001 From: sporchia Date: Fri, 19 May 2017 14:20:35 -0400 Subject: [PATCH] fix maps/big keys/compasses they were previously overwriting each other when collected. --- newitems.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/newitems.asm b/newitems.asm index 4fa5686..f0c16d6 100755 --- a/newitems.asm +++ b/newitems.asm @@ -233,29 +233,29 @@ AddReceivedItemExpandedGetItem: + CMP.b #$70 : !BLT + : CMP.b #$80 : !BGE + ; Free Map AND #$0F : CMP #$08 : !BGE ++ %ValueShift() - ORA $73F368 : STA $7EF368 ; Map 1 + ORA $7EF368 : STA $7EF368 ; Map 1 ++ !SUB #$08 %ValueShift() - ORA $73F369 : STA $7EF369 ; Map 2 + ORA $7EF369 : STA $7EF369 ; Map 2 BRL .done + CMP.b #$80 : !BLT + : CMP.b #$90 : !BGE + ; Free Compass AND #$0F : CMP #$08 : !BGE ++ %ValueShift() - ORA $73F364 : STA $7EF364 ; Compass 1 + ORA $7EF364 : STA $7EF364 ; Compass 1 ++ !SUB #$08 %ValueShift() - ORA $73F365 : STA $7EF365 ; Compass 2 + ORA $7EF365 : STA $7EF365 ; Compass 2 BRL .done + CMP.b #$90 : !BLT + : CMP.b #$A0 : !BGE + ; Free Big Key AND #$0F : CMP #$08 : !BGE ++ %ValueShift() - ORA $73F366 : STA $7EF366 ; Big Key 1 + ORA $7EF366 : STA $7EF366 ; Big Key 1 ++ !SUB #$08 %ValueShift() - ORA $73F367 : STA $7EF367 ; Big Key 2 + ORA $7EF367 : STA $7EF367 ; Big Key 2 BRL .done + CMP.b #$A0 : !BLT + : CMP.b #$B0 : !BGE + ; Free Small Key AND #$0F : TAX