Merge branch 'InventoryCount' into ShopBranch

hudadditions.asm

@@ -8,7 +8,7 @@ DrHudOverride:
 HudAdditions:
 {
     lda.l DRFlags : and #$0008 : beq ++
-        lda $7EF423 : and #$00ff
+        lda $7EF423
         jsr HudHexToDec4DigitCopy
         LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+10 ; draw 100's digit
         LDX.b $06 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+12 ; draw 10's digit

inventory.asm

@@ -340,13 +340,19 @@ AddInventory:
 
 	LDA !MULTIWORLD_RECEIVING_ITEM : CMP #$01 : BEQ ++
 		LDA $7EF355 : BNE + ; Check for Boots
+			REP #$20
 			LDA $7EF432 : INC : STA $7EF432 ; Increment Pre Boots Counter
+			SEP #$20
 		+
 
 		LDA $7EF353 : BNE + ; Check for Mirror
-			LDA $7EF433 : INC : STA $7EF433 ; Increment Pre Mirror Counter
+			REP #$20
+			LDA $7EF434 : INC : STA $7EF434 ; Increment Pre Mirror Counter
+			SEP #$20
 		+
+		REP #$20
 		LDA $7EF423 : INC : STA $7EF423 ; Increment Item Total
+		SEP #$20
 	++
 
 	.itemCounts
@@ -650,7 +656,7 @@ RTS
 RTS
 
 .incrementMail
-	LDA $7EF424 : !ADD #$40 : STA $7EF424
+	LDA $7EF436 : !ADD #$40 : STA $7EF436
 RTS
 
 .incrementKeyLong
@@ -659,9 +665,9 @@ RTL
 
 .incrementKey
 	PHA : PHX
-		LDA $7EF424 : INC : AND #$3F : TAX
+		LDA $7EF436 : INC : AND #$3F : TAX
-		LDA $7EF424 : AND #$C0 : STA $7EF424
+		LDA $7EF436 : AND #$C0 : STA $7EF436
-		TXA : ORA $7EF424 : STA $7EF424
+		TXA : ORA $7EF436 : STA $7EF436
 	PLX : PLA
 RTS
 

rupeelimit.asm

@@ -1,22 +0,0 @@
-;================================================================================
-; Four Digit Rupees
-;--------------------------------------------------------------------------------
-Draw4DigitRupees:
-	LDA $1B : AND.w #$00FF : BEQ .outdoors ; skip if outdoors
-	.indoors
-		LDA $A0 : BNE .normal ; skip except for ganon's room
-			;LDA #$246E : STA $7EC712
-			;LDA #$246F : STA $7EC714
-			LDA $7EF423 : AND #$00FF
-			BRA .print
-	.outdoors
-    .normal
-		LDA $7EF362
-	.print
-	    JSL.l HexToDec
-		LDA $7F5004 : AND.w #$00FF : ORA.w #$2400 : STA $7EC750
-	    LDA $7F5005 : AND.w #$00FF : ORA.w #$2400 : STA $7EC752
-	    LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC754
-	    LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC756
-RTL
-;================================================================================

stats.asm

@@ -16,10 +16,6 @@
 ;--------------------------------------------------------------------------------
 ; $7EF423 - item counter
 ;--------------------------------------------------------------------------------
-; $7EF424 mmkkkkkk
-; m - mail counter
-; k - small keys
-;--------------------------------------------------------------------------------
 ; $7EF425w[2] 1111 2222 3333 4444
 ; 1 - lvl 1 sword bosses
 ; 2 - lvl 2 sword bosses
@@ -53,9 +49,13 @@
 ;--------------------------------------------------------------------------------
 ; $7EF432 - locations before boots
 ;--------------------------------------------------------------------------------
-; $7EF433 - locations before mirror
+; $7EF434 - locations before mirror
 ;--------------------------------------------------------------------------------
-; $7EF434-7EF439 - free space
+; $7EF436 mmkkkkkk
+; m - mail counter
+; k - small keys
+;--------------------------------------------------------------------------------
+; $7EF437-7EF439 - free space
 ;--------------------------------------------------------------------------------
 ; $7EF43A - times mirrored outdoors
 ;--------------------------------------------------------------------------------
@@ -324,7 +324,9 @@ RTL
 DecrementItemCounter:
 	PHA
 		LDA !LOCK_STATS : BNE +
+			REP #$20
 			LDA !ITEM_TOTAL : DEC : STA !ITEM_TOTAL
+			SEP #$20
 		+
 	PLA
 RTL
@@ -386,7 +388,7 @@ IndoorSubtileTransitionCounter:
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
 !CHEST_COUNTER = "$7EF442"
-!MAIL_COUNTER = "$7EF424" ; mmkkkkkk
+!MAIL_COUNTER = "$7EF436" ; mmkkkkkk
 !BOSS_KILLS = "$7F5037"
 !SWORD_KILLS_1 = "$7EF425"
 !SWORD_KILLS_2 = "$7EF426"

stats/statConfig.asm

@@ -16,5 +16,5 @@
 %AddStat($7EF453, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y)
 %AddStat($7EF444, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
 %AddStat($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
-%AddStat($7EF423, 0, 0, 08, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
+%AddStat($7EF423, 0, 0, 10, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
 %AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)