Upstream merge: mm → 2026-08-24

[Varuuna]

⚠️ Merge #178 (libultraship) first — mm/ #includes libultraship by path, so it expects the newer engine.

mm — d35196ad7 → 10bfaa0f0 (10 merges)

new commits

10bfaa0f0 Wire up background input toggle (#1898)
431dea3c6 develop-battler -> develop (#1892)
7e6907f96 Allow freelook in more situations (#1877)
0aebaf297 Fix Circle Shadow Streaks (#1888)
9afe75860 Limit Ocarina dive fix to hovering only (#1847)
525c1bc62 Toggle for screen distortion (#1880)
5d96fd84f Add Dungeon Specific Keys (#1881)
236aa75ba Allow dungeon items to be set to vanilla locations (#1883)
dabc3aadc zora swim Y invert (#1887)
4c128e4cd Merge develop-keiichi->develop

Conflict surface (our customized files upstream touched):

2s2h/BenGui/BenMenu.cpp
2s2h/BenGui/CosmeticEditor.cpp
2s2h/BenGui/Menu.cpp
2s2h/BenPort.cpp
2s2h/DeveloperTools/SaveEditor.cpp
2s2h/DeveloperTools/SaveEditor.h
2s2h/Rando/DrawItem.cpp
2s2h/Rando/Logic/GeneratePools.cpp
2s2h/Rando/Logic/Logic.h
2s2h/Rando/Menu.cpp
2s2h/Rando/Types.h
src/overlays/actors/ovl_player_actor/z_player.c

---

Auto-generated by upstream-merge.yml. Pin bump + merge-log scaffold are already committed.

Other open upstream-merge PRs:

• Upstream merge: soh → 2026-08-24 #179 — soh
• Upstream merge: libultraship → 2026-08-24 #178 — libultraship

Build Artifacts

• ComboShip-windows.zip