Moved spiral warp point during dark transition (fixed $53 logic)

More spiral layers fixed by adding a 'from layer' bit.
Several edge cases addressed (a couple stairs crossed quadrant boundaries during transition)

BaseClasses.py

@@ -860,7 +860,7 @@ class Door(object):
             layer = 4 * (self.layer ^ 1 if toggle else self.layer)
             return [self.roomIndex, layer + self.doorIndex]
         if self.type == DoorType.SpiralStairs:
-            bitmask = 0x04 * int(self.layer)
+            bitmask = int(self.layer) << 2
             bitmask += 0x10 * int(self.zeroHzCam)
             bitmask += 0x20 * int(self.zeroVtCam)
             return [self.roomIndex, bitmask + self.quadrant, self.shiftX, self.shiftY]