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

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	inventory.asm
#	newhud.asm
This commit is contained in:
aerinon
2023-09-08 13:49:16 -06:00
parent e772b4a931 bc3dd5c186
commit 2561737236
14 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inventory.asm
View File

@@ -372,7 +372,7 @@ Link_ReceiveItem_HUDRefresh:
+
JSL.l HUD_RefreshIconLong ; thing we wrote over
INC.w UpdateHUD
INC.w UpdateHUDFlag
JSL.l PostItemGet
RTL
;--------------------------------------------------------------------------------
@@ -387,7 +387,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
;--------------------------------------------------------------------------------