This commit is contained in:
parent
aa00cba76e
commit
fd3872ae30
|
@ -99,6 +99,7 @@ void SaveManager::LoadRandomizerVersion1() {
|
||||||
|
|
||||||
std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
|
std::shared_ptr<Randomizer> randomizer = OTRGlobals::Instance->gRandomizer;
|
||||||
|
|
||||||
|
randomizer->LoadRandomizerSettings("");
|
||||||
size_t merchantPricesSize = 0;
|
size_t merchantPricesSize = 0;
|
||||||
if (randomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) > 0) {
|
if (randomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) > 0) {
|
||||||
merchantPricesSize += NUM_SCRUBS;
|
merchantPricesSize += NUM_SCRUBS;
|
||||||
|
|
|
@ -307,6 +307,7 @@ void Title_Init(GameState* thisx) {
|
||||||
Randomizer_LoadSettings("");
|
Randomizer_LoadSettings("");
|
||||||
Randomizer_LoadHintLocations("");
|
Randomizer_LoadHintLocations("");
|
||||||
Randomizer_LoadItemLocations("", true);
|
Randomizer_LoadItemLocations("", true);
|
||||||
|
Randomizer_LoadMerchantMessages("");
|
||||||
gSaveContext.gameMode = 0;
|
gSaveContext.gameMode = 0;
|
||||||
gSaveContext.magic = gSaveContext.magic;
|
gSaveContext.magic = gSaveContext.magic;
|
||||||
SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext);
|
SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext);
|
||||||
|
|
Loading…
Reference in New Issue