Replaces string literal for BaseGameOverrides with const variable.

lilDavid · Aug 2, 2022 · bb8152b · bb8152b
1 parent 480053d
commit bb8152b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -1518,7 +1518,7 @@ extern "C" int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx) {
             } else {
                 textId = TEXT_GS_FREEZE;
             }
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage("BaseGameOverrides", textId);
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
         }
     }
     if (messageEntry.textBoxType != -1) {

diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
@@ -10,6 +10,8 @@
 #include "Enhancements/savestates.h"
 #include "Enhancements/randomizer/randomizer.h"
 
+const std::string customMessageTableID = "BaseGameOverrides";
+
 class OTRGlobals
 {
 public:

diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
@@ -15,8 +15,6 @@ extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
 extern "C" MessageTableEntry* sStaffMessageEntryTablePtr;
 //extern "C" MessageTableEntry* _message_0xFFFC_nes;	
 
-const std::string customMessageTableID = "BaseGameOverrides";
-
 MessageTableEntry* OTRMessage_LoadTable(const char* filePath, bool isNES) {
     auto file = std::static_pointer_cast<Ship::Text>(OTRGlobals::Instance->context->GetResourceManager()->LoadResource(filePath));