From 50b3038a136d8836cefa8a950724238ad857a5f8 Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Tue, 23 Aug 2022 22:14:13 +0200
Subject: [PATCH] Made functions static

---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 10 +++++-----
 soh/soh/Enhancements/randomizer/randomizer.h   |  4 ++--
 soh/soh/OTRGlobals.cpp                         |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index e32a60dd1..482cd6227 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -4649,7 +4649,7 @@ void CreateRupeeMessages() {
     }
 }
 
-std::string Randomizer::Randomizer_InsertRupeeName(std::string message, int language) {
+std::string Randomizer::InsertRupeeName(std::string message, int language) {
     const char* englishRupeeNames[44] = {
         "Rupees",    "Bitcoin",   "Bananas",     "Cornflakes", "Gummybears", "Floopies", "Dollars",    "Lemmings",
         "Emeralds",  "Bucks",     "Rubles",      "Diamonds",   "Moons",      "Stars",    "Mana",       "Doll Hairs",
@@ -4690,12 +4690,12 @@ std::string Randomizer::Randomizer_InsertRupeeName(std::string message, int lang
     return message;
 }
 
-CustomMessageEntry Randomizer::Randomizer_GetRupeeMessage(u16 rupeeTextId) {
+CustomMessageEntry Randomizer::GetRupeeMessage(u16 rupeeTextId) {
     CustomMessageEntry messageEntry =
         CustomMessageManager::Instance->RetrieveMessage(Randomizer::rupeeMessageTableID, rupeeTextId);
-    messageEntry.english = Randomizer::Randomizer_InsertRupeeName(messageEntry.english, LANGUAGE_ENG);
-    messageEntry.german = Randomizer::Randomizer_InsertRupeeName(messageEntry.german, LANGUAGE_GER);
-    messageEntry.french = Randomizer::Randomizer_InsertRupeeName(messageEntry.french, LANGUAGE_FRA);
+    messageEntry.english = Randomizer::InsertRupeeName(messageEntry.english, LANGUAGE_ENG);
+    messageEntry.german = Randomizer::InsertRupeeName(messageEntry.german, LANGUAGE_GER);
+    messageEntry.french = Randomizer::InsertRupeeName(messageEntry.french, LANGUAGE_FRA);
     return messageEntry;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index 9ec983e14..645c47bc5 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -48,8 +48,8 @@ class Randomizer {
     GetItemID GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
     GetItemID GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum);
     static void CreateCustomMessages();
-    std::string Randomizer_InsertRupeeName(std::string message, int language);
-    CustomMessageEntry Randomizer_GetRupeeMessage(u16 rupeeTextId);
+    static std::string InsertRupeeName(std::string message, int language);
+    static CustomMessageEntry GetRupeeMessage(u16 rupeeTextId);
 };
 
 #ifdef __cplusplus
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 602f2793c..183f99957 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1544,8 +1544,7 @@ extern "C" int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx) {
         } else if (CVar_GetS32("gRandomizeRupeeNames", 0) &&
                    (textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE ||
                    textId == TEXT_HUGE_RUPEE)) {
-            Randomizer randomizerInstance;
-            messageEntry = randomizerInstance.Randomizer_GetRupeeMessage(textId);
+            messageEntry = Randomizer::GetRupeeMessage(textId);
         }
     }
     if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {