9 files changed, 11 insertions, 8 deletions
diff --git a/data/maps/daedalus/doors.txtpb b/data/maps/daedalus/doors.txtpb
index 2d8ba0b..d6c33f4 100644
--- a/data/maps/daedalus/doors.txtpb
+++ b/data/maps/daedalus/doors.txtpb

@@ -892,16 +892,12 @@ doors {
 }
 doors {
  name: "White Hallway From Entry"
-  # TODO: This should be combined with the corresponding door in the_entry, at
-  # least when connections are not shuffled.
  type: CONTROL_CENTER_COLOR
  receivers: "Components/Doors/Halls/froom_6"
  control_center_color: "white"
 }
 doors {
  name: "Purple Hallway From Great"
-  # TODO: This should be combined with the corresponding door in the_great, at
-  # least when connections are not shuffled.
  type: CONTROL_CENTER_COLOR
  receivers: "Components/Doors/Halls/froom_7"
  control_center_color: "purple"
@@ -1080,6 +1076,7 @@ doors {
  panels { room: "Outside Snake Room" name: "SONG (South)" }
  panels { room: "West Castle Area" name: "SONG (2)" }
  location_room: "West Castle Area"
+  location_name: "South SONGs"
 }
 doors {
  name: "Amber North Door"
@@ -1088,6 +1085,7 @@ doors {
  panels { room: "Outside Snake Room" name: "SONG (North)" }
  panels { room: "Amber North 2" name: "SONG" }
  location_room: "Amber North 2"
+  location_name: "North SONGs"
 }
 doors {
  name: "Amber East Doors"
@@ -1921,6 +1919,7 @@ doors {
  type: LOCATION_ONLY
  panels { room: "Dark Light Exit" name: "GASKET" }
  location_room: "Dark Light Exit"
+  location_name: "GASKET"
 }
 doors {
  name: "Dark Light Room Divider"
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 6f847da..a2e325a 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -192,7 +192,7 @@ 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"
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 78ffa52..6bef160 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -193,7 +193,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_great/doors.txtpb b/data/maps/the_great/doors.txtpb
index dc25128..992b4fa 100644
--- a/data/maps/the_great/doors.txtpb
+++ b/data/maps/the_great/doors.txtpb

@@ -49,6 +49,7 @@ doors {
  type: LOCATION_ONLY
  panels { room: "West Side" name: "ERASE" }
  location_room: "West Side"
+  location_name: "ERASE"
 }
 doors {
  name: "Control Center Purple Door"
diff --git a/data/maps/the_linear/doors.txtpb b/data/maps/the_linear/doors.txtpb
index 63d8ae8..9a57158 100644
--- a/data/maps/the_linear/doors.txtpb
+++ b/data/maps/the_linear/doors.txtpb

@@ -10,4 +10,5 @@ doors {
  panels { room: "Room" name: "INTO" }
  panels { room: "Room" name: "NOR" }
  location_room: "Room"
+  location_name: "Gravestone"
 }
diff --git a/data/maps/the_repetitive/connections.txtpb b/data/maps/the_repetitive/connections.txtpb
index 2b115a9..0afe72d 100644
--- a/data/maps/the_repetitive/connections.txtpb
+++ b/data/maps/the_repetitive/connections.txtpb

@@ -6,7 +6,7 @@ connections {
 connections {
  from_room: "Main Room"
  to_room: "Plaza Connector"
-  door { name: "Plaza Entrance" }
+  door { name: "Black Hallway" }
  oneway: true
 }
 connections {
diff --git a/data/maps/the_repetitive/doors.txtpb b/data/maps/the_repetitive/doors.txtpb
index 9e63c1d..8171dc4 100644
--- a/data/maps/the_repetitive/doors.txtpb
+++ b/data/maps/the_repetitive/doors.txtpb

@@ -6,7 +6,7 @@ doors {
  location_room: "Main Room"
 }
 doors {
-  name: "Plaza Entrance"
+  name: "Black Hallway"
  type: STANDARD
  receivers: "Components/Doors/Door12"
  panels { room: "Main Room" name: "I" }
diff --git a/data/maps/the_three_doors/doors.txtpb b/data/maps/the_three_doors/doors.txtpb
index 99fbcee..5ae9d90 100644
--- a/data/maps/the_three_doors/doors.txtpb
+++ b/data/maps/the_three_doors/doors.txtpb

@@ -50,4 +50,5 @@ doors {
  panels { room: "Dead End Room" name: "DEAD" }
  panels { room: "Dead End Room" name: "END" }
  location_room: "Loose Strings Room"
+  location_name: "Gravestone"
 }
diff --git a/data/maps/the_tree/doors.txtpb b/data/maps/the_tree/doors.txtpb
index b62a881..6cb4086 100644
--- a/data/maps/the_tree/doors.txtpb
+++ b/data/maps/the_tree/doors.txtpb

@@ -38,4 +38,5 @@ doors {
  panels { room: "Main Area" name: "SMALL (3)" }
  panels { room: "Main Area" name: "SPRINKLE" }
  location_room: "Main Area"
+  location_name: "Gravestone"
 }