Merge branch 'main' into kara

lampmantlecone.asm

@@ -4,12 +4,12 @@
 ; Output: 0 for darkness, 1 for lamp cone
 ;--------------------------------------------------------------------------------
 LampCheck:
-	LDA $7F50C4 : CMP.b #$01 : BNE + : RTL : +
-				  CMP.b #$FF : BNE + : INC : RTL : +
+	LDA LightConeModifier : CMP.b #$01 : BNE + : RTL : +
+	                        CMP.b #$FF : BNE + : INC : RTL : +
 	
-	LDA $7EF34A : BNE .done ; skip if we already have lantern
+	LDA LampEquipment : BNE .done ; skip if we already have lantern
 	
-	LDA $7EF3CA : BNE +
+	LDA CurrentWorld : BNE +
 		.lightWorld
 		LDA $040C : BNE ++ ; check if we're in sewers
 			LDA LampConeSewers : BRA .done
@@ -26,20 +26,17 @@ RTL
 ; Output: 0 locked, 1 open
 ;--------------------------------------------------------------------------------
 CheckForZelda:
-	;LDA.l OpenMode : BEQ + ; Skip if not open mode
-	;LDA $FFFFFF
-	LDA.l $7EF3C5 : CMP.b #$02 : !BLT + ; Skip if rain is falling
+	LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
 		LDA.b #$01 ; pretend we have zelda anyway
 		RTL
 	+
-	LDA $7EF3CC
+	LDA FollowerIndicator
 RTL
 ;================================================================================
 ;--------------------------------------------------------------------------------
 SetOverlayIfLamp:
-	;LDA $7EF34A ; check if lamp
 	JSL.l LampCheck
 	STA $1D ; write it directly to the overlay, this isn't a terrible idea at all
 RTL
 ;================================================================================
-;LDA $7EF3CA : EOR #$40 : LSR #6 : AND #$01 ; return the same result as having the lantern in the light world
+;LDA CurrentWorld : EOR #$40 : LSR #6 : AND #$01 ; return the same result as having the lantern in the light world