summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris <f1ana@users.noreply.github.com>2026-05-09 18:25:09 -0400
committerGitHub <noreply@github.com>2026-05-09 22:25:09 +0000
commit37db03481526f2a2c1e0063ebd3ae6b4d3e4abeb (patch)
tree801a03ae74ed64e1d6cda7fb9722b870aa6b680f
parent5b4d8edf5194c7581e514e715ec7c37e2ffc9fdd (diff)
Use singular on message for 1 token (#6567)
-rw-r--r--soh/soh/Enhancements/InjectItemCounts.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/soh/soh/Enhancements/InjectItemCounts.cpp b/soh/soh/Enhancements/InjectItemCounts.cpp
index 8b33a9b64..8d66ba271 100644
--- a/soh/soh/Enhancements/InjectItemCounts.cpp
+++ b/soh/soh/Enhancements/InjectItemCounts.cpp
@@ -6,11 +6,11 @@ extern "C" {
void BuildSkulltulaMessage(uint16_t* textId, bool* loadFromMessageTable) {
CustomMessage msg =
- CustomMessage("You got a %rGold Skulltula Token%w!&You've collected %r[[gsCount]]%w tokens&in total!",
- "Ein %rGoldenes Skulltula-Symbol%w!&Du hast nun insgesamt %r[[gsCount]]&%wGoldene "
- "Skulltula-Symbole&gesammelt!",
- "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r[[gsCount]]%w symboles en "
- "tout!",
+ CustomMessage("You got a %rGold Skulltula Token%w!&You've collected %r[[d]]%w |token|tokens|&in total!",
+ "Ein %rGoldenes Skulltula-Symbol%w!&Du hast nun insgesamt %r[[d]]&%w|Goldenes "
+ "Skulltula-Symbol|Goldene Skulltula-Symbole|&gesammelt!",
+ "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r[[d]]%w |symbole|symboles| "
+ "en tout!",
TEXTBOX_TYPE_BLUE);
// The freeze text cannot be manually dismissed and must be auto-dismissed.
// This is fine and even wanted when skull tokens are not shuffled, but when
@@ -25,7 +25,7 @@ void BuildSkulltulaMessage(uint16_t* textId, bool* loadFromMessageTable) {
msg = msg + "\x0E\x3C";
}
int16_t gsCount = gSaveContext.inventory.gsTokens;
- msg.Replace("[[gsCount]]", std::to_string(gsCount));
+ msg.InsertNumber(gsCount);
msg.AutoFormat(ITEM_SKULL_TOKEN);
msg.LoadIntoFont();
*loadFromMessageTable = false;