Add CVar for Better Level Select language.

Convert CVars to macro use in BetterLevelSelect.cpp.
Add mGhostshipMenu as an extern to GhosthipGui.hpp.

Author: Malkierian

src/port/mods/BetterLevelSelect.cpp

@@ -1,6 +1,7 @@
 #include "BetterLevelSelect.h"
 
 #include "sm64.h"
+#include "port/ui/cvar_prefixes.h"
 #include "game/area.h"
 #include "audio/external.h"
 #include "game/game_init.h"
@@ -244,7 +245,7 @@ s32 BetterLevelSelect_UpdateMenu(s16 arg, s32 b) {
         return 1;
     }
 
-    if(arg != LVL_INTRO_LEVEL_SELECT || CVarGetInteger("gDeveloperTools.BetterLevelSelect", 1) == 0){
+    if(arg != LVL_INTRO_LEVEL_SELECT || CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterLevelSelect"), 1) == 0){
         return lvl_intro_update(arg, b);
     }
 
@@ -397,10 +398,11 @@ s32 BetterLevelSelect_UpdateMenu(s16 arg, s32 b) {
 }
 
 Gfx* BetterLevelSelect_DrawMenu(s32 state, struct GraphNode *node, UNUSED void *context) {
-    if(state != 1 || CVarGetInteger("gDeveloperTools.BetterLevelSelect", 1) != 1) {
+    if (state != 1 || CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterLevelSelect"), 1) != 1) {
         return NULL;
     }
 
+    int language = CVarGetInteger(CVAR_DEVELOPER_TOOLS("BLSLanguage"), ROM_JP);
     int32_t count = ARRAY_COUNT(entries);
     GfxPrint printer;
     Gfx* head = &self.pool[0];
@@ -430,10 +432,10 @@ Gfx* BetterLevelSelect_DrawMenu(s32 state, struct GraphNode *node, UNUSED void *
                 GfxPrint_SetColor(&printer, 175, 175, 175, 255);
             }
 
-            GfxPrint_Printf(&printer, "%3d %s", idx, ROM_JP ? entry.japaneseName : entry.englishName);
+            GfxPrint_Printf(&printer, "%3d %s", idx, language ? entry.japaneseName : entry.englishName);
         }
 
-        std::vector<const char*> acts = ROM_JP ? entries[self.currentLevelIndex].actsJp : entries[self.currentLevelIndex].actsEn;
+        std::vector<const char*> acts = language ? entries[self.currentLevelIndex].actsJp : entries[self.currentLevelIndex].actsEn;
 
         if(!acts.empty()) {
             GfxPrint_SetPos(&printer, 2, 25);
@@ -497,7 +499,7 @@ static void Init() {
             return;
         }
 
-        if(CVarGetInteger("gDeveloperTools.BetterLevelSelect", 1) == 0){
+        if(CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterLevelSelect"), 1) == 0){
             *ev->geoLayoutAddr = (void*) intro_geo_000414;
         } else {
             *ev->geoLayoutAddr = (void*) BetterLevelSelect_GeoWrapper;

src/port/ui/GhostshipGui.cpp

@@ -3,7 +3,6 @@
 #include <spdlog/spdlog.h>
 #include <imgui.h>
 #include <imgui_internal.h>
-#include "UIWidgets.hpp"
 
 #ifdef __APPLE__
 #include <fast/backends/gfx_metal.h>
@@ -14,7 +13,6 @@
 #endif
 
 #include "Notification.h"
-#include "GhostshipMenu.h"
 #include "GhostshipInputEditorWindow.h"
 #include "SaveEditor.h"
 

src/port/ui/GhostshipGui.hpp

@@ -3,13 +3,15 @@
 #include "UIWidgets.hpp"
 #include "InputViewer.h"
 #include "GhostshipModals.h"
+#include "GhostshipMenu.h"
 
 namespace GhostshipGui {
 void SetupHooks();
 void SetupGuiElements();
 void Draw();
 void Destroy();
 UIWidgets::Colors GetMenuThemeColor();
+extern std::shared_ptr<GhostshipMenu> mGhostshipMenu;
 } // namespace GhostshipGui
 
 #define THEME_COLOR GhostshipGui::GetMenuThemeColor()

src/port/ui/GhostshipMenuDevTools.cpp

@@ -18,6 +18,10 @@ static const std::unordered_map<int32_t, const char*> debugInfoPages = {
     { DEBUG_PAGE_EFFECTINFO, "Effect" }, { DEBUG_PAGE_ENEMYINFO, "Enemy" },
 };
 
+static const std::unordered_map<int32_t, const char*> language = {
+    { 0, "English" }, { 1, "Japanese" },
+};
+
 #ifdef _DEBUG
 DebugLogOption defaultLogLevel = DEBUG_LOG_TRACE;
 #else
@@ -67,6 +71,14 @@ void GhostshipMenu::AddMenuDevTools() {
         })
         .PreFunc(
             [](WidgetInfo& info) { info.options->Disabled(!CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugMode"), 0)); });
+    AddWidget(path, "Level Select Language", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_DEVELOPER_TOOLS("BLSLanguage"))
+        .Options(ComboboxOptions()
+            .Tooltip("Language used in Better Level Select")
+            .ComboMap(language))
+        .PreFunc(
+            [](WidgetInfo& info) { info.options->Disabled(!CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugMode"), 0) ||
+                                                          !CVarGetInteger(CVAR_DEVELOPER_TOOLS("BetterLevelSelect"), 0)); });
     AddWidget(path, "Draw Debug Info", WIDGET_CVAR_CHECKBOX)
         .CVar(CVAR_DEVELOPER_TOOLS("DrawDebugInfo"))
         .Options(CheckboxOptions().Tooltip("Draws Debug Related Information"));