From dd029fd0b00cc5caaaabf7f1bba1c168fd2d8195 Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Sun, 27 May 2018 17:45:35 -0400
Subject: [PATCH] rupee counter displays item collection count in ganon's room

---
 rupeelimit.asm | 50 ++++++++++++++++----------------------------------
 timer.asm      |  2 +-
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/rupeelimit.asm b/rupeelimit.asm
index c4cd2b9..4bcceb5 100644
--- a/rupeelimit.asm
+++ b/rupeelimit.asm
@@ -2,39 +2,21 @@
 ; Four Digit Rupees
 ;--------------------------------------------------------------------------------
 Draw4DigitRupees:
-	LDA $7EF362
-    JSL.l HexToDec
-    
-    ;REP #$30
-	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
-	
-	;LDA.w #$247F ; clear other hud cells
-	;STA $7EC758
-	;STA $7EC75E
-	;STA $7EC764
-
-	;STA $7EC718 ; bombs
-	;STA $7EC71E ; arrows
-	;STA $7EC724 ; keys
-	
-	;LDA.w #$2C88 : STA $7EC71A ; bomb icon
-	;LDA.w #$2C89 : STA $7EC71C
-
-    ;LDA $7EF340 : AND.w #$00FF : CMP.w #$0003 : !BGE .silverArrows
-	
-	;.woodArrows
-	;LDA.w #$20A7 : STA $7EC720 ; wood arrow icon
-	;LDA.w #$20A9 : STA $7EC722
-	;BRA +
-	
-	;.silverArrows
-	;LDA.w #$2486 : STA $7EC720 ; silver arrow icon
-	;LDA.w #$2487 : STA $7EC722
-	;+
-	
-	;LDA.w #$2871 : STA $7EC726 ; key icon
+	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
+			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
 ;================================================================================
\ No newline at end of file
diff --git a/timer.asm b/timer.asm
index eb3b8b6..e223270 100644
--- a/timer.asm
+++ b/timer.asm
@@ -125,7 +125,7 @@ dw #$FFFF, #$7FFF
 ;--------------------------------------------------------------------------------
 !TEMPORARY_OHKO = "$7F50CC"
 DrawChallengeTimer:
-	LDA !TEMPORARY_OHKO : AND.w #00FF : BEQ +
+	LDA !TEMPORARY_OHKO : AND.w #$00FF : BEQ +
     	LDA.w #$2807 : STA $7EC790
 		LDA.w #$280A : STA $7EC792
 		LDA.w #$280B : STA $7EC794