From b02ab9185de152757ee04c3df8e7aab0e1514ef9 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Tue, 6 Sep 2022 13:32:59 -0500 Subject: [PATCH] Rename randomizerMerchantPrices to merchantPrices --- soh/soh/Enhancements/randomizer/randomizer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index dd98dd5c7..3a70e8866 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -840,7 +840,7 @@ void Randomizer::LoadMerchantMessages(const char* spoilerFileName) { for (int index = 0; index < shopItemRandomizerChecks.size(); ++index) { RandomizerCheck shopItemCheck = shopItemRandomizerChecks[index]; std::string shopItemName = GetEnumToSpoilerfileName[this->itemLocations[shopItemCheck]]; - u16 shopItemPrice = randomizerMerchantPrices[shopItemCheck]; + u16 shopItemPrice = merchantPrices[shopItemCheck]; // TODO: Magic number 100, we don't to overwrite deku scrub messages CustomMessageManager::Instance->CreateMessage( Randomizer::merchantMessageTableID, index + 100, { TEXTBOX_TYPE_BLACK, TEXTBOX_POS_VARIABLE, @@ -2993,8 +2993,8 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) { shopItemIdentity.enGirlAShopItem = randomizerGetToEnGirlShopItem[randoGet]; } - if (randomizerMerchantPrices.find(shopItemIdentity.randomizerCheck) != randomizerMerchantPrices.end()) { - shopItemIdentity.itemPrice = randomizerMerchantPrices[shopItemIdentity.randomizerCheck]; + if (merchantPrices.find(shopItemIdentity.randomizerCheck) != merchantPrices.end()) { + shopItemIdentity.itemPrice = merchantPrices[shopItemIdentity.randomizerCheck]; } return shopItemIdentity;