Skip to content

fix(rando): clamp upgrade levels so a 4th wallet can't corrupt logic #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Varuuna merged 1 commit into from
Aug 31, 2026
Merged

fix(rando): clamp upgrade levels so a 4th wallet can't corrupt logic #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions soh/soh/Enhancements/randomizer/logic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2664,6 +2664,13 @@ uint32_t Logic::CurrentInventory(uint32_t item) {
}

void Logic::SetUpgrade(uint32_t upgrade, uint8_t level) {
// ComboShip: clamp to what the field can hold. UPG_WALLET is 2 bits, so an unclamped 4th
// Progressive Wallet wrote 0x4000 into UPG_BULLET_BAG and the wallet read back as 0 — logic went
// non-monotonic (more wallets = smaller capacity) and priced shop checks became unreachable.
const uint8_t maxLevel = static_cast<uint8_t>(gUpgradeMasks[upgrade] >> gUpgradeShifts[upgrade]);
if (level > maxLevel) {
level = maxLevel;
}
mSaveContext->inventory.upgrades &= gUpgradeNegMasks[upgrade];
mSaveContext->inventory.upgrades |= level << gUpgradeShifts[upgrade];
}
Expand Down
Loading