Change tingle maps to shop checks and more misc tweaks to messaging

1 files changed, 5 insertions, 14 deletions

diff --git a/mm/2s2h/DeveloperTools/SaveEditor.cpp b/mm/2s2h/DeveloperTools/SaveEditor.cpp
index ae208889c..6d92cae91 100644
--- a/mm/2s2h/DeveloperTools/SaveEditor.cpp
+++ b/mm/2s2h/DeveloperTools/SaveEditor.cpp
@@ -896,22 +896,13 @@ void DrawItemsAndMasksTab() {
                     .giveItem =
                         [](Actor* actor, PlayState* play) {
                             RandoItemId randoItemId = Rando::ConvertItem((RandoItemId)CUSTOM_ITEM_PARAM);
-                            std::string msg = "You received";
-                            if (!Ship_IsCStringEmpty(Rando::StaticData::Items[randoItemId].article)) {
-                                msg += " ";
-                                msg += Rando::StaticData::Items[randoItemId].article;
-                            }
-
-                            std::string itemName = Rando::StaticData::Items[randoItemId].name;
-                            if (randoItemId == RI_JUNK) {
-                                randoItemId = Rando::CurrentJunkItem();
-                                itemName += std::string(" (") + Rando::StaticData::Items[randoItemId].name + ")";
-                            }
+                            std::string prefix = "You found";
+                            std::string message = Rando::StaticData::GetItemName(randoItemId);
 
                             CustomMessage::Entry entry = {
                                 .textboxType = 2,
                                 .icon = Rando::StaticData::GetIconForZMessage(randoItemId),
-                                .msg = msg + " " + itemName + "!",
+                                .msg = prefix + " " + message + "!",
                             };
 
                             if (CUSTOM_ITEM_FLAGS & CustomItem::GIVE_ITEM_CUTSCENE) {
@@ -922,8 +913,8 @@ void DrawItemsAndMasksTab() {
                             } else {
                                 Notification::Emit({
                                     .itemIcon = Rando::StaticData::GetIconTexturePath(randoItemId),
-                                    .message = msg,
-                                    .suffix = itemName,
+                                    .message = prefix,
+                                    .suffix = message,
                                 });
                             }
                             Rando::GiveItem(randoItemId);