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

5
hooks.asm
View File

@@ -1459,8 +1459,8 @@ org $8DFB29 : BRA UpdateHUDBuffer_update_item_check_arrows
;--------------------------------------------------------------------------------
org $8DF1AB : JSR.w RebuildHUD_update
org $8DDFC8 : JSR.w RebuildHUD_update
org $8DDB88 ; Don't rebuild HUD twice on icon refresh
NOP #3 ; Not sure why this is here
org $8DDB85
JSR.w RebuildHUD : BRA + : NOP : +
;--------------------------------------------------------------------------------
org $87A205 : JSL.l RebuildHUD_update_long
org $8AEF62 : JSL.l RebuildHUD_update_long
@@ -1475,6 +1475,7 @@ warnpc $8E8000
;--------------------------------------------------------------------------------
org $8DEDE8
JSL.l DrawHeartPiecesMenu : BRA DrawEquipment_in_a_dungeon
;--------------------------------------------------------------------------------
;================================================================================
; 300 Rupee NPC