7 files changed, 39 insertions, 28 deletions
diff --git a/data/connections.txtpb b/data/connections.txtpb
index 3cfbe6a..9d72467 100644
--- a/data/connections.txtpb
+++ b/data/connections.txtpb

@@ -1,4 +1,5 @@
 # TODO
+# the_entry/Starting Room/HI/thewords
 # the_entry/Lime Room/DAEDALUS
 # the_entry/Lime Room/REVITALIZED
 # the_entry/Shop Entrance/SHOP
@@ -38,23 +39,6 @@
 # the_liberated/Painting Room/PYRAMID
 connections {
  from {
-    panel {
-      map: "the_entry"
-      room: "Starting Room"
-      name: "HI"
-      answer: "thewords"
-    }
-  }
-  to {
-    room {
-      map: "the_words"
-      name: "Entrance"
-    }
-  }
-  oneway: true
-}
-connections {
-  from {
    port {
      map: "the_entry"
      room: "Gallery Return"
@@ -171,7 +155,7 @@ connections {
  from {
    painting {
      map: "the_bearer"
-      room: "Butterfly"
+      room: "Butterfly Room"
      name: "BUTTERFLY"
    }
  }
diff --git a/data/ids.txtpb b/data/ids.txtpb
index 7d1d9d0..49e035a 100644
--- a/data/ids.txtpb
+++ b/data/ids.txtpb

@@ -37,10 +37,26 @@ maps {
          value: 265
        }
        panels {
+          key: "EMOTION (1)"
+          value: 738
+        }
+        panels {
+          key: "EMOTION (2)"
+          value: 740
+        }
+        panels {
          key: "SIZE"
          value: 264
        }
        panels {
+          key: "SIZE (1)"
+          value: 737
+        }
+        panels {
+          key: "SIZE (2)"
+          value: 739
+        }
+        panels {
          key: "SONNET"
          value: 267
        }
@@ -2740,6 +2756,10 @@ maps {
          value: 518
        }
        panels {
+          key: "CURT"
+          value: 736
+        }
+        panels {
          key: "DEW"
          value: 505
        }
diff --git a/data/maps/four_rooms/doors.txtpb b/data/maps/four_rooms/doors.txtpb
index 46d0abe..f0bf060 100644
--- a/data/maps/four_rooms/doors.txtpb
+++ b/data/maps/four_rooms/doors.txtpb

@@ -16,10 +16,10 @@ doors {
  name: "Examples Door"
  type: STANDARD
  receivers: "Components/Doors/entry_2"
-  panels { room: "Examples Room" name: "SIZE" }
+  panels { room: "Examples Room" name: "SIZE (1)" }
-  panels { room: "Examples Room" name: "EMOTION" }
+  panels { room: "Examples Room" name: "EMOTION (1)" }
-  panels { room: "Examples Room" name: "SIZE" }
+  panels { room: "Examples Room" name: "SIZE (2)" }
-  panels { room: "Examples Room" name: "EMOTION" }
+  panels { room: "Examples Room" name: "EMOTION (2)" }
  panels { room: "Examples Room" name: "SUPERLATIVE" }
  panels { room: "Examples Room" name: "SONNET" }
  panels { room: "Examples Room" name: "URN" }
diff --git a/data/maps/four_rooms/rooms/Examples Room.txtpb b/data/maps/four_rooms/rooms/Examples Room.txtpb
index ffbe74d..bec3a23 100644
--- a/data/maps/four_rooms/rooms/Examples Room.txtpb
+++ b/data/maps/four_rooms/rooms/Examples Room.txtpb

@@ -1,28 +1,28 @@
 name: "Examples Room"
 display_name: "Examples Room"
 panels {
-  name: "SIZE"
+  name: "SIZE (1)"
  path: "Panels/Room 2 Examples/entry_1"
  clue: "size"
  answer: "tiny"
  symbols: "example"
 }
 panels {
-  name: "EMOTION"
+  name: "EMOTION (1)"
  path: "Panels/Room 2 Examples/entry_2"
  clue: "emotion"
  answer: "love"
  symbols: "example"
 }
 panels {
-  name: "SIZE"
+  name: "SIZE (2)"
  path: "Panels/Room 2 Examples/entry_3"
  clue: "size"
  answer: "huge"
  symbols: "example"
 }
 panels {
-  name: "EMOTION"
+  name: "EMOTION (2)"
  path: "Panels/Room 2 Examples/entry_4"
  clue: "emotion"
  answer: "fear"
diff --git a/data/maps/the_butterfly/doors.txtpb b/data/maps/the_butterfly/doors.txtpb
index 1994d2f..987c269 100644
--- a/data/maps/the_butterfly/doors.txtpb
+++ b/data/maps/the_butterfly/doors.txtpb

@@ -4,7 +4,7 @@ doors {
  type: EVENT
  panels { room: "Main Area" name: "SPECIES" }
  panels { room: "Main Area" name: "PERSONALITY" }
-  panels { room: "Main Area" name: "CONSTITUION" }
+  panels { room: "Main Area" name: "CONSTITUTION" }
  panels { room: "Main Area" name: "GAME" }
  panels { room: "Main Area" name: "SCIENCE" }
  panels { room: "Main Area" name: "SCHOOL" }
diff --git a/data/maps/the_double_sided/connections.txtpb b/data/maps/the_double_sided/connections.txtpb
index c21049d..3c404e2 100644
--- a/data/maps/the_double_sided/connections.txtpb
+++ b/data/maps/the_double_sided/connections.txtpb

@@ -94,7 +94,7 @@ connections {
  door { name: "Obverse Black/Pink Door" }
 }
 connections {
-  from_room: "Flipped Yellow Area"
+  from_room: "Flipped Yellow Front Area"
  to_room: "Flipped Black Area"
  door { name: "Flipped Yellow/Black Door" }
 }
diff --git a/data/maps/the_great/rooms/Main Area.txtpb b/data/maps/the_great/rooms/Main Area.txtpb
index a70b011..b014b16 100644
--- a/data/maps/the_great/rooms/Main Area.txtpb
+++ b/data/maps/the_great/rooms/Main Area.txtpb

@@ -119,6 +119,13 @@ panels {
  symbols: "sun"
  symbols: "zero"
 }
+panels {
+  name: "CURT"
+  path: "Panels/Maze/entry_1"
+  clue: "curt"
+  answer: "court"
+  symbols: "sparkles"
+}
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"