summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Leggett <chris@leggett.dev>2026-03-03 00:38:01 +0000
committerGitHub <noreply@github.com>2026-03-03 00:38:01 +0000
commit49aa33038df9328c950a3a42f2f400d63f4fa2cd (patch)
tree07e35d1ee02d401a688a6dec893e349e1b907be0
parentb65acb9c9ded4a49ee5cf5f4eb30bfd1846ee4a4 (diff)
Restores Greg's textbox icon (#6320)
-rw-r--r--soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
index 8549ab07f..e93576b8a 100644
--- a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
@@ -65,6 +65,7 @@ void BuildTriforcePieceMessage(CustomMessage& msg) {
void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
int16_t rgid;
+ ItemID icon = ITEM_NONE;
msg = CustomMessage("You found [[article]][[color]][[name]]%w!",
"Du erhältst [[article]][[color]][[name]]%w gefunden!",
"Vous avez trouvé [[article]][[color]][[name]]%w!", TEXTBOX_TYPE_BLUE);
@@ -73,6 +74,14 @@ void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
} else {
rgid = player->getItemId;
}
+ // Icon Overrides
+ switch (rgid) {
+ case RG_GREG_RUPEE:
+ icon = ITEM_MASK_GORON;
+ break;
+ default:
+ break;
+ }
CustomMessage name =
CustomMessage(Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetName(), TEXTBOX_TYPE_BLUE);
CustomMessage article = CustomMessage(
@@ -80,7 +89,11 @@ void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
msg.Replace("[[article]]", article);
msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor());
msg.Replace("[[name]]", name);
- msg.AutoFormat();
+ if (icon != ITEM_NONE) {
+ msg.AutoFormat(icon);
+ } else {
+ msg.AutoFormat();
+ }
}
void BuildItemMessage(u16* textId, bool* loadFromMessageTable) {