From 052dcf8c6e097e01aa9d3989d7728abac79f19dc Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Tue, 14 Oct 2025 21:26:12 -0700
Subject: [PATCH] update 6xB6 notes

---
 src/CommandFormats.hh | 7 ++++++-
 src/Map.cc            | 4 +---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/CommandFormats.hh b/src/CommandFormats.hh
index e98cd2fb..e749be6b 100644
--- a/src/CommandFormats.hh
+++ b/src/CommandFormats.hh
@@ -5969,10 +5969,15 @@ struct G_MapData_Ep3_6xB6x41 {
 } __packed_ws__(G_MapData_Ep3_6xB6x41, 0x14);
 
 // 6xB6: BB shop contents (server->client only)
+// The client will ignore this command (leaving the player softlocked) if there
+// are too many items. The limits are:
+// - Tool shop: up to 18 items allowed
+// - Weapon shop: up to 16 items allowed
+// - Armor shop: up to 21 items allowed
 
 struct G_ShopContents_BB_6xB6 {
   G_UnusedHeader header;
-  uint8_t shop_type = 0;
+  uint8_t shop_type = 0; // 0 = tool shop, 1 = weapon shop, 2 = armor shop
   uint8_t num_items = 0;
   le_uint16_t unused = 0;
   // Note: data2d of these entries should be the price
diff --git a/src/Map.cc b/src/Map.cc
index 7785a918..38fe97ed 100644
--- a/src/Map.cc
+++ b/src/Map.cc
@@ -4361,9 +4361,7 @@ void SuperMap::link_object_version(std::shared_ptr<Object> obj, Version version,
 }
 
 shared_ptr<SuperMap::Enemy> SuperMap::add_enemy_and_children(
-    Version version,
-    uint8_t floor,
-    const MapFile::EnemySetEntry* set_entry) {
+    Version version, uint8_t floor, const MapFile::EnemySetEntry* set_entry) {
 
   shared_ptr<Enemy> head_ene = nullptr;
   size_t next_child_index = 0;