Support for other language addresses

supremetakoyaki · Oct 19, 2022 · d177722 · d177722
1 parent 077e325
commit d177722
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/Forms/MainForm.cs b/Forms/MainForm.cs
@@ -455,6 +455,11 @@ private void connectButton_Click(object sender, EventArgs e)
                 }
 
                 string buildId = _connectionManager.SendCommandAsIs("getBuildID", 33)[..16].Trim();
+                string languageCode = _connectionManager.SendCommandAsIs("getSystemLanguage", 5)[..2].Trim();
+                if (languageCode != "1" && _savedBuildReader.GetBuild($"{buildId}.{languageCode}") is not null)
+                {
+                    buildId += $".{languageCode}";
+                }
                 SavedBuild? build = _savedBuildReader.GetBuild(buildId);
                 if (build == null)
                 {
@@ -689,7 +694,7 @@ private void metaDataButton_Click(object sender, EventArgs e)
 
             string titleId = _connectionManager.SendCommandAsIs("getTitleID", 33)[..16];
             string buildId = _connectionManager.SendCommandAsIs("getBuildID", 33)[..16];
-            string languageCode = _connectionManager.SendCommandAsIs("getSystemLanguage", 4)[..1];
+            string languageCode = _connectionManager.SendCommandAsIs("getSystemLanguage", 5)[..2].Trim();
             string mainAddress = _connectionManager.SendCommandAsIs("getMainNsoBase", 33)[..16];
             string heapAddress = _connectionManager.SendCommandAsIs("getHeapBase", 33)[..16];
 

diff --git a/IO/SavedBuildReader.cs b/IO/SavedBuildReader.cs
@@ -12,7 +12,8 @@ internal SavedBuildReader()
             foreach (string fileName in Directory.GetFiles("addresses/"))
             {
                 string[] contents = File.ReadAllLines(fileName);
-                string buildId = Path.GetFileNameWithoutExtension(fileName);
+                string buildId = Path.GetFileNameWithoutExtension(fileName)[..16];
+                string? language = null;
                 string? version = null;
                 string? moneyBase = null;
                 string? chunkBase = null;
@@ -44,6 +45,10 @@ internal SavedBuildReader()
                                 version = data[1];
                                 break;
 
+                            case "language":
+                                language = data[1];
+                                break;
+
                             case "moneyBase":
                                 moneyBase = data[1];
                                 break;
@@ -105,7 +110,14 @@ internal SavedBuildReader()
                         pointSteps.Add(new(pStep[0], Convert.ToInt64(pStep[1..], 16)));
                     }
 
-                    _savedBuilds.Add(buildId, new(buildId, version, moneyBase, chunkBase, foodTicketBase, drinkTicketBase, gearBase, tableTurfRankBase, new(tableTurfSpecialBase, specialSteps, tableTurfPointBase, pointSteps)));
+                    if (language == "1")
+                    {
+                        _savedBuilds.Add(buildId, new(buildId, version, moneyBase, chunkBase, foodTicketBase, drinkTicketBase, gearBase, tableTurfRankBase, new(tableTurfSpecialBase, specialSteps, tableTurfPointBase, pointSteps)));
+                    }
+                    else
+                    {
+                        _savedBuilds.Add($"{buildId}.{language}", new($"{buildId}.{language}", version, moneyBase, chunkBase, foodTicketBase, drinkTicketBase, gearBase, tableTurfRankBase, new(tableTurfSpecialBase, specialSteps, tableTurfPointBase, pointSteps)));
+                    }
                 }
             }