8 files changed, 10 insertions, 2 deletions
diff --git a/data/maps/daedalus/rooms/C Keyholder.txtpb b/data/maps/daedalus/rooms/C Keyholder.txtpb
index cc8548c..ef10a90 100644
--- a/data/maps/daedalus/rooms/C Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/C Keyholder.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "North Area"
 keyholders {
  name: "C"
  path: "Components/KeyHolders/keyHolderC"
+  key: "c"
 }
diff --git a/data/maps/daedalus/rooms/D Keyholder.txtpb b/data/maps/daedalus/rooms/D Keyholder.txtpb
index 2521ab2..a5852be 100644
--- a/data/maps/daedalus/rooms/D Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/D Keyholder.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "Plum Room"
 keyholders {
  name: "D"
  path: "Components/KeyHolders/keyHolderD"
+  key: "d"
 }
diff --git a/data/maps/daedalus/rooms/F Keyholder.txtpb b/data/maps/daedalus/rooms/F Keyholder.txtpb
index 662f76d..b424c6a 100644
--- a/data/maps/daedalus/rooms/F Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/F Keyholder.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "West Area"
 keyholders {
  name: "F"
  path: "Components/KeyHolders/keyHolderF"
+  key: "f"
 }
diff --git a/data/maps/daedalus/rooms/Number Paintings Area.txtpb b/data/maps/daedalus/rooms/Number Paintings Area.txtpb
index 15c8875..c89bfcf 100644
--- a/data/maps/daedalus/rooms/Number Paintings Area.txtpb
+++ b/data/maps/daedalus/rooms/Number Paintings Area.txtpb

@@ -17,6 +17,7 @@ panels {
 keyholders {
  name: "G"
  path: "Components/KeyHolders/keyHolderG"
+  key: "g"
 }
 paintings {
  name: "WON"
diff --git a/data/maps/daedalus/rooms/Orange Room Hallway.txtpb b/data/maps/daedalus/rooms/Orange Room Hallway.txtpb
new file mode 100644
index 0000000..915e698
--- /dev/null
+++ b/data/maps/daedalus/rooms/Orange Room Hallway.txtpb

@@ -0,0 +1,4 @@
+name: "Orange Room Hallway"
+panel_display_name: "Orange Room"
+# This has the same door at both sides, and mainly just connects Z2 Room and
+# Orange Room. It's separate because you can also get here from the Roof.
diff --git a/data/maps/daedalus/rooms/Outside House.txtpb b/data/maps/daedalus/rooms/Outside House.txtpb
index fd3f5f0..fed9dda 100644
--- a/data/maps/daedalus/rooms/Outside House.txtpb
+++ b/data/maps/daedalus/rooms/Outside House.txtpb

@@ -75,6 +75,7 @@ panels {
 keyholders {
  name: "H"
  path: "Components/KeyHolders/keyHolderH"
+  key: "h"
 }
 paintings {
  name: "CASTLE2"
diff --git a/data/maps/daedalus/rooms/Wonderland.txtpb b/data/maps/daedalus/rooms/Wonderland.txtpb
index 4b69e99..ae9b3f1 100644
--- a/data/maps/daedalus/rooms/Wonderland.txtpb
+++ b/data/maps/daedalus/rooms/Wonderland.txtpb

@@ -1,6 +1,5 @@
 name: "Wonderland"
 panel_display_name: "Northwest Area"
-# TODO: There's a warp from The Entry into here.
 panels {
  name: "APRIL"
  path: "Panels/Wonderland/wonderland_1"
diff --git a/data/maps/daedalus/rooms/Yellow Color Door.txtpb b/data/maps/daedalus/rooms/Yellow Color Door.txtpb
index f22c954..e44658c 100644
--- a/data/maps/daedalus/rooms/Yellow Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Yellow Color Door.txtpb

@@ -26,7 +26,7 @@ paintings {
  path: "Components/Paintings/Temple of the Eyes/eyeRedStart"
  move: true
  enter_only: true
-  # TODO: requires double letters
+  required_door { name: "Eye Painting" }
 }
 ports {
  name: "FOURROOMS"