Initial work for fixing standard (basic only so far)

asm/doorrando.asm

@@ -16,6 +16,8 @@ incsrc normal.asm
 incsrc spiral.asm
 incsrc gfx.asm
 incsrc keydoors.asm
+incsrc overrides.asm
+warnpc $279000
 
 ; Data Section
 org $279000

asm/drhooks.asm

@@ -59,6 +59,9 @@ org $1bece4
 Palette_SpriteAux1:
 
 
+org $0DFA53
+jsl.l LampCheckOverride
+
 ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire
 ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes
 ; Hera BK door back can be seen with Pot clipping - likely useful for no logic seeds

asm/overrides.asm

@@ -0,0 +1,23 @@
+;================================================================================
+; Lamp Mantle & Light Cone Fix
+;--------------------------------------------------------------------------------
+; Output: 0 for darkness, 1 for lamp cone
+;--------------------------------------------------------------------------------
+LampCheckOverride:
+	LDA $7F50C4 : CMP.b #$01 : BNE + : RTL : +
+				  CMP.b #$FF : BNE + : INC : RTL : +
+
+	LDA $7EF34A : BNE .done ; skip if we already have lantern
+
+	LDA $7EF3CA : BNE +
+		.lightWorld
+		LDA $040C : CMP.b #$02 : BNE ++ ; check if we're in HC
+			LDA LampConeSewers : BRA .done
+		++
+			LDA LampConeLightWorld : BRA .done
+	+
+		.darkWorld
+		LDA LampConeDarkWorld
+	.done
+	;BNE + : STZ $1D : + ; remember to turn cone off after a torch
+RTL