5 files changed, 32 insertions, 16 deletions
diff --git a/data/maps/the_jubilant/doors.txtpb b/data/maps/the_jubilant/doors.txtpb
index 02db1ff..90bfd0f 100644
--- a/data/maps/the_jubilant/doors.txtpb
+++ b/data/maps/the_jubilant/doors.txtpb

@@ -31,3 +31,14 @@ doors {
  panels { room: "Main Area" name: "QUEEN" answer: "jack" }
  location_room: "Main Area"
 }
+doors {
+  name: "Side Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Side Area" name: "CALLBACK" }
+  panels { room: "Side Area" name: "CALL" }
+  panels { room: "Side Area" name: "PUSHBACK" }
+  panels { room: "Side Area" name: "PUSH" }
+  panels { room: "Side Area" name: "FLASHBACK" }
+  panels { room: "Side Area" name: "FLASH" }
+  location_room: "Side Area"
+}
diff --git a/data/maps/the_jubilant/metadata.txtpb b/data/maps/the_jubilant/metadata.txtpb
new file mode 100644
index 0000000..4af1874
--- /dev/null
+++ b/data/maps/the_jubilant/metadata.txtpb

@@ -0,0 +1,5 @@
+display_name: "The Jubilant"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
diff --git a/data/maps/the_jubilant/rooms/J Room.txtpb b/data/maps/the_jubilant/rooms/J Room.txtpb
index 35abc54..19425f1 100644
--- a/data/maps/the_jubilant/rooms/J Room.txtpb
+++ b/data/maps/the_jubilant/rooms/J Room.txtpb

@@ -1,5 +1,4 @@
 name: "J Room"
-display_name: "Jubilant"
 letters {
  key: "j"
  path: "Components/Collectables/q" # yeah lol
diff --git a/data/maps/the_jubilant/rooms/Main Area.txtpb b/data/maps/the_jubilant/rooms/Main Area.txtpb
index 3f12452..b38fafd 100644
--- a/data/maps/the_jubilant/rooms/Main Area.txtpb
+++ b/data/maps/the_jubilant/rooms/Main Area.txtpb

@@ -1,11 +1,10 @@
 name: "Main Area"
-display_name: "Jubilant"
 panels {
  name: "GEMSTONE"
  path: "Panels/Main/panel_1"
  clue: "gemstone"
  answer: "ruby"
-  symbols: "example"
+  symbols: EXAMPLE
  proxies { answer: "jade" path: "Panels/J/panel_1" }
 }
 panels {
@@ -13,7 +12,7 @@ panels {
  path: "Panels/Main/panel_2"
  clue: "pull"
  answer: "yank"
-  symbols: "pyramid"
+  symbols: PYRAMID
  proxies { answer: "jerk" path: "Panels/J/panel_2" }
 }
 panels {
@@ -21,7 +20,7 @@ panels {
  path: "Panels/Main/panel_3"
  clue: "loin"
  answer: "coin"
-  symbols: "zero"
+  symbols: ZERO
  proxies { answer: "join" path: "Panels/J/panel_3" }
 }
 panels {
@@ -29,7 +28,7 @@ panels {
  path: "Panels/Main/panel_4"
  clue: "small"
  answer: "large"
-  symbols: "sun"
+  symbols: SUN
  proxies { answer: "jumbo" path: "Panels/J/panel_4" }
 }
 panels {
@@ -37,7 +36,7 @@ panels {
  path: "Panels/Main/panel_5"
  clue: "hop"
  answer: "leap"
-  symbols: "pyramid"
+  symbols: PYRAMID
  proxies { answer: "jump" path: "Panels/J/panel_5" }
 }
 panels {
@@ -45,7 +44,7 @@ panels {
  path: "Panels/Main/panel_6"
  clue: "unfair"
  answer: "fair"
-  symbols: "sun"
+  symbols: SUN
  proxies { answer: "just" path: "Panels/J/panel_6" }
 }
 panels {
@@ -53,7 +52,7 @@ panels {
  path: "Panels/Main/panel_7"
  clue: "sprint"
  answer: "run"
-  symbols: "pyramid"
+  symbols: PYRAMID
  proxies { answer: "jog" path: "Panels/J/panel_7" }
 }
 panels {
@@ -61,7 +60,7 @@ panels {
  path: "Panels/Main/panel_8"
  clue: "minor"
  answer: "adult"
-  symbols: "sun"
+  symbols: SUN
  proxies { answer: "major" path: "Panels/J/panel_8" }
 }
 panels {
@@ -69,7 +68,7 @@ panels {
  path: "Panels/Main/panel_9"
  clue: "bird"
  answer: "owl"
-  symbols: "example"
+  symbols: EXAMPLE
  proxies { answer: "jay" path: "Panels/J/panel_9" }
 }
 panels {
@@ -77,7 +76,7 @@ panels {
  path: "Panels/Main/panel_10"
  clue: "tree"
  answer: "forest"
-  symbols: "boxes"
+  symbols: BOXES
  proxies { answer: "jungle" path: "Panels/J/panel_10" }
 }
 panels {
@@ -85,7 +84,7 @@ panels {
  path: "Panels/Main/panel_11"
  clue: "orange"
  answer: "fruit"
-  symbols: "example"
+  symbols: EXAMPLE
  proxies { answer: "juice" path: "Panels/J/panel_11" }
 }
 panels {
@@ -93,11 +92,13 @@ panels {
  path: "Panels/Main/panel_12"
  clue: "queen"
  answer: "king"
-  symbols: "example"
+  symbols: EXAMPLE
  proxies { answer: "jack" path: "Panels/J/panel_12" }
 }
 ports {
  name: "GREAT"
+  display_name: "Entrance"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 9 }
+  rotation: 270
 }
diff --git a/data/maps/the_jubilant/rooms/Side Area.txtpb b/data/maps/the_jubilant/rooms/Side Area.txtpb
index 0e904aa..807f044 100644
--- a/data/maps/the_jubilant/rooms/Side Area.txtpb
+++ b/data/maps/the_jubilant/rooms/Side Area.txtpb

@@ -1,5 +1,4 @@
 name: "Side Area"
-display_name: "Jubilant"
 panels {
  name: "CALLBACK"
  path: "Panels/Back Helpers/back_1"
@@ -39,4 +38,5 @@ panels {
 keyholders {
  name: "J"
  path: "Components/KeyHolders/keyHolderJ"
+  key: "j"
 }