diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2025-01-07 01:29:06 -0600 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2025-01-07 01:29:06 -0600 |
| commit | 4ee74876c6909b1c9abc20bfcbd44bf5ef749de4 (patch) | |
| tree | dc459ad61f3eb67749b6bbfce8fb011709a70687 /mm/2s2h/DeveloperTools/SaveEditor.cpp | |
| parent | ce9e390140abea9827d27dc186d25eb13622ec89 (diff) | |
Fix item message icons
Diffstat (limited to 'mm/2s2h/DeveloperTools/SaveEditor.cpp')
| -rw-r--r-- | mm/2s2h/DeveloperTools/SaveEditor.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mm/2s2h/DeveloperTools/SaveEditor.cpp b/mm/2s2h/DeveloperTools/SaveEditor.cpp index a6044c80a..4f03a6f3e 100644 --- a/mm/2s2h/DeveloperTools/SaveEditor.cpp +++ b/mm/2s2h/DeveloperTools/SaveEditor.cpp @@ -904,25 +904,17 @@ void DrawItemsAndMasksTab() { CustomMessage::Entry entry = { .textboxType = 2, + .icon = Rando::StaticData::GetIconForZMessage(randoItemId), .msg = msg + " " + itemName + "!", }; - if (Rando::StaticData::Items[randoItemId].getItemId != GI_NONE) { - entry.icon = (u8)Rando::StaticData::Items[randoItemId].getItemId; - } if (CUSTOM_ITEM_FLAGS & CustomItem::GIVE_ITEM_CUTSCENE) { CustomMessage::SetActiveCustomMessage(entry.msg, entry); } else if (!CVarGetInteger("gEnhancements.Cutscenes.SkipGetItemCutscenes", 0)) { CustomMessage::StartTextbox(entry.msg + "\x1C\x02\x10", entry); } else { - s16 itemId = Rando::StaticData::Items[randoItemId].itemId; - if (itemId >= ITEM_RECOVERY_HEART) { - itemId = D_801CFF94[Rando::StaticData::Items[randoItemId].getItemId]; - } - Notification::Emit({ - .itemIcon = - itemId < ITEM_RECOVERY_HEART ? (const char*)gItemIcons[itemId] : nullptr, + .itemIcon = Rando::StaticData::GetIconTexturePath(randoItemId), .message = msg, .suffix = itemName, }); |