Merge branch 'DoorDev' into EdgeWork

asm/doorrando.asm

@@ -31,6 +31,8 @@ DRMode:
 dw 0
 DRFlags:
 dw 0
+DRScroll:
+db 0
 
 ; Vert 0,6,0 Horz 2,0,8
 org $279010

asm/drhooks.asm

@@ -72,6 +72,13 @@ jsl GtBossHeartCheckOverride : bcs .not_in_ganons_tower
 nop : stz $0dd0, X : rts
 .not_in_ganons_tower
 
+
+org $2081f2
+jsl MirrorCheckOverride2
+org $20825c
+jsl MirrorCheckOverride2
+
+
 ; 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

@@ -43,9 +43,11 @@ OnFileLoadOverride:
 + rtl
 
 MirrorCheckOverride:
-    lda $8A : and #$40 ; what I wrote over
-    beq +
     lda DRFlags : and #$02 : beq ++
         lda $7ef353 : cmp #$01 : beq +
-    ++ lda #$01
-+ rtl
+    ++ lda $8A : and #$40 ; what I wrote over
+    rtl
+    + lda DRScroll : rtl
+
+MirrorCheckOverride2:
+    lda $7ef353 : and #$02 : rtl