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

Merge pull request #68 from JonHanon/mushroom-in-save-hud

Browse Source 
Mushroom in save hud (#652 in /alttp_vt_randomizer)
This commit is contained in:
KatDevsGames
2019-06-17 22:46:20 -04:00
committed by GitHub
parent 7ca12758db ab9e7a029a
commit a099ef5c73
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fileselect.asm
View File

@@ -203,7 +203,7 @@ DrawPlayerFileShared:
++ ++
; Mushroom ; Mushroom
LDA.l !FS_INVENTORY_SWAP : AND.w #$0020 : BEQ + LDA.l !FS_INVENTORY_SWAP : AND.w #$0008 : BEQ +
%fs_drawItem(3,18,FileSelectItems_mushroom) %fs_drawItem(3,18,FileSelectItems_mushroom)
BRA ++ BRA ++
+ +

8
inventory.asm
View File

@@ -3,12 +3,12 @@
;================================================================================ ;================================================================================
!INVENTORY_SWAP = "$7EF38C" !INVENTORY_SWAP = "$7EF38C"
; Item Tracking Slot ; Item Tracking Slot
; brmp-skf ; brmpnskf
; b = blue boomerang ; b = blue boomerang
; r = red boomerang ; r = red boomerang
; m = mushroom ; m = mushroom current
; p = magic powder ; p = magic powder
; - ; n = mushroom past
; s = shovel ; s = shovel
; k = fake flute ; k = fake flute
; f = working flute ; f = working flute
@@ -208,7 +208,7 @@ AddInventory:
LDA !INVENTORY_SWAP : ORA #$40 : STA !INVENTORY_SWAP LDA !INVENTORY_SWAP : ORA #$40 : STA !INVENTORY_SWAP
BRL .incrementCounts BRL .incrementCounts
+ CPY.b #$29 : BNE + ; Mushroom + CPY.b #$29 : BNE + ; Mushroom
LDA !INVENTORY_SWAP : ORA #$20 : STA !INVENTORY_SWAP LDA !INVENTORY_SWAP : ORA #$28 : STA !INVENTORY_SWAP
BRL .incrementCounts BRL .incrementCounts
+ CPY.b #$0D : BNE + ; Magic Powder + CPY.b #$0D : BNE + ; Magic Powder
LDA !INVENTORY_SWAP : ORA #$10 : STA !INVENTORY_SWAP LDA !INVENTORY_SWAP : ORA #$10 : STA !INVENTORY_SWAP