English localisation

Author: hyperbx

MarathonRecomp/CMakeLists.txt

@@ -81,6 +81,7 @@ set(MARATHON_RECOMP_KERNEL_CXX_SOURCES
 )
 
 set(MARATHON_RECOMP_LOCALE_CXX_SOURCES
+    "locale/achievement_locale.cpp"
     "locale/config_locale.cpp"
     "locale/locale.cpp"
 )

MarathonRecomp/api/Marathon.h

@@ -57,6 +57,7 @@
 #include "Sonicteam/HudTextParts.h"
 #include "Sonicteam/ImageFilter.h"
 #include "Sonicteam/MainDisplayTask.h"
+#include "Sonicteam/MainMenuExpositionTask.h"
 #include "Sonicteam/MainMenuTask.h"
 #include "Sonicteam/MainMode.h"
 #include "Sonicteam/Message/Camera/Cameraman/MsgChangeMode.h"

MarathonRecomp/api/Sonicteam/MainMenuTask.h

@@ -16,7 +16,7 @@ namespace Sonicteam
         {
             MainMenuState_MainMenuBack = 1,
             MainMenuState_MainMenu = 2,
-            MainMenuState_MainMenuExitPrompt = 4,
+            MainMenuState_ExitPrompt = 4,
             MainMenuState_SinglePlayer = 6,
             MainMenuState_EpisodeSelect = 9,
             MainMenuState_TrialSelect = 0x0D,
@@ -33,8 +33,8 @@ namespace Sonicteam
             MainMenuState_AudioRoom = 0x2F,
             MainMenuState_TheaterRoom = 0x31,
             MainMenuState_Options = 0x33,
-            MainMenuState_MainMenuExitToStage = 0x3B,
-            MainMenuState_MainMenuExitToTitle = 0x3C
+            MainMenuState_ExitToStage = 0x3B,
+            MainMenuState_ExitToTitle = 0x3C
         };
 
         be<uint32_t> m_State;

MarathonRecomp/kernel/xdbf.h

@@ -10,24 +10,24 @@ namespace xdbf
 {
     inline std::string& FixInvalidSequences(std::string& str)
     {
-        static std::array<std::string_view, 1> invalidSequences =
+        static std::array<std::string_view, 1> s_invalidSequences =
         {
             "\n"
         };
 
-        static std::array<std::string_view, 1> replaceSequences =
+        static std::array<std::string_view, 1> s_replaceSequences =
         {
             " "
         };
 
-        for (int i = 0; i < invalidSequences.size(); i++)
+        for (int i = 0; i < s_invalidSequences.size(); i++)
         {
             size_t pos = 0;
 
-            auto& invalidSeq = invalidSequences[i];
-            auto& replaceSeq = replaceSequences[i];
+            auto& invalidSeq = s_invalidSequences[i];
+            auto& replaceSeq = s_replaceSequences[i];
 
-            while ((pos = str.find(invalidSequences[i], pos)) != std::string::npos)
+            while ((pos = str.find(s_invalidSequences[i], pos)) != std::string::npos)
             {
                 str = str.replace(pos, invalidSeq.length(), replaceSeq);