Merged in DR v1.4.1.9

doorrando/hudadditions.asm

@@ -55,9 +55,8 @@ DRHUD_BossIndicator:
 
 DRHUD_EnemyDropIndicator:
 	REP #$30
-	LDA.l DRFlags : BIT.w #$0800 : BEQ +
 	LDA.w EnemyDropIndicator : STA.w HUDMultiIndicator
-	+ SEP #$20
+	SEP #$20
 	LDA.w DungeonID : CMP.b #$1B : BCS DRHUD_Finished
 	SEP #$10 : TAX : REP #$10
 

keydrop/standing_items.asm

@@ -347,16 +347,19 @@ SetupEnemyDropIndicator:
 	REP #$20
 	LDA.w #!BlankTile : STA.w EnemyDropIndicator
 	LDX.b IndoorsFlag : BEQ .done
+	LDA.l DRFlags : BIT.w #$0800 : BEQ .done
+
+;	Skipping the compass checks, could make this a toggle later?
 	; do we have a flag for enemy drops on? could check it here
-	LDA.w DungeonID : AND.w #$00FF : CMP.w #$00FF : BEQ .skipCompassChecks
+;	LDA.w DungeonID : AND.w #$00FF : CMP.w #$00FF : BEQ .skipCompassChecks
 	; compass checks
 	; does compass for dungeon exist?
-	LSR : TAX : LDA.l ExistsTransfer, X : TAX : LDA.l CompassExists, X : BEQ .skipCompassChecks
+;	LSR : TAX : LDA.l ExistsTransfer, X : TAX : LDA.l CompassExists, X : BEQ .skipCompassChecks
 	; do we have the compass
-	; todo: sewers?
-	LDA.l CompassField : LDX.w DungeonID : AND.l DungeonMask, X : BEQ .done
+	; sewers? outstanding?
+;	LDA.l CompassField : LDX.w DungeonID : AND.l DungeonMask, X : BEQ .done
 
-.skipCompassChecks
+;.skipCompassChecks
 	; either we're in a cave ($040C: $FF), compass doesn't exist, or we have the compass
 	; check if there are enemy drops
 	LDA.b Scrap02 : PHA : REP #$10 ; store 02/03 for later