From 4e6acaf7b983946400b32fa53b11dd376011873d Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Wed, 6 Jul 2022 09:48:42 -0600
Subject: [PATCH] Big key door double-sided check

---
 doorrando/doorrando.asm | 14 ++++++++++++++
 doorrando/drhooks.asm   | 17 ++++++-----------
 doorrando/overrides.asm |  6 ++++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/doorrando/doorrando.asm b/doorrando/doorrando.asm
index cc134be..94402b4 100644
--- a/doorrando/doorrando.asm
+++ b/doorrando/doorrando.asm
@@ -21,6 +21,20 @@ org $278000 ;138000
 db $44, $52 ;DR
 DRMode:
 dw 0
+; xxpg rmse
+; xxxx xBDM
+; x - unused
+
+; p - use the original palette for the dungeon rooms instead of the DR table
+; g - fix the EG glitch in more places (should be off for no logic)
+; r - The collection rate flag
+; m - Whether to display keys Map Info
+; s - Start with Mirror Scroll
+; e - GT minibosses marked as defeated instead of spawning heart container in all dungeons
+
+; B - Big Key doors can displayed and be opened on the "south" side in addition
+; D - Enabled spawning as a bunny in the Dark World underworld
+; M - hides the total number in the collection rate
 DRFlags:
 dw 0
 DRScroll:
diff --git a/doorrando/drhooks.asm b/doorrando/drhooks.asm
index 708bd11..d3b8012 100644
--- a/doorrando/drhooks.asm
+++ b/doorrando/drhooks.asm
@@ -198,20 +198,15 @@ Underworld_DoorDown_Call:
 org $02C3F3
 dw $8AD9 ; address of Bank02.asm:2085
 
-; 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
+org $01aa90
+JSL BigKeyDoorCheck
 
-;Kill big key (1e) check for south doors
-;org $1aa90
-;DontCheck:
-;bra .done
-;nop #3
-;.done
+org $01AAA2
+RoomDraw_OneSidedShutters_South_onesided_shutter_or_big_key_door:
 
 ;Enable south facing bk graphic
-;org $00CE24
-;dw $2ac8
+org $00CE24
+dw $2ac8
 
 org $01b714 ; PC: b714
 OpenableDoors:
diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm
index a8338ac..fa7c0ed 100644
--- a/doorrando/overrides.asm
+++ b/doorrando/overrides.asm
@@ -152,3 +152,9 @@ BlindsAtticHint:
 		SEP #$20 : RTL ; skip the dialog box if the hole is already open
 	+ SEP #$20 : JML Main_ShowTextMessage
 
+BigKeyDoorCheck:
+	CPY.w #$001E : BNE + ; skip if it isn't a BK door
+	LDA.l DRFlags : AND #$0400 : BNE + ; skip if the flag is set - bk doors can be double-sided
+		 PLA : PEA.w RoomDraw_OneSidedShutters_South_onesided_shutter_or_big_key_door-1
++ RTL
+