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

Merge branch 'main' into kara

Browse Source
This commit is contained in:
karafruit
2023-09-09 11:06:13 -05:00
parent 468d1e3ec4 fcbde59a1e
commit 13e558b8eb
16 changed files with 170 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inventory.asm
View File

@@ -193,15 +193,15 @@ AddInventory:
JSR.w IncrementByOne
JSR.w StampItem
JSR.w IncrementYAItems
REP #$20
REP #$30
LDA.l TotalItemCounter : INC : TAY
LDA.l BootsEquipment : BNE +
LDA.l BootsEquipment : AND.w #$00FF : BNE +
TYA : STA.l PreBootsLocations
+
LDA.l MirrorEquipment : BNE +
LDA.l MirrorEquipment : AND.w #$00FF : BNE +
TYA : STA.l PreMirrorLocations
+
LDA.l FluteEquipment : BNE +
LDA.l FluteEquipment : AND.w #$00FF : BNE +
TYA : STA.l PreFluteLocations
+
TYA
@@ -409,7 +409,7 @@ Link_ReceiveItem_HUDRefresh:
+
JSL.l HUD_RefreshIconLong ; thing we wrote over
INC.w UpdateHUD
INC.w UpdateHUDFlag
JSL.l PostItemGet
RTL
;--------------------------------------------------------------------------------
@@ -424,7 +424,7 @@ HandleBombAbsorbtion:
LDA.b #$04 : STA.w ItemCursor ; set selected item to bombs
LDA.b #$01 : STA.w CurrentYItem ; set selected item to bombs
JSL.l HUD_RebuildLong
INC.w UpdateHUD
INC.w UpdateHUDFlag
+
RTL
;--------------------------------------------------------------------------------