Stonewall generation changed to pre-open wall if necessary.

GT Mini bosses no longer drop heart containers.
Crystal switch logic during generation updated.

asm/doorrando.asm

@@ -23,6 +23,10 @@ warnpc $279000
 org $279000
 OffsetTable:
 dw -8, 8
+DRMode:
+dw 0
+DRFlags:
+dw 0
 
 ; Vert 0,6,0 Horz 2,0,8
 org $279010

asm/drhooks.asm

@@ -61,6 +61,14 @@ Palette_SpriteAux1:
 
 org $0DFA53
 jsl.l LampCheckOverride
+org $028046 ; <- 10046 - Bank02.asm : 217 (JSL EnableForceBlank) (Start of Module_LoadFile)
+jsl.l OnFileLoadOverride
+
+org $05ef47
+Sprite_HeartContainer_Override: ;sprite_heart_upgrades.asm : 96-100 (LDA $040C : CMP.b #$1A : BNE .not_in_ganons_tower)
+jsl GtBossHeartCheckOverride : bcs .not_in_ganons_tower
+nop : stz $0dd0, X : rts
+.not_in_ganons_tower
 
 ; 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

asm/overrides.asm

@@ -20,4 +20,21 @@ LampCheckOverride:
 		LDA LampConeDarkWorld
 	.done
 	;BNE + : STZ $1D : + ; remember to turn cone off after a torch
-RTL
+RTL
+
+GtBossHeartCheckOverride:
+    lda $a0 : cmp #$1c : beq ++
+    cmp #$6c : beq ++
+    cmp #$4d : bne +
+    ++ lda DRFlags : and #$01 : bne ++ ;skip if flag on
+        lda $403 : ora #$80 : sta $403
+    ++ clc
+rtl
+    + sec
+rtl
+
+OnFileLoadOverride:
+    jsl OnFileLoad ; what I wrote over
+    lda DRFlags : and #$80 : beq +  ;flag is off
+        lda $7ef086 : ora #$80 : sta $7ef086
++ rtl