From d5b5a208620a9ba626dbc8eebf4332f2690eaaeb Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Fri, 9 Jun 2023 18:45:57 -0400
Subject: [PATCH] OHKO HUD

---
 newhud.asm |  1 +
 ram.asm    |  2 +-
 timer.asm  | 34 ++++++++++++++++++++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/newhud.asm b/newhud.asm
index 0e19bd9..e407a86 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -296,6 +296,7 @@ DrawCompassCounts:
         JSR HUDHex2Digit
         STY.w HUDTileMapBuffer+$9A : STX.w HUDTileMapBuffer+$9C
 
+        LDX.w #!BlankTile : STX.w HUDTileMapBuffer+$92
         LDX.w #!SlashTile : STX.w HUDTileMapBuffer+$98 
 
         PLA
diff --git a/ram.asm b/ram.asm
index 9d98411..ee12a1d 100644
--- a/ram.asm
+++ b/ram.asm
@@ -528,7 +528,7 @@ OHKOFlag: skip 1                   ; Any non-zero write sets OHKO mode
 SpriteSwapper: skip 1              ; Loads new link sprite and glove/armor palette. No gfx or
                                    ; code currently in base ROM for this.
 BootsModifier: skip 1              ; $01 = Give dash ability
-skip 1                             ; Unused
+OHKOCached: skip 1                 ; "Old" OHKO flag state. Used to detect changes.
                                    ; Crypto Block ($7F50D0 - $7F51FF)
 KeyBase: skip $10                  ;
 y: skip 4                          ;
diff --git a/timer.asm b/timer.asm
index cdd2b9c..7fef763 100644
--- a/timer.asm
+++ b/timer.asm
@@ -110,14 +110,19 @@ dw #$003C, #$0000
 dw #$FFFF, #$7FFF
 ;--------------------------------------------------------------------------------
 DrawChallengeTimer:
-	LDA.l OHKOFlag : AND.w #$00FF : BEQ +
-                LDA.w #$2807 : STA.l HUDTileMapBuffer+$90
-                LDA.w #$280A : STA.l HUDTileMapBuffer+$92
-                LDA.w #$280B : STA.l HUDTileMapBuffer+$94
-                LDA.w #$280C : STA.l HUDTileMapBuffer+$96
-                RTL
-        +
-
+        JSR.w CheckOHKO : BCC ++
+	        AND.w #$00FF : BEQ +
+                        LDA.w #$2807 : STA.l HUDTileMapBuffer+$90
+                        LDA.w #$280A : STA.l HUDTileMapBuffer+$92
+                        LDA.w #$280B : STA.l HUDTileMapBuffer+$94
+                        LDA.w #$280C : STA.l HUDTileMapBuffer+$96
+                        RTL
+                +
+                LDA.w #$247F : STA.l HUDTileMapBuffer+$90
+                STA.l HUDTileMapBuffer+$92
+                STA.l HUDTileMapBuffer+$94
+                STA.l HUDTileMapBuffer+$96
+        ++
         LDA.l TimerStyle : BNE + : RTL : + ; Hud Timer
         LDA.w #$2807 : STA.l HUDTileMapBuffer+$92    	
         LDA.l ClockStatus : AND.w #$0002 : BEQ + ; DNF / OKHO
@@ -166,3 +171,16 @@ OHKOTimer:
 	LDA.l CurrentHealth
 RTL
 ;--------------------------------------------------------------------------------
+CheckOHKO:
+        SEP #$20
+        LDA.l OHKOFlag : CMP.l OHKOCached : BNE .change
+                REP #$20
+                CLC
+                RTS
+        .change
+        STA.l OHKOCached
+        INC.w UpdateHUD
+        REP #$20
+        SEC
+RTS
+;--------------------------------------------------------------------------------