nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Restores Greg's textbox icon (#6320)

Browse Source
This commit is contained in:
Christopher Leggett
2026-03-03 00:38:01 +00:00
committed by GitHub
parent b65acb9c9d
commit 49aa33038d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
View File

@@ -65,6 +65,7 @@ void BuildTriforcePieceMessage(CustomMessage& msg) {
void BuildCustomItemMessage(Player* player, CustomMessage& msg) { void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
int16_t rgid; int16_t rgid;
ItemID icon = ITEM_NONE;
msg = CustomMessage("You found [[article]][[color]][[name]]%w!", msg = CustomMessage("You found [[article]][[color]][[name]]%w!",
"Du erhältst [[article]][[color]][[name]]%w gefunden!", "Du erhältst [[article]][[color]][[name]]%w gefunden!",
"Vous avez trouvé [[article]][[color]][[name]]%w!", TEXTBOX_TYPE_BLUE); "Vous avez trouvé [[article]][[color]][[name]]%w!", TEXTBOX_TYPE_BLUE);
@@ -73,6 +74,14 @@ void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
} else { } else {
rgid = player->getItemId; rgid = player->getItemId;
} }
// Icon Overrides
switch (rgid) {
case RG_GREG_RUPEE:
icon = ITEM_MASK_GORON;
break;
default:
break;
}
CustomMessage name = CustomMessage name =
CustomMessage(Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetName(), TEXTBOX_TYPE_BLUE); CustomMessage(Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetName(), TEXTBOX_TYPE_BLUE);
CustomMessage article = CustomMessage( CustomMessage article = CustomMessage(
@@ -80,7 +89,11 @@ void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
msg.Replace("[[article]]", article); msg.Replace("[[article]]", article);
msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor()); msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor());
msg.Replace("[[name]]", name); msg.Replace("[[name]]", name);
msg.AutoFormat(); if (icon != ITEM_NONE) {
msg.AutoFormat(icon);
} else {
msg.AutoFormat();
}
} }
void BuildItemMessage(u16* textId, bool* loadFromMessageTable) { void BuildItemMessage(u16* textId, bool* loadFromMessageTable) {