alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'InventoryCount' into ShopBranch

Browse Source
This commit is contained in:
aerinon
2021-01-29 15:13:14 -07:00
parent 05e7f8eb96 356bfb3a05
commit b1d4ef3252
5 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inventory.asm
View File

@@ -340,13 +340,19 @@ AddInventory:
LDA !MULTIWORLD_RECEIVING_ITEM : CMP #$01 : BEQ ++
LDA $7EF355 : BNE + ; Check for Boots
REP #$20
LDA $7EF432 : INC : STA $7EF432 ; Increment Pre Boots Counter
SEP #$20
+
LDA $7EF353 : BNE + ; Check for Mirror
LDA $7EF433 : INC : STA $7EF433 ; Increment Pre Mirror Counter
REP #$20
LDA $7EF434 : INC : STA $7EF434 ; Increment Pre Mirror Counter
SEP #$20
+
REP #$20
LDA $7EF423 : INC : STA $7EF423 ; Increment Item Total
SEP #$20
++
.itemCounts
@@ -650,7 +656,7 @@ RTS
RTS
.incrementMail
LDA $7EF424 : !ADD #$40 : STA $7EF424
LDA $7EF436 : !ADD #$40 : STA $7EF436
RTS
.incrementKeyLong
@@ -659,9 +665,9 @@ RTL
.incrementKey
PHA : PHX
LDA $7EF424 : INC : AND #$3F : TAX
LDA $7EF424 : AND #$C0 : STA $7EF424
TXA : ORA $7EF424 : STA $7EF424
LDA $7EF436 : INC : AND #$3F : TAX
LDA $7EF436 : AND #$C0 : STA $7EF436
TXA : ORA $7EF436 : STA $7EF436
PLX : PLA
RTS