alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases 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

6
keydrop/standing_items.asm
View File

@@ -229,7 +229,7 @@ RevealPotItem:
; Could increment GT Tower Pre Big Key but we aren't showing that stat right now
+ REP #$10
LDA.l TotalItemCounter : INC : STA.l TotalItemCounter ; Increment Item Total
INC.w UpdateHUD
INC.w UpdateHUDFlag
.obtained
PLY : PLX
@@ -322,7 +322,7 @@ IncrementCountsForSubstitute:
; Could increment GT Tower Pre Big Key but we aren't showing that stat right now
+
LDA.l TotalItemCounter : INC : STA.l TotalItemCounter ; Increment Item Total
INC.w UpdateHUD
INC.w UpdateHUDFlag
.obtained
SEP #$30 : PLX
RTS
@@ -523,7 +523,7 @@ IncrementCountForMinor:
; Could increment GT Tower Pre Big Key but we aren't showing that stat right now
+
LDA.l TotalItemCounter : INC : STA.l TotalItemCounter ; Increment Item Total
INC.w UpdateHUD
INC.w UpdateHUDFlag
.obtained
SEP #$30 : PLX
RTS