From 922d41d610e8f64a5e7bd93da6d258cb0feaa5a5 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Mon, 13 Jan 2025 16:25:31 -0600 Subject: Add more options for skipping item get cutscenes --- mm/2s2h/DeveloperTools/SaveEditor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mm/2s2h/DeveloperTools/SaveEditor.cpp') diff --git a/mm/2s2h/DeveloperTools/SaveEditor.cpp b/mm/2s2h/DeveloperTools/SaveEditor.cpp index 4f03a6f3e..d929d2720 100644 --- a/mm/2s2h/DeveloperTools/SaveEditor.cpp +++ b/mm/2s2h/DeveloperTools/SaveEditor.cpp @@ -885,7 +885,8 @@ void DrawItemsAndMasksTab() { buttonLabel += randoStaticItem.name; if (UIWidgets::Button(buttonLabel.c_str())) { GameInteractor::Instance->events.emplace_back(GIEventGiveItem{ - .showGetItemCutscene = !CVarGetInteger("gEnhancements.Cutscenes.SkipGetItemCutscenes", 0), + .showGetItemCutscene = + Rando::StaticData::ShouldShowGetItemCutscene(Rando::ConvertItem(randoItemId)), .param = (int16_t)randoItemId, .giveItem = [](Actor* actor, PlayState* play) { @@ -910,7 +911,8 @@ void DrawItemsAndMasksTab() { if (CUSTOM_ITEM_FLAGS & CustomItem::GIVE_ITEM_CUTSCENE) { CustomMessage::SetActiveCustomMessage(entry.msg, entry); - } else if (!CVarGetInteger("gEnhancements.Cutscenes.SkipGetItemCutscenes", 0)) { + } else if (Rando::StaticData::ShouldShowGetItemCutscene( + Rando::ConvertItem((RandoItemId)CUSTOM_ITEM_PARAM))) { CustomMessage::StartTextbox(entry.msg + "\x1C\x02\x10", entry); } else { Notification::Emit({ -- cgit v1.2.3