diff options
| author | Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> | 2024-10-15 00:02:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 16:02:46 -0700 |
| commit | 4dbb86e980f159fe0055df588e9bb8128232c255 (patch) | |
| tree | 28c8cf1b9bc3b4a3ab82cea02131603f9709fd76 | |
| parent | a9df9cbce4beba851aeed1fcd451b6bbff89f139 (diff) | |
fix some bean salesman oversights (#4405)
| -rw-r--r-- | soh/soh/Enhancements/debugger/debugSaveEditor.h | 1 | ||||
| -rw-r--r-- | soh/soh/Enhancements/randomizer/3drando/item_pool.cpp | 2 | ||||
| -rw-r--r-- | soh/soh/Enhancements/randomizer/randomizer.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h index c3e01b657..30e4473c1 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.h +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h @@ -478,6 +478,7 @@ const std::vector<FlagTable> flagTables = { { RAND_INF_MERCHANTS_CARPET_SALESMAN, "RAND_INF_MERCHANTS_CARPET_SALESMAN" }, { RAND_INF_MERCHANTS_MEDIGORON, "RAND_INF_MERCHANTS_MEDIGORON" }, { RAND_INF_MERCHANTS_GRANNYS_SHOP, "RAND_INF_MERCHANTS_GRANNY_SHOP"}, + { RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN, "RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN"}, { RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO, "ADULT_TRADES_LW_TRADE_COJIRO" }, { RAND_INF_ADULT_TRADES_GV_TRADE_SAW, "ADULT_TRADES_GV_TRADE_SAW" }, diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp index 08a9a5179..066474c4a 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp @@ -1283,7 +1283,7 @@ void GenerateItemPool() { for (uint8_t i = 0; i < bottleCount; i++) { if (i >= rutoBottles) { if ((i == bottleCount - 1) && - (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) || + (ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) || ctx->GetOption(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))) { AddItemToMainPool(RG_BOTTLE_WITH_BLUE_POTION); } else { diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index a9a13de09..f9f721677 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -919,6 +919,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = { { RC_GC_MEDIGORON, RAND_INF_MERCHANTS_MEDIGORON }, { RC_KAK_GRANNYS_SHOP, RAND_INF_MERCHANTS_GRANNYS_SHOP }, { RC_WASTELAND_BOMBCHU_SALESMAN, RAND_INF_MERCHANTS_CARPET_SALESMAN }, + { RC_ZR_MAGIC_BEAN_SALESMAN, RAND_INF_MERCHANTS_MAGIC_BEAN_SALESMAN }, { RC_LW_TRADE_COJIRO, RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO }, { RC_GV_TRADE_SAW, RAND_INF_ADULT_TRADES_GV_TRADE_SAW }, { RC_DMT_TRADE_BROKEN_SWORD, RAND_INF_ADULT_TRADES_DMT_TRADE_BROKEN_SWORD }, |