11 files changed, 56 insertions, 39 deletions
diff --git a/data/maps/the_owl/connections.txtpb b/data/maps/the_owl/connections.txtpb
index 87c98b3..cb4bee3 100644
--- a/data/maps/the_owl/connections.txtpb
+++ b/data/maps/the_owl/connections.txtpb

@@ -10,12 +10,27 @@ connections {
 }
 connections {
  from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C2 Top"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "R2C2 Bottom"
+  to_room: "Connected Area"
  door { name: "Gray Owl" }
 }
 connections {
  from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "Connected Area"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "R2C3 Bottom"
+  to_room: "Connected Area"
+  oneway: true
+}
+connections {
+  from_room: "R2C2 Bottom"
+  to_room: "Connected Area"
  door { name: "First Room Shortcut" }
 }
 connections {
@@ -30,18 +45,18 @@ connections {
 }
 connections {
  from_room: "R2C2 Top"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
  door { name: "Gray Bottom Door" }
 }
 connections {
-  from_room: "R2C2 Top"
+  from_room: "Connected Area"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
  door { name: "Gray Owl" }
 }
 connections {
  from_room: "Connected Area"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
-  door { name: "Gray Owl" }
+  door { name: "Sky Owl" }
 }
 connections {
  from_room: "Connected Area"
@@ -70,6 +85,11 @@ connections {
 }
 connections {
  from_room: "Connected Area"
+  to_room: "R1C4 Left"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "Connected Area"
  to_room: "R2C1 Left"
  door { name: "Sky Top Doors" }
 }
@@ -84,6 +104,11 @@ connections {
  door { name: "Gray Owl" }
 }
 connections {
+  from_room: "Connected Area"
+  to_room: "R2C1 Left"
+  door { name: "Sky Owl" }
+}
+connections {
  from {
    painting {
      room: "Connected Area"
diff --git a/data/maps/the_owl/doors.txtpb b/data/maps/the_owl/doors.txtpb
index 28af5d0..9254c2a 100644
--- a/data/maps/the_owl/doors.txtpb
+++ b/data/maps/the_owl/doors.txtpb

@@ -25,8 +25,8 @@ doors {
  name: "First Room Shortcut"
  type: STANDARD
  receivers: "Components/Doors/entry_6"
-  panels { room: "R2C2.5 Bottom" name: "FIZZLE" }
+  panels { room: "Connected Area" name: "FIZZLE" }
-  location_room: "R2C2.5 Bottom"
+  location_room: "Connected Area"
 }
 doors {
  name: "First Door"
@@ -171,8 +171,8 @@ doors {
  receivers: "Components/Owl/Room 10/WG"
  receivers: "Components/Owl/Room 11/W"
  receivers: "Components/Owl/Room 11/WG"
-  panels { room: "R2C2.5 Bottom" name: "BLACK" }
+  panels { room: "R2C3 Bottom" name: "BLACK" }
-  location_room: "R2C2.5 Bottom"
+  location_room: "R2C3 Bottom"
 }
 doors {
  name: "Black Owl"
@@ -233,20 +233,20 @@ doors {
 doors {
  name: "Gray Panel"
  type: EVENT
-  # TODO: Is it okay to have an event with an in-game effect?
+  #receivers: "Panels/Colors/owl_2/animationListener2"
-  receivers: "Panels/Colors/owl_2/animationListener2"
+  panels { room: "Connected Area" name: "RANGE" }
-  doors { name: "Orange Owl" }
+  panels { room: "Connected Area" name: "WHITE" }
-  doors { name: "Black Owl" }
+  panels { room: "Blue Room" name: "SKY" }
-  doors { name: "Blue Owl" }
 }
 doors {
  name: "Owl Painting"
  type: EVENT
  #move_paintings { room: "Connected Area" name: "OWL" }
  #receivers: "Components/Paintings/owl/teleportListener"
-  doors { name: "Orange Owl" }
+  panels { room: "R2C1 Left" name: "DUSKY" }
-  doors { name: "Black Owl" }
+  panels { room: "R2C2 Top" name: "RAY" }
-  doors { name: "Blue Owl" }
+  panels { room: "Connected Area" name: "RANGE" }
-  doors { name: "White Owl" }
+  panels { room: "R2C3 Bottom" name: "BLACK" }
-  doors { name: "Sky Owl" }
+  panels { room: "Connected Area" name: "WHITE" }
+  panels { room: "Blue Room" name: "SKY" }
 }
diff --git a/data/maps/the_owl/rooms/Blue Room.txtpb b/data/maps/the_owl/rooms/Blue Room.txtpb
index 7c2d69a..a7298cd 100644
--- a/data/maps/the_owl/rooms/Blue Room.txtpb
+++ b/data/maps/the_owl/rooms/Blue Room.txtpb

@@ -1,5 +1,4 @@
 name: "Blue Room"
-display_name: "Owl"
 panels {
  name: "SKY"
  path: "Panels/Colors/owl_7"
diff --git a/data/maps/the_owl/rooms/Connected Area.txtpb b/data/maps/the_owl/rooms/Connected Area.txtpb
index 18388be..cf5ea1f 100644
--- a/data/maps/the_owl/rooms/Connected Area.txtpb
+++ b/data/maps/the_owl/rooms/Connected Area.txtpb

@@ -1,5 +1,4 @@
 name: "Connected Area"
-display_name: "Owl"
 panels {
  name: "MODE"
  path: "Panels/Noncritical/owl_12"
@@ -133,6 +132,13 @@ panels {
  answer: "orange"
  symbols: SPARKLES
 }
+panels {
+  name: "FIZZLE"
+  path: "Panels/Bottom Mid/owl_10"
+  clue: "fizzle"
+  answer: "chisel"
+  symbols: ZERO
+}
 paintings {
  name: "OWL"
  path: "Components/Paintings/owl"
diff --git a/data/maps/the_owl/rooms/Magenta Hallway.txtpb b/data/maps/the_owl/rooms/Magenta Hallway.txtpb
index 58a4a5d..ccbdc1c 100644
--- a/data/maps/the_owl/rooms/Magenta Hallway.txtpb
+++ b/data/maps/the_owl/rooms/Magenta Hallway.txtpb

@@ -1,5 +1,4 @@
 name: "Magenta Hallway"
-display_name: "Owl"
 ports {
  name: "STURDY"
  path: "Components/Warps/worldport3"
diff --git a/data/maps/the_owl/rooms/R1C4 Left.txtpb b/data/maps/the_owl/rooms/R1C4 Left.txtpb
index 73c1520..3714842 100644
--- a/data/maps/the_owl/rooms/R1C4 Left.txtpb
+++ b/data/maps/the_owl/rooms/R1C4 Left.txtpb

@@ -1,5 +1,4 @@
 name: "R1C4 Left"
-display_name: "Owl"
 panels {
  name: "WALK"
  path: "Panels/Noncritical/owl_5"
diff --git a/data/maps/the_owl/rooms/R2C1 Left.txtpb b/data/maps/the_owl/rooms/R2C1 Left.txtpb
index 0f9a2b5..72e7331 100644
--- a/data/maps/the_owl/rooms/R2C1 Left.txtpb
+++ b/data/maps/the_owl/rooms/R2C1 Left.txtpb

@@ -1,5 +1,4 @@
 name: "R2C1 Left"
-display_name: "Owl"
 panels {
  name: "VERB"
  path: "Panels/Bottom Left/owl_8"
diff --git a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
index e7eb9e4..604a1cc 100644
--- a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
+++ b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb

@@ -1,5 +1,4 @@
 name: "R2C2 Bottom"
-display_name: "Owl"
 panels {
  name: "FOUL"
  path: "Panels/Bottom Mid/owl_11"
@@ -11,5 +10,6 @@ ports {
  name: "GALLERY"
  path: "Components/Warps/worldport"
  orientation: "south"
-  # Note that this port is accessible from the other side in the Z1 room. Hmm.
+  # TODO: Note that this port is accessible from the other side in the Z1
+  # room. Hmm.
 }
diff --git a/data/maps/the_owl/rooms/R2C2 Top.txtpb b/data/maps/the_owl/rooms/R2C2 Top.txtpb
index 87b7705..78ce270 100644
--- a/data/maps/the_owl/rooms/R2C2 Top.txtpb
+++ b/data/maps/the_owl/rooms/R2C2 Top.txtpb

@@ -1,5 +1,4 @@
 name: "R2C2 Top"
-display_name: "Owl"
 panels {
  name: "CRUSH"
  path: "Panels/Bottom Mid/owl_1"
diff --git a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb
index 41b6265..2b49e26 100644
--- a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb
+++ b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb

@@ -1,12 +1,4 @@
-name: "R2C2.5 Bottom"
+name: "R2C3 Bottom"
-display_name: "Owl"
-panels {
-  name: "FIZZLE"
-  path: "Panels/Bottom Mid/owl_10"
-  clue: "fizzle"
-  answer: "chisel"
-  symbols: ZERO
-}
 panels {
  name: "FIGMENT"
  path: "Panels/Noncritical/owl_14"
diff --git a/data/maps/the_owl/rooms/Z Room.txtpb b/data/maps/the_owl/rooms/Z Room.txtpb
index 035d0b4..ab28655 100644
--- a/data/maps/the_owl/rooms/Z Room.txtpb
+++ b/data/maps/the_owl/rooms/Z Room.txtpb

@@ -1,5 +1,4 @@
 name: "Z Room"
-display_name: "Owl"
 panels {
  name: "MAZE"
  path: "Panels/Noncritical/owl_10"