6 files changed, 29 insertions, 18 deletions
diff --git a/data/maps/the_orb/connections.txtpb b/data/maps/the_orb/connections.txtpb
index 62a7643..b902711 100644
--- a/data/maps/the_orb/connections.txtpb
+++ b/data/maps/the_orb/connections.txtpb

@@ -10,10 +10,20 @@ connections {
 }
 connections {
  from_room: "Main Area"
-  to_room: "B Room"
+  to_room: "Middle Room"
  door { name: "B Puzzles" }
 }
 connections {
+  from_room: "Middle Room"
+  to_room: "B Room"
+  oneway: true
+}
+connections {
+  from_room: "Middle Room"
+  to_room: "Main Area"
+  oneway: true
+}
+connections {
  from_room: "B Room"
  to_room: "Main Area"
  oneway: true
diff --git a/data/maps/the_orb/rooms/B Room.txtpb b/data/maps/the_orb/rooms/B Room.txtpb
index 833c659..633232f 100644
--- a/data/maps/the_orb/rooms/B Room.txtpb
+++ b/data/maps/the_orb/rooms/B Room.txtpb

@@ -1,5 +1,4 @@
 name: "B Room"
-display_name: "Orb"
 letters {
  key: "b"
  path: "Components/Collectables/b"
@@ -10,19 +9,10 @@ paintings {
  # TODO: This is too high up to enter. It's also a hint painting.
  exit_only: true
 }
-# TODO: Should these two be independent for shuffling purposes, or always tied
-# to the Main Area's port?
-ports {
-  name: "MID"
-  path: "Components/Warps/worldport4"
-  orientation: "south"
-  # This port is in the room immediately after solving the B puzzles, which
-  # means it seems like it would be inaccessible if you enter the map from the
-  # painting or from the final port, but entering the O or R areas brings you
-  # back to the beginning.
-}
 ports {
  name: "FINAL"
+  display_name: "Final Worldport"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 87 }
+  rotation: 90
 }
diff --git a/data/maps/the_orb/rooms/Main Area.txtpb b/data/maps/the_orb/rooms/Main Area.txtpb
index 8d7b7b1..976c489 100644
--- a/data/maps/the_orb/rooms/Main Area.txtpb
+++ b/data/maps/the_orb/rooms/Main Area.txtpb

@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Orb"
 panels {
  name: "STRIKE"
  path: "Panels/O/entry_1"
@@ -86,6 +85,8 @@ panels {
 }
 ports {
  name: "GREAT"
+  display_name: "Main Entrance"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 39 }
+  rotation: 90
 }
diff --git a/data/maps/the_orb/rooms/Middle Room.txtpb b/data/maps/the_orb/rooms/Middle Room.txtpb
new file mode 100644
index 0000000..ed1a00c
--- /dev/null
+++ b/data/maps/the_orb/rooms/Middle Room.txtpb

@@ -0,0 +1,12 @@
+name: "Middle Room"
+# This is the room after solving the B puzzles but before getting to B1 itself.
+# It has to be a separate region because if you are shuffling worldports and you
+# warp to the B1 room port, you can't access this port if you're not able to
+# solve the B puzzles.
+ports {
+  name: "MID"
+  display_name: "Middle Worldport"
+  path: "Components/Warps/worldport4"
+  destination { x: -69 y: 0 z: 43 }
+  rotation: 90
+}
diff --git a/data/maps/the_orb/rooms/O Room.txtpb b/data/maps/the_orb/rooms/O Room.txtpb
index f997780..cc254a4 100644
--- a/data/maps/the_orb/rooms/O Room.txtpb
+++ b/data/maps/the_orb/rooms/O Room.txtpb

@@ -1,5 +1,4 @@
 name: "O Room"
-display_name: "Orb"
 letters {
  key: "o"
  path: "Components/Collectables/o"
diff --git a/data/maps/the_orb/rooms/R Room.txtpb b/data/maps/the_orb/rooms/R Room.txtpb
index c53b7eb..a01726a 100644
--- a/data/maps/the_orb/rooms/R Room.txtpb
+++ b/data/maps/the_orb/rooms/R Room.txtpb

@@ -1,5 +1,4 @@
 name: "R Room"
-display_name: "Orb"
 letters {
  key: "r"
  path: "Components/Collectables/r"