alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

fix maps/big keys/compasses

Browse Source 
they were previously overwriting each other when collected.
This commit is contained in:
sporchia
2017-05-19 14:20:35 -04:00
parent e30814ad16
commit 611b644e29
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
newitems.asm
View File

@@ -233,29 +233,29 @@ AddReceivedItemExpandedGetItem:
+ CMP.b #$70 : !BLT + : CMP.b #$80 : !BGE + ; Free Map + CMP.b #$70 : !BLT + : CMP.b #$80 : !BGE + ; Free Map
AND #$0F : CMP #$08 : !BGE ++ AND #$0F : CMP #$08 : !BGE ++
%ValueShift() %ValueShift()
ORA $73F368 : STA $7EF368 ; Map 1 ORA $7EF368 : STA $7EF368 ; Map 1
++ ++
!SUB #$08 !SUB #$08
%ValueShift() %ValueShift()
ORA $73F369 : STA $7EF369 ; Map 2 ORA $7EF369 : STA $7EF369 ; Map 2
BRL .done BRL .done
+ CMP.b #$80 : !BLT + : CMP.b #$90 : !BGE + ; Free Compass + CMP.b #$80 : !BLT + : CMP.b #$90 : !BGE + ; Free Compass
AND #$0F : CMP #$08 : !BGE ++ AND #$0F : CMP #$08 : !BGE ++
%ValueShift() %ValueShift()
ORA $73F364 : STA $7EF364 ; Compass 1 ORA $7EF364 : STA $7EF364 ; Compass 1
++ ++
!SUB #$08 !SUB #$08
%ValueShift() %ValueShift()
ORA $73F365 : STA $7EF365 ; Compass 2 ORA $7EF365 : STA $7EF365 ; Compass 2
BRL .done BRL .done
+ CMP.b #$90 : !BLT + : CMP.b #$A0 : !BGE + ; Free Big Key + CMP.b #$90 : !BLT + : CMP.b #$A0 : !BGE + ; Free Big Key
AND #$0F : CMP #$08 : !BGE ++ AND #$0F : CMP #$08 : !BGE ++
%ValueShift() %ValueShift()
ORA $73F366 : STA $7EF366 ; Big Key 1 ORA $7EF366 : STA $7EF366 ; Big Key 1
++ ++
!SUB #$08 !SUB #$08
%ValueShift() %ValueShift()
ORA $73F367 : STA $7EF367 ; Big Key 2 ORA $7EF367 : STA $7EF367 ; Big Key 2
BRL .done BRL .done
+ CMP.b #$A0 : !BLT + : CMP.b #$B0 : !BGE + ; Free Small Key + CMP.b #$A0 : !BLT + : CMP.b #$B0 : !BGE + ; Free Small Key
AND #$0F : TAX AND #$0F : TAX