Merge branch 'develop' into macos-develop

diff --cc lib/edit/Makefile.am
Simple merge

diff --cc src/main/angband-initializer.cpp
Simple merge

diff --cc src/view/display-map.cpp
index 1f5faeb,eba00a2..833ed13
--- 1/src/view/display-map.cpp
--- 2/src/view/display-map.cpp
+++ b/src/view/display-map.cpp
@@@ -46,8 -46,9 +46,8 @@@ const std::string image_monsters = "abc
  ColoredChar image_object()
  {
      if (use_graphics) {
 -        std::span<BaseitemInfo> candidates(baseitems_info.begin() + 1, baseitems_info.end());
 -        const auto &baseitem = rand_choice(candidates);
 +        const auto &baseitem = baseitems_info[randint1(baseitems_info.size() - 1)];
-         return { baseitem.x_attr, baseitem.x_char };
+         return baseitem.cc_config;
      }
  
      return { randnum1<uint8_t>(15), rand_choice(image_objects) };