From ff3bdc1326804c5b2235c0ecfe092eeae51defe2 Mon Sep 17 00:00:00 2001
From: caitsith2 <d_good@caitsith2.com>
Date: Tue, 14 Jul 2020 21:06:50 -0700
Subject: [PATCH] Check for door rando before doing safety checks to and
 possibly draining room 55 (the hammer locked room)

---
 floodgatesoftlock.asm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/floodgatesoftlock.asm b/floodgatesoftlock.asm
index 043e422..7dfe0ca 100644
--- a/floodgatesoftlock.asm
+++ b/floodgatesoftlock.asm
@@ -11,15 +11,16 @@ FloodGateReset:
 		LDA $7EF051 : AND.b #$FE : STA $7EF051 ; clear water front room (room 40)
 	+
 FloodGateResetInner:
-	LDA.l Bugfix_SwampWaterLevel : BEQ +++
-		LDA $7EF06F : AND.b #$04 : BEQ + ; Check if key in room 55 has been collected. 
-		LDA $7EF356 : AND.b #$01 : BNE ++ ; Check for flippers. This can otherwise softlock doors if flooded without flippers and no way to reset.
-	+
+	LDA.l Bugfix_SwampWaterLevel : BEQ .done
+	    LDA $279004 : BEQ .check_room_53 ; Only do the check for room 55 if on door rando
+		LDA $7EF06F : AND.b #$04 : BEQ .drain_room_55 ; Check if key in room 55 has been collected. 
+		LDA $7EF356 : AND.b #$01 : BNE .check_room_53 ; Check for flippers. This can otherwise softlock doors if flooded without flippers and no way to reset.
+	.drain_room_55
 		LDA $7EF06E : AND.b #$7F : STA $7EF06E ; clear water room 55 - outer room you shouldn't be able to softlock except in major glitches
-	++
-		LDA $7EF06B : AND.b #$04 : BNE +++ ; Check if key in room 53 has been collected.
+	.check_room_53
+		LDA $7EF06B : AND.b #$04 : BNE .done ; Check if key in room 53 has been collected.
 		; no need to check for flippers on the inner room, as you can't get to the west door no matter what, without flippers.
 		LDA $7EF06A : AND.b #$7F : STA $7EF06A ; clear water room 53 - inner room with the easy key flood softlock
-	+++
+	.done
 RTL
 ;================================================================================