From 334f721a292f3c38cdee97c3ca05875d752d0161 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sun, 17 Sep 2023 12:02:54 -0400
Subject: [PATCH] Don't increment highest mail on final stats prep

---
 newitems.asm |  2 +-
 stats.asm    | 52 +++++++++++++++++++++-------------------------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/newitems.asm b/newitems.asm
index a173e04..ad68b13 100644
--- a/newitems.asm
+++ b/newitems.asm
@@ -869,7 +869,7 @@ HandleBowTracking:
         ; at this point.
         LDA.w ItemReceiptMethod : CMP.b #$01 : BEQ +
                 LDX.w CurrentSpriteSlot
-                LDA.w SpriteMetaData,X : BEQ +
+                LDA.w SpriteMetaData,X : BEQ .done
                         BRA .done
         +
         LDA.b #$00
diff --git a/stats.asm b/stats.asm
index a45fdf1..3311707 100644
--- a/stats.asm
+++ b/stats.asm
@@ -339,40 +339,30 @@ IndoorSubtileTransitionCounter:
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
 StatsFinalPrep:
-	PHA : PHX : PHP
-		SEP #$30 ; set 8-bit accumulator and index registers
-		
-		LDA.l StatsLocked : BNE .ramPostOnly
-		INC : STA.l StatsLocked
-	
-		JSL.l IncrementFinalSword
-	
-		LDA.l HighestMail : INC : STA.l HighestMail ; add green mail to mail count
-		
-		LDA.l ScreenTransitions : DEC : STA.l ScreenTransitions ; remove extra transition from exiting gtower via duck
-		
-		.ramPostOnly
-		LDA.l SwordBossKills : LSR #4 : !ADD SwordBossKills : STA.l BossKills
-		LDA.l SwordBossKills+1 : LSR #4 : !ADD SwordBossKills+1 : !ADD BossKills : AND.b #$0F : STA.l BossKills
-	
-		LDA.l NMIFrames : !SUB LoopFrames : STA.l LagTime
-		LDA.l NMIFrames+1 : SBC LoopFrames+1 : STA.l LagTime+1
-		LDA.l NMIFrames+2 : SBC LoopFrames+2 : STA.l LagTime+2
-		LDA.l NMIFrames+3 : SBC LoopFrames+3 : STA.l LagTime+3
+        PHA : PHX : PHP
+        SEP #$30
+        LDA.l StatsLocked : BNE .ramPostOnly
+                INC : STA.l StatsLocked
+                JSL.l IncrementFinalSword
+                LDA.l Aga2Duck : BEQ .ramPostOnly
+                        LDA.l ScreenTransitions : DEC : STA.l ScreenTransitions ; remove extra transition from exiting gtower via duck
+        .ramPostOnly
+        LDA.l SwordBossKills : LSR #4 : !ADD SwordBossKills : STA.l BossKills
+        LDA.l SwordBossKills+1 : LSR #4 : !ADD SwordBossKills+1 : !ADD BossKills : AND.b #$0F : STA.l BossKills
 
-		LDA.l RupeesSpent : !ADD DisplayRupees : STA.l RupeesCollected
-		LDA.l RupeesSpent+1 : ADC DisplayRupees+1 : STA.l RupeesCollected+1
+        LDA.l NMIFrames : !SUB LoopFrames : STA.l LagTime
+        LDA.l NMIFrames+1 : SBC LoopFrames+1 : STA.l LagTime+1
+        LDA.l NMIFrames+2 : SBC LoopFrames+2 : STA.l LagTime+2
+        LDA.l NMIFrames+3 : SBC LoopFrames+3 : STA.l LagTime+3
 
-                REP #$20
-		LDA.l TotalItemCounter : !SUB ChestsOpened : STA.l NonChestCounter
+        LDA.l RupeesSpent : !ADD DisplayRupees : STA.l RupeesCollected
+        LDA.l RupeesSpent+1 : ADC DisplayRupees+1 : STA.l RupeesCollected+1
 
-		.done
-	PLP : PLX : PLA
-	LDA.b #$19 : STA.b GameMode ; thing we wrote over, load triforce room
+        REP #$20
+        LDA.l TotalItemCounter : !SUB ChestsOpened : STA.l NonChestCounter
+        .done
+        PLP : PLX : PLA
+        LDA.b #$19 : STA.b GameMode ; thing we wrote over, load triforce room
         STZ.b GameSubMode
         STZ.b SubSubModule
 RTL
-;--------------------------------------------------------------------------------
-; Notes:
-; s&q counter
-;================================================================================