11 files changed, 105 insertions, 10 deletions
diff --git a/data/door_groups.txtpb b/data/door_groups.txtpb
new file mode 100644
index 0000000..ca8ce54
--- /dev/null
+++ b/data/door_groups.txtpb

@@ -0,0 +1,84 @@
+door_groups {
+  name: "The Entry - Repetitive Entrance"
+  type: CONNECTOR
+  doors {
+    map: "the_entry"
+    name: "Starting Room West Wall North Door"
+  }
+  doors {
+    map: "the_repetitive"
+    name: "Entry Entrance"
+  }
+}
+door_groups {
+  name: "The Repetitive - Plaza Entrance"
+  type: CONNECTOR
+  doors {
+    map: "the_repetitive"
+    name: "Black Hallway"
+  }
+  doors {
+    map: "the_plaza"
+    name: "Repetitive Entrance"
+  }
+}
+door_groups {
+  name: "Control Center White Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "daedalus"
+    name: "White Hallway From Entry"
+  }
+  doors {
+    map: "the_entry"
+    name: "Control Center White Door"
+  }
+}
+door_groups {
+  name: "Control Center Purple Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "daedalus"
+    name: "Purple Hallway From Great"
+  }
+  doors {
+    map: "the_great"
+    name: "Control Center Purple Door"
+  }
+}
+door_groups {
+  name: "Control Center Orange Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "daedalus"
+    name: "Control Center Orange Door"
+  }
+  doors {
+    map: "the_unkempt"
+    name: "Control Center Orange Door"
+  }
+}
+door_groups {
+  name: "Control Center Brown Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "the_bearer"
+    name: "Control Center Brown Door"
+  }
+  doors {
+    map: "the_tree"
+    name: "Control Center Brown Door"
+  }
+}
+door_groups {
+  name: "Control Center Blue Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "the_digital"
+    name: "Control Center Blue Door"
+  }
+  doors {
+    map: "the_unyielding"
+    name: "Digital Entrance"
+  }
+}
diff --git a/data/ids.yaml b/data/ids.yaml
index 6498619..bd6cbc1 100644
--- a/data/ids.yaml
+++ b/data/ids.yaml

@@ -1743,13 +1743,13 @@ maps:
      Red Blue Area Left Door: 302
      Red Blue Area Right Door: 303
      Red Room Painting: 323
-      Repetitive Entrance: 312
      Revitalized Entrance: 306
      Right Eye Entrance: 301
      Scarf Door: 296
      Second Room Left Door: 298
      Second Room Right Door: 290
      Shop Entrance: 313
+      Starting Room West Wall North Door: 2781
      Third Eye Painting: 324
      Trick Door: 287
      Trick To Shop Door: 289
@@ -2760,6 +2760,7 @@ maps:
          ZEROING: 1118
    doors:
      Anti-Collectable Room: 1025
+      Black Hallway: 2780
      Cyan Door: 1028
      Cyan Puzzles: 1032
      Dot Area Entrance: 1026
@@ -2768,7 +2769,6 @@ maps:
      Lime Puzzles: 1031
      Magenta Door: 1029
      Magenta Puzzles: 1033
-      Plaza Entrance: 1024
      Yellow Door: 1030
      Yellow Puzzles: 1034
  the_revitalized:
@@ -3840,3 +3840,11 @@ special:
  A Job Well Done: 1160
 progressives:
  Progressive Gold Ending: 2753
+door_groups:
+  Control Center Blue Doors: 2788
+  Control Center Brown Doors: 2787
+  Control Center Orange Doors: 2786
+  Control Center Purple Doors: 2785
+  Control Center White Doors: 2784
+  The Entry - Repetitive Entrance: 2782
+  The Repetitive - Plaza Entrance: 2783
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"
 }