Merge branch 'OWMain' into overworld_kara

2023-09-04 15:03:18 -05:00
parent 015f769521 173b474b9d
commit 25c44cd2bb
38 changed files with 1581 additions and 466 deletions
--- a/stats.asm
+++ b/stats.asm
@@ -7,8 +7,7 @@
 ;--------------------------------------------------------------------------------
 IncrementBonkCounter:
 	LDA StatsLocked : BNE +
-		LDA BonkCounter : INC
-		CMP.b #100 : BEQ + ; decimal 100
+		LDA BonkCounter : INC : BEQ + ; overflow
 			STA BonkCounter
 	+
 RTL
@@ -328,9 +327,7 @@ RTL
 IndoorTileTransitionCounter:
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 IndoorSubtileTransitionCounter:
-	LDA.b #$01 : STA !REDRAW ; set redraw flag for items
    STZ $0646 ; stuff we wrote over
    STZ $0642
 JMP StatTransitionCounter