jak3: fix error with subtitle speaker names (#3832)

open-goal · Jan 7, 2025 · e836f09 · e836f09
1 parent f883b07
commit e836f09
Show file tree

Hide file tree

Showing 15 changed files with 455 additions and 421 deletions.
diff --git a/common/serialization/subtitles/subtitles_v2.cpp b/common/serialization/subtitles/subtitles_v2.cpp
@@ -131,17 +131,17 @@ const std::unordered_map<std::string, u16> jak3_speaker_name_to_enum_val = {
     {"ottsel-veger", 33},
     {"ottsel-tess", 34},
     {"computer", 35},
-    {"krew", 36},
-    {"baron", 37},
-    {"scherr", 38},
-    {"arey", 39},
-    {"baldwin", 40},
-    {"schimpf", 41},
-    {"martinsen", 42},
-    {"phillips", 43},
-    {"yates", 44},
-    {"ottsel-voice-before-outro", 45},
-    {"ottsel-voice", 46},
+    {"ottsel-voice-before-outro", 36},
+    {"ottsel-voice", 37},
+    {"krew", 38},
+    {"baron", 39},
+    {"scherr", 40},
+    {"arey", 41},
+    {"baldwin", 42},
+    {"schimpf", 43},
+    {"martinsen", 44},
+    {"phillips", 45},
+    {"yates", 46},
 };
 
 GameSubtitlePackage read_json_files_v2(const GameSubtitleDefinitionFile& file_info) {

diff --git a/game/assets/jak3/subtitle/subtitle_lines_cm-CM.json b/game/assets/jak3/subtitle/subtitle_lines_cm-CM.json
@@ -2,49 +2,51 @@
   "cutscenes": {},
   "other": {},
   "speakers": {
-    "jak": "Jak",
-    "darkjak": "Dark Jak",
-    "daxter": "Daxter",
-    "pecker": "Pecker",
-    "veger": "Count Veger",
+    "arey": "Daniel Arey",
     "ashelin": "Ashelin",
-    "wastelander-male": "Wastelander",
-    "wastelander-female": "Wastelander",
+    "baldwin": "Eric Baldwin",
+    "baron": "Baron Praxis",
     "citizen-female": "Citizen",
     "citizen-male": "Citizen",
-    "marauder": "Marauder",
+    "computer": "Computer",
     "damas": "Damas",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
     "errol": "Errol",
     "errol-hologram": "???",
-    "guard": "Freedom League Guard",
+    "guard": "Freedom Guard",
     "guard-a": "Guard A",
     "guard-b": "Guard B",
+    "jak": "Jak",
     "jinx": "Jinx",
     "keira": "Keira",
     "kleiver": "Kleiver",
+    "krew": "Krew",
+    "marauder": "Marauder",
+    "martinsen": "Jason Martinsen",
     "onin": "Onin",
     "oracle": "Oracle",
-    "precursor": "Precursor",
     "ottsel-dummy": "Ottsel Dummy",
     "ottsel-leader": "Ottsel Leader",
     "ottsel-surfer": "Ottsel Surfer",
-    "ottsel-veger": "Ottsel Veger",
     "ottsel-tess": "Ottsel Tess",
-    "computer": "Computer",
+    "ottsel-veger": "Ottsel Veger",
+    "ottsel-voice": "Precursors",
+    "ottsel-voice-before-outro": "???",
+    "pecker": "Pecker",
+    "phillips": "Kion Phillips",
+    "precursor": "Precursor",
     "samos": "Samos",
+    "scherr": "Josh Scherr",
+    "schimpf": "Adam Schimpf",
     "seem": "Seem",
     "sig": "Sig",
     "tess": "Tess",
     "torn": "Torn",
+    "veger": "Count Veger",
     "vin": "Vin",
-    "krew": "Krew",
-    "baron": "Baron Praxis",
-    "scherr": "Josh Scherr",
-    "arey": "Daniel Arey",
-    "baldwin": "Eric Baldwin",
-    "schimpf": "Adam Schimpf",
-    "martinsen": "Jason Martinsen",
-    "phillips": "Kion Phillips",
+    "wastelander-female": "Wastelander",
+    "wastelander-male": "Wastelander",
     "yates": "Jeremy Yates"
   }
 }
diff --git a/game/assets/jak3/subtitle/subtitle_lines_de-DE.json b/game/assets/jak3/subtitle/subtitle_lines_de-DE.json
@@ -2,49 +2,51 @@
   "cutscenes": {},
   "other": {},
   "speakers": {
-    "jak": "Jak",
-    "darkjak": "Dark Jak",
-    "daxter": "Daxter",
-    "pecker": "Pecker",
-    "veger": "Count Veger",
+    "arey": "Daniel Arey",
     "ashelin": "Ashelin",
-    "wastelander-male": "Wastelander",
-    "wastelander-female": "Wastelander",
+    "baldwin": "Eric Baldwin",
+    "baron": "Baron Praxis",
     "citizen-female": "Citizen",
     "citizen-male": "Citizen",
-    "marauder": "Marauder",
+    "computer": "Computer",
     "damas": "Damas",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
     "errol": "Errol",
     "errol-hologram": "???",
-    "guard": "Freedom League Guard",
+    "guard": "Freedom Guard",
     "guard-a": "Guard A",
     "guard-b": "Guard B",
+    "jak": "Jak",
     "jinx": "Jinx",
     "keira": "Keira",
     "kleiver": "Kleiver",
+    "krew": "Krew",
+    "marauder": "Marauder",
+    "martinsen": "Jason Martinsen",
     "onin": "Onin",
     "oracle": "Oracle",
-    "precursor": "Precursor",
     "ottsel-dummy": "Ottsel Dummy",
     "ottsel-leader": "Ottsel Leader",
     "ottsel-surfer": "Ottsel Surfer",
-    "ottsel-veger": "Ottsel Veger",
     "ottsel-tess": "Ottsel Tess",
-    "computer": "Computer",
+    "ottsel-veger": "Ottsel Veger",
+    "ottsel-voice": "Precursors",
+    "ottsel-voice-before-outro": "???",
+    "pecker": "Pecker",
+    "phillips": "Kion Phillips",
+    "precursor": "Precursor",
     "samos": "Samos",
+    "scherr": "Josh Scherr",
+    "schimpf": "Adam Schimpf",
     "seem": "Seem",
     "sig": "Sig",
     "tess": "Tess",
     "torn": "Torn",
+    "veger": "Count Veger",
     "vin": "Vin",
-    "krew": "Krew",
-    "baron": "Baron Praxis",
-    "scherr": "Josh Scherr",
-    "arey": "Daniel Arey",
-    "baldwin": "Eric Baldwin",
-    "schimpf": "Adam Schimpf",
-    "martinsen": "Jason Martinsen",
-    "phillips": "Kion Phillips",
+    "wastelander-female": "Wastelander",
+    "wastelander-male": "Wastelander",
     "yates": "Jeremy Yates"
   }
 }
diff --git a/game/assets/jak3/subtitle/subtitle_lines_en-GB.json b/game/assets/jak3/subtitle/subtitle_lines_en-GB.json
@@ -2,49 +2,51 @@
   "cutscenes": {},
   "other": {},
   "speakers": {
-    "jak": "Jak",
-    "darkjak": "Dark Jak",
-    "daxter": "Daxter",
-    "pecker": "Pecker",
-    "veger": "Count Veger",
+    "arey": "Daniel Arey",
     "ashelin": "Ashelin",
-    "wastelander-male": "Wastelander",
-    "wastelander-female": "Wastelander",
+    "baldwin": "Eric Baldwin",
+    "baron": "Baron Praxis",
     "citizen-female": "Citizen",
     "citizen-male": "Citizen",
-    "marauder": "Marauder",
+    "computer": "Computer",
     "damas": "Damas",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
     "errol": "Errol",
     "errol-hologram": "???",
-    "guard": "Freedom League Guard",
+    "guard": "Freedom Guard",
     "guard-a": "Guard A",
     "guard-b": "Guard B",
+    "jak": "Jak",
     "jinx": "Jinx",
     "keira": "Keira",
     "kleiver": "Kleiver",
+    "krew": "Krew",
+    "marauder": "Marauder",
+    "martinsen": "Jason Martinsen",
     "onin": "Onin",
     "oracle": "Oracle",
-    "precursor": "Precursor",
     "ottsel-dummy": "Ottsel Dummy",
     "ottsel-leader": "Ottsel Leader",
     "ottsel-surfer": "Ottsel Surfer",
-    "ottsel-veger": "Ottsel Veger",
     "ottsel-tess": "Ottsel Tess",
-    "computer": "Computer",
+    "ottsel-veger": "Ottsel Veger",
+    "ottsel-voice": "Precursors",
+    "ottsel-voice-before-outro": "???",
+    "pecker": "Pecker",
+    "phillips": "Kion Phillips",
+    "precursor": "Precursor",
     "samos": "Samos",
+    "scherr": "Josh Scherr",
+    "schimpf": "Adam Schimpf",
     "seem": "Seem",
     "sig": "Sig",
     "tess": "Tess",
     "torn": "Torn",
+    "veger": "Count Veger",
     "vin": "Vin",
-    "krew": "Krew",
-    "baron": "Baron Praxis",
-    "scherr": "Josh Scherr",
-    "arey": "Daniel Arey",
-    "baldwin": "Eric Baldwin",
-    "schimpf": "Adam Schimpf",
-    "martinsen": "Jason Martinsen",
-    "phillips": "Kion Phillips",
+    "wastelander-female": "Wastelander",
+    "wastelander-male": "Wastelander",
     "yates": "Jeremy Yates"
   }
 }
diff --git a/game/assets/jak3/subtitle/subtitle_lines_es-ES.json b/game/assets/jak3/subtitle/subtitle_lines_es-ES.json
@@ -2,49 +2,51 @@
   "cutscenes": {},
   "other": {},
   "speakers": {
-    "jak": "Jak",
-    "darkjak": "Dark Jak",
-    "daxter": "Daxter",
-    "pecker": "Pecker",
-    "veger": "Count Veger",
+    "arey": "Daniel Arey",
     "ashelin": "Ashelin",
-    "wastelander-male": "Wastelander",
-    "wastelander-female": "Wastelander",
+    "baldwin": "Eric Baldwin",
+    "baron": "Baron Praxis",
     "citizen-female": "Citizen",
     "citizen-male": "Citizen",
-    "marauder": "Marauder",
+    "computer": "Computer",
     "damas": "Damas",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
     "errol": "Errol",
     "errol-hologram": "???",
-    "guard": "Freedom League Guard",
+    "guard": "Freedom Guard",
     "guard-a": "Guard A",
     "guard-b": "Guard B",
+    "jak": "Jak",
     "jinx": "Jinx",
     "keira": "Keira",
     "kleiver": "Kleiver",
+    "krew": "Krew",
+    "marauder": "Marauder",
+    "martinsen": "Jason Martinsen",
     "onin": "Onin",
     "oracle": "Oracle",
-    "precursor": "Precursor",
     "ottsel-dummy": "Ottsel Dummy",
     "ottsel-leader": "Ottsel Leader",
     "ottsel-surfer": "Ottsel Surfer",
-    "ottsel-veger": "Ottsel Veger",
     "ottsel-tess": "Ottsel Tess",
-    "computer": "Computer",
+    "ottsel-veger": "Ottsel Veger",
+    "ottsel-voice": "Precursors",
+    "ottsel-voice-before-outro": "???",
+    "pecker": "Pecker",
+    "phillips": "Kion Phillips",
+    "precursor": "Precursor",
     "samos": "Samos",
+    "scherr": "Josh Scherr",
+    "schimpf": "Adam Schimpf",
     "seem": "Seem",
     "sig": "Sig",
     "tess": "Tess",
     "torn": "Torn",
+    "veger": "Count Veger",
     "vin": "Vin",
-    "krew": "Krew",
-    "baron": "Baron Praxis",
-    "scherr": "Josh Scherr",
-    "arey": "Daniel Arey",
-    "baldwin": "Eric Baldwin",
-    "schimpf": "Adam Schimpf",
-    "martinsen": "Jason Martinsen",
-    "phillips": "Kion Phillips",
+    "wastelander-female": "Wastelander",
+    "wastelander-male": "Wastelander",
     "yates": "Jeremy Yates"
   }
 }
diff --git a/game/assets/jak3/subtitle/subtitle_lines_fr-FR.json b/game/assets/jak3/subtitle/subtitle_lines_fr-FR.json
@@ -2,49 +2,51 @@
   "cutscenes": {},
   "other": {},
   "speakers": {
-    "jak": "Jak",
-    "darkjak": "Dark Jak",
-    "daxter": "Daxter",
-    "pecker": "Pecker",
-    "veger": "Count Veger",
+    "arey": "Daniel Arey",
     "ashelin": "Ashelin",
-    "wastelander-male": "Wastelander",
-    "wastelander-female": "Wastelander",
+    "baldwin": "Eric Baldwin",
+    "baron": "Baron Praxis",
     "citizen-female": "Citizen",
     "citizen-male": "Citizen",
-    "marauder": "Marauder",
+    "computer": "Computer",
     "damas": "Damas",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
     "errol": "Errol",
     "errol-hologram": "???",
-    "guard": "Freedom League Guard",
+    "guard": "Freedom Guard",
     "guard-a": "Guard A",
     "guard-b": "Guard B",
+    "jak": "Jak",
     "jinx": "Jinx",
     "keira": "Keira",
     "kleiver": "Kleiver",
+    "krew": "Krew",
+    "marauder": "Marauder",
+    "martinsen": "Jason Martinsen",
     "onin": "Onin",
     "oracle": "Oracle",
-    "precursor": "Precursor",
     "ottsel-dummy": "Ottsel Dummy",
     "ottsel-leader": "Ottsel Leader",
     "ottsel-surfer": "Ottsel Surfer",
-    "ottsel-veger": "Ottsel Veger",
     "ottsel-tess": "Ottsel Tess",
-    "computer": "Computer",
+    "ottsel-veger": "Ottsel Veger",
+    "ottsel-voice": "Precursors",
+    "ottsel-voice-before-outro": "???",
+    "pecker": "Pecker",
+    "phillips": "Kion Phillips",
+    "precursor": "Precursor",
     "samos": "Samos",
+    "scherr": "Josh Scherr",
+    "schimpf": "Adam Schimpf",
     "seem": "Seem",
     "sig": "Sig",
     "tess": "Tess",
     "torn": "Torn",
+    "veger": "Count Veger",
     "vin": "Vin",
-    "krew": "Krew",
-    "baron": "Baron Praxis",
-    "scherr": "Josh Scherr",
-    "arey": "Daniel Arey",
-    "baldwin": "Eric Baldwin",
-    "schimpf": "Adam Schimpf",
-    "martinsen": "Jason Martinsen",
-    "phillips": "Kion Phillips",
+    "wastelander-female": "Wastelander",
+    "wastelander-male": "Wastelander",
     "yates": "Jeremy Yates"
   }
 }