Lobby logic improvements

Cutoff entrance rug re-work

asm/drhooks.asm

@@ -108,7 +108,7 @@ nop : stz $0dd0, X : rts
 org $20820E
 jsl MirrorCheckOverride2
 ;org $208270
-org $208278
+org $20827C
 jsl MirrorCheckOverride2
 org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD)
 jsl BlockEraseFix
@@ -134,7 +134,7 @@ jsl SuctionOverworldFix
 ; also rando's hooks.asm line 1360
 ; 106e4e -> goes to  a0ee4e
 ;org $a0ee8a ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
-org $a0ee9a
+org $a0eeab
 jsl DrHudOverride
 org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30)
 jsl DrHudDungeonItemsAdditions

asm/overrides.asm

@@ -87,22 +87,28 @@ SuctionOverworldFix:
         stz $49
     + rtl
 
-CutoffEntranceRug:
-    pha
-    lda.l DRMode : beq +
-        lda $04 : cmp #$000A : bne +
-          lda $a0 : cmp #$00BC : beq .check ;; TT Alcove
-          cmp #$00A2 : beq .check  ; Mire Bridges
-          cmp #$001A : beq .check  ; pod falling
-	  	  cmp #$0049 : beq .check  ; SW torch room
-	  	  cmp #$0014 : beq .check  ; TR Pipe room
-          cmp #$00C2 : bne +  ; Mire Hub
-          .check
-              lda $0c : cmp #$0006 : !bge .skip
-              lda $0e : cmp #$0008 : !bge .skip
-              cmp #$0004 : !blt .skip
-          bra +
-            .skip pla : rtl
-    + pla : lda $9B52, y : sta $7E2000, x ; what we wrote over
-rtl
+; TT Alcove, Mire bridges, pod falling, SW torch room, TR Pipe room, Bob's Room, Ice Many Pots, Mire Hub
+; swamp waterfall
+CutoffRooms:
+db $bc, $a2, $1a, $49, $14, $8c, $9f, $c2
+db $66
+
+CutoffEntranceRug:
+    pha : phx
+    lda.l DRMode : beq .norm
+        lda $04 : cmp #$000A : beq +
+        cmp #$000C : bne .norm
+          + lda $a0 : sep #$20 : ldx #$0000
+          	- cmp.l CutoffRooms, x : beq .check
+          	inx : cpx #$0009 : !blt - ; CutoffRoom Count is here!
+        rep #$20
+    .norm plx : pla : lda $9B52, y : sta $7E2000, x ; what we wrote over
+rtl
+     .check
+		  rep #$20
+		  lda $0c : cmp #$0006 : !bge .skip
+		  lda $0e : cmp #$0008 : !bge .skip
+		  cmp #$0004 : !blt .skip
+      bra  .norm
+.skip plx : pla : rtl