From 31f9b659afb37223193f3750b917438730f45f95 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Wed, 12 Mar 2025 20:52:47 -0400 Subject: [PATCH] Clean up now unused skulltula hint storage --- .../Enhancements/randomizer/3drando/hint_list.cpp | 5 ----- soh/soh/Enhancements/randomizer/randomizerTypes.h | 7 ------- soh/soh/Enhancements/randomizer/static_data.cpp | 12 ------------ 3 files changed, 24 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp index 3081d4863..ef4abede5 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp @@ -2323,11 +2323,6 @@ void StaticData::HintTable_Init() { hintTextTable[RHT_OOT_HINT] = HintText(CustomMessage("Bring the #Spiritual Stones# to the past so you can receive #[[1]]# from Zelda and learn #[[2]]#!", {QM_BLUE, QM_GREEN, QM_GREEN})); - hintTextTable[RHT_SKULLS_HINT] = HintText(CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying #[[d]] Spiders of the Curse# and I will give you my #[[1]]#!", - /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du #[[d]] Skulltulas# zerstörst und ich werde Dir dafür #[[1]]# geben!", - /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore #[[d]] Araignées de la Malédiction# et j'aurai quelque chose à te donner! #([[1]])#", - {QM_YELLOW, QM_GREEN})); - hintTextTable[RHT_MASK_SHOP_HINT] = HintText(CustomMessage("Some young scrubs in the #Deku Theatre# love seeing Masks!^" "They'll give you #[[1]]# if you show them the #Skull Mask#, and #[[2]]# if you show them the #Mask of Truth#!", {QM_GREEN, QM_GREEN, QM_RED, QM_GREEN, QM_RED})); diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 23cbb290f..c99458758 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -3467,12 +3467,6 @@ typedef enum { RH_BIGGORON_HINT, RH_FROGS_HINT, RH_OOT_HINT, - RH_KAK_10_SKULLS_HINT, - RH_KAK_20_SKULLS_HINT, - RH_KAK_30_SKULLS_HINT, - RH_KAK_40_SKULLS_HINT, - RH_KAK_50_SKULLS_HINT, - RH_KAK_100_SKULLS_HINT, RH_MASK_SHOP_HINT, RH_MAX, } RandomizerHint; @@ -4740,7 +4734,6 @@ typedef enum { RHT_BIGGORON_HINT, RHT_FROGS_HINT, RHT_OOT_HINT, - RHT_SKULLS_HINT, RHT_MASK_SHOP_HINT, // Shuffle Pots RHT_POT_KOKIRI_FOREST, diff --git a/soh/soh/Enhancements/randomizer/static_data.cpp b/soh/soh/Enhancements/randomizer/static_data.cpp index 84da0d3c1..c3c2e4aa0 100644 --- a/soh/soh/Enhancements/randomizer/static_data.cpp +++ b/soh/soh/Enhancements/randomizer/static_data.cpp @@ -85,12 +85,6 @@ std::unordered_map StaticData::hintNames = { {RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint")}, {RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint")}, {RH_OOT_HINT, CustomMessage("Sheik in Temple of Time Hint")}, - {RH_KAK_10_SKULLS_HINT, CustomMessage("10 Skulls Hint")}, - {RH_KAK_20_SKULLS_HINT, CustomMessage("20 Skulls Hint")}, - {RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint")}, - {RH_KAK_40_SKULLS_HINT, CustomMessage("40 Skulls Hint")}, - {RH_KAK_50_SKULLS_HINT, CustomMessage("50 Skulls Hint")}, - {RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint")}, {RH_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint")}, }; @@ -204,12 +198,6 @@ std::unordered_map StaticData::staticHintInfoMap {RH_BIGGORON_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_BIGGORON_HINT}, RSK_BIGGORON_HINT, true, {RC_DMT_TRADE_CLAIM_CHECK})}, {RH_FROGS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_FROGS_HINT}, RSK_FROGS_HINT, true, {RC_ZR_FROGS_OCARINA_GAME})}, {RH_OOT_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_OOT_HINT}, RSK_OOT_HINT, true, {RC_HF_OCARINA_OF_TIME_ITEM, RC_SONG_FROM_OCARINA_OF_TIME}, {}, {RC_TOT_SHEIK_HINT})}, - {RH_KAK_10_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_SKULLS_HINT}, RSK_KAK_10_SKULLS_HINT, true, {RC_KAK_10_GOLD_SKULLTULA_REWARD}, {}, {}, false, 10)}, - {RH_KAK_20_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_SKULLS_HINT}, RSK_KAK_20_SKULLS_HINT, true, {RC_KAK_20_GOLD_SKULLTULA_REWARD}, {}, {}, false, 20)}, - {RH_KAK_30_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_SKULLS_HINT}, RSK_KAK_30_SKULLS_HINT, true, {RC_KAK_30_GOLD_SKULLTULA_REWARD}, {}, {}, false, 30)}, - {RH_KAK_40_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_SKULLS_HINT}, RSK_KAK_40_SKULLS_HINT, true, {RC_KAK_40_GOLD_SKULLTULA_REWARD}, {}, {}, false, 40)}, - {RH_KAK_50_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_SKULLS_HINT}, RSK_KAK_50_SKULLS_HINT, true, {RC_KAK_50_GOLD_SKULLTULA_REWARD}, {}, {}, false, 50)}, - {RH_KAK_100_SKULLS_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_SKULLS_HINT}, RSK_KAK_100_SKULLS_HINT, true, {RC_KAK_100_GOLD_SKULLTULA_REWARD}, {}, {}, false, 100)}, {RH_MASK_SHOP_HINT, StaticHintInfo(HINT_TYPE_ITEM, {RHT_MASK_SHOP_HINT}, RSK_MASK_SHOP_HINT, true, {RC_DEKU_THEATER_SKULL_MASK, RC_DEKU_THEATER_MASK_OF_TRUTH}, {}, {RC_MASK_SHOP_HINT})} };