Merge pull request #1329 from garrettjoecox/shopsanity

briaguya0 · web-flow · commit 219dec97ecb2 · 2022-09-18T20:19:02.000-04:00
Shopsanity
diff --git a/soh/include/macros.h b/soh/include/macros.h
@@ -261,6 +261,7 @@ extern GraphicsContext* __gfxCtx;
 #define SEG_ADDR(seg, addr) (addr | (seg << 24) | 1)
 
 #define NUM_TRIALS 6
+#define NUM_SHOP_ITEMS 64
 #define NUM_SCRUBS 35
 
 #endif
diff --git a/soh/include/z64save.h b/soh/include/z64save.h
@@ -183,7 +183,7 @@ typedef struct {
     char ganonHintText[150];
     char ganonText[250];
     u8 seedIcons[5];
-    u16 randomizerInf[4];
+    u16 randomizerInf[8];
     u8 temporaryWeapon;
     u16 adultTradeItems;
 } SaveContext; // size = 0x1428
diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -18,7 +18,9 @@ typedef enum {
     TEXT_RED_RUPEE = 0xF0,
     TEXT_PURPLE_RUPEE = 0xF1,
     TEXT_HUGE_RUPEE = 0xF2,
-    TEXT_BEAN_SALESMAN = 0x405E
+    TEXT_BEAN_SALESMAN = 0x405E,
+    TEXT_SCRUB_RANDOM = 0x9000,
+    TEXT_SHOP_ITEM_RANDOM = 0x9100,
 } TextIDs;
 
 #ifdef __cplusplus
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1125,11 +1125,19 @@ void DrawEquipmentTab() {
     DrawUpgradeIcon("Strength", UPG_STRENGTH, strengthValues);
 
     // There is no icon for child wallet, so default to a text list
-    const std::vector<std::string> walletNames = {
+    // this was const, but I needed to append to it depending in rando settings.
+    std::vector<std::string> walletNamesImpl = {
         "Child (99)",
         "Adult (200)",
         "Giant (500)",
     };
+    // only display Tycoon wallet if you're in a save file that would allow it.
+    if (gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > 1) {
+        const std::string walletName = "Tycoon (999)";
+        walletNamesImpl.push_back(walletName);
+    }
+    // copy it to const value for display in ImGui.
+    const std::vector<std::string> walletNames = walletNamesImpl;
     DrawUpgrade("Wallet", UPG_WALLET, walletNames);
 
     const std::vector<std::string> stickNames = {
diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
@@ -157,7 +157,7 @@ namespace Settings {
   Option ShuffleRewards         = Option::U8  ("Shuffle Dungeon Rewards",{"End of dungeons", "Any dungeon", "Overworld", "Anywhere"},       {shuffleRewardsEndOfDungeon, shuffleRewardsAnyDungeon, shuffleRewardsOverworld, shuffleRewardsAnywhere});
   Option LinksPocketItem        = Option::U8  ("Link's Pocket",          {"Dungeon Reward", "Advancement", "Anything", "Nothing"},          {linksPocketDungeonReward, linksPocketAdvancement, linksPocketAnything, linksPocketNothing});
   Option ShuffleSongs           = Option::U8  ("Shuffle Songs",          {"Song locations", "Dungeon rewards", "Anywhere"},                 {songsSongLocations, songsDungeonRewards, songsAllLocations});
-  Option Shopsanity             = Option::U8  ("Shopsanity",             {MultiVecOpts({{"Off"}, NumOpts(0, 4), {"Random"}})},              {shopsOff, shopsZero, shopsOne, shopsTwo, shopsThree, shopsFour, shopsRandom});
+  Option Shopsanity             = Option::U8  ("Shopsanity",             {"Off","0 Items","1 Item","2 Items","3 Items","4 Items","Random"}, {shopsOff, shopsZero, shopsOne, shopsTwo, shopsThree, shopsFour, shopsRandom});
   Option Tokensanity            = Option::U8  ("Tokensanity",            {"Off", "Dungeons", "Overworld", "All Tokens"},                    {tokensOff, tokensDungeon, tokensOverworld, tokensAllTokens});
   Option Scrubsanity            = Option::U8  ("Scrub Shuffle",          {"Off", "Affordable", "Expensive", "Random Prices"},               {scrubsOff, scrubsAffordable, scrubsExpensive, scrubsRandomPrices});
   Option ShuffleCows            = Option::Bool("Shuffle Cows",           {"Off", "On"},                                                     {shuffleCowsDesc});
@@ -2537,6 +2537,7 @@ namespace Settings {
     ShuffleRewards.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_DUNGEON_REWARDS]);
     ShuffleSongs.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SONGS]);
     Tokensanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_TOKENS]);
+    Shopsanity.SetSelectedIndex(cvarSettings[RSK_SHOPSANITY]);
     Scrubsanity.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_SCRUBS]);
     ShuffleCows.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_COWS]);
     ShuffleKokiriSword.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_KOKIRI_SWORD]);
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -46,8 +46,9 @@ class Randomizer {
     bool SpoilerFileExists(const char* spoilerFileName);
     void LoadRandomizerSettings(const char* spoilerFileName);
     void LoadHintLocations(const char* spoilerFileName);
+    void LoadMerchantMessages(const char* spoilerFileName);
+    void LoadItemLocations(const char* spoilerFileName, bool silent);
     void LoadRequiredTrials(const char* spoilerFileName);
-    void LoadItemLocations(const char* spoilerFileName,bool silent);
     bool IsTrialRequired(RandomizerInf trial);
     u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
     RandomizerCheck GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
@@ -58,6 +59,7 @@ class Randomizer {
     std::string GetGanonText() const;
     std::string GetGanonHintText() const;
     ScrubIdentity IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
+    ShopItemIdentity IdentifyShopItem(s32 sceneNum, u8 slotIndex);
     GetItemID GetItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId);
     GetItemID GetItemIdFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId);
     GetItemID GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId);
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -961,6 +961,7 @@ typedef enum {
     RG_BUY_RED_POTION_50,
     RG_TRIFORCE,
     RG_HINT,
+    RG_TYCOON_WALLET,
     RG_MAX
 } RandomizerGet;
 
@@ -989,6 +990,7 @@ typedef enum {
     RSK_SHUFFLE_DUNGEON_REWARDS,
     RSK_SHUFFLE_SONGS,
     RSK_SHUFFLE_TOKENS,
+    RSK_SHOPSANITY,
     RSK_SHUFFLE_SCRUBS,
     RSK_SHUFFLE_COWS,
     RSK_SHUFFLE_WEIRD_EGG,
@@ -1041,3 +1043,11 @@ typedef struct ScrubIdentity {
     int32_t itemPrice;
     bool isShuffled;
 } ScrubIdentity;
+
+typedef struct ShopItemIdentity {
+    RandomizerInf randomizerInf;
+    RandomizerCheck randomizerCheck;
+    GetItemID ogItemId;
+    int32_t enGirlAShopItem;
+    int32_t itemPrice;
+} ShopItemIdentity;
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -66,6 +66,71 @@ typedef enum {
     RAND_INF_SCRUBS_PURCHASED_LW_DEKU_SCRUB_NEAR_BRIDGE,
     RAND_INF_SCRUBS_PURCHASED_DMC_DEKU_SCRUB,
 
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_2,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_3,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_4,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_5,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_6,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_7,
+    RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_8,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_1,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_2,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_3,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_4,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_5,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_6,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_7,
+    RAND_INF_SHOP_ITEMS_GC_SHOP_ITEM_8,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_1,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_2,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_3,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_4,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_5,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_6,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_7,
+    RAND_INF_SHOP_ITEMS_ZD_SHOP_ITEM_8,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_2,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_3,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_4,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_5,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_6,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_7,
+    RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_8,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_1,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_2,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_3,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_4,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_5,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_6,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_7,
+    RAND_INF_SHOP_ITEMS_KAK_POTION_SHOP_ITEM_8,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_1,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_2,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_3,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_4,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_5,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_6,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_7,
+    RAND_INF_SHOP_ITEMS_MARKET_BAZAAR_ITEM_8,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_1,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_2,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_3,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_4,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_5,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_6,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_7,
+    RAND_INF_SHOP_ITEMS_MARKET_POTION_SHOP_ITEM_8,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_1,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_2,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_3,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_4,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_5,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_6,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_7,
+    RAND_INF_SHOP_ITEMS_MARKET_BOMBCHU_SHOP_ITEM_8,
+
     // If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
 
     RAND_INF_MAX,
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -1,5 +1,6 @@
 #include "randomizer_item_tracker.h"
 #include "../../util.h"
+#include "../../OTRGlobals.h"
 #include <libultraship/ImGuiImpl.h>
 #include "../../UIWidgets.hpp"
 
@@ -278,7 +279,7 @@ ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
         case ITEM_WALLET_ADULT:
         case ITEM_WALLET_GIANT:
             result.currentCapacity = CUR_CAPACITY(UPG_WALLET);
-            result.maxCapacity = 500;
+            result.maxCapacity = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHOPSANITY) > 1 ? 999 : 500;
             result.currentAmmo = gSaveContext.rupees;
             break;
         case ITEM_BOMBCHU:
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -1567,6 +1567,10 @@ extern "C" void Randomizer_LoadHintLocations(const char* spoilerFileName) {
     OTRGlobals::Instance->gRandomizer->LoadHintLocations(spoilerFileName);
 }
 
+extern "C" void Randomizer_LoadMerchantMessages(const char* spoilerFileName) {
+    OTRGlobals::Instance->gRandomizer->LoadMerchantMessages(spoilerFileName);
+}
+
 extern "C" void Randomizer_LoadRequiredTrials(const char* spoilerFileName) {
     OTRGlobals::Instance->gRandomizer->LoadRequiredTrials(spoilerFileName);
 }
@@ -1595,8 +1599,8 @@ extern "C" ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams,
     return OTRGlobals::Instance->gRandomizer->IdentifyScrub(sceneNum, actorParams, respawnData);
 }
 
-extern "C" CustomMessageEntry Randomizer_GetScrubMessage(s16 itemPrice) {
-    return CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, itemPrice);
+extern "C" ShopItemIdentity Randomizer_IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
+    return OTRGlobals::Instance->gRandomizer->IdentifyShopItem(sceneNum, slotIndex);
 }
 
 extern "C" CustomMessageEntry Randomizer_GetNaviMessage() {
@@ -1676,6 +1680,22 @@ extern "C" GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomi
     return ItemTable_RetrieveEntry(getItemModIndex, itemID);
 }
 
+extern "C" GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId) {
+    s16 getItemModIndex;
+    if (OTRGlobals::Instance->gRandomizer->CheckContainsVanillaItem(randomizerCheck)) {
+        getItemModIndex = MOD_NONE;
+    } else {
+        getItemModIndex = MOD_RANDOMIZER;
+    }
+    s16 itemID = OTRGlobals::Instance->gRandomizer->GetItemIdFromKnownCheck(randomizerCheck, ogId);
+
+    return ItemTable_RetrieveEntry(getItemModIndex, itemID);
+}
+
+extern "C" ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck) {
+    return OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck);
+}
+
 extern "C" bool Randomizer_ItemIsIceTrap(RandomizerCheck randomizerCheck, GetItemID ogId) {
     return gSaveContext.n64ddFlag && Randomizer_GetItemFromKnownCheck(randomizerCheck, ogId).getItemId == RG_ICE_TRAP;
 }
@@ -1743,8 +1763,12 @@ extern "C" int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx) {
             } else {
                 messageEntry = Randomizer_GetGanonHintText();
             }
-        } else if (textId >= 0x9000 && textId <= 0x905F) {
-            messageEntry = Randomizer_GetScrubMessage((textId & ((1 << 8) - 1)));
+        // Business Scrub textID is TEXT_SCRUB_RANDOM + their price, anywhere from 0-95
+        } else if (textId >= TEXT_SCRUB_RANDOM && textId <= TEXT_SCRUB_RANDOM + 95) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
+        // Shop items each have two message entries
+        } else if (textId >= TEXT_SHOP_ITEM_RANDOM && textId <= TEXT_SHOP_ITEM_RANDOM + (NUM_SHOP_ITEMS * 2)) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId);
         } else if (CVar_GetS32("gRandomizeRupeeNames", 0) &&
                    (textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE ||
                    textId == TEXT_HUGE_RUPEE)) {
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
@@ -98,12 +98,16 @@ void Randomizer_LoadSettings(const char* spoilerFileName);
 u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 RandomizerCheck Randomizer_GetCheckFromActor(s16 actorId, s16 sceneNum, s16 actorParams);
 ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData);
+ShopItemIdentity Randomizer_IdentifyShopItem(s32 sceneNum, u8 slotIndex);
 void Randomizer_LoadHintLocations(const char* spoilerFileName);
+void Randomizer_LoadMerchantMessages(const char* spoilerFileName);
 void Randomizer_LoadRequiredTrials(const char* spoilerFileName);
 void Randomizer_LoadItemLocations(const char* spoilerFileName, bool silent);
 bool Randomizer_IsTrialRequired(RandomizerInf trial);
 GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
 GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
+GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
+ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
 bool Randomizer_ObtainedFreestandingIceTrap(RandomizerCheck randomizerCheck, GetItemID ogId, Actor* actor);
 bool Randomizer_ItemIsIceTrap(RandomizerCheck randomizerCheck, GetItemID ogId);
 int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx);
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
@@ -98,7 +98,9 @@ void SaveManager::LoadRandomizerVersion1() {
     if (randomizer->GetRandoSettingValue(RSK_SHUFFLE_SCRUBS) > 0) {
         merchantPricesSize += NUM_SCRUBS;
     }
-    // TODO: Add shop item count when shopsanity is enabled
+    if (randomizer->GetRandoSettingValue(RSK_SHOPSANITY) > 0) {
+        merchantPricesSize += NUM_SHOP_ITEMS;
+    }
 
     SaveManager::Instance->LoadArray("merchantPrices", merchantPricesSize, [&](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
diff --git a/soh/src/code/code_80097A00.c b/soh/src/code/code_80097A00.c
@@ -27,7 +27,7 @@ u16 gUpgradeCapacities[][4] = {
     { 0, 20, 30, 40 },     // Bomb Bags
     { 0, 0, 0, 0 },        // Unused (Scale)
     { 0, 0, 0, 0 },        // Unused (Strength)
-    { 99, 200, 500, 500 }, // Wallets
+    { 99, 200, 500, 999 }, // Wallets
     { 0, 30, 40, 50 },     // Deku Seed Bullet Bags
     { 0, 10, 20, 30 },     // Deku Stick Upgrades
     { 0, 20, 30, 40 },     // Deku Nut Upgrades
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
@@ -1339,8 +1339,15 @@ void EnItem00_CustomItemsParticles(Actor* Parent, GlobalContext* globalCtx, GetI
     velocity.y = -0.05f;
     accel.y = -0.025f;
     pos.x = Rand_CenteredFloat(32.0f) + Parent->world.pos.x;
-    pos.y = (Rand_ZeroOne() * 6.0f) + Parent->world.pos.y + 25;
+    // Shop items are rendered at a different height than the rest, so a different y offset is required
+    if (Parent->id == ACTOR_EN_GIRLA) {
+        pos.y = (Rand_ZeroOne() * 6.0f) + Parent->world.pos.y + 5;
+    } else {
+        pos.y = (Rand_ZeroOne() * 6.0f) + Parent->world.pos.y + 25;
+    }
     pos.z = Rand_CenteredFloat(32.0f) + Parent->world.pos.z;
+
+
     EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 1000, 50);
 }
 
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
@@ -2392,6 +2392,14 @@ u16 Randomizer_Item_Give(GlobalContext* globalCtx, GetItemEntry giEntry) {
         }
     }
 
+    if (item == RG_TYCOON_WALLET) {
+        Inventory_ChangeUpgrade(UPG_WALLET, 3);
+        if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_FULL_WALLETS)) {
+            Rupees_ChangeBy(999);
+        }
+        return RG_NONE;
+    }
+
     temp = gSaveContext.inventory.items[slot];
     osSyncPrintf("Item_Register(%d)=%d  %d\n", slot, item, temp);
     INV_CONTENT(item) = item;
@@ -4626,14 +4634,15 @@ void Interface_Draw(GlobalContext* globalCtx) {
     static s16 D_80125B1C[][3] = {
         { 0, 150, 0 }, { 100, 255, 0 }, { 255, 255, 255 }, { 0, 0, 0 }, { 255, 255, 255 },
     };
-    static s16 rupeeDigitsFirst[] = { 1, 0, 0 };
-    static s16 rupeeDigitsCount[] = { 2, 3, 3 };
+    static s16 rupeeDigitsFirst[] = { 1, 0, 0, 0 };
+    static s16 rupeeDigitsCount[] = { 2, 3, 3, 3 };
 
     // courtesy of https://github.com/TestRunnerSRL/OoT-Randomizer/blob/Dev/ASM/c/hud_colors.c
-    static s16 rupeeWalletColors[3][3] = {
+    static s16 rupeeWalletColors[4][3] = {
         { 0xC8, 0xFF, 0x64 }, // Base Wallet (Green)
         { 0x82, 0x82, 0xFF }, // Adult's Wallet (Blue)
         { 0xFF, 0x64, 0x64 }, // Giant's Wallet (Red)
+        { 0xFF, 0x5A, 0xFF }, // Tycoon's Wallet (Purple). Only used in rando shopsanity.
     };
     Color_RGB8 rColor_ori = { 200, 255, 100 };
     Color_RGB8 rColor;
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
