From a20c432003352dd2944e8c37b031abd45c4a808b Mon Sep 17 00:00:00 2001 From: CaitSith2 Date: Wed, 13 May 2020 10:23:22 -0700 Subject: [PATCH] Reset inner floodgates if and only if the... ...small keys are actually flooded. --- floodgatesoftlock.asm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/floodgatesoftlock.asm b/floodgatesoftlock.asm index be3a06b..a1dcc83 100644 --- a/floodgatesoftlock.asm +++ b/floodgatesoftlock.asm @@ -11,9 +11,12 @@ FloodGateReset: LDA $7EF051 : AND.b #$FE : STA $7EF051 ; clear water front room (room 40) + FloodGateResetInner: - LDA.l Bugfix_SwampWaterLevel : BEQ + - ; 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 $7EF06A : AND.b #$7F : STA $7EF06A ; clear water room 53 - inner room with the easy key flood softlock + LDA.l Bugfix_SwampWaterLevel : BEQ ++ + LDA $7EF06F : AND.b #$04 : BNE + ; Check if key in room 55 has been collected. + 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. + LDA $7EF06A : AND.b #$7F : STA $7EF06A ; clear water room 53 - inner room with the easy key flood softlock + ++ RTL -;================================================================================ \ No newline at end of file +;================================================================================