diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-12-14 10:55:17 -0600 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-12-14 10:55:17 -0600 |
| commit | 3bbb0da4238955953e15580216308c021533f731 (patch) | |
| tree | f9025c5385f198f488398bd33a253d2d4480770d /mm/2s2h/DeveloperTools/SaveEditor.cpp | |
| parent | 802cd8c24b3684cc03370ce4ea3711abb6b1fc05 (diff) | |
Another pass on the junk item concept
Diffstat (limited to 'mm/2s2h/DeveloperTools/SaveEditor.cpp')
| -rw-r--r-- | mm/2s2h/DeveloperTools/SaveEditor.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mm/2s2h/DeveloperTools/SaveEditor.cpp b/mm/2s2h/DeveloperTools/SaveEditor.cpp index a8cbf7cac..d3b4550ed 100644 --- a/mm/2s2h/DeveloperTools/SaveEditor.cpp +++ b/mm/2s2h/DeveloperTools/SaveEditor.cpp @@ -882,9 +882,15 @@ void DrawItemsAndMasksTab() { 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 + ")"; + } + CustomMessage::Entry entry = { .textboxType = 2, - .msg = msg + " " + Rando::StaticData::Items[randoItemId].name + "!", + .msg = msg + " " + itemName + "!", }; if (Rando::StaticData::Items[randoItemId].getItemId != GI_NONE) { entry.icon = (u8)Rando::StaticData::Items[randoItemId].getItemId; @@ -904,7 +910,7 @@ void DrawItemsAndMasksTab() { .itemIcon = itemId < ITEM_RECOVERY_HEART ? (const char*)gItemIcons[itemId] : nullptr, .message = msg, - .suffix = Rando::StaticData::Items[randoItemId].name, + .suffix = itemName, }); } Rando::GiveItem(randoItemId); |