fix incorrect ep3 map command size

src/CommandFormats.hh

@@ -1621,9 +1621,9 @@ struct S_RankUpdate_GC_Ep3_B7 {
 // B8 (S->C): Update card definitions (Episode 3)
 // Contents is a single little-endian le_uint32_t specifying the size of the
 // (PRS-compressed) data, followed immediately by the data.
-// Note: BB has a handler for B8, but it does nothing - the client ignores B8.
+// Note: PSO BB accepts this command as well, but ignores it.
 
-// B8 (C->S): Confirm updated card definitions
+// B8 (C->S): Confirm updated card definitions (Episode 3)
 // No arguments
 // The client sends this after it receives a B8 from the server.
 
@@ -1633,7 +1633,7 @@ struct S_Unknown_GC_Ep3_B9 {
   le_uint32_t unknown_a1; // Must be 1-4 (inclusive)
   le_uint32_t unknown_a2;
   le_uint16_t unknown_a3;
-  le_uint16_t unknown_a4;
+  le_uint16_t unused;
   parray<uint8_t, 0x3800> unknown_a5;
 };
 
@@ -2708,14 +2708,14 @@ struct G_EnemyHitByPlayer_6x0A {
 // 0F: Invalid subcommand
 // 10: Unknown (not valid on Episode 3)
 // 11: Unknown (not valid on Episode 3)
-// 12: Dragon actions (not valid on Episode 3)
-// 13: Re Rol Le actions (not valid on Episode 3)
+// 12: Dragon boss actions (not valid on Episode 3)
+// 13: Re Rol Le boss actions (not valid on Episode 3)
 // 14: Unknown (supported; game only; not valid on Episode 3)
 // 15: Vol Opt boss actions (not valid on Episode 3)
 // 16: Vol Opt boss actions (not valid on Episode 3)
 // 17: Unknown (supported; game only; not valid on Episode 3)
 // 18: Unknown (supported; game only; not valid on Episode 3)
-// 19: Dark Falz actions (not valid on Episode 3)
+// 19: Dark Falz boss actions (not valid on Episode 3)
 // 1A: Invalid subcommand
 // 1B: Unknown (not valid on Episode 3)
 // 1C: Unknown (supported; game only; not valid on Episode 3)
@@ -3096,7 +3096,7 @@ struct G_BoxItemDropRequest_6xA2 {
 // B4: Unknown (Episode 3 only)
 // B5: Episode 3 game setup menu state sync
 // B5: BB shop request (handled by the server)
-// B6: Episode 3 map list (server->client only)
+// B6: Episode 3 subcommands (server->client only)
 
 // B6: BB shop contents (server->client only)
 

src/ReceiveCommands.cc

@@ -2713,7 +2713,7 @@ static process_command_t gc_handlers[0x100] = {
   // B0
   nullptr, process_server_time_request, nullptr, process_function_call_result,
   nullptr, nullptr, nullptr, process_ignored_command,
-  process_ignored_command, nullptr, process_ep3_meseta_transaction, nullptr,
+  process_ignored_command, process_ignored_command, process_ep3_meseta_transaction, nullptr,
   nullptr, nullptr, nullptr, nullptr,
 
   // C0

src/SendCommands.cc

@@ -1450,7 +1450,7 @@ void send_ep3_map_list(shared_ptr<ServerState> s, shared_ptr<Lobby> l) {
   string cmd_data(16, '\0');
   PSOSubcommand* subs = reinterpret_cast<PSOSubcommand*>(cmd_data.data());
   subs[0].dword = 0x000000B6;
-  subs[1].dword = (data.size() + 0x14 + 3) & 0xFFFFFFFC;
+  subs[1].dword = (data.size() + 0x10 + 3) & 0xFFFFFFFC;
   subs[2].dword = 0x00000040;
   subs[3].dword = data.size();
   cmd_data += data;
@@ -1466,7 +1466,7 @@ void send_ep3_map_data(shared_ptr<ServerState> s, shared_ptr<Lobby> l, uint32_t
   string data(0x14, '\0');
   PSOSubcommand* subs = reinterpret_cast<PSOSubcommand*>(data.data());
   subs[0].dword = 0x000000B6;
-  subs[1].dword = (19 + compressed.size()) & 0xFFFFFFFC;
+  subs[1].dword = (compressed.size() + 0x14 + 3) & 0xFFFFFFFC;
   subs[2].dword = 0x00000041;
   subs[3].dword = entry->map.map_number.load();
   subs[4].dword = compressed.size();