8 files changed, 42 insertions, 23 deletions
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 6f847da..9813f85 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -192,10 +192,25 @@ connections {
 connections {
  from_room: "Starting Room"
  to_room: "Repetitive Entrance"
-  door { name: "Repetitive Entrance" }
+  door { name: "Starting Room West Wall North Door" }
 }
 connections {
  from_room: "Lime Room"
  to_room: "White Hallway To Daedalus"
  door { name: "Control Center White Door" }
 }
+connections {
+  from_room: "Flipped Second Room"
+  to_room: "Four Rooms Entrance"
+  door { name: "Flipped Second Room Right Door" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Liberated Entrance"
+  door { name: "Liberated Entrance" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Literate Entrance"
+  door { name: "Literate Entrance" }
+}
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 78ffa52..466f5ce 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -137,8 +137,10 @@ doors {
  type: STANDARD
  receivers: "Components/Doors/back_left_2"
  panels { room: "Colored Doors Area" name: "OPEN" answer: "orange" }
-  # "wall" is supposed to also work. idk man
+  panels { room: "Colored Doors Area" name: "OPEN" answer: "wall" }
+  complete_at: 1
  location_room: "Colored Doors Area"
+  location_name: "OPEN"
 }
 doors {
  name: "Lime Room Entrance"
@@ -193,7 +195,7 @@ doors {
  location_room: "Starting Room"
 }
 doors {
-  name: "Repetitive Entrance"
+  name: "Starting Room West Wall North Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/Entry/entry_proxied_9"
  double_letters: true
diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb
index 5841ca1..0d518bb 100644
--- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb

@@ -21,10 +21,3 @@ paintings {
  gravity: Y_PLUS
  display_name: "Eye Painting"
 }
-ports {
-  name: "FOUR"
-  path: "Components/Warps/worldport9"
-  orientation: "south"
-  gravity: Y_PLUS
-  required_door { name: "Flipped Second Room Right Door" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
new file mode 100644
index 0000000..689d23e
--- /dev/null
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Four Rooms Entrance"
+ports {
+  name: "FOUR"
+  path: "Components/Warps/worldport9"
+  orientation: "south"
+  gravity: Y_PLUS
+}
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
new file mode 100644
index 0000000..f0176a0
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Liberated Entrance"
+ports {
+  name: "BLUE"
+  path: "worldport8"
+  orientation: "west"
+}
diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb
index 689f57a..5b68279 100644
--- a/data/maps/the_entry/rooms/Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Link Area.txtpb

@@ -26,15 +26,3 @@ paintings {
  orientation: "south"
  display_name: "Center Painting"
 }
-ports {
-  name: "BLUE"
-  path: "worldport8"
-  orientation: "west"
-  required_door { name: "Liberated Entrance" }
-}
-ports {
-  name: "BROWN"
-  path: "worldport9"
-  orientation: "east"
-  required_door { name: "Literate Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
new file mode 100644
index 0000000..4ec402f
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Literate Entrance"
+ports {
+  name: "BROWN"
+  path: "worldport9"
+  orientation: "east"
+}
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb
index bc77e6d..8e8373b 100644
--- a/data/maps/the_entry/rooms/Starting Room.txtpb
+++ b/data/maps/the_entry/rooms/Starting Room.txtpb

@@ -24,7 +24,9 @@ panels {
  path: "Panels/Entry/front_1"
  clue: "eye"
  answer: "i"
-  symbols: ZERO
+  #symbols: ZERO
+  # This panel blocks getting N1 and T1. We will mod it to be I/I with no symbol
+  # when symbol shuffle is on.
 }
 panels {
  name: "HINT"