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

# Conflicts:
#	inventory.asm
#	newhud.asm
This commit is contained in:
aerinon
2023-09-08 13:49:16 -06:00
14 changed files with 29 additions and 26 deletions

View File

@@ -83,7 +83,7 @@ IncrementSmallKeys:
JSL.l UpdateKeys
PHY : LDY.b #24 : JSL.l AddInventory : PLY
JSL.l HUD_RebuildLong
INC.w UpdateHUD
INC.w UpdateHUDFlag
PLX
RTL
;--------------------------------------------------------------------------------
@@ -109,7 +109,7 @@ IncrementSmallKeysNoPrimary:
++
PLP
+
INC.w UpdateHUD
INC.w UpdateHUDFlag
JSL.l HUD_RebuildLong
PLX
RTL