diff --git a/src/ChatCommands.cc b/src/ChatCommands.cc
index cd53199f..66dfcb9a 100644
--- a/src/ChatCommands.cc
+++ b/src/ChatCommands.cc
@@ -590,7 +590,7 @@ static void server_command_persist(shared_ptr<Client> c, const std::string&) {
   auto l = c->require_lobby();
   if (l->check_flag(Lobby::Flag::DEFAULT)) {
     send_text_message(c, "$C6Default lobbies\ncannot be marked\ntemporary");
-  } else if (!l->check_flag(Lobby::Flag::GAME)) {
+  } else if (!l->is_game()) {
     send_text_message(c, "$C6Private lobbies\ncannot be marked\npersistent");
   } else if (l->check_flag(Lobby::Flag::QUEST_IN_PROGRESS) || l->check_flag(Lobby::Flag::JOINABLE_QUEST_IN_PROGRESS)) {
     send_text_message(c, "$C6Games cannot be\npersistent if a\nquest has already\nbegun");
diff --git a/src/Lobby.cc b/src/Lobby.cc
index f2a976e5..7e2abc77 100644
--- a/src/Lobby.cc
+++ b/src/Lobby.cc
@@ -135,9 +135,9 @@ uint32_t Lobby::FloorItemManager::reassign_all_item_ids(uint32_t next_item_id) {
   return next_item_id;
 }
 
-Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id)
+Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id, bool is_game)
     : server_state(s),
-      log(string_printf("[Lobby:%" PRIX32 "] ", id), lobby_log.min_level),
+      log(string_printf("[%s:%" PRIX32 "] ", is_game ? "Game" : "Lobby", id), lobby_log.min_level),
       lobby_id(id),
       min_level(0),
       max_level(0xFFFFFFFF),
@@ -162,15 +162,24 @@ Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id)
           event_new(s->base.get(), -1, EV_TIMEOUT | EV_PERSIST, &Lobby::dispatch_on_idle_timeout, this),
           event_free) {
   this->log.info("Created");
-  for (size_t x = 0; x < 12; x++) {
-    this->next_item_id_for_client[x] = 0x00010000 + 0x00200000 * x;
+  if (is_game) {
+    this->set_flag(Flag::GAME);
   }
+  this->reset_next_item_ids();
 }
 
 Lobby::~Lobby() {
   this->log.info("Deleted");
 }
 
+void Lobby::reset_next_item_ids() {
+  uint32_t base_item_id = this->is_game() ? 0x00010000 : 0x10010000;
+  for (size_t x = 0; x < 12; x++) {
+    this->next_item_id_for_client[x] = base_item_id + 0x00200000 * x;
+  }
+  this->next_game_item_id = 0xCC000000;
+}
+
 shared_ptr<ServerState> Lobby::require_server_state() const {
   auto s = this->server_state.lock();
   if (!s) {
@@ -468,10 +477,7 @@ void Lobby::add_client(shared_ptr<Client> c, ssize_t required_client_id) {
   // If this is a lobby or no one was here before this, reassign all the floor
   // item IDs and reset the next item IDs
   if (!this->is_game() || (leader_index >= this->max_clients)) {
-    for (size_t x = 0; x < 12; x++) {
-      this->next_item_id_for_client[x] = 0x00010000 + 0x00200000 * x;
-    }
-    this->next_game_item_id = 0xCC000000;
+    this->reset_next_item_ids();
     for (auto& m : this->floor_item_managers) {
       this->next_game_item_id = m.reassign_all_item_ids(this->next_game_item_id);
     }
diff --git a/src/Lobby.hh b/src/Lobby.hh
index e68f7d10..32ebf296 100644
--- a/src/Lobby.hh
+++ b/src/Lobby.hh
@@ -169,13 +169,15 @@ struct Lobby : public std::enable_shared_from_this<Lobby> {
   uint64_t idle_timeout_usecs;
   std::unique_ptr<struct event, void (*)(struct event*)> idle_timeout_event;
 
-  Lobby(std::shared_ptr<ServerState> s, uint32_t id);
+  Lobby(std::shared_ptr<ServerState> s, uint32_t id, bool is_game);
   Lobby(const Lobby&) = delete;
   Lobby(Lobby&&) = delete;
   ~Lobby();
   Lobby& operator=(const Lobby&) = delete;
   Lobby& operator=(Lobby&&) = delete;
 
+  void reset_next_item_ids();
+
   [[nodiscard]] inline bool check_flag(Flag flag) const {
     return !!(this->enabled_flags & static_cast<uint32_t>(flag));
   }
diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 5bbca1f9..5dab9574 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -3955,10 +3955,8 @@ shared_ptr<Lobby> create_game_generic(
     return nullptr;
   }
 
-  shared_ptr<Lobby> game = s->create_lobby();
+  shared_ptr<Lobby> game = s->create_lobby(true);
   game->name = name;
-  game->set_flag(Lobby::Flag::GAME);
-
   game->base_version = c->version();
   game->allowed_versions = 0;
   switch (game->base_version) {
diff --git a/src/ServerState.cc b/src/ServerState.cc
index 74d5be76..2a4dc44f 100644
--- a/src/ServerState.cc
+++ b/src/ServerState.cc
@@ -93,7 +93,7 @@ void ServerState::init() {
     bool allow_v1 = (x <= 9);
     bool allow_non_ep3 = (x <= 14);
 
-    shared_ptr<Lobby> l = this->create_lobby();
+    shared_ptr<Lobby> l = this->create_lobby(false);
     l->set_flag(Lobby::Flag::PUBLIC);
     l->set_flag(Lobby::Flag::DEFAULT);
     l->set_flag(Lobby::Flag::PERSISTENT);
@@ -190,7 +190,7 @@ void ServerState::add_client_to_available_lobby(shared_ptr<Client> c) {
   }
 
   if (!added_to_lobby) {
-    added_to_lobby = this->create_lobby();
+    added_to_lobby = this->create_lobby(false);
     added_to_lobby->set_flag(Lobby::Flag::PUBLIC);
     added_to_lobby->set_flag(Lobby::Flag::IS_OVERFLOW);
     added_to_lobby->block = 100;
@@ -278,11 +278,11 @@ vector<shared_ptr<Lobby>> ServerState::all_lobbies() {
   return ret;
 }
 
-shared_ptr<Lobby> ServerState::create_lobby() {
+shared_ptr<Lobby> ServerState::create_lobby(bool is_game) {
   while (this->id_to_lobby.count(this->next_lobby_id)) {
     this->next_lobby_id++;
   }
-  auto l = make_shared<Lobby>(this->shared_from_this(), this->next_lobby_id++);
+  auto l = make_shared<Lobby>(this->shared_from_this(), this->next_lobby_id++, is_game);
   this->id_to_lobby.emplace(l->lobby_id, l);
   l->idle_timeout_usecs = this->persistent_game_idle_timeout_usecs;
   return l;
diff --git a/src/ServerState.hh b/src/ServerState.hh
index fdfc7e79..18642aa3 100644
--- a/src/ServerState.hh
+++ b/src/ServerState.hh
@@ -245,7 +245,7 @@ struct ServerState : public std::enable_shared_from_this<ServerState> {
   std::shared_ptr<Lobby> find_lobby(uint32_t lobby_id);
   std::vector<std::shared_ptr<Lobby>> all_lobbies();
 
-  std::shared_ptr<Lobby> create_lobby();
+  std::shared_ptr<Lobby> create_lobby(bool is_game);
   void remove_lobby(std::shared_ptr<Lobby> l);
   void on_player_left_lobby(std::shared_ptr<Lobby> l, uint8_t leaving_client_id);
 
diff --git a/tests/DCNTE-GameSmokeTest.test.txt b/tests/DCNTE-GameSmokeTest.test.txt
index 36853d93..56eaf7fe 100644
--- a/tests/DCNTE-GameSmokeTest.test.txt
+++ b/tests/DCNTE-GameSmokeTest.test.txt
@@ -198,14 +198,14 @@ I 25793 2023-11-24 23:06:59 - [Commands] Sending to C-8 (ABCDEFGHIJKL) (version=
 0010 | 7F 00 00 01 00 00 00 00 41 42 43 44 45 46 47 48 |         ABCDEFGH
 0020 | 49 4A 4B 4C 00 00 00 00 05 00 00 00 02 00 00 00 | IJKL
 0030 | 0C 00 00 00 00 06 00 00 00 00 00 00 00 00 00 00 |
-0040 | 05 00 01 00 00 00 00 00 02 00 00 00 0C 00 00 00 |
-0050 | 01 01 00 00 00 00 00 00 00 00 00 00 06 00 01 00 |
+0040 | 00 00 01 10 00 00 00 00 02 00 00 00 0C 00 00 00 |
+0050 | 01 01 00 00 00 00 00 00 00 00 00 00 01 00 01 10 |
 0060 | 00 00 00 00 02 00 00 00 0C 00 00 00 02 00 05 00 |
-0070 | F4 01 00 00 00 00 00 00 07 00 01 00 00 00 28 00 |               (
+0070 | F4 01 00 00 00 00 00 00 02 00 01 10 00 00 28 00 |               (
 0080 | 01 00 00 00 10 00 00 00 03 00 00 00 00 01 00 00 |
-0090 | 00 00 00 00 08 00 01 00 00 00 00 00 01 00 00 00 |
+0090 | 00 00 00 00 03 00 01 10 00 00 00 00 01 00 00 00 |
 00A0 | 10 00 00 00 03 01 00 00 00 01 00 00 00 00 00 00 |
-00B0 | 09 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |
+00B0 | 04 00 01 10 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -325,14 +325,14 @@ I 25793 2023-11-24 23:07:09 - [Commands] Sending to C-8 (ABCDEFGHIJKL) (version=
 0010 | 7F 00 00 01 00 00 00 00 41 42 43 44 45 46 47 48 |         ABCDEFGH
 0020 | 49 4A 4B 4C 00 00 00 00 05 00 00 00 02 00 00 00 | IJKL
 0030 | 0C 00 00 00 00 06 00 00 00 00 00 00 00 00 00 00 |
-0040 | 05 00 01 00 00 00 00 00 02 00 00 00 0C 00 00 00 |
-0050 | 01 01 00 00 00 00 00 00 00 00 00 00 06 00 01 00 |
+0040 | 00 00 01 10 00 00 00 00 02 00 00 00 0C 00 00 00 |
+0050 | 01 01 00 00 00 00 00 00 00 00 00 00 01 00 01 10 |
 0060 | 00 00 00 00 02 00 00 00 0C 00 00 00 02 00 05 00 |
-0070 | F4 01 00 00 00 00 00 00 07 00 01 00 00 00 28 00 |               (
+0070 | F4 01 00 00 00 00 00 00 02 00 01 10 00 00 28 00 |               (
 0080 | 01 00 00 00 10 00 00 00 03 00 00 00 00 01 00 00 |
-0090 | 00 00 00 00 08 00 01 00 00 00 00 00 01 00 00 00 |
+0090 | 00 00 00 00 03 00 01 10 00 00 00 00 01 00 00 00 |
 00A0 | 10 00 00 00 03 01 00 00 00 01 00 00 00 00 00 00 |
-00B0 | 09 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |
+00B0 | 04 00 01 10 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -745,14 +745,14 @@ I 25793 2023-11-24 23:07:53 - [Commands] Sending to C-A (ABCDEFGHIJKL) (version=
 0010 | 7F 00 00 01 00 00 00 00 41 42 43 44 45 46 47 48 |         ABCDEFGH
 0020 | 49 4A 4B 4C 00 00 00 00 05 00 00 00 02 00 00 00 | IJKL
 0030 | 0C 00 00 00 00 06 00 00 00 00 00 00 00 00 00 00 |
-0040 | 00 00 01 00 00 00 00 00 02 00 00 00 0C 00 00 00 |
-0050 | 01 01 00 00 00 00 00 00 00 00 00 00 01 00 01 00 |
+0040 | 00 00 01 10 00 00 00 00 02 00 00 00 0C 00 00 00 |
+0050 | 01 01 00 00 00 00 00 00 00 00 00 00 01 00 01 10 |
 0060 | 00 00 00 00 02 00 00 00 0C 00 00 00 02 00 05 00 |
-0070 | F4 01 00 00 00 00 00 00 02 00 01 00 00 00 28 00 |               (
+0070 | F4 01 00 00 00 00 00 00 02 00 01 10 00 00 28 00 |               (
 0080 | 01 00 00 00 10 00 00 00 03 00 00 00 00 01 00 00 |
-0090 | 00 00 00 00 03 00 01 00 00 00 00 00 01 00 00 00 |
+0090 | 00 00 00 00 03 00 01 10 00 00 00 00 01 00 00 00 |
 00A0 | 10 00 00 00 03 01 00 00 00 01 00 00 00 00 00 00 |
-00B0 | 04 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |
+00B0 | 04 00 01 10 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
diff --git a/tests/DCv1-GameSmokeTest.test.txt b/tests/DCv1-GameSmokeTest.test.txt
index 3c082a6f..577617c6 100644
--- a/tests/DCv1-GameSmokeTest.test.txt
+++ b/tests/DCv1-GameSmokeTest.test.txt
@@ -236,14 +236,14 @@ I 40469 2023-05-26 10:40:59 - [Commands] Sending to C-2 (Tali) (version=DC comma
 0010 | 00 00 01 00 77 77 77 77 7F 00 00 01 00 00 00 00 |     wwww
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 05 00 00 01 02 00 00 00 0C 00 00 00 00 06 00 00 |
-0040 | 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 02 00 00 00 0C 00 00 00 01 01 00 00 00 00 00 00 |
-0060 | 00 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 0C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 |
-0080 | 02 00 01 00 00 00 23 00 01 00 00 00 10 00 00 00 |       #
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 00 |
+0080 | 02 00 01 10 00 00 23 00 01 00 00 00 10 00 00 00 |       #
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -393,14 +393,14 @@ I 40469 2023-05-26 10:41:20 - [Commands] Sending to C-2 (Tali) (version=DC comma
 0010 | 00 00 01 00 77 77 77 77 7F 00 00 01 00 00 00 00 |     wwww
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 05 00 00 01 02 00 00 00 0C 00 00 00 00 06 00 00 |
-0040 | 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 02 00 00 00 0C 00 00 00 01 01 00 00 00 00 00 00 |
-0060 | 00 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 0C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 |
-0080 | 02 00 01 00 00 00 23 00 01 00 00 00 10 00 00 00 |       #
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 00 |
+0080 | 02 00 01 10 00 00 23 00 01 00 00 00 10 00 00 00 |       #
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -1116,16 +1116,16 @@ I 40469 2023-05-26 10:42:43 - [Commands] Sending to C-2 (Tali) (version=DC comma
 0010 | 00 00 01 00 77 77 77 77 7F 00 00 01 00 00 00 00 |     wwww
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 06 00 00 01 02 00 00 00 4C 00 00 00 00 06 00 00 |         L
-0040 | 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 02 00 00 00 4C 00 00 00 01 01 00 00 00 00 00 00 |     L
-0060 | 00 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 | L
-0080 | 02 00 01 00 00 00 1E 00 01 00 00 00 10 00 00 00 |
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 00 |
+0080 | 02 00 01 10 00 00 1E 00 01 00 00 00 10 00 00 00 |
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 04 00 00 00 00 06 00 00 00 00 00 00 |
-00D0 | 00 00 00 00 7E 01 01 06 00 00 00 00 00 00 00 00 |     ~
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
diff --git a/tests/DCv2-GameSmokeTest.test.txt b/tests/DCv2-GameSmokeTest.test.txt
index 214b6bb6..b3d1b7b0 100644
--- a/tests/DCv2-GameSmokeTest.test.txt
+++ b/tests/DCv2-GameSmokeTest.test.txt
@@ -240,16 +240,16 @@ I 40992 2023-05-26 10:52:57 - [Commands] Sending to C-2 (Tali) (version=DC comma
 0010 | 00 00 01 00 77 77 77 77 7F 00 00 01 00 00 00 00 |     wwww
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 06 00 00 01 02 00 00 00 4C 00 00 00 00 06 00 00 |         L
-0040 | 00 00 00 00 00 00 00 00 06 00 01 10 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 02 00 00 00 4C 00 00 00 01 01 00 00 00 00 00 00 |     L
-0060 | 00 00 00 00 07 00 01 10 00 00 00 00 02 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 | L
-0080 | 08 00 01 10 00 00 19 00 01 00 00 00 10 00 00 00 |
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 09 00 01 10 |
+0080 | 02 00 01 10 00 00 19 00 01 00 00 00 10 00 00 00 |
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 0A 00 01 10 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 04 00 00 00 00 06 00 00 00 00 00 00 |
-00D0 | 00 00 00 00 0B 00 01 10 00 00 00 00 00 FF 00 00 |
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 00 FF 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | FF FF FF FF 00 00 00 00 00 FF 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 FF FF FF FF |
@@ -387,16 +387,16 @@ I 40992 2023-05-26 10:53:08 - [Commands] Sending to C-2 (Tali) (version=DC comma
 0010 | 00 00 01 00 77 77 77 77 7F 00 00 01 00 00 00 00 |     wwww
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 06 00 00 01 02 00 00 00 4C 00 00 00 00 06 00 00 |         L
-0040 | 00 00 00 00 00 00 00 00 06 00 01 10 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 02 00 00 00 4C 00 00 00 01 01 00 00 00 00 00 00 |     L
-0060 | 00 00 00 00 07 00 01 10 00 00 00 00 02 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 | L
-0080 | 08 00 01 10 00 00 19 00 01 00 00 00 10 00 00 00 |
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 09 00 01 10 |
+0080 | 02 00 01 10 00 00 19 00 01 00 00 00 10 00 00 00 |
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 0A 00 01 10 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 04 00 00 00 00 06 00 00 00 00 00 00 |
-00D0 | 00 00 00 00 0B 00 01 10 00 00 00 00 00 FF 00 00 |
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 00 FF 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | FF FF FF FF 00 00 00 00 00 FF 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 FF FF FF FF |
@@ -1360,18 +1360,18 @@ I 40992 2023-05-26 10:55:24 - [Commands] Sending to C-2 (Tali) (version=DC comma
 0010 | 00 00 01 00 77 77 77 77 7F 00 00 01 00 00 00 00 |     wwww
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 07 00 00 01 02 00 00 00 4C 00 00 00 00 06 00 00 |         L
-0040 | 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 02 00 00 00 4C 00 00 00 01 01 00 00 00 00 00 00 |     L
-0060 | 00 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 | L
-0080 | 02 00 01 00 00 00 14 00 01 00 00 00 10 00 00 00 |
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 00 |
+0080 | 02 00 01 10 00 00 14 00 01 00 00 00 10 00 00 00 |
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 04 00 00 00 00 06 00 00 00 00 00 00 |
-00D0 | 00 00 00 00 05 00 01 00 00 00 00 00 01 00 00 00 |
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 00 00 |
 00E0 | 10 00 00 00 03 06 00 00 00 01 00 00 00 00 00 00 |
-00F0 | 7B 01 01 06 00 00 00 00 00 00 00 00 00 00 00 00 | {
+00F0 | 06 00 01 10 00 00 00 00 00 00 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0110 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0120 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
diff --git a/tests/GC-Episode3BattleWithSpectator.test.txt b/tests/GC-Episode3BattleWithSpectator.test.txt
index d45c8d5e..ba054d61 100644
--- a/tests/GC-Episode3BattleWithSpectator.test.txt
+++ b/tests/GC-Episode3BattleWithSpectator.test.txt
@@ -3521,14 +3521,14 @@ I 17097 2023-09-19 21:52:50 - [Commands] Sending to C-2 (Tali) (version=GC comma
 0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
 0020 | 54 61 6C 69 00 00 00 00 00 00 00 00 00 00 00 00 | Tali
 0030 | 05 00 00 01 01 00 00 00 08 00 00 00 00 06 00 00 |
-0040 | 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 |
+0040 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0050 | 01 00 00 00 08 00 00 00 01 01 00 00 00 00 00 00 |
-0060 | 00 00 00 00 01 00 01 00 00 00 00 00 01 00 00 00 |
+0060 | 00 00 00 00 01 00 01 10 00 00 00 00 01 00 00 00 |
 0070 | 08 00 00 00 02 00 05 00 F4 01 00 00 00 00 00 00 |
-0080 | 02 00 01 00 12 00 00 28 01 00 00 00 00 00 00 00 |        (
-0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 00 |
+0080 | 02 00 01 10 12 00 00 28 01 00 00 00 00 00 00 00 |        (
+0090 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 01 00 00 00 00 00 00 00 03 01 00 00 |
-00B0 | 00 04 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00B0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
diff --git a/tests/GC-ForestGame.test.txt b/tests/GC-ForestGame.test.txt
index 1429ae77..ffdfc7de 100644
--- a/tests/GC-ForestGame.test.txt
+++ b/tests/GC-ForestGame.test.txt
@@ -302,30 +302,30 @@ I 49108 2023-05-26 16:18:08 - [Commands] Sending to C-2 (Jess) (version=GC comma
 0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
 0020 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
 0030 | 0E 02 00 01 02 00 00 00 4C 00 00 00 02 0B 2D 29 |         L     -)
-0040 | 2C 06 8E 03 14 02 72 06 1C 00 01 10 05 03 34 67 | ,     r       4g
+0040 | 2C 06 8E 03 14 02 72 06 00 00 01 10 05 03 34 67 | ,     r       4g
 0050 | 02 00 00 00 4C 00 00 00 01 01 07 00 00 01 00 00 |     L
-0060 | 01 00 00 00 1D 00 01 10 00 00 00 00 02 00 00 00 |
+0060 | 01 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 01 02 07 00 00 00 04 00 02 00 00 00 | L
-0080 | 1E 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 |             L
-0090 | 00 06 02 03 00 00 02 19 03 19 00 00 1F 00 01 10 |
+0080 | 02 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 |             L
+0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 02 00 00 00 4C 00 00 00 01 03 21 00 |         L     !
-00B0 | 00 00 00 00 00 00 00 00 20 00 01 10 00 00 00 00 |
+00B0 | 00 00 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 44 00 00 00 01 03 04 00 00 00 FF FF |     D
-00D0 | 00 00 00 00 21 00 01 10 00 00 00 00 01 00 05 00 |     !
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 05 00 |
 00E0 | 44 00 00 00 01 01 03 00 00 00 00 00 00 00 00 00 | D
-00F0 | 22 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | "           P
-0100 | 03 00 02 00 00 01 00 00 00 00 00 00 23 00 01 10 |             #
+00F0 | 06 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 |             P
+0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 10 |
 0110 | 00 00 00 00 01 00 00 05 50 00 00 00 03 08 00 00 |         P
-0120 | 00 01 00 00 00 00 00 00 24 00 01 10 00 00 00 00 |         $
+0120 | 00 01 00 00 00 00 00 00 08 00 01 10 00 00 00 00 |
 0130 | 01 00 00 03 44 00 00 00 00 01 01 00 00 00 01 0F |     D
-0140 | 00 00 00 00 25 00 01 10 00 00 00 00 01 00 00 04 |     %
+0140 | 00 00 00 00 09 00 01 10 00 00 00 00 01 00 00 04 |
 0150 | 44 00 00 00 01 01 06 00 00 00 01 00 00 00 00 00 | D
-0160 | 26 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | &           D
-0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 27 00 01 10 |             '
+0160 | 0A 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 |             D
+0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 10 |
 0180 | 00 00 00 00 01 00 00 00 40 00 00 00 03 10 00 00 |         @
-0190 | 00 02 00 00 00 00 00 00 28 00 01 10 00 00 00 00 |         (
+0190 | 00 02 00 00 00 00 00 00 0C 00 01 10 00 00 00 00 |
 01A0 | 01 00 00 01 50 00 00 00 03 01 00 00 00 01 00 00 |     P
-01B0 | 00 00 00 00 29 00 01 10 00 00 00 00 00 00 00 00 |     )
+01B0 | 00 00 00 00 0D 00 01 10 00 00 00 00 00 00 00 00 |
 01C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 01D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 01E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -511,30 +511,30 @@ I 49108 2023-05-26 16:18:21 - [Commands] Sending to C-2 (Jess) (version=GC comma
 0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
 0020 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
 0030 | 0E 02 00 01 02 00 00 00 4C 00 00 00 02 0B 2D 29 |         L     -)
-0040 | 2C 06 8E 03 14 02 72 06 1C 00 01 10 05 03 34 67 | ,     r       4g
+0040 | 2C 06 8E 03 14 02 72 06 00 00 01 10 05 03 34 67 | ,     r       4g
 0050 | 02 00 00 00 4C 00 00 00 01 01 07 00 00 01 00 00 |     L
-0060 | 01 00 00 00 1D 00 01 10 00 00 00 00 02 00 00 00 |
+0060 | 01 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 01 02 07 00 00 00 04 00 02 00 00 00 | L
-0080 | 1E 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 |             L
-0090 | 00 06 02 03 00 00 02 19 03 19 00 00 1F 00 01 10 |
+0080 | 02 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 |             L
+0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 02 00 00 00 4C 00 00 00 01 03 21 00 |         L     !
-00B0 | 00 00 00 00 00 00 00 00 20 00 01 10 00 00 00 00 |
+00B0 | 00 00 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 44 00 00 00 01 03 04 00 00 00 FF FF |     D
-00D0 | 00 00 00 00 21 00 01 10 00 00 00 00 01 00 05 00 |     !
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 05 00 |
 00E0 | 44 00 00 00 01 01 03 00 00 00 00 00 00 00 00 00 | D
-00F0 | 22 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | "           P
-0100 | 03 00 02 00 00 01 00 00 00 00 00 00 23 00 01 10 |             #
+00F0 | 06 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 |             P
+0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 10 |
 0110 | 00 00 00 00 01 00 00 05 50 00 00 00 03 08 00 00 |         P
-0120 | 00 01 00 00 00 00 00 00 24 00 01 10 00 00 00 00 |         $
+0120 | 00 01 00 00 00 00 00 00 08 00 01 10 00 00 00 00 |
 0130 | 01 00 00 03 44 00 00 00 00 01 01 00 00 00 01 0F |     D
-0140 | 00 00 00 00 25 00 01 10 00 00 00 00 01 00 00 04 |     %
+0140 | 00 00 00 00 09 00 01 10 00 00 00 00 01 00 00 04 |
 0150 | 44 00 00 00 01 01 06 00 00 00 01 00 00 00 00 00 | D
-0160 | 26 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | &           D
-0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 27 00 01 10 |             '
+0160 | 0A 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 |             D
+0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 10 |
 0180 | 00 00 00 00 01 00 00 00 40 00 00 00 03 10 00 00 |         @
-0190 | 00 02 00 00 00 00 00 00 28 00 01 10 00 00 00 00 |         (
+0190 | 00 02 00 00 00 00 00 00 0C 00 01 10 00 00 00 00 |
 01A0 | 01 00 00 01 50 00 00 00 03 01 00 00 00 01 00 00 |     P
-01B0 | 00 00 00 00 29 00 01 10 00 00 00 00 00 00 00 00 |     )
+01B0 | 00 00 00 00 0D 00 01 10 00 00 00 00 00 00 00 00 |
 01C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 01D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 01E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -9834,63 +9834,63 @@ I 49108 2023-05-26 16:28:09 - [Commands] Sending to C-2 (Jess) (version=GC comma
 0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
 0020 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
 0030 | 1E 02 00 01 02 00 00 00 4C 00 00 00 02 0B 2D 29 |         L     -)
-0040 | 2C 06 8E 03 14 02 72 06 00 00 01 00 05 03 34 67 | ,     r       4g
+0040 | 2C 06 8E 03 14 02 72 06 00 00 01 10 05 03 34 67 | ,     r       4g
 0050 | 02 00 00 00 4C 00 00 00 01 01 07 00 00 01 00 00 |     L
-0060 | 01 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
+0060 | 01 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0070 | 4C 00 00 00 01 02 07 00 00 00 04 00 02 00 00 00 | L
-0080 | 02 00 01 00 00 00 00 00 02 00 00 00 4C 00 00 00 |             L
-0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 00 |
+0080 | 02 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 |             L
+0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 10 |
 00A0 | 00 00 00 00 02 00 00 00 4C 00 00 00 01 03 21 00 |         L     !
-00B0 | 00 00 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00B0 | 00 00 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00C0 | 01 00 00 00 44 00 00 00 01 03 04 00 00 00 FF FF |     D
-00D0 | 00 00 00 00 05 00 01 00 00 00 00 00 01 00 05 00 |
+00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 05 00 |
 00E0 | 44 00 00 00 01 01 03 00 00 00 00 00 00 00 00 00 | D
-00F0 | 06 00 01 00 00 00 00 00 01 00 00 00 50 00 00 00 |             P
-0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 00 |
+00F0 | 06 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 |             P
+0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 10 |
 0110 | 00 00 00 00 01 00 00 05 50 00 00 00 03 08 00 00 |         P
-0120 | 00 01 00 00 00 00 00 00 08 00 01 00 00 00 00 00 |
+0120 | 00 01 00 00 00 00 00 00 08 00 01 10 00 00 00 00 |
 0130 | 01 00 00 03 44 00 00 00 00 01 01 00 00 00 01 0F |     D
-0140 | 00 00 00 00 09 00 01 00 00 00 00 00 01 00 00 04 |
+0140 | 00 00 00 00 09 00 01 10 00 00 00 00 01 00 00 04 |
 0150 | 44 00 00 00 01 01 06 00 00 00 01 00 00 00 00 00 | D
-0160 | 0A 00 01 00 00 00 00 00 01 00 00 02 44 00 00 00 |             D
-0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 00 |
+0160 | 0A 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 |             D
+0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 10 |
 0180 | 00 00 00 00 01 00 00 00 40 00 00 00 03 10 00 00 |         @
-0190 | 00 02 00 00 00 00 00 00 0C 00 01 00 00 00 00 00 |
+0190 | 00 02 00 00 00 00 00 00 0C 00 01 10 00 00 00 00 |
 01A0 | 01 00 00 01 50 00 00 00 03 01 00 00 00 0A 00 00 |     P
-01B0 | 00 00 00 00 0D 00 01 00 00 00 00 00 01 00 00 00 |
+01B0 | 00 00 00 00 0D 00 01 10 00 00 00 00 01 00 00 00 |
 01C0 | 50 00 00 00 03 06 01 00 00 02 00 00 00 00 00 00 | P
-01D0 | 11 0D 01 06 00 00 00 00 01 00 00 00 50 00 00 00 |             P
-01E0 | 03 00 01 00 00 01 00 00 00 00 00 00 0F 0D 01 06 |
+01D0 | 0E 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 |             P
+01E0 | 03 00 01 00 00 01 00 00 00 00 00 00 0F 00 01 10 |
 01F0 | 00 00 00 00 01 00 00 00 50 00 00 00 03 06 00 00 |         P
-0200 | 00 01 00 00 00 00 00 00 04 0D 01 06 00 00 00 00 |
+0200 | 00 01 00 00 00 00 00 00 10 00 01 10 00 00 00 00 |
 0210 | 01 00 00 00 50 00 00 00 03 02 00 00 00 00 00 00 |     P
-0220 | 00 00 00 00 35 01 01 06 00 00 00 00 01 00 00 00 |     5
+0220 | 00 00 00 00 11 00 01 10 00 00 00 00 01 00 00 00 |
 0230 | 44 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 | D
-0240 | 33 01 01 06 00 00 00 00 01 00 00 00 44 00 00 00 | 3           D
-0250 | 00 06 00 00 00 00 00 00 00 00 00 00 26 01 01 06 |             &
+0240 | 12 00 01 10 00 00 00 00 01 00 00 00 44 00 00 00 |             D
+0250 | 00 06 00 00 00 00 00 00 00 00 00 00 13 00 01 10 |
 0260 | 00 00 00 00 01 00 00 00 44 00 00 00 00 01 00 00 |         D
-0270 | 00 00 00 00 00 00 00 00 24 01 01 06 00 00 00 00 |         $
+0270 | 00 00 00 00 00 00 00 00 14 00 01 10 00 00 00 00 |
 0280 | 01 00 00 00 44 00 00 00 01 01 00 00 00 00 00 00 |     D
-0290 | 01 00 00 00 D8 0C 01 06 00 00 00 00 01 00 00 00 |
+0290 | 01 00 00 00 15 00 01 10 00 00 00 00 01 00 00 00 |
 02A0 | 44 00 00 00 01 01 00 00 00 00 01 00 01 00 00 00 | D
-02B0 | DA 0C 01 06 00 00 00 00 01 00 00 00 50 00 00 00 |             P
-02C0 | 03 00 00 00 00 03 00 00 00 00 00 00 43 01 01 06 |             C
+02B0 | 16 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 |             P
+02C0 | 03 00 00 00 00 03 00 00 00 00 00 00 17 00 01 10 |
 02D0 | 00 00 00 00 01 00 00 00 50 00 00 00 03 07 00 00 |         P
-02E0 | 00 01 00 00 00 00 00 00 F8 0C 01 06 00 00 00 00 |
+02E0 | 00 01 00 00 00 00 00 00 18 00 01 10 00 00 00 00 |
 02F0 | 01 00 00 00 44 00 00 00 01 01 00 00 00 00 01 00 |     D
-0300 | 01 00 00 00 FA 0C 01 06 00 00 00 00 01 00 00 00 |
+0300 | 01 00 00 00 19 00 01 10 00 00 00 00 01 00 00 00 |
 0310 | 44 00 00 00 00 0A 00 00 00 00 01 05 00 00 00 00 | D
-0320 | F2 0C 01 06 00 00 00 00 01 00 00 00 44 00 00 00 |             D
-0330 | 00 01 00 00 00 00 00 00 00 00 00 00 DC 0C 01 06 |
+0320 | 1A 00 01 10 00 00 00 00 01 00 00 00 44 00 00 00 |             D
+0330 | 00 01 00 00 00 00 00 00 00 00 00 00 1B 00 01 10 |
 0340 | 00 00 00 00 01 00 00 00 44 00 00 00 00 0A 00 00 |         D
-0350 | 00 00 00 00 00 00 00 00 E2 0C 01 06 00 00 00 00 |
+0350 | 00 00 00 00 00 00 00 00 1C 00 01 10 00 00 00 00 |
 0360 | 01 00 00 00 44 00 00 00 00 06 00 00 00 00 00 00 |     D
-0370 | 00 00 00 00 02 0D 01 06 00 00 00 00 7F 00 87 00 |
+0370 | 00 00 00 00 1D 00 01 10 00 00 00 00 7F 00 87 00 |
 0380 | A4 00 45 00 30 00 00 01 0A 00 28 00 64 66 92 41 |   E 0     ( df A
 0390 | 00 00 20 41 18 00 00 00 B5 9C 00 00 E6 00 00 00 |    A
 03A0 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
 03B0 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 |
-03C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
+03C0 | 00 00 00 00 00 00 00 00 00 00 00 00 56 47 29 B8 |             VG)
 03D0 | 05 0B 00 02 46 00 00 00 0E 00 01 00 02 00 00 00 |     F
 03E0 | 06 00 AD 00 15 00 FF 00 8C 11 C7 3D FA 7C 9A 35 |            = | 5
 03F0 | 00 00 00 00 01 06 00 00 02 00 01 00 02 01 01 00 |
diff --git a/tests/PC-BasicGame.test.txt b/tests/PC-BasicGame.test.txt
index 415686b3..8817e0f8 100644
--- a/tests/PC-BasicGame.test.txt
+++ b/tests/PC-BasicGame.test.txt
@@ -263,14 +263,14 @@ I 49484 2023-05-26 16:35:14 - [Commands] Sending to C-3 (Tali) (version=PC comma
 0020 | 54 00 61 00 6C 00 69 00 00 00 00 00 00 00 00 00 | T a l i
 0030 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0040 | 05 00 00 01 01 00 00 00 08 00 00 00 00 06 00 00 |
-0050 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 |
+0050 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0060 | 01 00 00 00 08 00 00 00 01 01 00 00 00 00 00 00 |
-0070 | 00 00 00 00 FF FF FF FF 00 00 00 00 01 00 00 00 |
+0070 | 00 00 00 00 01 00 01 10 00 00 00 00 01 00 00 00 |
 0080 | 08 00 00 00 02 00 05 00 F4 01 01 00 01 00 01 00 |
-0090 | FF FF FF FF 00 00 28 00 01 00 00 00 00 00 00 00 |       (
-00A0 | 03 00 00 00 00 04 00 00 00 00 00 00 FF FF FF FF |
+0090 | 02 00 01 10 00 00 28 00 01 00 00 00 00 00 00 00 |       (
+00A0 | 03 00 00 00 00 04 00 00 00 00 00 00 03 00 01 10 |
 00B0 | 00 00 00 00 01 00 00 00 00 00 00 00 03 01 00 00 |
-00C0 | 00 04 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 |
+00C0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -1004,14 +1004,14 @@ I 49484 2023-05-26 16:36:57 - [Commands] Sending to C-3 (Tali) (version=PC comma
 0020 | 54 00 61 00 6C 00 69 00 00 00 00 00 00 00 00 00 | T a l i
 0030 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0040 | 05 00 00 01 02 00 00 00 4C 00 00 00 00 06 00 00 |         L
-0050 | 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 |
+0050 | 00 00 00 00 00 00 00 00 00 00 01 10 00 00 00 00 |
 0060 | 02 00 00 00 4C 00 00 00 01 01 00 00 00 00 00 00 |     L
-0070 | 00 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
+0070 | 00 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
 0080 | 4C 00 00 00 02 00 05 00 F4 01 01 00 00 00 00 00 | L
-0090 | 02 00 01 00 00 00 23 00 01 00 00 00 10 00 00 00 |       #
-00A0 | 03 00 00 00 00 08 00 00 00 00 00 00 03 00 01 00 |
+0090 | 02 00 01 10 00 00 23 00 01 00 00 00 10 00 00 00 |       #
+00A0 | 03 00 00 00 00 08 00 00 00 00 00 00 03 00 01 10 |
 00B0 | 00 00 00 00 01 00 00 00 10 00 00 00 03 01 00 00 |
-00C0 | 00 04 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
+00C0 | 00 04 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
diff --git a/tests/XB-ForestGame.test.txt b/tests/XB-ForestGame.test.txt
index e284bd15..ed5975bd 100644
--- a/tests/XB-ForestGame.test.txt
+++ b/tests/XB-ForestGame.test.txt
@@ -308,11 +308,11 @@ I 16496 2023-11-08 01:54:18 - [Commands] Sending to C-2 (Tali) (version=XB comma
 0050 | 00 00 00 00 87 AA 3F BE 5B B1 47 B3 5A 2F 1A B0 |       ? [ G Z/
 0060 | 00 00 00 00 54 61 6C 69 00 00 00 00 00 00 00 00 |     Tali
 0070 | 00 00 00 00 03 00 00 01 02 00 00 00 4C 00 00 00 |             L
-0080 | 02 00 05 00 F4 01 00 00 00 00 00 00 00 00 01 00 |
+0080 | 02 00 05 00 F4 01 00 00 00 00 00 00 00 00 01 10 |
 0090 | 12 00 00 09 02 00 00 00 4C 00 00 00 01 01 00 00 |         L
-00A0 | 00 00 00 00 00 00 00 00 01 00 01 00 00 00 00 00 |
+00A0 | 00 00 00 00 00 00 00 00 01 00 01 10 00 00 00 00 |
 00B0 | 02 00 00 00 4C 00 00 00 00 06 00 00 00 00 00 00 |     L
-00C0 | 00 00 00 00 02 00 01 00 00 00 00 00 00 00 00 00 |
+00C0 | 00 00 00 00 02 00 01 10 00 00 00 00 00 00 00 00 |
 00D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -1446,13 +1446,13 @@ I 16496 2023-11-08 01:56:37 - [Commands] Sending to C-2 (Tali) (version=XB comma
 0050 | 00 00 00 00 87 AA 3F BE 5B B1 47 B3 5A 2F 1A B0 |       ? [ G Z/
 0060 | 00 00 00 00 54 61 6C 69 00 00 00 00 00 00 00 00 |     Tali
 0070 | 00 00 00 00 04 00 00 01 02 00 00 00 4C 00 00 00 |             L
-0080 | 02 00 05 00 F4 01 00 00 00 00 00 00 00 00 01 00 |
+0080 | 02 00 05 00 F4 01 00 00 00 00 00 00 00 00 01 10 |
 0090 | 12 00 00 09 02 00 00 00 4C 00 00 00 01 01 00 00 |         L
-00A0 | 00 00 00 00 00 00 00 00 01 00 01 00 00 00 00 00 |
+00A0 | 00 00 00 00 00 00 00 00 01 00 01 10 00 00 00 00 |
 00B0 | 02 00 00 00 4C 00 00 00 00 06 00 00 00 00 00 00 |     L
-00C0 | 00 00 00 00 02 00 01 00 00 00 00 00 01 00 00 00 |
+00C0 | 00 00 00 00 02 00 01 10 00 00 00 00 01 00 00 00 |
 00D0 | 50 00 00 00 03 00 00 00 00 01 00 00 00 00 00 00 | P
-00E0 | 7B 01 01 06 00 00 00 00 00 00 00 00 00 00 00 00 | {
+00E0 | 03 00 01 10 00 00 00 00 00 00 00 00 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0110 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |