5 files changed, 23 insertions, 22 deletions
diff --git a/data/maps/the_owl/connections.txtpb b/data/maps/the_owl/connections.txtpb
index 87c98b3..2bd2380 100644
--- a/data/maps/the_owl/connections.txtpb
+++ b/data/maps/the_owl/connections.txtpb

@@ -10,12 +10,17 @@ connections {
 }
 connections {
  from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "Connected Area"
  door { name: "Gray Owl" }
 }
 connections {
+  from_room: "R2C3 Bottom"
+  to_room: "Connected Area"
+  oneway: true
+}
+connections {
  from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "Connected Area"
  door { name: "First Room Shortcut" }
 }
 connections {
@@ -30,17 +35,12 @@ 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"
-  to_room: "R2C2.5 Bottom"
-  door { name: "Gray Owl" }
-}
-connections {
  from_room: "Connected Area"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
  door { name: "Gray Owl" }
 }
 connections {
diff --git a/data/maps/the_owl/doors.txtpb b/data/maps/the_owl/doors.txtpb
index 28af5d0..3d2d055 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"
diff --git a/data/maps/the_owl/rooms/Connected Area.txtpb b/data/maps/the_owl/rooms/Connected Area.txtpb
index 5862d59..cf5ea1f 100644
--- a/data/maps/the_owl/rooms/Connected Area.txtpb
+++ b/data/maps/the_owl/rooms/Connected Area.txtpb

@@ -132,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/R2C2 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
index 4661877..604a1cc 100644
--- a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
+++ b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb

@@ -10,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.5 Bottom.txtpb b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb
index 0f5381e..2b49e26 100644
--- a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb
+++ b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb

@@ -1,11 +1,4 @@
-name: "R2C2.5 Bottom"
+name: "R2C3 Bottom"
-panels {
-  name: "FIZZLE"
-  path: "Panels/Bottom Mid/owl_10"
-  clue: "fizzle"
-  answer: "chisel"
-  symbols: ZERO
-}
 panels {
  name: "FIGMENT"
  path: "Panels/Noncritical/owl_14"