From 3b415b3f5f182238da9ed83e0b2b07fb07044e04 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 6 Feb 2026 13:03:32 -0500
Subject: Annotated RTE rooms for most maps

---
 tools/datapacker/main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools/datapacker')

diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index 953821f..4b74217 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp
@@ -100,6 +100,11 @@ class DataPacker {
           map_name, metadata.worldport_entrance().room(),
           metadata.worldport_entrance().name(), std::nullopt, std::nullopt));
     }
+
+    if (metadata.has_rte_room()) {
+      map.set_rte_room(container_.FindOrAddRoom(map_name, metadata.rte_room(),
+                                                std::nullopt));
+    }
   }
 
   void ProcessRooms(std::filesystem::path path,
-- 
cgit 1.4.1


From 225a6dba793386f36e72b432c8374e1978cee72a Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 6 Feb 2026 13:24:35 -0500
Subject: Add RTE AP ID to compiled datafile

---
 proto/data.proto          | 4 +++-
 tools/datapacker/main.cpp | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'tools/datapacker')

diff --git a/proto/data.proto b/proto/data.proto
index 6c846a3..3330666 100644
--- a/proto/data.proto
+++ b/proto/data.proto
@@ -287,8 +287,10 @@ message Map {
   optional string display_name = 3;
   optional DaedalusOnlyMode daedalus_only_mode = 6;
   optional uint64 worldport_entrance = 4;
-  optional uint64 rte_room = 7;
   optional MapType type = 5;
+
+  optional uint64 rte_room = 7;
+  optional uint64 rte_ap_id = 8;
 }
 
 message Progressive {
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index 4b74217..f1ef10e 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp
@@ -716,6 +716,11 @@ class DataPacker {
           container_.all_objects().mutable_ports(port_id)->set_ap_id(ap_id);
         }
       }
+
+      if (map.has_rte()) {
+        uint64_t map_id = container_.FindOrAddMap(map_name);
+        container_.all_objects().mutable_maps(map_id)->set_rte_ap_id(map.rte());
+      }
     }
 
     auto& specials = *container_.all_objects().mutable_special_ids();
-- 
cgit 1.4.1