Merge branch 'ChestKeyCounter' into DRMain

# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	build.sh
#	darkworldspawn.asm
#	events.asm
#	itemdowngrade.asm
#	shopkeeper.asm
#	stats.asm

stats.asm

@@ -238,38 +238,42 @@ DecrementSmallKeys:
 RTL
 ;--------------------------------------------------------------------------------
 CountChestKeyLong: ; called from ItemDowngradeFix in itemdowngrade.asm
-    JSR CountChestKey
+	JSR CountChestKey
 RTL
 ;--------------------------------------------------------------------------------
 CountChestKey: ; called by neighbor functions
-    PHA : PHX
-        lda !MULTIWORLD_ITEM_PLAYER_ID : bne .end
-        CPY #$24 : BEQ +  ; small key for this dungeon - use $040C
-        CPY #$A0 : !BLT .end ; Ignore most items
-        CPY #$AE : !BGE .end ; Ignore reserved key and generic key
-        TYA : AND.B #$0F : BNE ++ ; If this is a sewers key, instead count it as an HC key
-            INC
-        ++ TAX : BRA .count  ; use Key id instead of $040C (Keysanity)
-        + LDA $040C : LSR : TAX
-        .count
-        LDA $7EF4E0, X : INC : STA $7EF4E0, X
+	PHA : PHX
+		LDA !MULTIWORLD_ITEM_PLAYER_ID : bne .end
+		CPY #24 : BEQ + ; hera basement key
+		CPY #$24 : BEQ +  ; small key for this dungeon - use $040C
+			CPY #$A0 : !BLT .end ; Ignore most items
+			CPY #$AE : !BGE .end ; Ignore reserved key and generic key
+			TYA : AND.B #$0F : BNE ++ ; If this is a sewers key, instead count it as an HC key
+				INC
+			++ TAX : BRA .count  ; use Key id instead of $040C (Keysanity)
+		+ LDA $040C : LSR
+		BNE +
+			INC ; combines HC and Sewer counts
+		+ TAX
+		.count
+		LDA $7EF4E0, X : INC : STA $7EF4E0, X
    .end
-    PLX : PLA
+	PLX : PLA
 RTS
 ;--------------------------------------------------------------------------------
 CountBonkItem: ; called from GetBonkItem in bookofmudora.asm
-    LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
-    CMP #115 : BNE + ; Desert Bonk Key
-        LDA.L BonkKey_Desert : BRA ++
-    + : CMP #140 : BNE + ; GTower Bonk Key
-        LDA.L BonkKey_GTower : BRA ++
-    + LDA.B #$24 ; default to small key
-    ++
-    CMP #$24 : BNE +
-        PHY
-            TAY : JSR CountChestKey
-        PLY
-    +
+	LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
+	CMP #115 : BNE + ; Desert Bonk Key
+		LDA.L BonkKey_Desert : BRA ++
+	+ : CMP #140 : BNE + ; GTower Bonk Key
+		LDA.L BonkKey_GTower : BRA ++
+	+ LDA.B #$24 ; default to small key
+	++
+	CMP #$24 : BNE +
+		PHY
+			TAY : JSR CountChestKey
+		PLY
+	+
 RTL
 ;--------------------------------------------------------------------------------
 IncrementAgahnim2Sword: