From 36d451eb850c9ad098124f0337dbbb1bbb4cb85e Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Wed, 20 Jul 2022 14:07:01 +0200
Subject: [PATCH] Add setting tooltip and fixed an oopsie

---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 12 +++++++++++-
 soh/src/overlays/actors/ovl_En_Si/z_en_si.c    |  9 +++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 12970b4b8..fd51866fa 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -3923,7 +3923,17 @@ void DrawRandoEditor(bool& open) {
 
                         // Shuffle Tokens
                         ImGui::Text(Settings::Tokensanity.GetName().c_str());
-                        InsertHelpHoverText("Spoopy");
+                        InsertHelpHoverText(
+                            "Shuffles Golden Skulltula Tokens into the item pool.\n"
+                            "\n"
+                            "Off - GS tokens will not be shuffled.\n"
+                            "\n"
+                            "Dungeons - Only shuffle GS tokens that are within dungeons.\n"
+                            "\n"
+                            "Overworld - Only shuffle GS tokens that are outside of dungeons.\n"
+                            "\n"
+                            "All Tokens - Shuffle all 100 GS tokens."
+                        );
                         SohImGui::EnhancementCombobox("gRandomizeShuffleTokens", randoShuffleTokens, 4, 0);
                         ImGui::Separator();
 
diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
index 2095bdc26..44b52389c 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -106,9 +106,8 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) {
                         textId = sGetItemTable[getItemId - 1].textId;
                         giveItemId = sGetItemTable[getItemId - 1].itemId;
                     }
-                } else {
-                    Item_Give(globalCtx, giveItemId);
                 }
+                Item_Give(globalCtx, giveItemId);
                 if (CVar_GetS32("gSkulltulaFreeze", 0) != 1 || giveItemId != ITEM_SKULL_TOKEN) {
                     player->actor.freezeTimer = 20;
                 }
@@ -140,9 +139,8 @@ void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) {
                 textId = sGetItemTable[getItemId - 1].textId;
                 giveItemId = sGetItemTable[getItemId - 1].itemId;
             }
-        } else {
-            Item_Give(globalCtx, giveItemId);
         }
+        Item_Give(globalCtx, giveItemId);
         Message_StartTextbox(globalCtx, textId, NULL);
         Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
         this->actionFunc = func_80AFB950;
@@ -178,13 +176,12 @@ void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx) {
         if (!gSaveContext.n64ddFlag) {
             GetItem_Draw(globalCtx, GID_SKULL_TOKEN_2);
         } else {
-            f32 mtxScale;
             getItemId = Randomizer_GetRandomizedItemId(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
             if (getItemId >= GI_MINUET_OF_FOREST && getItemId <= GI_DOUBLE_DEFENSE) {
                 EnItem00_CustomItemsParticles(&this->actor, globalCtx, getItemId);
             }
             if (getItemId != ITEM_SKULL_TOKEN) {
-                mtxScale = 1.5f;
+                f32 mtxScale = 1.5f;
                 Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
             }
             GetItem_Draw(globalCtx, Randomizer_GetItemModelFromId(getItemId));