From ed225e044b073fa9ea9169fd09af3c3286df4fbb Mon Sep 17 00:00:00 2001
From: cassidy <cassidymoen@gmx.com>
Date: Fri, 17 Dec 2021 13:53:53 -0500
Subject: [PATCH] Cleanup in sram.asm and compasses.asm

---
 compasses.asm | 4 ++--
 sram.asm      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/compasses.asm b/compasses.asm
index 4ed8590..1e7e757 100644
--- a/compasses.asm
+++ b/compasses.asm
@@ -27,11 +27,11 @@ DrawDungeonCompassCounts:
 		BEQ .done ; skip if we don't have compass
 	++
 	
-        LDA $040C : LSR
+        TXA : LSR : TAX
         BNE +
                 INC
         +
-        TAX : LDA.l CompassTotalsWRAM, X : AND #$00FF
+        LDA.l CompassTotalsWRAM, X : AND #$00FF
 	SEP #$20
 	JSR HudHexToDec2Digit
 	REP #$20
diff --git a/sram.asm b/sram.asm
index 31af42f..a37d9ad 100644
--- a/sram.asm
+++ b/sram.asm
@@ -142,8 +142,8 @@ MagicConsumption: skip 1        ; $00 = Normal | $01 = Half Magic | $02 = Quarte
 ;--------------------------------------------------------------------------------
                                 ; Small keys earned per dungeon (integers)
 DungeonKeys:                    ;
-SewerKeys: skip 1               ;
-HyruleCastleKeys: skip 1        ;
+SewerKeys: skip 1               ; \ HC and Sewers small keys increment together
+HyruleCastleKeys: skip 1        ; /
 EasternKeys: skip 1             ; Eastern Palace small keys
 DesertKeys: skip 1              ; Desert Palace small keys
 CastleTowerKeys: skip 1         ; Agahnim's Tower small keys
@@ -467,6 +467,7 @@ endmacro
 %assertSRAM(CrystalsField, $7EF37A)
 %assertSRAM(MagicConsumption, $7EF37B)
 ;--------------------------------------------------------------------------------
+%assertSRAM(DungeonKeys, $7EF37C)
 %assertSRAM(SewerKeys, $7EF37C)
 %assertSRAM(HyruleCastleKeys, $7EF37D)
 %assertSRAM(EasternKeys, $7EF37E)
@@ -512,6 +513,9 @@ endmacro
 %assertSRAM(CompassCountDisplay, $7EF403)
 %assertSRAM(NpcFlags, $7EF410)
 %assertSRAM(MapOverlay, $7EF414)
+%assertSRAM(HudFlag, $7EF416)
+%assertSRAM(IgnoreFaeries, $7EF416)
+%assertSRAM(HasGroveItem, $7EF416)
 %assertSRAM(GeneralFlags, $7EF416)
 %assertSRAM(HighestSword, $7EF417)
 %assertSRAM(GoalCounter, $7EF418)