10 files changed, 9 insertions, 13 deletions
diff --git a/data/maps/control_center/rooms/Ancient Entrance.txtpb b/data/maps/control_center/rooms/Ancient Entrance.txtpb
index 5b65d9a..dc018ba 100644
--- a/data/maps/control_center/rooms/Ancient Entrance.txtpb
+++ b/data/maps/control_center/rooms/Ancient Entrance.txtpb

@@ -5,6 +5,8 @@ ports {
  path: "Components/Warps/worldport8"
  destination { x: -27 y: 0 z: -34 }
  rotation: 90
-  # TODO: shuffle entrances with dependent keyholders
+  # This is because there's no port on the other side of the connection, so if
+  # this connection was removed and gallery paintings aren't shuffled then
+  # there'd be no way into The Ancient.
  no_shuffle: true
 }
diff --git a/data/maps/daedalus/rooms/Hotel.txtpb b/data/maps/daedalus/rooms/Hotel.txtpb
index d2a05db..d590841 100644
--- a/data/maps/daedalus/rooms/Hotel.txtpb
+++ b/data/maps/daedalus/rooms/Hotel.txtpb

@@ -1,7 +1,5 @@
 name: "Hotel"
 panel_display_name: "Southwest Area"
-# TODO: Something has to be changed in-game so that the puzzles don't disappear
-# and thus cause them to become unsolvable.
 panels {
  name: "MARLIN"
  path: "Panels/Connections/connections_2"
diff --git a/data/maps/the_butterfly/doors.txtpb b/data/maps/the_butterfly/doors.txtpb
index 987c269..1ebc3a2 100644
--- a/data/maps/the_butterfly/doors.txtpb
+++ b/data/maps/the_butterfly/doors.txtpb

@@ -1,4 +1,3 @@
-# TODO: The gallery painting
 doors {
  name: "Panels"
  type: EVENT
diff --git a/data/maps/the_colorful/doors.txtpb b/data/maps/the_colorful/doors.txtpb
index 003c9a9..4785cf2 100644
--- a/data/maps/the_colorful/doors.txtpb
+++ b/data/maps/the_colorful/doors.txtpb

@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
  name: "White Door"
  type: STANDARD
diff --git a/data/maps/the_congruent/rooms/C Keyholder.txtpb b/data/maps/the_congruent/rooms/C Keyholder.txtpb
index 75ef920..d9a8cf2 100644
--- a/data/maps/the_congruent/rooms/C Keyholder.txtpb
+++ b/data/maps/the_congruent/rooms/C Keyholder.txtpb

@@ -2,5 +2,4 @@ name: "C Keyholder"
 keyholders {
  name: "C"
  path: "Components/KeyHolders/keyHolder"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
diff --git a/data/maps/the_congruent/rooms/G Keyholder.txtpb b/data/maps/the_congruent/rooms/G Keyholder.txtpb
index 8184703..cd12419 100644
--- a/data/maps/the_congruent/rooms/G Keyholder.txtpb
+++ b/data/maps/the_congruent/rooms/G Keyholder.txtpb

@@ -2,5 +2,4 @@ name: "G Keyholder"
 keyholders {
  name: "G"
  path: "Components/KeyHolders/keyHolder2"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
diff --git a/data/maps/the_darkroom/doors.txtpb b/data/maps/the_darkroom/doors.txtpb
index 047c7d0..c4a47a0 100644
--- a/data/maps/the_darkroom/doors.txtpb
+++ b/data/maps/the_darkroom/doors.txtpb

@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
  name: "Double Letter Panel Blockers"
  type: EVENT
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 9e6a30f..5bc6f57 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -304,7 +304,6 @@ doors {
 doors {
  name: "Red Room Painting"
  type: STANDARD
-  #move_paintings { room: "Right Eye" name: "PSYCHIC" }
  receivers: "Components/Paintings/psychic/teleportListener"
  panels { room: "Right Eye" name: "FAINT" }
  location_room: "Right Eye"
@@ -312,7 +311,6 @@ doors {
 doors {
  name: "Third Eye Painting"
  type: LOCATION_ONLY
-  # move_paintings { room: "Eye Room" name: "GALLERY" }
  # TODO: ummmm
  panels { room: "Eye Room" name: "I" }
  location_room: "Eye Room"
diff --git a/data/maps/the_partial/doors.txtpb b/data/maps/the_partial/doors.txtpb
index b6445cd..11826ea 100644
--- a/data/maps/the_partial/doors.txtpb
+++ b/data/maps/the_partial/doors.txtpb

@@ -49,9 +49,10 @@ doors {
 }
 doors {
  name: "Control Center Entrance"
-  type: EVENT
+  type: LEGACY_LOCATION
  #receivers: "Components/Doors/controlDoor"
  panels { room: "Control Center Entrance" name: "RETURN" }
+  location_room: "Control Center Entrance"
 }
 doors {
  name: "F Door"
diff --git a/data/maps/the_relentless/doors.txtpb b/data/maps/the_relentless/doors.txtpb
index 727599f..e970e40 100644
--- a/data/maps/the_relentless/doors.txtpb
+++ b/data/maps/the_relentless/doors.txtpb

@@ -26,17 +26,18 @@ doors {
 }
 doors {
  name: "Left/Turn Door"
-  type: EVENT
+  type: LEGACY_LOCATION
  panels { room: "Left Room" name: "HIDE" }
  panels { room: "Left Room" name: "LEFT" }
  panels { room: "Left Room" name: "MORE" }
  panels { room: "Turn Room" name: "HIDE (1)" }
  panels { room: "Turn Room" name: "HIDE (2)" }
  panels { room: "Turn Room" name: "MORE" }
+  location_room: "Turn Room"
 }
 doors {
  name: "Turn/Shop Door"
-  type: EVENT
+  type: LEGACY_LOCATION
  panels { room: "Turn Room" name: "HIDE (1)" }
  panels { room: "Turn Room" name: "HIDE (2)" }
  panels { room: "Turn Room" name: "MORE" }
@@ -45,6 +46,7 @@ doors {
  panels { room: "Shop Room" name: "EXIT (1)" }
  panels { room: "Shop Room" name: "EXIT (2)" }
  panels { room: "Shop Room" name: "EXIT (3)" }
+  location_room: "Turn Room"
 }
 doors {
  name: "All Doors"