splitscreen hack

This should avoid the stuttering due to slow unloading on some drivers.

I also turned up the amount of stuff we load per frame since nobody has
been complaining about stutters there, but there has been a few cases of
levels loading in too slowly.

(this only changes graphics, not actual GOAL level load times).

.vs/launch.vs.json

@@ -267,8 +267,8 @@
       "type" : "default",
       "project" : "CMakeLists.txt",
       "projectTarget" : "formatter.exe (bin\\formatter.exe)",
-      "name" : "Tools - Formatter",
-      "args" : ["--new", "--file", "C:\\Users\\xtvas\\Repos\\opengoal\\jak-project\\test-formatter.gc"]
+      "name" : "Tools - Formatter - Inplace",
+      "args" : ["--write", "--file", "C:\\Users\\xtvas\\Repos\\opengoal\\jak-project\\goal_src\\jak2\\pc\\util\\popup-menu-h.gc"]
     },
     {
       "type": "default",

CMakeLists.txt

@@ -195,6 +195,9 @@ if(WIN32)
 elseif(APPLE)
     set(CURL_USE_SECTRANSP ON) # native macOS SSL support
 else()
+    if(STATICALLY_LINK)
+        set(OPENSSL_USE_STATIC_LIBS TRUE)
+    endif()
     set(CURL_USE_OPENSSL ON) # not native, but seems to be the best choice for linux
 endif()
 include_directories(third-party/curl/include)

common/formatter/formatter.cpp

@@ -114,6 +114,8 @@ void apply_formatting_config(
       if (predefined_config &&
           predefined_config->index_configs.find(i) != predefined_config->index_configs.end()) {
         apply_formatting_config(ref, predefined_config->index_configs.at(i));
+      } else if (predefined_config && predefined_config->default_index_config) {
+        apply_formatting_config(ref, predefined_config->default_index_config);
       } else {
         apply_formatting_config(ref);
       }
@@ -179,7 +181,7 @@ bool can_node_be_inlined(const FormatterTreeNode& curr_node, int cursor_pos) {
     return false;
   }
   // If this is set in the config, then the form is intended to be partially inlined
-  if (curr_node.formatting_config.inline_until_index != -1) {
+  if (curr_node.formatting_config.inline_until_index({})) {
     return false;
   }
   // let's see if we can inline the form all on one line to do that, we recursively explore
@@ -193,7 +195,8 @@ std::vector<std::string> apply_formatting(const FormatterTreeNode& curr_node,
                                           int cursor_pos = 0) {
   using namespace formatter_rules;
   if (!curr_node.token && curr_node.refs.empty()) {
-    return output;
+    // special case to handle an empty list
+    return {"()"};
   }
 
   // If its a token, just print the token and move on
@@ -211,6 +214,7 @@ std::vector<std::string> apply_formatting(const FormatterTreeNode& curr_node,
   //
   // This means we may combine elements onto the same line in this step.
   std::vector<std::string> form_lines = {};
+
   for (int i = 0; i < (int)curr_node.refs.size(); i++) {
     const auto& ref = curr_node.refs.at(i);
     // Add new line entry
@@ -265,10 +269,10 @@ std::vector<std::string> apply_formatting(const FormatterTreeNode& curr_node,
   }
 
   // Consolidate any lines if the configuration requires it
-  if (curr_node.formatting_config.inline_until_index != -1) {
+  if (curr_node.formatting_config.inline_until_index(form_lines)) {
     std::vector<std::string> new_form_lines = {};
     for (int i = 0; i < (int)form_lines.size(); i++) {
-      if (i < curr_node.formatting_config.inline_until_index) {
+      if (i < curr_node.formatting_config.inline_until_index(form_lines)) {
         if (new_form_lines.empty()) {
           new_form_lines.push_back(form_lines.at(i));
         } else {
@@ -311,7 +315,7 @@ std::vector<std::string> apply_formatting(const FormatterTreeNode& curr_node,
 }
 
 std::string join_formatted_lines(const std::vector<std::string> lines) {
-  // TODO - respect original file line endings?
+  // TODO - respect original file line endings
   return fmt::format("{}", fmt::join(lines, "\n"));
 }
 

common/formatter/rules/rule_config.cpp

@@ -5,13 +5,34 @@
 namespace formatter_rules {
 namespace config {
 
-// TODO - populate these more
-
 // TODO - this could be greatly simplified with C++20's designated initialization
 FormFormattingConfig new_flow_rule(int start_index) {
   FormFormattingConfig cfg;
   cfg.hang_forms = false;
-  cfg.inline_until_index = start_index;
+  cfg.inline_until_index = [start_index](const std::vector<std::string>& curr_lines) {
+    return start_index;
+  };
+  return cfg;
+}
+
+FormFormattingConfig new_flow_rule_prevent_inlining_indexes(
+    int start_index,
+    const std::vector<int>& inlining_preventation_indices) {
+  FormFormattingConfig cfg;
+  cfg.hang_forms = false;
+  cfg.inline_until_index = [start_index](std::vector<std::string> curr_lines) {
+    if (curr_lines.size() >= 4 && curr_lines.at(3) == "()") {
+      return 4;
+    }
+    return start_index;
+  };
+  for (const auto& index : inlining_preventation_indices) {
+    auto temp_config = std::make_shared<FormFormattingConfig>();
+    temp_config->prevent_inlining = true;
+    temp_config->hang_forms = false;
+    temp_config->indentation_width = 1;
+    cfg.index_configs.emplace(index, temp_config);
+  }
   return cfg;
 }
 
@@ -41,9 +62,27 @@ FormFormattingConfig new_binding_rule() {
   return cfg;
 }
 
+FormFormattingConfig new_pair_rule(bool combine_first_two_expr) {
+  FormFormattingConfig cfg;
+  cfg.hang_forms = false;
+  cfg.prevent_inlining = true;
+  cfg.combine_first_two_lines = combine_first_two_expr;
+  auto pair_config = std::make_shared<FormFormattingConfig>();
+  pair_config->hang_forms = false;
+  pair_config->indentation_width = 1;
+  cfg.default_index_config = pair_config;
+  return cfg;
+}
+
 const std::unordered_map<std::string, FormFormattingConfig> opengoal_form_config = {
+    {"case", new_pair_rule(true)},
+    {"cond", new_pair_rule(false)},
+    {"defmethod", new_flow_rule(3)},
+    {"deftype", new_flow_rule_prevent_inlining_indexes(3, {3, 4, 5})},
     {"defun", new_flow_rule(3)},
-    {"defmethod", new_flow_rule(4)},
-    {"let", new_binding_rule()}};
+    {"dotimes", new_flow_rule(2)},
+    {"let", new_binding_rule()},
+    {"when", new_flow_rule(2)},
+    {"with-dma-buffer-add-bucket", new_flow_rule(2)}};
 }  // namespace config
 }  // namespace formatter_rules

common/formatter/rules/rule_config.h

@@ -19,13 +19,16 @@ struct FormFormattingConfig {
   std::function<int(FormFormattingConfig, int)> indentation_width_for_index =
       [](FormFormattingConfig config, int /*index*/) { return config.indentation_width; };
   bool combine_first_two_lines =
-      false;  // NOTE - basically hang, but will probably stick around after hang is gone
-  int inline_until_index = -1;
+      false;  // NOTE - basically hang, but will probably stick around after hang is gone, may be
+              // redundant (inline_until_index!)
+  std::function<std::optional<int>(const std::vector<std::string>& curr_lines)> inline_until_index =
+      [](std::vector<std::string> curr_lines) { return std::nullopt; };
   bool has_constant_pairs = false;
-  bool prevent_inlining = false;
+  bool prevent_inlining = false;  // TODO - duplicate of below
   std::function<bool(FormFormattingConfig, int num_refs)> should_prevent_inlining =
       [](FormFormattingConfig config, int /*num_refs*/) { return config.prevent_inlining; };
   int parent_mutable_extra_indent = 0;
+  std::optional<std::shared_ptr<FormFormattingConfig>> default_index_config;
   std::unordered_map<int, std::shared_ptr<FormFormattingConfig>> index_configs = {};
 };
 

common/log/log.cpp

@@ -153,7 +153,9 @@ void set_file(const std::string& filename,
       }
     }
   } else {
-    complete_filename += ".log";
+    if (!str_util::ends_with(complete_filename, ".log")) {
+      complete_filename += ".log";
+    }
   }
 
   if (append) {

common/util/FontUtils.cpp

@@ -947,6 +947,7 @@ static std::vector<ReplaceInfo> s_replace_info_jak2 = {
     {"O~Y~-28H~-4V'~-9H'~Z", "Ő"},
     {"U~Y~-27H~-4V'~-12H'~Z", "Ű"},
     {"o~Y~-28H~-4V'~-9H'~Z", "ő"},
+    {"u~Y~-28H~-4V'~-9H'~Z", "ű"},
     {"E~Y~-22H~-11Vº~Z", "Ė"},
     {"e~Y~-25H~-5Vº~Z", "ė"},
     {"C~Y~-27H~-10Vˇ~Z", "Č"},

crowdin.yml

@@ -3,12 +3,22 @@ files:
     translation: /game/assets/jak1/text/game_custom_text_%locale%.json
   - source: /game/assets/jak1/subtitle/subtitle_lines_en-US.json
     translation: /game/assets/jak1/subtitle/subtitle_lines_%locale%.json
+    excluded_target_languages:
+      - fr
+      - de
+      - es-ES
+      - it
+      - ja
+      - en-GB
+  - source: /game/assets/jak2/text/game_custom_text_en-US.json
+    translation: /game/assets/jak2/text/game_custom_text_%locale%.json
+  - source: /game/assets/jak2/subtitle/subtitle_lines_en-US.json
+    translation: /game/assets/jak2/subtitle/subtitle_lines_%locale%.json
     excluded_target_languages:
       - "fr"
       - "de"
       - "es-ES"
       - "it"
       - "ja"
+      - "ko"
       - "en-GB"
-  - source: /game/assets/jak2/text/game_custom_text_en-US.json
-    translation: /game/assets/jak2/text/game_custom_text_%locale%.json

decompiler/config/jak1/all-types.gc

@@ -1611,6 +1611,7 @@
   (catalan                      #x1119)
   (icelandic                    #x111a)
   (polish                       #x111b)
+  (lithuanian                   #x111c)
   (scene-0                      #x1200)
   (scene-255                    #x12ff)
   (hint-0                       #x1300)

decompiler/config/jak1/ntsc_v1/stack_structures.jsonc

@@ -1190,7 +1190,7 @@
 
   "(code projectile-die projectile)": [[16, "event-message-block"]],
 
-  "projectile-init-by-other": [[16, "collide-edge-hold-list"]],
+  "projectile-init-by-other": [[16, "overlaps-others-params"]],
 
   "(method 27 projectile-yellow)": [[16, "vector"]],
 

decompiler/config/jak2/all-types.gc

@@ -62,6 +62,14 @@
   (uk-english)
   )
 
+(defenum runtime-exit-status
+  :type uint32
+  (running)
+  (restart-runtime)
+  (exit)
+  (restart-in-debug)
+  )
+
 (define-extern *debug-segment* symbol)
 (define-extern nothing (function none))
 (define-extern _format (function _varargs_ object))
@@ -92,7 +100,7 @@
 (define-extern file-stream-write (function file-stream pointer uint uint))
 (define-extern file-stream-close (function file-stream file-stream))
 (define-extern new-dynamic-structure (function symbol type int structure))
-(define-extern kernel-shutdown (function none))
+(define-extern kernel-shutdown (function runtime-exit-status none))
 (define-extern scf-get-timeout (function int))
 (define-extern scf-get-inactive-timeout (function int))
 (define-extern syncv (function int int))
@@ -7404,6 +7412,9 @@
   (progress-mouse-options-horz-sens #x129d)
   (progress-mouse-options-vert-sens #x129e)
   (progress-mouse-options-player-movement #x129f)
+  (progress-shadows #x12a0)
+  (progress-shadows-normal #x12a1)
+  (progress-shadows-extended #x12a2)
   (progress-input-options-auto-hide-cursor #x1300)
   (progress-menu-reassign-binds #x1301)
   (progress-reassign-binds-controller #x1302)
@@ -7426,6 +7437,32 @@
   (progress-highscores-local-time #x1313)
   (progress-fps-disclaimer-warning #x1314)
   (progress-fps-disclaimer #x1315)
+  (trick-board-none #x1320)
+  (trick-board-spin #x1321)
+  (trick-board-boost #x1322)
+  (trick-board-flip #x1323)
+  (trick-board-rail #x1324)
+  (trick-board-rail-jump #x1325)
+  (trick-board-nosegrab #x1326)
+  (trick-board-method #x1327)
+  (trick-board-board-spin #x1328)
+  (trick-board-board-flip #x1329)
+  (trick-board-noseflip #x132a)
+  (trick-board-kickflip #x132b)
+  (trick-board-jump #x132c)
+  (trick-board-duck-jump #x132d)
+  (trick-board-quick-jump #x132e)
+  (trick-darkjak #x132f)
+  (trick-darkjak-bomb0 #x1330)
+  (trick-darkjak-bomb1 #x1331)
+  (trick-darkjak-giant #x1332)
+  (progress-graphics-ps2 #x1333)
+  (progress-graphics-actor-culling #x1334)
+  (progress-graphics-force-envmap #x1335)
+  (progress-fast-progress #x1336)
+  (progress-graphics-ps2-lod-dist #x1337)
+  (progress-graphics-msaa-off #x1338)
+  (progress-graphics-display #x1339)
 )
 ;; ---text-id-h:text-id
 
@@ -12903,11 +12940,11 @@
   :flag-assert         #xf00000060
   (:methods
     (new (symbol type float float float shadow-flags float) _type_) ;; 0
-    (clear-offset-bit (shadow-control) int) ;; 9
-    (set-offset-bit (shadow-control) int) ;; 10
+    (enable-draw (shadow-control) int) ;; 9
+    (disable-draw (shadow-control) int) ;; 10
     (set-top-plane-offset (shadow-control float) int) ;; 11
     (set-bottom-plane-offset (shadow-control float) int) ;; 12
-    (shadow-control-method-13 (_type_ vector float float float) none) ;; 13 ;; (unused-13 (_type_) none) ;; 13
+    (probe-line-for-shadow (_type_ vector float float float) none) ;; 13 ;; (unused-13 (_type_) none) ;; 13
     (shadow-control-method-14 (_type_ vector vector float float float) none) ;; 14 ;; (update-direction-from-time-of-day (_type_) none) ;; 14
     )
   )
@@ -33034,10 +33071,10 @@
    (actor-group                 (pointer actor-group)       :offset-assert 480)
    (actor-group-count           int32                       :offset-assert 484)
    (neck                        joint-mod                       :offset-assert 488)
-   (on-notice                   symbol                      :offset-assert 492)
-   (on-active                   symbol                      :offset-assert 496)
-   (on-hostile                  symbol                      :offset-assert 500)
-   (on-death                    symbol                      :offset-assert 504)
+   (on-notice                   pair                        :offset-assert 492)
+   (on-active                   pair                        :offset-assert 496)
+   (on-hostile                  pair                        :offset-assert 500)
+   (on-death                    pair                        :offset-assert 504)
    (idle-anim-player            idle-control :inline        :offset-assert 512)
    (rand-gen                    symbol                      :offset-assert 528)
   )
@@ -49975,8 +50012,8 @@
     (vehicle-method-99 (_type_ float) none) ;; 99
     (vehicle-method-100 (_type_ float vehicle-physics-work) none) ;; 100
     (vehicle-method-101 (_type_) none) ;; 101
-    (vehicle-method-102 (_type_) none) ;; 102
-    (vehicle-method-103 (_type_) none) ;; 103
+    (shadow-enable (_type_) none) ;; 102
+    (shadow-disable (_type_) none) ;; 103
     (vehicle-method-104 (_type_) none) ;; 104
     (vehicle-method-105 (_type_) symbol) ;; 105
     (vehicle-method-106 (_type_) none) ;; 106

decompiler/config/jak2/ntsc_v1/art_info.jsonc

@@ -45,7 +45,7 @@
 
   // remap names for types in an entire file (higher priority)
   "file_override": {
-    "target-indax": {"target": "daxter-ag"} // in target-indax.gc, the remap for 'target' will be set to 'daxter-ag'
+    "target-indax": { "target": "daxter-ag" } // in target-indax.gc, the remap for 'target' will be set to 'daxter-ag'
   },
 
   // some art groups (like robotboss-ag) have a name for their model that differs

decompiler/config/jak2/ntsc_v1/type_casts.jsonc

@@ -3152,7 +3152,8 @@
     [872, "f1", "float"],
     [22, "v1", "float"],
     ["_stack_", 56, "handle"],
-    ["_stack_", 16, "float"]
+    ["_stack_", 16, "float"],
+    [792, "t1", "sound-name"]
   ],
   "target-bomb1-fire-shot": [
     [12, "v1", "handle"],

decompiler/config/jak2/ntsc_v1/var_names.jsonc

@@ -4625,5 +4625,17 @@
     "vars": {
       "s5-0": "play-sound?"
     }
+  },
+  "(method 135 enemy)": {
+    "args": ["this", "sound"],
+    "vars": {
+      "gp-0": ["name", "sound-name"],
+      "v1-0": "sound-type"
+    }
+  },
+  "(code target-darkjak-running-attack)": {
+    "vars": {
+      "t1-3": ["imp-sound", "sound-name"]
+    }
   }
 }

game/assets/jak1/game_subtitle.gp

@@ -125,7 +125,14 @@
     :lines-base "game/assets/jak1/subtitle/subtitle_lines_en-US.json"
     :meta "game/assets/jak1/subtitle/subtitle_meta_pl-PL.json"
     :meta-base "game/assets/jak1/subtitle/subtitle_meta_en-US.json")
+  (file-json
+    :language-id 20
+    :text-version "jak1-v2"
+    :lines "game/assets/jak1/subtitle/subtitle_lines_lt-LT.json"
+    :lines-base "game/assets/jak1/subtitle/subtitle_lines_en-US.json"
+    :meta "game/assets/jak1/subtitle/subtitle_meta_lt-LT.json"
+    :meta-base "game/assets/jak1/subtitle/subtitle_meta_en-US.json")
   )
-  
+
 
 

game/assets/jak1/game_text.gp

@@ -32,4 +32,5 @@
   (file-json 16 jak1-v2 "common" '("game/assets/jak1/text/game_custom_text_is-IS.json"))
   (file-json 19 jak1-v2 "common" '("game/assets/jak1/text/game_custom_text_pl-PL.json"
                                    "game/assets/jak1/text/game_base_text_pl-PL.json"))
+  (file-json 20 jak1-v2 "common" '("game/assets/jak1/text/game_custom_text_lt-LT.json"))
 )

game/assets/jak1/subtitle/subtitle_lines_it-IT.json

@@ -2772,7 +2772,7 @@
     "FISHERMAN": "PESCATORE",
     "FLUT-FLUT": "FLUT-FLUT",
     "GAMBLER": "GIOCATORE D'AZZARDO",
-    "GEOLOGIST": "GEOLOGIST",
+    "GEOLOGIST": "GEOLOGA",
     "GOL": "GOL",
     "GORDY": "GORDY",
     "JAK": "JAK",

game/assets/jak1/subtitle/subtitle_meta_lt-LT.json

@@ -0,0 +1,4 @@
+{
+  "cutscenes": {},
+  "hints": {}
+}

game/assets/jak1/text/game_custom_text_ca-ES.json

@@ -1,5 +1,5 @@
 {
-  "1000": "CAMERA OPTIONS",
+  "1000": "KAMERAN ASETUKSET",
   "1001": "NORMAL",
   "1002": "INVERTED",
   "1003": "1ST-PERSON HORIZONTAL CAMERA",
@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER MODE",
   "138": "PLEASE DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
   "161": "WHILE THIS ICON IS ON SCREEN, DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",

game/assets/jak1/text/game_custom_text_da-DK.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER TILSTAND",
   "138": "FJERN VENLIGST IKKE, INDSÆT EKSTRA ENHEDER, ELLER SLUKKE SYSTEMET ELLER SPILLET",
   "161": "MENS DETTE IKON ER PÅ SKÆRMEN, MÅ DU IKKE FJERNE ELLER INDSÆTTE NOGEN EKSTRA ENHEDER, SLUKKE SYSTEMET ELLER SLUKKE SPILLET",

game/assets/jak1/text/game_custom_text_de-DE.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER-MODUS",
   "138": "BITTE SCHALTE NICHT DAS SYSTEM ODER DAS SPIEL AUS UND ENTFERNE/VERBINDE KEIN ZUBEHÖR",
   "161": "WÄHREND DIESES SYMBOL ANGEZEIGT WIRD, BITTE SCHALTE NICHT DAS SYSTEM ODER DAS SPIEL AUS UND ENTFERNE/VERBINDE KEIN ZUBEHÖR",

game/assets/jak1/text/game_custom_text_en-GB.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER MODE",
   "138": "PLEASE DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
   "161": "WHILE THIS ICON IS ON SCREEN, DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",

game/assets/jak1/text/game_custom_text_en-US.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER MODE",
   "138": "PLEASE DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
   "161": "WHILE THIS ICON IS ON SCREEN, DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",

game/assets/jak1/text/game_custom_text_es-ES.json

@@ -91,7 +91,8 @@
   "1118": "NEDERLANDS",
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
-  "111b": "POLSKI",
+  "111b": "POLACO",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "MODO DE SPEEDRUNNER",
   "138": "POR FAVOR NO QUITES/INSERTES NINGÚN PERIFÉRICO, APAGUES EL SISTEMA NI CIERRES EL JUEGO",
   "161": "MIENTRAS ESTE ICONO ESTÉ EN PANTALLA, NO QUITES/INSERTES NINGÚN PERIFÉRICO, APAGUES EL SISTEMA NI CIERRES EL JUEGO",

game/assets/jak1/text/game_custom_text_fi-FI.json

@@ -38,7 +38,7 @@
   "1053": "4X",
   "1054": "8X",
   "1055": "16X",
-  "1060": "RUUDUNPÄIVITYSNOPEUS (KOKEELLINEN)",
+  "1060": "KUVATAAJUUS (KOKEELLINEN)",
   "1061": "60",
   "1062": "100",
   "1063": "150",
@@ -92,12 +92,13 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUN-TILA",
   "138": "ÄLÄ LISÄÄ TAI POISTA MITÄÄN OHEISLAITTEITA, SAMMUTA LAITETTASI TAI SAMMUTA PELIÄ",
   "161": "KUN TÄMÄ KUVAKE ON RUUDULLA, ÄLÄ LISÄÄ TAI POISTA MITÄÄN OHEISLAITTEITA, SAMMUTA LAITETTASI TAI SAMMUTA PELIÄ",
-  "100c": "AUTOMAATTITALLENNUS EI KÄYTÖSSÄ",
-  "100d": "HALUATKO VARMASTI POISTAA AUTOMAATTITALLENNUKSEN KÄYTÖSTÄ?",
-  "100e": "POISTA AUTOMAATTITALLENNUS KÄYTÖSTÄ",
+  "100c": "AUTO-TALLENNUS POIS PÄÄLTÄ",
+  "100d": "HALUATKO VARMASTI LOPETTAA AUTO-TALLENTAMISEN?",
+  "100e": "LOPETA AUTO-TALLENNUS",
   "100f": "SEKALAISET",
   "103a": "SOVITA RUUTUUN",
   "103b": "PYSTYTAHDISTUS",
@@ -159,7 +160,7 @@
   "10f2": "SOLAN LOPPUOSA",
   "10f3": "HÄMÄHÄKKILUOLAAN",
   "10f4": "LUMIVUORILLE",
-  "10f5": "MAINARIT",
+  "10f5": "KAIVOSMIEHET",
   "10f6": "ROBOTTILUOLAN TELINEET",
   "10f7": "EDELTÄJÄROBOTIN HUIPPU",
   "10f8": "PÄÄLUOLA",
@@ -170,8 +171,8 @@
   "10fd": "LUMIPALLOT",
   "10fe": "TUNNELIN KESKIOSA",
   "10ff": "TUNNELIN LOPPU",
-  "1501": "VÄLIANIMAATIOIDEN OHITUKSET",
-  "1502": "TARKISTUSPISTEEN VALINTA",
+  "1501": "OHITA VÄLIANIMAATIOT",
+  "1502": "VALITSE TARKISTUSPISTE",
   "1503": "SPEEDRUN-ASETUKSET",
   "1504": "VAROITUS: NÄMÄ ASETUKSET AUTOMAATTITALLENTAVAT ENSIMMÄISEEN TALLENNUSPAIKKAAN!",
   "1505": "ALOITA SPEEDRUN UUDELLEEN",
@@ -179,7 +180,7 @@
   "150e": "UUSI YKSITTÄISEN TASON SPEEDRUN",
   "150f": "GEYSIRSAARI -TASO",
   "1510": "SANDOVERIN KYLÄ -TASO",
-  "1511": "VAHTITORNIN RANTA -TASO",
+  "1511": "VARTIJARANTA -TASO",
   "1512": "KIELLETTY VIIDAKKO -TASO",
   "1513": "USVASAARI -TASO",
   "1514": "TULIKANJONI -TASO",
@@ -189,11 +190,11 @@
   "1518": "EDELTÄJÄLAAKSO -TASO",
   "1519": "VUORISTOSOLA -TASO",
   "151a": "TULIVUOREN KRAATERI -TASO",
-  "151b": "LUMIHUIPPU -TASO",
+  "151b": "LUMIVUORI -TASO",
   "151c": "HÄMÄHÄKKILUOLA -TASO",
   "151d": "LAAVATUNNELI -TASO",
   "151e": "GOLIN JA MAIAN LINNOITUS -TASO",
-  "151f": "UUSI KATEGORIA-PIKAPELAUS",
+  "151f": "UUSI LAAJENNETUN KATEGORIAN SPEEDRUN",
   "1520": "UUSI PELI+",
   "1521": "HUBI 1 100%",
   "1522": "HUBI 2 100%",
@@ -208,11 +209,11 @@
   "1606": "KAMERAN OHJAUS HIIRELLÄ",
   "1607": "VAAKASUUNTAINEN HERKKYYS",
   "1608": "PYSTYSUUNTAINEN HERKKYYS",
-  "1609": "PELAAJAN LIIKE HIIRELLÄ",
+  "1609": "PELAAJAN OHJAUS HIIRELLÄ",
   "160a": "PELIOHJAIMEN KYTKENNÄT",
   "160b": "NÄPPÄIMISTÖN KYTKENNÄT",
   "160c": "HIIREN KYTKENNÄT",
-  "160d": "OHJAINASETUKSET",
+  "160d": "OHJAIMEN ASETUKSET",
   "160e": "SALLI NÄPPÄIMISTÖ",
   "160f": "SALLI HIIRI",
   "1610": "HIIREN ASETUKSET",

game/assets/jak1/text/game_custom_text_fr-FR.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "MODE SPEEDRUN",
   "138": "VEUILLEZ NE PAS RETIRER OU INSÉRER DE PÉRIPHÉRIQUES, ÉTEINDRE VOTRE SYSTÈME OU ARRÊTER LE JEU",
   "161": "NE PAS RETIRER OU INSÉRER DE PÉRIPHÉRIQUES, ÉTEINDRE VOTRE SYSTÈME OU ARRÊTER LE JEU LORSQUE CE SYMBOLE S'AFFICHE",

game/assets/jak1/text/game_custom_text_hu-HU.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER-MÓD",
   "138": "NE HELYEZZ BE VAGY TÁVOLÍTS EL SEMMILYEN PERIFÉRIÁT, NE ÁLLÍTSD LE A RENDSZERT, ÉS NE ZÁRD BE A JÁTÉKOT",
   "161": "AMÉG EZ AZ IKON A KÉPEN VAN, NE HELYEZZ BE VAGY TÁVOLÍTS EL SEMMILYEN PERIFÉRIÁT, NE ÁLLÍTSD LE A RENDSZERT, ÉS NE ZÁRD BE A JÁTÉKOT",
@@ -99,7 +100,7 @@
   "100d": "BIZTOSAN KI AKAROD KAPCSOLNI AZ AUTOMATIKUS MENTÉST?",
   "100e": "AUTOMATIKUS MENTÉS KIKAPCSOLÁSA",
   "100f": "EGYÉB",
-  "103a": "FIT TO SCREEN",
+  "103a": "IGAZÍTÁS KÉPERNYŐRE",
   "103b": "V-SYNC",
   "103c": "4X3 (PS2)",
   "103d": "16X9 (PS2)",
@@ -194,33 +195,33 @@
   "151d": "LÁVACSŐ IL",
   "151e": "GOL ÉS MAIA FELLEGVÁRA IL",
   "151f": "ÚJ KATEGÓRIAKITERJESZTÉS SPEEDRUN",
-  "1520": "NG+",
+  "1520": "ÚJ JÁTÉK +",
   "1521": "HUB 1 100%",
   "1522": "HUB 2 100%",
   "1523": "HUB 3 100%",
   "1524": "ÖSSZES JELENET",
-  "1600": "INPUT OPTIONS",
-  "1601": "SELECT CONTROLLER",
-  "1602": "ANALOG DEADZONE",
-  "1603": "IGNORE IF WINDOW UNFOCUSED",
+  "1600": "BEVITELI OPCIÓK",
+  "1601": "JÁTÉKVEZÉRLŐ KIVÁLASZTÁSA",
+  "1602": "ANALÓG HOLTTÉR",
+  "1603": "INAKTÍV ABLAK FIGYELEN KÍVÜL HAGYÁSA",
   "1604": "LED REFLECT HP",
   "1605": "LED REFLECT ECO",
-  "1606": "TRACK CAMERA",
-  "1607": "HORIZONTAL SENSITIVITY",
-  "1608": "VERTICAL SENSITIVITY",
-  "1609": "PLAYER MOVEMENT",
-  "160a": "CONTROLLER BINDS",
-  "160b": "KEYBOARD BINDS",
-  "160c": "MOUSE BINDS",
-  "160d": "CONTROLLER OPTIONS",
-  "160e": "ENABLE KEYBOARD",
-  "160f": "ENABLE MOUSE",
-  "1610": "MOUSE OPTIONS",
-  "1611": "REASSIGN BINDS",
-  "1612": "CONTROLLER ~D",
-  "1613": "AUTO HIDE CURSOR",
-  "1614": "UNSET",
-  "1615": "UNKNOWN",
-  "1616": "NO OTHER OPTIONS FOR ASPECT RATIO",
-  "1617": "CONTROLLER LED FOR HEAT"
+  "1606": "HÁTSÓ KAMERA",
+  "1607": "VÍZSZINTES ÉRZÉKENYSÉG",
+  "1608": "FÜGGŐLEGES ÉRZÉKENYSÉG",
+  "1609": "JÁTÉKOS MOZGÁSOK",
+  "160a": "JÁTÉKVEZÉRLŐ GOMBKIOSZTÁS",
+  "160b": "BILLENTYŰZET GOMBKIOSZTÁS",
+  "160c": "EGÉR GOMBKIOSZTÁS",
+  "160d": "JÁTÉKVEZÉRLŐ BEÁLLÍTÁSOK",
+  "160e": "BILLENTYŰZET ENGEDÉLYEZÉSE",
+  "160f": "EGÉR ENGEDÉLYEZÉSE",
+  "1610": "EGÉR BEÁLLÍTÁSOK",
+  "1611": "GOMBKIOSZTÁSOK ÚJRABEÁLLÍTÁSA",
+  "1612": "JÁTÉKVEZÉRLŐ ~D",
+  "1613": "KURZOR AUTOMATIKUS ELREJTÉSE",
+  "1614": "NEM BEÁLLÍTOTT",
+  "1615": "ISMERETLEN",
+  "1616": "NINCS MÁS LEHETŐSÉG EHHEZ A KÉPARÁNYHOZ",
+  "1617": "LED REFLECT HEAT"
 }

game/assets/jak1/text/game_custom_text_is-IS.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER MODE",
   "138": "PLEASE DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
   "161": "WHILE THIS ICON IS ON SCREEN, DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",

game/assets/jak1/text/game_custom_text_it-IT.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "MODALITÀ SPEEDRUN",
   "138": "NON RIMUOVERE O INSERIRE ALCUNA PERIFERICA, SPEGNERE IL SISTEMA O CHIUDERE IL GIOCO",
   "161": "QUANDO QUESTA ICONA APPARE SULLO SCHERMO, NON RIMUOVERE O INSERIRE ALCUNA PERIFERICA, SPEGNERE IL SISTEMA O CHIUDERE IL GIOCO",
@@ -203,9 +204,9 @@
   "1601": "SELEZIONA CONTROLLER",
   "1602": "ZONA MORTA ANALOGICO",
   "1603": "IGNORA SE NON IN PRIMO PIANO",
-  "1604": "CONTROLLER LED PER HP",
-  "1605": "CONTROLLER LED PER ECO",
-  "1606": "TELECAMERA DELLA PISTA",
+  "1604": "LED CONTROLLER PER GLI HP",
+  "1605": "LED CONTROLLER PER L'ECO",
+  "1606": "BLOCCA VISUALE",
   "1607": "SENSIBILITÀ ORIZZONTALE",
   "1608": "SENSIBILITÀ VERTICALE",
   "1609": "MOVIMENTO DEL GIOCATORE",
@@ -222,5 +223,5 @@
   "1614": "NON ASSEGNATO",
   "1615": "SCONOSCIUTO",
   "1616": "NON CI SONO ALTRE OPZIONI PER IL RAPPORTO D'ASPETTO",
-  "1617": "CONTROLLER LED PER CALORE"
+  "1617": "LED CONTROLLER PER IL CALORE"
 }

game/assets/jak1/text/game_custom_text_ja-JP.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "スピードラン モード",
   "138": "しゅうへんききをぬいたり, さしたり, でんげんを きったりは しないでください",
   "161": "このアイコンが あらわれているあいだ、しゅうへんききをぬいたり, さしたり, でんげんを きったりは しないでください",

game/assets/jak1/text/game_custom_text_lt-LT.json

@@ -0,0 +1,227 @@
+{
+  "1000": "KAMEROS PARINKTYS",
+  "1001": "NORMALUS",
+  "1002": "APVERSTA",
+  "1003": "1ST-PERSON HORIZONTAL CAMERA",
+  "1004": "1ST-PERSON VERTICAL CAMERA",
+  "1005": "3RD-PERSON HORIZONTAL CAMERA",
+  "1006": "3RD-PERSON VERTICAL CAMERA",
+  "1007": "RESTORE DEFAULTS",
+  "1010": "PRIEINAMUMAS",
+  "1011": "PRECURSOR ORB GLOW",
+  "1020": "PS2 PARINKTYS",
+  "1021": "PS2 PAKROVIMO GREITIS",
+  "1022": "PARTICLE CULLING",
+  "1023": "MUSIC FADE-OUT",
+  "1024": "MUSIC FADE-IN",
+  "1025": "ACTOR CULLING",
+  "1026": "BACKGROUND CULLING",
+  "1027": "FORCE ENVIRONMENT MAPPING",
+  "1030": "DISCORD RICH-PRESENCE",
+  "1031": "RODYMO REŽIMAS",
+  "1032": "WINDOWED",
+  "1033": "BORDERLESS",
+  "1034": "VISAS EKRANAS",
+  "1035": "ŽAIDIMO REZOLIUCIJA",
+  "1036": "~D X ~D",
+  "1037": "PS2 PROPORCIJŲ SANTYKIS",
+  "1038": "WHEN PS2 ASPECT RATIO IS ENABLED, ONLY 4X3 AND 16X9 ASPECT RATIO CAN BE SELECTED. CONTINUE?",
+  "1039": "PROPORCIJŲ SANTYKIS (PS2)",
+  "1040": "SUBTITLES ENABLED",
+  "1041": "SUBTITLES DISABLED",
+  "1042": "TEKSTO KALBA",
+  "1043": "DISPLAY",
+  "1044": "DISPLAY ~D",
+  "1050": "MSAA",
+  "1051": "~DX",
+  "1052": "2X",
+  "1053": "4X",
+  "1054": "8X",
+  "1055": "16X",
+  "1060": "FRAME RATE (EXPERIMENTAL)",
+  "1061": "60",
+  "1062": "100",
+  "1063": "150",
+  "1070": "DETALUMO LYGIS (FONAS)",
+  "1071": "DETALUMO LYGIS (PIRMAME PLANE)",
+  "1072": "MAKSIMALUS",
+  "1073": "AUKŠTAS",
+  "1074": "VIDUTINIS",
+  "1075": "ŽEMAS",
+  "1076": "MINIMUMAS",
+  "1077": "PS2",
+  "1078": "SUBTITRAI",
+  "1079": "PATARIMŲ SUBTITRAI",
+  "1080": "CHEATAI",
+  "1081": "PASLAPTYS",
+  "1082": "SELECT TRACK",
+  "1083": "SELECT FLAVOR",
+  "1084": "PASKUTINIS BOSAS",
+  "1085": "KREDITAI",
+  "1086": "?????",
+  "1087": "KLAWW",
+  "1088": "FISHING MINI-GAME",
+  "1089": "CHALLENGE THEME",
+  "1090": "INFINITE BLUE ECO",
+  "1091": "INFINITE RED ECO",
+  "1092": "INFINITE GREEN ECO",
+  "1093": "INFINITE YELLOW ECO",
+  "1094": "ALTERNATYVUSIS DAKSTERIS",
+  "1095": "INVINCIBILITY",
+  "1096": "ALL MUSIC TRACKS",
+  "1097": "REAL TIME OF DAY",
+  "1098": "REACH 100% COMPLETION",
+  "1099": "NUGALĖTI ŽAIDIMĄ",
+  "1100": "YELLOW SAGE",
+  "1101": "RED SAGE",
+  "1102": "BLUE SAGE",
+  "1103": "CITADEL HUB",
+  "1104": "MIDDLE OF THE BOSS",
+  "1105": "END OF THE BOSS",
+  "1106": "FLAVOR 1",
+  "1107": "FLAVOR 2",
+  "1110": "ENGLISH (UK)",
+  "1111": "PORTUGUÊS",
+  "1112": "PORTUGUÊS (BRASIL)",
+  "1113": "SUOMI",
+  "1114": "SVENSKA",
+  "1115": "DANSK",
+  "1116": "NORSK",
+  "1117": "MAGYAR",
+  "1118": "NEDERLANDS",
+  "1119": "CATALÀ",
+  "111a": "ÍSLANDSKA",
+  "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
+  "1500": "SPEEDRUNNER MODE",
+  "138": "PLEASE DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
+  "161": "WHILE THIS ICON IS ON SCREEN, DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
+  "100c": "AUTO-SAVE DISABLED",
+  "100d": "ARE YOU SURE YOU WANT TO DISABLE AUTO-SAVE?",
+  "100e": "DISABLE AUTO-SAVE",
+  "100f": "ĮVAIRŪS",
+  "103a": "FIT TO SCREEN",
+  "103b": "V-SYNC",
+  "103c": "4X3 (PS2)",
+  "103d": "16X9 (PS2)",
+  "103e": "~DX~D",
+  "103f": "PRESS <PAD_SQUARE> TO TOGGLE SUBTITLES",
+  "107a": "SUBTITLE LANGUAGE",
+  "107b": "SHOW SPEAKER IN SUBTITLE",
+  "107c": "VISADA",
+  "107d": "NIEKADA",
+  "107e": "OFF-SCREEN",
+  "107f": "HINT LOG",
+  "109a": "DIDELĖS GALVOS DŽEKAS",
+  "109b": "MAŽOS GALVOS DŽEKAS",
+  "109c": "BIG FIST JAK",
+  "109d": "BIG HEAD CHARACTERS",
+  "109e": "NO TEXTURES MODE",
+  "109f": "MIRRORED WORLD",
+  "10a0": "MILŽINIŠKOS GALVOS DŽEKAS",
+  "10c0": "MUZIKOS GROTUVAS",
+  "10c1": "SCENE PLAYER",
+  "10c2": "LEISTI KREDITUS",
+  "10c3": "SCRAPBOOK",
+  "10d0": "NUMATYTASIS",
+  "10d1": "NENAUDOJAMAS",
+  "10d2": "SAGE",
+  "10d3": "SAGE'S HUT",
+  "10d4": "PAUKŠČIŲ STEBĖTOJAS",
+  "10d5": "ŪKININKAS",
+  "10d6": "KEIRA",
+  "10d7": "MERAS",
+  "10d8": "SKULPTORIUS",
+  "10d9": "DŽEKO DĖDĖ",
+  "10da": "PRIEPLAUKA",
+  "10db": "FORBIDDEN TEMPLE EXIT",
+  "10dc": "LURKER MACHINE",
+  "10dd": "TOP OF THE TOWER",
+  "10de": "BLUE VENT SWITCH",
+  "10df": "NENAUDOJAMAS",
+  "10e0": "SENTINELS",
+  "10e1": "LURKER CANNON",
+  "10e2": "GROTTO",
+  "10e3": "NENAUDOJAMAS 1",
+  "10e4": "LURKER BOAT",
+  "10e5": "NENAUDOJAMAS 2",
+  "10e6": "ZOOMERIS",
+  "10e7": "FLUT FLUT",
+  "10e8": "NENAUDOJAMAS",
+  "10e9": "KARYS",
+  "10ea": "GEOLOGAS",
+  "10eb": "LOŠĖJAS",
+  "10ec": "LEVITATOR MACHINE",
+  "10ed": "NENAUDOJAMAS 1",
+  "10ee": "LAUNCHER TRAPS",
+  "10ef": "NENAUDOJAMAS 2",
+  "10f0": "DEAD MAN'S GORGE",
+  "10f1": "MIDDLE OF THE PASS",
+  "10f2": "END OF THE PASS",
+  "10f3": "TO SPIDER CAVE",
+  "10f4": "TO SNOWY MOUNTAIN",
+  "10f5": "KALNAKASIAI",
+  "10f6": "ROBOT CAVE SCAFFOLDING",
+  "10f7": "PRECURSOR ROBOT TOP",
+  "10f8": "MAIN CAVE",
+  "10f9": "DARK CAVE",
+  "10fa": "NENAUDOJAMAS",
+  "10fb": "HIDDEN CAVE",
+  "10fc": "LURKER FORT",
+  "10fd": "SNIEGO GNIŪŽTĖS",
+  "10fe": "MIDDLE OF THE TUBE",
+  "10ff": "END OF THE TUBE",
+  "1501": "CUTSCENE SKIPS",
+  "1502": "CHECKPOINT SELECT",
+  "1503": "SPEEDRUN OPTIONS",
+  "1504": "CAUTION: THESE OPTIONS WILL AUTO SAVE IN YOUR FIRST SAVE SLOT!",
+  "1505": "RESET CURRENT SPEEDRUN",
+  "1506": "NEW FULL GAME RUN",
+  "150e": "NEW INDIVIDUAL LEVEL RUN",
+  "150f": "GEIZERIO UOLA IL",
+  "1510": "SANDOVERIO KAIMELIS IL",
+  "1511": "SENTINEL BEACH IL",
+  "1512": "UŽDRAUSTOS DŽIUNGLĖS IL",
+  "1513": "MIGLOTA SALA IL",
+  "1514": "UGNIES KANJONAS IL",
+  "1515": "AKMENS KAIMELIS IL",
+  "1516": "LOST PRECURSOR CITY IL",
+  "1517": "BOGGY SWAMP IL",
+  "1518": "PRECURSOR BASIN IL",
+  "1519": "MOUNTAIN PASS IL",
+  "151a": "VOLCANIC CRATER IL",
+  "151b": "SNOWY MOUNTAIN IL",
+  "151c": "SPIDER CAVE IL",
+  "151d": "LAVA TUBE IL",
+  "151e": "GOL AND MAIA'S CITADEL IL",
+  "151f": "NEW CATEGORY EXTENSION RUN",
+  "1520": "NŽ+",
+  "1521": "HUB 1 100%",
+  "1522": "HUB 2 100%",
+  "1523": "HUB 3 100%",
+  "1524": "ALL CUTSCENES",
+  "1600": "INPUT OPTIONS",
+  "1601": "SELECT CONTROLLER",
+  "1602": "ANALOG DEADZONE",
+  "1603": "IGNORE IF WINDOW UNFOCUSED",
+  "1604": "CONTROLLER LED FOR HP",
+  "1605": "CONTROLLER LED FOR ECO",
+  "1606": "TRACK CAMERA",
+  "1607": "HORIZONTAL SENSITIVITY",
+  "1608": "VERTICAL SENSITIVITY",
+  "1609": "ŽAIDĖJO JUDĖJIMAS",
+  "160a": "CONTROLLER BINDS",
+  "160b": "KEYBOARD BINDS",
+  "160c": "MOUSE BINDS",
+  "160d": "CONTROLLER OPTIONS",
+  "160e": "ENABLE KEYBOARD",
+  "160f": "ENABLE MOUSE",
+  "1610": "PELĖS PARINKTYS",
+  "1611": "REASSIGN BINDS",
+  "1612": "KONTROLERIS ~D",
+  "1613": "AUTO HIDE CURSOR",
+  "1614": "NENUSTATYTA",
+  "1615": "NEŽINOMAS",
+  "1616": "NO OTHER OPTIONS FOR ASPECT RATIO",
+  "1617": "CONTROLLER LED FOR HEAT"
+}

game/assets/jak1/text/game_custom_text_nl-NL.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER MODUS",
   "138": "GELIEVE GEEN RANDAPPARATUUR TE VERWIJDEREN OF AAN TE SLUITEN, UW SYSTEEM NIET UIT TE SCHAKELEN EN HET SPEL NIET AF TE SLUITEN",
   "161": "WANNEER DIT PICTOGRAM OP HET SCHERM GETOOND WORDT, GELIEVE GEEN RANDAPPARATUUR TE VERWIJDEREN OF AAN TE SLUITEN, UW SYSTEEM NIET UIT TE SCHAKELEN EN HET SPEL NIET AF TE SLUITEN",

game/assets/jak1/text/game_custom_text_no-NO.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER MODUS",
   "138": "VENNLIGST IKKE FJERN ELLER SETT INN NOE PERIFERI, SKRU AV SYSTEMET, ELLER SKRU AV SPILLET",
   "161": "I MENS DETTE IKONET ER PÅ SKJERMEN, IKKE FJERN ELLER SETT INN NOE PERIFERI, SKRU AV SYSTEMET, ELLER SKRU AV SPILLET",

game/assets/jak1/text/game_custom_text_pl-PL.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "TRYB SPEEDRUNNERA",
   "138": "PROSZĘ NIE ODŁĄCZAĆ ANI PODŁĄCZAĆ ŻADNYCH URZĄDZEŃ, WYŁĄCZAĆ SYSTEMU ORAZ NIE WYŁĄCZAĆ GRY",
   "161": "KIEDY TA IKONA JEST NA EKRANIE, PROSZĘ NIE ODŁĄCZAĆ ANI PODŁĄCZAĆ ŻADNYCH URZĄDZEŃ, WYŁĄCZAĆ SYSTEMU ORAZ NIE WYŁĄCZAĆ GRY",

game/assets/jak1/text/game_custom_text_pt-BR.json

@@ -91,7 +91,8 @@
   "1118": "NEDERLANDS",
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
-  "111b": "POLONÊS",
+  "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "MODO SPEEDRUN",
   "138": "POR FAVOR NÃO REMOVA OU INSIRA NENHUM PERIFÉRICO, DESLIGUE O SEU SISTEMA OU REMOVA O JOGO",
   "161": "ENQUANTO ESTE ÍCONE ESTIVER NA TELA, POR FAVOR NÃO REMOVA OU INSIRA NENHUM PERIFÉRICO, DESLIGUE O SEU SISTEMA OU REMOVA O JOGO",
@@ -177,23 +178,23 @@
   "1505": "REINICIE O SPEEDRUN",
   "1506": "NOVA SPEEDRUN COMPLETA",
   "150e": "NOVA SPEEDRUN NÍVEL",
-  "150f": "GEYSER ROCK IL",
-  "1510": "SANDOVER VILLAGE IL",
-  "1511": "SENTINEL BEACH IL",
-  "1512": "FORBIDDEN JUNGLE IL",
-  "1513": "MISTY ISLAND IL",
-  "1514": "FIRE CANYON IL",
-  "1515": "ROCK VILLAGE IL",
-  "1516": "LOST PRECURSOR CITY IL",
-  "1517": "BOGGY SWAMP IL",
-  "1518": "PRECURSOR BASIN IL",
-  "1519": "MOUNTAIN PASS IL",
-  "151a": "VOLCANIC CRATER IL",
-  "151b": "SNOWY MOUNTAIN IL",
-  "151c": "SPIDER CAVE IL",
-  "151d": "LAVA TUBE IL",
-  "151e": "GOL AND MAIA'S CITADEL IL",
-  "151f": "NEW CATEGORY EXTENSION RUN",
+  "150f": "ROCHA DO GÊISER IL",
+  "1510": "VILA SANDOVER NI",
+  "1511": "PRAIA DA SENTINELA NI",
+  "1512": "SELVA PROIBIDA NI",
+  "1513": "ILHA NEBULOSA NI",
+  "1514": "DESFILADEIRO DO FOGO NI",
+  "1515": "VILA ROCHOSA NI",
+  "1516": "CIDADE PERDIDA DOS PRECURSORES NI",
+  "1517": "PÂNTANO PANTANOSO NI",
+  "1518": "BACIA DOS PRECURSORES NI",
+  "1519": "PASSAGEM DA MONTANHA NI",
+  "151a": "CRATERA VULCÂNICA NI",
+  "151b": "MONTANHA NEVADA NI",
+  "151c": "CAVERNA DAS ARANHAS NI",
+  "151d": "TUBO DE LAVA NI",
+  "151e": "CIDADELA DE GOL E MAIA NI",
+  "151f": "NOVA RUN DE CATEGORIA ESTENDIDA",
   "1520": "NOVO JOGO+",
   "1521": "CAPÍTULO 1 100%",
   "1522": "CAPÍTULO 2 100%",
@@ -209,14 +210,14 @@
   "1607": "SENSIBILIDADE HORIZONTAL",
   "1608": "SENSIBILIDADE VERTICAL",
   "1609": "MOVIMENTO DO JOGADOR",
-  "160a": "CONTROLLER BINDS",
-  "160b": "KEYBOARD BINDS",
-  "160c": "MOUSE BINDS",
+  "160a": "MAPEAMENTO DO CONTROLE",
+  "160b": "MAPEAMENTO DO TECLADO",
+  "160c": "MAPEAMENTO DO MOUSE",
   "160d": "OPÇÕES DE CONTROLE",
   "160e": "HABILITAR TECLADO",
   "160f": "HABILITAR MOUSE",
   "1610": "OPÇÕES DE MOUSE",
-  "1611": "REASSIGN BINDS",
+  "1611": "REATRIBUIR MAPEAMENTO",
   "1612": "CONTROLE ~D",
   "1613": "AUTO OCULTAR CURSOR",
   "1614": "NÃO ATRIBUÍDO",

game/assets/jak1/text/game_custom_text_pt-PT.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "MODO DE SPEEDRUN",
   "138": "POR FAVOR NÃO REMOVA OU INSERIRA QUALQUER PERIFÉRICO, DESLIGAR O SEU SISTEMA OU FECHAR O JOGO",
   "161": "ENQUANTO ESTE ÍCONE ESTIVER NO ECRÃ, NÃO REMOVA OU INSERA QUALQUER PERIFÉRICO, DESLIGAR O SEU SISTEMA OU FECHAR O JOGO",

game/assets/jak1/text/game_custom_text_sv-SE.json

@@ -92,6 +92,7 @@
   "1119": "CATALÀ",
   "111a": "ÍSLANDSKA",
   "111b": "POLSKI",
+  "111c": "LIETUVIŲ KALBA",
   "1500": "SPEEDRUNNER-LÄGE",
   "138": "TA INTE BORT ELLER LÄGG TILL NÅGRA TILLBEHÖR, STÄNG AV DIN KONSOL ELLER AVSLUTA SPELET",
   "161": "TA INTE BORT ELLER LÄGG TILL NÅGRA TILLBEHÖR, STÄNG AV DIN KONSOL ELLER AVSLUTA SPELET MEDAN DEN HÄR IKONEN ÄR SYNLIG",

game/assets/jak2/subtitle/subtitle_lines_de-DE.json

@@ -1,5 +1,40 @@
 {
   "cutscenes": {},
   "other": {},
-  "speakers": {}
+  "speakers": {
+    "agent": "Agent",
+    "ashelin": "Ashelin",
+    "baron": "Baron Praxis",
+    "brutter": "Brutter",
+    "citizen-female": "Citizen",
+    "citizen-male": "Citizen",
+    "computer": "Computer",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
+    "errol": "Erol",
+    "grim": "Grim",
+    "guard": "Krimzon Guard",
+    "guard-a": "Guard A",
+    "guard-b": "Guard B",
+    "jak": "Jak",
+    "jinx": "Jinx",
+    "keira": "Keira",
+    "keira-before-class-3": "Mechanic",
+    "kid": "Kid",
+    "kor": "Kor",
+    "krew": "Krew",
+    "metalkor": "Metal Kor",
+    "mog": "Mog",
+    "onin": "Onin",
+    "oracle": "Oracle",
+    "pecker": "Pecker",
+    "precursor": "Precursor",
+    "samos": "Samos",
+    "sig": "Sig",
+    "tess": "Tess",
+    "torn": "Torn",
+    "vin": "Vin",
+    "youngsamos": "Young Samos",
+    "youngsamos-before-rescue": "Samos"
+  }
 }

game/assets/jak2/subtitle/subtitle_lines_en-GB.json

@@ -1,5 +1,40 @@
 {
   "cutscenes": {},
   "other": {},
-  "speakers": {}
+  "speakers": {
+    "agent": "Agent",
+    "ashelin": "Ashelin",
+    "baron": "Baron Praxis",
+    "brutter": "Brutter",
+    "citizen-female": "Citizen",
+    "citizen-male": "Citizen",
+    "computer": "Computer",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
+    "errol": "Erol",
+    "grim": "Grim",
+    "guard": "Krimzon Guard",
+    "guard-a": "Guard A",
+    "guard-b": "Guard B",
+    "jak": "Jak",
+    "jinx": "Jinx",
+    "keira": "Keira",
+    "keira-before-class-3": "Mechanic",
+    "kid": "Kid",
+    "kor": "Kor",
+    "krew": "Krew",
+    "metalkor": "Metal Kor",
+    "mog": "Mog",
+    "onin": "Onin",
+    "oracle": "Oracle",
+    "pecker": "Pecker",
+    "precursor": "Precursor",
+    "samos": "Samos",
+    "sig": "Sig",
+    "tess": "Tess",
+    "torn": "Torn",
+    "vin": "Vin",
+    "youngsamos": "Young Samos",
+    "youngsamos-before-rescue": "Samos"
+  }
 }

game/assets/jak2/subtitle/subtitle_lines_es-ES.json

@@ -1,5 +1,40 @@
 {
   "cutscenes": {},
   "other": {},
-  "speakers": {}
+  "speakers": {
+    "agent": "Agent",
+    "ashelin": "Ashelin",
+    "baron": "Baron Praxis",
+    "brutter": "Brutter",
+    "citizen-female": "Citizen",
+    "citizen-male": "Citizen",
+    "computer": "Computer",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
+    "errol": "Erol",
+    "grim": "Grim",
+    "guard": "Krimzon Guard",
+    "guard-a": "Guard A",
+    "guard-b": "Guard B",
+    "jak": "Jak",
+    "jinx": "Jinx",
+    "keira": "Keira",
+    "keira-before-class-3": "Mechanic",
+    "kid": "Kid",
+    "kor": "Kor",
+    "krew": "Krew",
+    "metalkor": "Metal Kor",
+    "mog": "Mog",
+    "onin": "Onin",
+    "oracle": "Oracle",
+    "pecker": "Pecker",
+    "precursor": "Precursor",
+    "samos": "Samos",
+    "sig": "Sig",
+    "tess": "Tess",
+    "torn": "Torn",
+    "vin": "Vin",
+    "youngsamos": "Young Samos",
+    "youngsamos-before-rescue": "Samos"
+  }
 }

game/assets/jak2/subtitle/subtitle_lines_it-IT.json

@@ -1,5 +1,40 @@
 {
   "cutscenes": {},
   "other": {},
-  "speakers": {}
+  "speakers": {
+    "agent": "Agent",
+    "ashelin": "Ashelin",
+    "baron": "Baron Praxis",
+    "brutter": "Brutter",
+    "citizen-female": "Citizen",
+    "citizen-male": "Citizen",
+    "computer": "Computer",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
+    "errol": "Erol",
+    "grim": "Grim",
+    "guard": "Krimzon Guard",
+    "guard-a": "Guard A",
+    "guard-b": "Guard B",
+    "jak": "Jak",
+    "jinx": "Jinx",
+    "keira": "Keira",
+    "keira-before-class-3": "Mechanic",
+    "kid": "Kid",
+    "kor": "Kor",
+    "krew": "Krew",
+    "metalkor": "Metal Kor",
+    "mog": "Mog",
+    "onin": "Onin",
+    "oracle": "Oracle",
+    "pecker": "Pecker",
+    "precursor": "Precursor",
+    "samos": "Samos",
+    "sig": "Sig",
+    "tess": "Tess",
+    "torn": "Torn",
+    "vin": "Vin",
+    "youngsamos": "Young Samos",
+    "youngsamos-before-rescue": "Samos"
+  }
 }

game/assets/jak2/subtitle/subtitle_lines_ko-KR.json

@@ -1,5 +1,40 @@
 {
   "cutscenes": {},
   "other": {},
-  "speakers": {}
+  "speakers": {
+    "agent": "Agent",
+    "ashelin": "Ashelin",
+    "baron": "Baron Praxis",
+    "brutter": "Brutter",
+    "citizen-female": "Citizen",
+    "citizen-male": "Citizen",
+    "computer": "Computer",
+    "darkjak": "Dark Jak",
+    "daxter": "Daxter",
+    "errol": "Erol",
+    "grim": "Grim",
+    "guard": "Krimzon Guard",
+    "guard-a": "Guard A",
+    "guard-b": "Guard B",
+    "jak": "Jak",
+    "jinx": "Jinx",
+    "keira": "Keira",
+    "keira-before-class-3": "Mechanic",
+    "kid": "Kid",
+    "kor": "Kor",
+    "krew": "Krew",
+    "metalkor": "Metal Kor",
+    "mog": "Mog",
+    "onin": "Onin",
+    "oracle": "Oracle",
+    "pecker": "Pecker",
+    "precursor": "Precursor",
+    "samos": "Samos",
+    "sig": "Sig",
+    "tess": "Tess",
+    "torn": "Torn",
+    "vin": "Vin",
+    "youngsamos": "Young Samos",
+    "youngsamos-before-rescue": "Samos"
+  }
 }

game/assets/jak2/text/game_custom_text_ca-ES.json

@@ -139,6 +139,9 @@
   "129d": "Horizontal Sensitivity",
   "129e": "Vertical Sensitivity",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "Controller Binds",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_da-DK.json

@@ -139,6 +139,9 @@
   "129d": "Vandret Følsomhed",
   "129e": "Lodret Følsomhed",
   "129f": "Spillerbevægelse",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Gem Automatisk Mus",
   "1301": "Omvælg Bindinger",
   "1302": "Controller Bindinger",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_de-DE.json

@@ -1,46 +1,46 @@
 {
-  "1a3": "Bitte Schalte Nicht Das System Oder Das Spiel Aus Und Entferne/Verbinde Kein Zubehör",
-  "1b5": "Während Dieses Symbol Angezeigt Wird, Bitte Schalte Nicht Das System Oder Das Spiel Aus Und Entferne/Verbinde Kein Zubehör",
-  "1100": "Not in a mission",
+  "1a3": "Bitte entferne oder verbinde kein Zubehör und schalte nicht das System oder Spiel aus",
+  "1b5": "Während dieses Symbol angezeigt wird, entferne oder verbinde kein Zubehör und schalte nicht das System oder das Spiel aus",
+  "1100": "Nicht in einer Mission",
   "1101": "Playing a bonus mission",
   "1102": "Scatter Gun Training Course",
   "1103": "Blaster Training Course",
   "1104": "Vulcan Fury Training Course",
   "1105": "Peace Maker Training Course",
-  "1106": "Onin Game",
+  "1106": "Onins Spiel",
   "1107": "Metal Head Mash",
   "1200": "Anzeigemodus",
   "1201": "Fenster",
   "1202": "Vollbild",
   "1203": "Randlos",
-  "1204": "Automatic",
-  "1205": "Custom",
+  "1204": "Automatisch",
+  "1205": "Benutzerdefiniert",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
-  "1208": "Choose width and height ratio",
+  "1208": "Seitenverhältnis wählen",
   "1209": "Press <PAD_X> to confirm and exit.",
   "120a": "Press <PAD_CIRCLE> to confirm and exit.",
-  "120b": "Ratio must not be lower than 4x3!",
+  "120b": "Verhältnis darf nicht kleiner als 4:3 sein!",
   "120c": "Musik-Player",
   "120d": "V-Sync",
   "120e": "Textsprache",
   "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "1210": "Breite",
+  "1211": "Höhe",
   "1212": "??????????",
-  "1213": "Now playing...",
-  "1214": "No Track",
+  "1213": "Jetzt spielt...",
+  "1214": "Kein Titel",
   "1215": "Standard",
   "1216": "Morph Gun",
   "1217": "JET-Board",
   "1218": "Titan Suit",
-  "1219": "Dark Jak",
-  "121a": "Vehicle",
-  "121b": "Danger",
-  "121c": "None",
-  "121d": "Low",
-  "121e": "Medium",
-  "121f": "High",
+  "1219": "Dunkler Jak",
+  "121a": "Fahrzeug",
+  "121b": "Gefahr",
+  "121c": "Keine",
+  "121d": "Niedrig",
+  "121e": "Mittel",
+  "121f": "Hoch",
   "1220": "Haven Exploration",
   "1221": "Guard Pursuit",
   "1222": "Ram Head Battle (Alt)",
@@ -65,63 +65,63 @@
   "1235": "Weapons Factory",
   "1236": "Arena Race",
   "1237": "Dead Town",
-  "1238": "Window Size",
-  "1239": "Select Window Size",
+  "1238": "Fenstergröße",
+  "1239": "Wähle Fenstergröße",
   "123a": "Auflösung",
-  "123b": "Select Game Resolution",
+  "123b": "Wähle Spielauflösung",
   "123c": "Detaillierungsgrad (Hintergrund)",
   "123d": "Detaillierungsgrad (Vordergrund)",
   "123f": "Sprecher In Untertiteln Anzeigen",
   "1240": "Niemals",
   "1241": "Offscreen",
   "1242": "Immer",
-  "1243": "Game Territory",
-  "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
+  "1243": "Spielregion",
+  "1244": "Amerika (SCEA)",
+  "1245": "Europa (SCEE)",
   "1246": "Japan (SCEI)",
   "1247": "Korea (SCEK)",
   "1248": "MSAA",
   "1249": "~DX",
-  "124a": "Controller LED Options",
+  "124a": "Controller-LED Optionen",
   "124b": "Show Player State",
-  "124c": "Show Amount of Health",
+  "124c": "Gesundheitsmenge anzeigen",
   "124d": "Auto-Speichern Ausschalten",
   "124e": "Auto-Speichern Aus",
   "124f": "Willst Du Wirklich Auto-Speichern Ausschalten?",
   "1250": "Turbo JET-Board in Haven City",
-  "1251": "Enemy Health Bars",
-  "1252": "Vehicle Health Bars",
-  "1253": "Vehicle Invulnerability",
+  "1251": "Gegner-Gesundheitsbalken",
+  "1252": "Fahrzeug-Gesundheitsbalken",
+  "1253": "Fahrzeug Unverwundbarkeit",
   "1254": "Statistics Page",
-  "1255": "Automatically Grab Collectables",
-  "1256": "Music Player",
+  "1255": "Collectibles automatisch aufheben",
+  "1256": "Musik-Player",
   "1257": "No Textures Mode",
-  "1258": "Fast Movies",
-  "1259": "Slow Movies",
-  "125a": "Fast Gameplay",
-  "125b": "Slow Gameplay",
+  "1258": "Schnelle Filme",
+  "1259": "Langsame Filme",
+  "125a": "Schnelles Gameplay",
+  "125b": "Langsames Gameplay",
   "125c": "Instant Travel in Haven City",
   "125d": "Precursor Orb Tracker",
   "125e": "Tag-Nacht-Zyklus In Echtzeit",
   "125f": "Pacified Haven City",
   "1260": "JET-Board Trick Display",
-  "1261": "Bad Weather",
-  "1262": "Nice Weather",
+  "1261": "Schlechtes Wetter",
+  "1262": "Schönes Wetter",
   "1280": "Kameraoptionen",
-  "1281": "Left/Right (1st Person)",
-  "1282": "Up/Down (1st Person)",
-  "1283": "Left/Right (3rd Person)",
-  "1284": "Up/Down (3rd Person)",
-  "1285": "Reset to Default",
+  "1281": "Links/Rechts (1. Person)",
+  "1282": "Hoch/Runter (1. Person)",
+  "1283": "Links/Rechts (3. Person)",
+  "1284": "Hoch/Runter (3. Person)",
+  "1285": "Auf Werkseinstellungen zurücksetzen",
   "1286": "Normal",
   "1287": "Invertiert",
-  "1288": "Particle Culling",
+  "1288": "Partikel-Culling",
   "1289": "Discord-Integration",
-  "128a": "Default",
-  "128b": "Low",
-  "128c": "High",
-  "128d": "Credits",
-  "128e": "Frame Rate",
+  "128a": "Standard",
+  "128b": "Niedrig",
+  "128c": "Hoch",
+  "128d": "Mitwirkende",
+  "128e": "Bildrate",
   "128f": "Sonstiges",
   "1290": "Speedrunner-Modus",
   "1291": "Eingabeoptionen",
@@ -139,18 +139,21 @@
   "129d": "Horizontale Sensitivität",
   "129e": "Vertikale Sensitivität",
   "129f": "Spieler Bewegung",
+  "12a0": "Objekt-Schatten",
+  "12a1": "Normal",
+  "12a2": "Erweitert",
   "1300": "Cursor Verstecken",
   "1301": "Tastenbelegung Ändern",
   "1302": "Controller Belegung",
   "1303": "Tastenbelegung",
   "1304": "Maus Belegung",
-  "1305": "No Options",
-  "1306": "Waiting",
+  "1305": "Keine Optionen",
+  "1306": "Wartet",
   "1307": "Unbelegt",
   "1308": "Unbekannt",
-  "1309": "High-Resolution Sky",
+  "1309": "Hochauflösender Himmel",
   "130a": "Fast Airlocks and Doors",
-  "130b": "Fast Elevators",
+  "130b": "Schnelle Aufzüge",
   "130c": "Speedrun",
   "130d": "Any%",
   "130e": "Any% - Hoverless",
@@ -158,7 +161,33 @@
   "1310": "100%",
   "1311": "Any% - All Orbs",
   "1312": "Any% - Hero Mode",
-  "1313": "Local Time",
-  "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1313": "Lokalzeit",
+  "1314": "Warnung!",
+  "1315": "Diese Einstellung ist hoch-experimentell. Bei anderen Werten als 60 Bilder pro Sekunde können visuelle und spielerische Fehler auftreten.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Springen",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2-Optionen",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD-Distanz",
+  "1338": "Aus",
+  "1339": "Anzeige"
 }

game/assets/jak2/text/game_custom_text_en-GB.json

@@ -139,6 +139,9 @@
   "129d": "Horizontal Sensitivity",
   "129e": "Vertical Sensitivity",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "Controller Binds",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_en-US.json

@@ -81,7 +81,7 @@
   "1246": "Japan (SCEI)",
   "1247": "Korea (SCEK)",
   "1248": "MSAA",
-  "1249": "~DX",
+  "1249": "~Dx",
   "124a": "Controller LED Options",
   "124b": "Show Player State",
   "124c": "Show Amount of Health",
@@ -139,6 +139,9 @@
   "129d": "Horizontal Sensitivity",
   "129e": "Vertical Sensitivity",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "Controller Binds",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_es-ES.json

@@ -116,12 +116,12 @@
   "1286": "Normal",
   "1287": "Invertida",
   "1288": "Culling de Partículas",
-  "1289": "Discord Rich-Presence",
+  "1289": "Presencia en Discord",
   "128a": "Por Defecto",
   "128b": "Bajo",
   "128c": "Alto",
   "128d": "Créditos",
-  "128e": "Frame Rate",
+  "128e": "Velocidad de Fotogramas",
   "128f": "Otros",
   "1290": "Modo de Speedrunner",
   "1291": "Ajustes de Entrada",
@@ -139,6 +139,9 @@
   "129d": "Sensibilidad Horizontal",
   "129e": "Sensibilidad Vertical",
   "129f": "Movimiento del Jugador",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Ocultar Cursor",
   "1301": "Reasignar Controles",
   "1302": "Asignaciones del Mando",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Tiempo Local",
   "1314": "¡Aviso!",
-  "1315": "Esta opción es muy experimental. Si no juegas a 60 frames por segundo, pueden surgir problemas gráficos y de jugabilidad."
+  "1315": "Esta opción es muy experimental. Si no juegas a 60 frames por segundo, pueden surgir problemas gráficos y de jugabilidad.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Jak Oscuro",
+  "1330": "Bomba Oscura",
+  "1331": "Explosión Oscura",
+  "1332": "Gigante Oscuro",
+  "1333": "Opciones de PS2",
+  "1334": "Culling de Actores",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Desactivado",
+  "1339": "Pantalla"
 }

game/assets/jak2/text/game_custom_text_fi-FI.json

@@ -1,46 +1,46 @@
 {
   "1a3": "Älä Lisää Tai Poista Mitään Oheislaitteita, Sammuta Laitettasi Tai Sammuta Peliä",
   "1b5": "Kun Tämä Kuvake On Ruudulla, Älä Lisää Tai Poista Mitään Oheislaitteita, Sammuta Laitettasi Tai Sammuta Peliä",
-  "1100": "Not in a mission",
-  "1101": "Playing a bonus mission",
+  "1100": "Ei tehtävässä",
+  "1101": "Pelataan bonustehtävää",
   "1102": "Scatter Gun Training Course",
   "1103": "Blaster Training Course",
   "1104": "Vulcan Fury Training Course",
   "1105": "Peace Maker Training Course",
-  "1106": "Onin Game",
+  "1106": "Onin-Peli",
   "1107": "Metal Head Mash",
   "1200": "Näytöntila",
   "1201": "Ikkunoitu",
   "1202": "Kokoruutu",
   "1203": "Reunaton",
-  "1204": "Automatic",
-  "1205": "Custom",
+  "1204": "Automaattinen",
+  "1205": "Mukautettu",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
-  "1208": "Choose width and height ratio",
-  "1209": "Press <PAD_X> to confirm and exit.",
-  "120a": "Press <PAD_CIRCLE> to confirm and exit.",
-  "120b": "Ratio must not be lower than 4x3!",
+  "1208": "Valitse leveys- ja korkeussuhde",
+  "1209": "Paina <PAD_X> vahvistaaksesi ja poistuaksesi.",
+  "120a": "Paina <PAD_CIRCLE> vahvistaaksesi ja poistuaksesi.",
+  "120b": "Kuvasuhde ei saa olla pienempi kuin 4x3!",
   "120c": "Musiikkisoitin",
   "120d": "Pystytahdistus",
   "120e": "Tekstin Kieli",
-  "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "120f": "OpenGOAL Salaisuudet",
+  "1210": "Leveys",
+  "1211": "Korkeus",
   "1212": "??????????",
-  "1213": "Now playing...",
-  "1214": "No Track",
+  "1213": "Nyt soi...",
+  "1214": "Ei Kappaletta",
   "1215": "Oletus",
   "1216": "Morph Gun",
-  "1217": "JET-Board",
-  "1218": "Titan Suit",
+  "1217": "JET-Lauta",
+  "1218": "Titaaniasu",
   "1219": "Dark Jak",
-  "121a": "Vehicle",
-  "121b": "Danger",
-  "121c": "None",
-  "121d": "Low",
-  "121e": "Medium",
-  "121f": "High",
+  "121a": "Ajoneuvo",
+  "121b": "Vaara",
+  "121c": "Ei mikään",
+  "121d": "Alhainen",
+  "121e": "Keskitaso",
+  "121f": "Korkea",
   "1220": "Haven Exploration",
   "1221": "Guard Pursuit",
   "1222": "Ram Head Battle (Alt)",
@@ -65,92 +65,95 @@
   "1235": "Weapons Factory",
   "1236": "Arena Race",
   "1237": "Dead Town",
-  "1238": "Window Size",
-  "1239": "Select Window Size",
+  "1238": "Ikkunan Koko",
+  "1239": "Valitse Ikkunan Koko",
   "123a": "Resoluutio",
-  "123b": "Select Game Resolution",
+  "123b": "Valitse Pelin Resoluutio",
   "123c": "Maaston Yksityiskohtaisuus",
   "123d": "Objektien Yksityiskohtaisuus",
   "123f": "Näytä Puhuja Tekstityksissä",
   "1240": "Ei Koskaan",
   "1241": "Ruudun Ulkopuolella",
   "1242": "Aina",
-  "1243": "Game Territory",
-  "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
-  "1246": "Japan (SCEI)",
+  "1243": "Pelin Julkaisualue",
+  "1244": "Amerikka (SCEA)",
+  "1245": "Eurooppa (SCEE)",
+  "1246": "Japani (SCEI)",
   "1247": "Korea (SCEK)",
   "1248": "MSAA",
   "1249": "~DX",
-  "124a": "Controller LED Options",
-  "124b": "Show Player State",
-  "124c": "Show Amount of Health",
+  "124a": "Ohjaimen LED-Asetukset",
+  "124b": "Näytä Pelaajan Tila",
+  "124c": "Näytä Terveyden Määrä",
   "124d": "Poista Automaattitallennus Käytöstä",
   "124e": "Automaattitallennus Ei Käytössä",
   "124f": "Haluatko Varmasti Poistaa Automaattitallennuksen Käytöstä?",
-  "1250": "Turbo JET-Board in Haven City",
-  "1251": "Enemy Health Bars",
-  "1252": "Vehicle Health Bars",
-  "1253": "Vehicle Invulnerability",
-  "1254": "Statistics Page",
-  "1255": "Automatically Grab Collectables",
-  "1256": "Music Player",
-  "1257": "No Textures Mode",
-  "1258": "Fast Movies",
-  "1259": "Slow Movies",
-  "125a": "Fast Gameplay",
-  "125b": "Slow Gameplay",
-  "125c": "Instant Travel in Haven City",
-  "125d": "Precursor Orb Tracker",
+  "1250": "Turbo JET-Lauta Haven Cityssä",
+  "1251": "Vihollisten Terveyspalkit",
+  "1252": "Ajoneuvojen Terveyspalkit",
+  "1253": "Ajoneuvon Haavoittumattomuus",
+  "1254": "Tilastot",
+  "1255": "Kerää Kerättävät Automaattisesti",
+  "1256": "Musiikkisoitin",
+  "1257": "Ei Tekstuureja -tila",
+  "1258": "Nopeat Välianimaatiot",
+  "1259": "Hitaat Välianimaatiot",
+  "125a": "Nopea Pelattavuus",
+  "125b": "Hidas Pelattavuus",
+  "125c": "Pikamatkustus Haven Cityssä",
+  "125d": "Edeltäjähelmien Seuranta",
   "125e": "Todellinen Vuorokauden Aika",
-  "125f": "Pacified Haven City",
-  "1260": "JET-Board Trick Display",
-  "1261": "Bad Weather",
-  "1262": "Nice Weather",
+  "125f": "Tyyni Haven City",
+  "1260": "Näytä JET-Laudan Temput",
+  "1261": "Huono Sää",
+  "1262": "Hyvä Sää",
   "1280": "Kameran Asetukset",
-  "1281": "Left/Right (1st Person)",
-  "1282": "Up/Down (1st Person)",
-  "1283": "Left/Right (3rd Person)",
-  "1284": "Up/Down (3rd Person)",
-  "1285": "Reset to Default",
+  "1281": "Vasen/Oikea (Ensimmäinen Persoona)",
+  "1282": "Ylös/Alas (Ensimmäinen Persoona)",
+  "1283": "Vasen/Oikea (Kolmas Persoona)",
+  "1284": "Ylös/Alas (Kolmas Persoona)",
+  "1285": "Palauta Oletukset",
   "1286": "Normaali",
   "1287": "Käänteinen",
-  "1288": "Particle Culling",
+  "1288": "Partikkeleiden Vähennys",
   "1289": "Discordin Tila-Integraatio",
-  "128a": "Default",
-  "128b": "Low",
-  "128c": "High",
-  "128d": "Credits",
-  "128e": "Frame Rate",
+  "128a": "Oletus",
+  "128b": "Alhainen",
+  "128c": "Korkea",
+  "128d": "Lopputekstit",
+  "128e": "Kuvataajuus",
   "128f": "Sekalaiset",
-  "1290": "Speedrun-Tila",
+  "1290": "Speedrun -Tila",
   "1291": "Ohjaussyötteen Asetukset",
   "1292": "Palauta Oletukset",
-  "1293": "Ohjainasetukset",
+  "1293": "Ohjaimen Asetukset",
   "1294": "Valitse Ohjain",
   "1295": "Analogisauvan Herkkyys",
-  "1296": "Älä Huomioi, Jos Ikkuna Ei Aktiivinen",
-  "1297": "Ohjaimen Led Terveydelle",
-  "1298": "Use LED for Other States",
+  "1296": "Älä Huomioi, Jos Ikkuna Ei Ole Aktiivinen",
+  "1297": "Ohjaimen LED Terveydelle",
+  "1298": "Käytä LED:iä Muissa Tiloissa",
   "1299": "Salli Näppäimistö",
   "129a": "Salli Hiiri",
   "129b": "Hiiren Asetukset",
   "129c": "Kameran Ohjaus Hiirellä",
   "129d": "Vaakasuuntainen Herkkyys",
   "129e": "Pystysuuntainen Herkkyys",
-  "129f": "Pelaajan Liike Hiirellä",
+  "129f": "Pelaajan Ohjaus Hiirellä",
+  "12a0": "Objektien Varjot",
+  "12a1": "Normaali",
+  "12a2": "Laajennettu",
   "1300": "Piilota Osoitin Automaattisesti",
   "1301": "Muuta Kytkentöjä",
   "1302": "Peliohjaimen Kytkennät",
   "1303": "Näppäimistön Kytkennät",
   "1304": "Hiiren Kytkennät",
-  "1305": "No Options",
-  "1306": "Waiting",
+  "1305": "Ei Asetuksia",
+  "1306": "Odotetaan",
   "1307": "Määrittämätön",
   "1308": "Tuntematon",
-  "1309": "High-Resolution Sky",
-  "130a": "Fast Airlocks and Doors",
-  "130b": "Fast Elevators",
+  "1309": "Korkeampi Taivaan Resoluutio",
+  "130a": "Nopeat Ilmalukot ja Ovet",
+  "130b": "Nopeat Hissit",
   "130c": "Speedrun",
   "130d": "Any%",
   "130e": "Any% - Hoverless",
@@ -158,7 +161,33 @@
   "1310": "100%",
   "1311": "Any% - All Orbs",
   "1312": "Any% - Hero Mode",
-  "1313": "Local Time",
-  "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1313": "Paikallinen Aika",
+  "1314": "Varoitus!",
+  "1315": "Tämä asetus on erittäin kokeellinen. Kun peliä ei pelata 60 Hz:n kuvataajuudella, visuaalisia sekä pelattavuuden ongelmia voi ilmaantua sen seurauksena.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Voltti",
+  "1324": "Rail Grind",
+  "1325": "Kaidehyppy",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Hyppy",
+  "132d": "Kyykkyhyppy",
+  "132e": "Pikahyppy",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Asetukset",
+  "1334": "Objektien Vähennys",
+  "1335": "Pakota Ympäristökartoitus",
+  "1336": "Nopeampi Valikko",
+  "1337": "PS2:n Yksityskohtien Etäisyys",
+  "1338": "Off",
+  "1339": "Näyttö"
 }

game/assets/jak2/text/game_custom_text_fr-FR.json

@@ -139,6 +139,9 @@
   "129d": "Sensibilité horizontale",
   "129e": "Sensibilité verticale",
   "129f": "Déplacements du personnage",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Masquer automatiquement le curseur",
   "1301": "Configuration des touches",
   "1302": "Affectation des boutons de la manette",
@@ -160,5 +163,31 @@
   "1312": "Any% - Mode héros",
   "1313": "Heure locale",
   "1314": "Attention !",
-  "1315": "Ce paramètre est expérimental. Si le jeu n'est pas joué à 60 images par seconde, des problèmes visuels et de gameplay peuvent survenir."
+  "1315": "Ce paramètre est expérimental. Si le jeu n'est pas joué à 60 images par seconde, des problèmes visuels et de gameplay peuvent survenir.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_hu-HU.json

@@ -1,46 +1,46 @@
 {
   "1a3": "Ne Helyezz Be Vagy Távolíts El Semmilyen Perifériát, Ne Állítsd Le A Rendszert, És Ne Zárd Be A Játékot",
   "1b5": "Amég Ez Az Ikon A Képen Van, Ne Helyezz Be Vagy Távolíts El Semmilyen Perifériát, Ne Állítsd Le A Rendszert, És Ne Zárd Be A Játékot",
-  "1100": "Not in a mission",
-  "1101": "Playing a bonus mission",
-  "1102": "Scatter Gun Training Course",
-  "1103": "Blaster Training Course",
-  "1104": "Vulcan Fury Training Course",
-  "1105": "Peace Maker Training Course",
-  "1106": "Onin Game",
+  "1100": "Nincs küldetésben",
+  "1101": "Bónusz küldetést játszik",
+  "1102": "Scatter Gun Gyakorlópálya",
+  "1103": "Blaster Gyakorlópálya",
+  "1104": "Vulcan Fury Gyakorlópálya",
+  "1105": "Peace Maker Gyakorlópálya",
+  "1106": "Onin Játék",
   "1107": "Metal Head Mash",
   "1200": "Kijelzőmód",
   "1201": "Ablakos",
   "1202": "Teljes Képernyős",
   "1203": "Keret Nélküli",
-  "1204": "Automatic",
-  "1205": "Custom",
+  "1204": "Automatikus",
+  "1205": "Egyéni",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
-  "1208": "Choose width and height ratio",
-  "1209": "Press <PAD_X> to confirm and exit.",
-  "120a": "Press <PAD_CIRCLE> to confirm and exit.",
-  "120b": "Ratio must not be lower than 4x3!",
+  "1208": "Válassz szélesség és magasság-arányt",
+  "1209": "Nyomj <PAD_X>-et a megerősítéshez és kilépéshez.",
+  "120a": "Nyomj <PAD_CIRCLE>-t a megerősítéshez és kilépéshez.",
+  "120b": "A képarány nem lehet kisebb 4x3-nál!",
   "120c": "Zenelejátszó",
   "120d": "V-Sync",
   "120e": "Szövegnyelv",
-  "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "120f": "OpenGOAL Titkok",
+  "1210": "Szélesség",
+  "1211": "Magasság",
   "1212": "??????????",
-  "1213": "Now playing...",
-  "1214": "No Track",
+  "1213": "Jelenleg szól...",
+  "1214": "Nincs Zeneszám",
   "1215": "Alapértelmezett",
   "1216": "Morph Gun",
   "1217": "JET-Board",
-  "1218": "Titan Suit",
-  "1219": "Dark Jak",
-  "121a": "Vehicle",
-  "121b": "Danger",
-  "121c": "None",
-  "121d": "Low",
-  "121e": "Medium",
-  "121f": "High",
+  "1218": "Titan Ruha",
+  "1219": "Sötét Jak",
+  "121a": "Jármű",
+  "121b": "Veszély",
+  "121c": "Egyik sem",
+  "121d": "Alacsony",
+  "121e": "Közepes",
+  "121f": "Magas",
   "1220": "Haven Exploration",
   "1221": "Guard Pursuit",
   "1222": "Ram Head Battle (Alt)",
@@ -65,92 +65,95 @@
   "1235": "Weapons Factory",
   "1236": "Arena Race",
   "1237": "Dead Town",
-  "1238": "Window Size",
-  "1239": "Select Window Size",
+  "1238": "Ablak méret",
+  "1239": "Válassz ablakméretet",
   "123a": "Játék Felbontása",
-  "123b": "Select Game Resolution",
+  "123b": "Válassz felbontást",
   "123c": "Részletezettségi Szint (Háttér)",
   "123d": "Részletezettségi Szint (Előtér)",
   "123f": "Beszélő Nevének Mutatása",
   "1240": "Soha",
   "1241": "Ha Nem Látszik",
   "1242": "Mindig",
-  "1243": "Game Territory",
-  "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
-  "1246": "Japan (SCEI)",
+  "1243": "Játékterület",
+  "1244": "Amerika (SCEA)",
+  "1245": "Európa (SCEE)",
+  "1246": "Japán (SCEI)",
   "1247": "Korea (SCEK)",
   "1248": "MSAA",
   "1249": "~DX",
-  "124a": "Controller LED Options",
-  "124b": "Show Player State",
-  "124c": "Show Amount of Health",
+  "124a": "Játékvezérlő LED Beállítások",
+  "124b": "Játékosállapot Megjelenítése",
+  "124c": "Életerő Megjelenítése",
   "124d": "Automatikus Mentés Kikapcsolása",
   "124e": "Automatikus Mentés Kikapcsolva",
   "124f": "Biztosan Ki Akarod Kapcsolni Az Automatikus Mentést?",
-  "1250": "Turbo JET-Board in Haven City",
-  "1251": "Enemy Health Bars",
-  "1252": "Vehicle Health Bars",
-  "1253": "Vehicle Invulnerability",
-  "1254": "Statistics Page",
-  "1255": "Automatically Grab Collectables",
-  "1256": "Music Player",
-  "1257": "No Textures Mode",
-  "1258": "Fast Movies",
-  "1259": "Slow Movies",
-  "125a": "Fast Gameplay",
-  "125b": "Slow Gameplay",
-  "125c": "Instant Travel in Haven City",
+  "1250": "Turbo JET-Board Haven City-ben",
+  "1251": "Ellenség Életerő",
+  "1252": "Jármű Életerő",
+  "1253": "Jármű Sebezhetetlenség",
+  "1254": "Statisztikai Oldal",
+  "1255": "Gyűjthető Tárgyak Automatikus Felszedése",
+  "1256": "Zenelejátszó",
+  "1257": "Textúramentes Mód",
+  "1258": "Gyors Filmek",
+  "1259": "Lassú Filmek",
+  "125a": "Gyors Játékmenet",
+  "125b": "Lassú Játékmenet",
+  "125c": "Azonnali utazás Haven Cityben",
   "125d": "Precursor Orb Tracker",
   "125e": "Valós Napszak",
   "125f": "Pacified Haven City",
   "1260": "JET-Board Trick Display",
-  "1261": "Bad Weather",
-  "1262": "Nice Weather",
+  "1261": "Rossz Időjárás",
+  "1262": "Jó Időjárás",
   "1280": "Kamera Opciók",
-  "1281": "Left/Right (1st Person)",
-  "1282": "Up/Down (1st Person)",
-  "1283": "Left/Right (3rd Person)",
-  "1284": "Up/Down (3rd Person)",
-  "1285": "Reset to Default",
+  "1281": "Bal/Jobb (belsőnézet)",
+  "1282": "Fel/Le (belsőnézet)",
+  "1283": "Bal/Jobb (külsőnézet)",
+  "1284": "Fel/Le (külsőnézet)",
+  "1285": "Visszaállítás alaphelyzetbe",
   "1286": "Normál",
   "1287": "Fordított",
   "1288": "Particle Culling",
   "1289": "Discord Rich-Presence",
-  "128a": "Default",
-  "128b": "Low",
-  "128c": "High",
-  "128d": "Credits",
-  "128e": "Frame Rate",
+  "128a": "Alapértelmezett",
+  "128b": "Alacsony",
+  "128c": "Magas",
+  "128d": "Készítők",
+  "128e": "Képkockasebesség",
   "128f": "Egyéb",
   "1290": "Speedrunner-Mód",
-  "1291": "Input Options",
+  "1291": "Beviteli beállítások",
   "1292": "Alapértelmezések Visszaállítása",
-  "1293": "Controller Options",
-  "1294": "Select Controller",
-  "1295": "Analog Deadzone",
+  "1293": "Játékvezérlő Beállítások",
+  "1294": "Játékvezérlő Kiválasztása",
+  "1295": "Analóg holttér",
   "1296": "Ignore If Window Unfocused",
   "1297": "Led Reflect Hp",
-  "1298": "Use LED for Other States",
-  "1299": "Enable Keyboard",
-  "129a": "Enable Mouse",
-  "129b": "Mouse Options",
-  "129c": "Track Camera",
-  "129d": "Horizontal Sensitivity",
-  "129e": "Vertical Sensitivity",
-  "129f": "Player Movement",
-  "1300": "Auto Hide Cursor",
-  "1301": "Reassign Binds",
-  "1302": "Controller Binds",
-  "1303": "Keyboard Binds",
-  "1304": "Mouse Binds",
-  "1305": "No Options",
-  "1306": "Waiting",
-  "1307": "Unset",
-  "1308": "Unknown",
-  "1309": "High-Resolution Sky",
-  "130a": "Fast Airlocks and Doors",
-  "130b": "Fast Elevators",
+  "1298": "LED Használata Más Állapotokhoz",
+  "1299": "Billentyűzet Engedélyezése",
+  "129a": "Egér Engedélyezése",
+  "129b": "Egér Beállítások",
+  "129c": "Hátsó Kamera",
+  "129d": "Vízszintes Érzékenység",
+  "129e": "Függőleges Érzékenység",
+  "129f": "Játékos mozgások",
+  "12a0": "Objektum Árnyékok",
+  "12a1": "Normál",
+  "12a2": "Kiterjesztett",
+  "1300": "Kurzor Automatikus Elrejtése",
+  "1301": "Gombkiosztások Újraosztása",
+  "1302": "Játékvezérlő Gombkiosztás",
+  "1303": "Billentyűzet Gombkiosztás",
+  "1304": "Egér Gombkiosztás",
+  "1305": "Nincsenek opciók",
+  "1306": "Várakozás",
+  "1307": "Nincs beállítva",
+  "1308": "Ismeretlen",
+  "1309": "Magas Felbontású Égbolt",
+  "130a": "Gyors Légzsilipek és Ajtók",
+  "130b": "Gyors Liftek",
   "130c": "Speedrun",
   "130d": "Any%",
   "130e": "Any% - Hoverless",
@@ -158,7 +161,33 @@
   "1310": "100%",
   "1311": "Any% - All Orbs",
   "1312": "Any% - Hero Mode",
-  "1313": "Local Time",
-  "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1313": "Helyi idő",
+  "1314": "Figyelem!",
+  "1315": "Ez a beállítás erősen kísérleti. Ha nem 60FPS-sel játszol akkor látvány- és játékmenetbeli problémák merülhetnek fel ennek következtében.",
+  "1320": "Egyik sem",
+  "1321": "Pörgés",
+  "1322": "Gyorsító",
+  "1323": "Forgatás",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Ugrás",
+  "132d": "Duck Jump",
+  "132e": "Gyors Ugrás",
+  "132f": "Sötét Jak",
+  "1330": "Sötét Bomba",
+  "1331": "Dark Blast",
+  "1332": "Sötét Óriás",
+  "1333": "PS2 Beállítások",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Gyors Fejlődési Menü",
+  "1337": "PS2 LOD Távolság",
+  "1338": "Ki",
+  "1339": "Megjelenítés"
 }

game/assets/jak2/text/game_custom_text_is-IS.json

@@ -139,6 +139,9 @@
   "129d": "Horizontal Sensitivity",
   "129e": "Vertical Sensitivity",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "Controller Binds",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_it-IT.json

@@ -1,46 +1,46 @@
 {
-  "1a3": "Non Rimuovere O Inserire Alcuna Periferica, Spegnere Il Sistema O Chiudere Il Gioco",
-  "1b5": "Quando Questa Icona Appare Sullo Schermo, Non Rimuovere O Inserire Alcuna Periferica, Spegnere Il Sistema O Chiudere Il Gioco",
-  "1100": "Not in a mission",
-  "1101": "Playing a bonus mission",
-  "1102": "Scatter Gun Training Course",
-  "1103": "Blaster Training Course",
-  "1104": "Vulcan Fury Training Course",
-  "1105": "Peace Maker Training Course",
-  "1106": "Onin Game",
-  "1107": "Metal Head Mash",
-  "1200": "Modalità Schermo",
-  "1201": "Finestra",
-  "1202": "Schermo Intero",
-  "1203": "Finestra Senza Bordi",
-  "1204": "Automatic",
-  "1205": "Custom",
+  "1a3": "Non rimuovere o inserire alcuna periferica, spegnere il sistema o chiudere il gioco",
+  "1b5": "Quando questa icona appare sullo schermo, non rimuovere o inserire alcuna periferica, spegnere il sistema o chiudere il gioco",
+  "1100": "Non in missione",
+  "1101": "Giocando una missione bonus",
+  "1102": "Percorso di addestramento Scatter Gun",
+  "1103": "Percorso di addestramento Blaster",
+  "1104": "Percorso di addestramento Vulcan",
+  "1105": "Percorso di addestramento Peace Maker",
+  "1106": "Sfida di Onin",
+  "1107": "Acchiappa la testa di metallo",
+  "1200": "Modalità schermo",
+  "1201": "In finestra",
+  "1202": "Schermo intero",
+  "1203": "Finestra senza bordi",
+  "1204": "Automatico",
+  "1205": "Personalizzato",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
-  "1208": "Choose width and height ratio",
-  "1209": "Press <PAD_X> to confirm and exit.",
-  "120a": "Press <PAD_CIRCLE> to confirm and exit.",
-  "120b": "Ratio must not be lower than 4x3!",
-  "120c": "Lettore Musicale",
-  "120d": "Sincronizzazione Verticale",
-  "120e": "Lingua Testo",
-  "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "1208": "Modifica il rapporto d'aspetto",
+  "1209": "Premi <PAD_X> per confermare.",
+  "120a": "Premi <PAD_CIRCLE> per confermare.",
+  "120b": "Il rapporto d'aspetto non può essere minore di 4x3!",
+  "120c": "Lettore musicale",
+  "120d": "Sincronizzazione verticale",
+  "120e": "Lingua testo",
+  "120f": "Segreti OpenGOAL",
+  "1210": "Larghezza",
+  "1211": "Altezza",
   "1212": "??????????",
-  "1213": "Now playing...",
-  "1214": "No Track",
+  "1213": "In ascolto...",
+  "1214": "Nessuna",
   "1215": "Predefinito",
-  "1216": "Morph Gun",
-  "1217": "JET-Board",
+  "1216": "Armato",
+  "1217": "Su Jet Board",
   "1218": "Titan Suit",
   "1219": "Dark Jak",
-  "121a": "Vehicle",
-  "121b": "Danger",
-  "121c": "None",
-  "121d": "Low",
-  "121e": "Medium",
-  "121f": "High",
+  "121a": "Su veicolo",
+  "121b": "Pericolo",
+  "121c": "Nessuno",
+  "121d": "Basso",
+  "121e": "Medio",
+  "121f": "Alto",
   "1220": "Haven Exploration",
   "1221": "Guard Pursuit",
   "1222": "Ram Head Battle (Alt)",
@@ -65,92 +65,95 @@
   "1235": "Weapons Factory",
   "1236": "Arena Race",
   "1237": "Dead Town",
-  "1238": "Window Size",
-  "1239": "Select Window Size",
-  "123a": "Risoluzione Del Gioco",
-  "123b": "Select Game Resolution",
-  "123c": "Livello Di Dettaglio (Sfondo)",
-  "123d": "Livello Di Dettaglio (Primo Piano)",
-  "123f": "Mostra Nomi Nei Sottotitoli",
+  "1238": "Dimensione finestra",
+  "1239": "Seleziona dimensione finestra",
+  "123a": "Risoluzione di gioco",
+  "123b": "Seleziona risoluzione di gioco",
+  "123c": "Livello di dettaglio (sfondo)",
+  "123d": "Livello di dettaglio (primo piano)",
+  "123f": "Mostra nomi nei sottotitoli",
   "1240": "Mai",
-  "1241": "Fuori Campo",
+  "1241": "Fuori campo",
   "1242": "Sempre",
   "1243": "Game Territory",
   "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
-  "1246": "Japan (SCEI)",
-  "1247": "Korea (SCEK)",
+  "1245": "Europa (SCEE)",
+  "1246": "Giappone (SCEI)",
+  "1247": "Corea (SCEK)",
   "1248": "MSAA",
   "1249": "~DX",
-  "124a": "Controller LED Options",
-  "124b": "Show Player State",
-  "124c": "Show Amount of Health",
-  "124d": "Disattiva Autosalvataggio",
-  "124e": "Autosalvataggio Disattivato",
-  "124f": "Vuoi Davvero Disattivare L'Autosalvataggio?",
-  "1250": "Turbo JET-Board in Haven City",
-  "1251": "Enemy Health Bars",
-  "1252": "Vehicle Health Bars",
-  "1253": "Vehicle Invulnerability",
-  "1254": "Statistics Page",
-  "1255": "Automatically Grab Collectables",
-  "1256": "Music Player",
-  "1257": "No Textures Mode",
-  "1258": "Fast Movies",
-  "1259": "Slow Movies",
-  "125a": "Fast Gameplay",
-  "125b": "Slow Gameplay",
-  "125c": "Instant Travel in Haven City",
-  "125d": "Precursor Orb Tracker",
-  "125e": "Ora Del Giorno Reale",
-  "125f": "Pacified Haven City",
-  "1260": "JET-Board Trick Display",
-  "1261": "Bad Weather",
-  "1262": "Nice Weather",
-  "1280": "Opzioni Telecamera",
-  "1281": "Left/Right (1st Person)",
-  "1282": "Up/Down (1st Person)",
-  "1283": "Left/Right (3rd Person)",
-  "1284": "Up/Down (3rd Person)",
-  "1285": "Reset to Default",
+  "124a": "Opzioni LED controller",
+  "124b": "Mostra stato giocatore",
+  "124c": "Mostra quantità HP",
+  "124d": "Disattiva autosalvataggio",
+  "124e": "Autosalvataggio disattivato",
+  "124f": "Vuoi davvero disattivare l'autosalvataggio?",
+  "1250": "Jet Board Turbo a Haven City",
+  "1251": "Barre salute nemici",
+  "1252": "Barre integrità veicoli",
+  "1253": "Indistruttibilità veicoli",
+  "1254": "Pagina delle statistiche",
+  "1255": "Cattura collezionabili automaticamente",
+  "1256": "Lettore musicale",
+  "1257": "Modalità senza texture",
+  "1258": "Filmati veloci",
+  "1259": "Filmati lenti",
+  "125a": "Gioco veloce",
+  "125b": "Gioco lento",
+  "125c": "Viaggi istantanei a Haven City",
+  "125d": "Cerca-sfere precursor",
+  "125e": "Ora del giorno reale",
+  "125f": "Haven City pacifica",
+  "1260": "Indicatore acrobazie Jet Board",
+  "1261": "Brutto tempo",
+  "1262": "Bel tempo",
+  "1280": "Opzioni telecamera",
+  "1281": "Destra/Sinistra (prima persona)",
+  "1282": "Su/Giù (prima persona)",
+  "1283": "Destra/Sinistra (terza persona)",
+  "1284": "Su/Giù (terza persona)",
+  "1285": "Ripristina predefiniti",
   "1286": "Normale",
   "1287": "Invertita",
-  "1288": "Particle Culling",
-  "1289": "Mostra Su Discord",
-  "128a": "Default",
-  "128b": "Low",
-  "128c": "High",
-  "128d": "Credits",
-  "128e": "Frame Rate",
+  "1288": "Riduzione particelle",
+  "1289": "Mostra su Discord",
+  "128a": "Predefinito",
+  "128b": "Basso",
+  "128c": "Alto",
+  "128d": "Crediti",
+  "128e": "Frequenza di aggiornamento",
   "128f": "Varie",
   "1290": "Modalità Speedrun",
-  "1291": "Opzioni Di Input",
-  "1292": "Ripristina Predefiniti",
-  "1293": "Opzioni Controller",
-  "1294": "Seleziona Controller",
-  "1295": "Zona Morta Analogico",
-  "1296": "Ignora Se Non In Primo Piano",
-  "1297": "Controller Led Per Hp",
+  "1291": "Opzioni di Input",
+  "1292": "Ripristina predefiniti",
+  "1293": "Opzioni controller",
+  "1294": "Seleziona controller",
+  "1295": "Zona morta analogico",
+  "1296": "Ignora se in secondo piano",
+  "1297": "Usa il LED per gli HP",
   "1298": "Use LED for Other States",
-  "1299": "Attiva La Tastiera",
-  "129a": "Attiva Il Mouse",
-  "129b": "Opzioni Mouse",
-  "129c": "Telecamera Della Pista",
-  "129d": "Sensibilità Orizzontale",
-  "129e": "Sensibilità Verticale",
-  "129f": "Movimento Del Giocatore",
-  "1300": "Nascondi Cursore Automaticamente",
-  "1301": "Riassegna Tasti",
-  "1302": "Tasti Controller",
-  "1303": "Tasti Tastiera",
-  "1304": "Tasti Mouse",
-  "1305": "No Options",
-  "1306": "Waiting",
-  "1307": "Non Assegnato",
+  "1299": "Attiva la tastiera",
+  "129a": "Attiva il mouse",
+  "129b": "Opzioni mouse",
+  "129c": "Blocco visuale",
+  "129d": "Sensibilità orizzontale",
+  "129e": "Sensibilità verticale",
+  "129f": "Movimento del giocatore",
+  "12a0": "Object Shadows",
+  "12a1": "Normale",
+  "12a2": "Extended",
+  "1300": "Nascondi cursore automaticamente",
+  "1301": "Riassegna tasti",
+  "1302": "Tasti controller",
+  "1303": "Tasti tastiera",
+  "1304": "Tasti mouse",
+  "1305": "Nessuna opzione",
+  "1306": "In attesa",
+  "1307": "Non assegnato",
   "1308": "Sconosciuto",
-  "1309": "High-Resolution Sky",
-  "130a": "Fast Airlocks and Doors",
-  "130b": "Fast Elevators",
+  "1309": "Cielo ad alta risoluzione",
+  "130a": "Porte veloci",
+  "130b": "Ascensori veloci",
   "130c": "Speedrun",
   "130d": "Any%",
   "130e": "Any% - Hoverless",
@@ -158,7 +161,33 @@
   "1310": "100%",
   "1311": "Any% - All Orbs",
   "1312": "Any% - Hero Mode",
-  "1313": "Local Time",
-  "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1313": "Ora locale",
+  "1314": "Attenzione!",
+  "1315": "Questa impostazione è sperimentale. Quando non è impostata su 60 FPS, potresti riscontrare problemi grafici e di gameplay.",
+  "1320": "None",
+  "1321": "Giro",
+  "1322": "Boost",
+  "1323": "Capriola",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Salto",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Bomba oscura",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "Opzioni PS2",
+  "1334": "Riduzione attori",
+  "1335": "Forza mappatura ambiente",
+  "1336": "Menu veloce",
+  "1337": "PS2 LOD Distance",
+  "1338": "No",
+  "1339": "Monitor"
 }

game/assets/jak2/text/game_custom_text_ja-JP.json

@@ -139,6 +139,9 @@
   "129d": "Horizontal Sensitivity",
   "129e": "Vertical Sensitivity",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "コントローラのバインド",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_lt-LT.json

@@ -0,0 +1,193 @@
+{
+  "1a3": "Neišimkite ir neįdėkite jokių periferinių įrenginių, neišjunkite sistemos ir neišjunkite žaidimo.",
+  "1b5": "Kol ši piktograma rodoma ekrane, neišimkite ir neįdėkite jokių periferinių įrenginių, neišjunkite sistemos ir neišjunkite žaidimo.",
+  "1100": "Ne misijoje",
+  "1101": "Žaidžiama papildoma misija",
+  "1102": "Išsklaidomojo šautuvo mokymo kursas",
+  "1103": "Blasterio mokymo kursai",
+  "1104": "Vulcan Fury mokymo kursas",
+  "1105": "Taikos kūrėjo mokymo kursai",
+  "1106": "Onin žaidimas",
+  "1107": "Metalo galvos mišinys",
+  "1200": "Ekrano režimas",
+  "1201": "Windowed",
+  "1202": "Visas ekranas",
+  "1203": "Be sienų",
+  "1204": "Automatinis",
+  "1205": "Pasirinktinis",
+  "1206": "4x3 (PS2)",
+  "1207": "16x9 (PS2)",
+  "1208": "Pasirinkite pločio ir aukščio santykį",
+  "1209": "Paspauskite <PAD_X>, kad patvirtintumėte ir išeitumėte.",
+  "120a": "Paspauskite <PAD_CIRCLE>, kad patvirtintumėte ir išeitumėte.",
+  "120b": "Santykis negali būti mažesnis nei 4x3!",
+  "120c": "Muzikos grotuvas",
+  "120d": "V-Sync",
+  "120e": "Teksto kalba",
+  "120f": "OpenGOAL paslaptys",
+  "1210": "Plotis",
+  "1211": "Aukštis",
+  "1212": "??????????",
+  "1213": "Dabar žaidžiama...",
+  "1214": "Nėra takelio",
+  "1215": "Numatytasis",
+  "1216": "Morfo pistoletas",
+  "1217": "JET-lenta",
+  "1218": "Titano kostiumas",
+  "1219": "Tamsusis Džekas",
+  "121a": "Transporto priemonė",
+  "121b": "Pavojus",
+  "121c": "Jokio",
+  "121d": "Žemas",
+  "121e": "Vidutinis",
+  "121f": "Aukštas",
+  "1220": "Haven Exploration",
+  "1221": "Guard Pursuit",
+  "1222": "Ram Head Battle (Alt)",
+  "1223": "Mar's Tomb",
+  "1224": "Onin Challenge",
+  "1225": "Metal Kor",
+  "1226": "Krew Battle",
+  "1227": "Baron Battle",
+  "1228": "Bouncing Boulders",
+  "1229": "Exploding Eco",
+  "122a": "Fortress Tank",
+  "122b": "Pumping Station",
+  "122c": "Protect Sig",
+  "122d": "Strip Mine",
+  "122e": "Haven Forest",
+  "122f": "Forest Dragons",
+  "1230": "The Fortress",
+  "1231": "Escape",
+  "1232": "Mountain Temple",
+  "1233": "Ram Head Battle",
+  "1234": "Praxis Palace",
+  "1235": "Weapons Factory",
+  "1236": "Arena Race",
+  "1237": "Dead Town",
+  "1238": "Lango dydis",
+  "1239": "Pasirinkite lango dydį",
+  "123a": "Žaidimo rezoliucija",
+  "123b": "Pasirinkite žaidimo rezoliuciją",
+  "123c": "Detalumo lygis (fonas)",
+  "123d": "Detalumo lygis (pirmas planas)",
+  "123f": "Rodyti garsiakalbį subtitruose",
+  "1240": "Niekada",
+  "1241": "Ne ekrane",
+  "1242": "Visada",
+  "1243": "Žaidimo teritorija",
+  "1244": "Amerika (SCEA)",
+  "1245": "Europa (SCEE)",
+  "1246": "Japonija (SCEI)",
+  "1247": "Korėja (SCEK)",
+  "1248": "MSAA",
+  "1249": "~Dx",
+  "124a": "Kontrolerio LED parinktys",
+  "124b": "Rodyti žaidėjo būseną",
+  "124c": "Rodyti sveikatos kiekį",
+  "124d": "Išjungti automatinį išsaugojimą",
+  "124e": "Automatinis išsaugojimas išjungtas",
+  "124f": "Ar tikrai norite išjungti automatinį išsaugojimą?",
+  "1250": "Turbo JET lenta Haveno mieste",
+  "1251": "Priešų gyvybės juostos",
+  "1252": "Transporto priemonių būsenos juostos",
+  "1253": "Transporto priemonės nepažeidžiamumas",
+  "1254": "Statistikos puslapis",
+  "1255": "Automatiškai paimti kolekcionuojamus daiktus",
+  "1256": "Muzikos grotuvas",
+  "1257": "Jokių tekstūrų režimas",
+  "1258": "Greiti filmai",
+  "1259": "Lėti filmai",
+  "125a": "Greitas žaidimas",
+  "125b": "Lėtas žaidimas",
+  "125c": "Greitasis keliavimas į Haveno miestą",
+  "125d": "Prekursoriaus orbų seklys",
+  "125e": "Realusis paros laikas",
+  "125f": "Nuramintas Haveno miestas",
+  "1260": "JET lentos triukų ekranas",
+  "1261": "Blogas oras",
+  "1262": "Gražus oras",
+  "1280": "Kameros parinktys",
+  "1281": "Kairė/dešinė (1-as asmuo)",
+  "1282": "Aukštyn/žemyn (1-as asmuo)",
+  "1283": "Kairė/dešinė (3-iasis asmuo)",
+  "1284": "Aukštyn / žemyn (3-iasis asmuo)",
+  "1285": "Atstatyti numatytuosius nustatymus",
+  "1286": "Normalus",
+  "1287": "Apverstas",
+  "1288": "Dalelių šalinimas",
+  "1289": "Discord Rich-Presence",
+  "128a": "Numatytasis",
+  "128b": "Žemas",
+  "128c": "Aukštas",
+  "128d": "Kūrėjų sąrašas",
+  "128e": "Kadrų dažnis",
+  "128f": "Įvairūs",
+  "1290": "Greitojo bėgimo režimas",
+  "1291": "Įvesties parinktys",
+  "1292": "Atkurti numatytąsias nuostatas",
+  "1293": "Kontrolerio parinktys",
+  "1294": "Pasirinkite kontrolerį",
+  "1295": "Analogo mirties zona",
+  "1296": "Ignoruoti, kai langas nesufokusuotas",
+  "1297": "Naudoti LED gyvybėms",
+  "1298": "Naudoti LED kitoms būsenoms",
+  "1299": "Įjungti klaviatūrą",
+  "129a": "Įjungti pelę",
+  "129b": "Pelės parinktys",
+  "129c": "Sekti kamerą",
+  "129d": "Horizontalusis jautrumas",
+  "129e": "Vertikalusis jautrumas",
+  "129f": "Žaidėjų judėjimas",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
+  "1300": "Automatinis žymeklio slėpimas",
+  "1301": "Iš naujo priskirti sąsajas",
+  "1302": "Kontrolerio sąsajos",
+  "1303": "Klaviatūros sąsajos",
+  "1304": "Pelės sąsajos",
+  "1305": "Nėra parinkčių",
+  "1306": "Laukiama",
+  "1307": "Nenustatyta",
+  "1308": "Nežinoma",
+  "1309": "Didelės raiškos dangus",
+  "130a": "Greiti oro vartai ir durys",
+  "130b": "Greitieji liftai",
+  "130c": "Speedrun",
+  "130d": "Any%",
+  "130e": "Any% - Hoverless",
+  "130f": "All Missions",
+  "1310": "100%",
+  "1311": "Any% - All Orbs",
+  "1312": "Any% - Hero Mode",
+  "1313": "Vietinis laikas",
+  "1314": "Įspėjimas!",
+  "1315": "Šis nustatymas yra labai eksperimentinis. Jei žaidžiama ne 60 kadrų per sekundę sparta, gali kilti vaizdo ir žaidimo problemų.",
+  "1320": "Jokio",
+  "1321": "Suktis",
+  "1322": "Sustiprinti",
+  "1323": "Apversti",
+  "1324": "Bėgių šlifavimas",
+  "1325": "Bėgių šuolis",
+  "1326": "Nosies sugriebimas",
+  "1327": "Metodas",
+  "1328": "Lentos sukimasis",
+  "1329": "Lentos apvertimas",
+  "132a": "Noseflipas",
+  "132b": "Kickflipas",
+  "132c": "Šokti",
+  "132d": "Anties šuolis",
+  "132e": "Greitasis šuolis",
+  "132f": "Tamsusis Džekas",
+  "1330": "Tamsos bomba",
+  "1331": "Tamsus smūgis",
+  "1332": "Tamsusis milžinas",
+  "1333": "PS2 nustatymai",
+  "1334": "Veikėjo Culling",
+  "1335": "Priverstinis Aplinkos Atvaizdavimas",
+  "1336": "Spartus Pažangos Meniu",
+  "1337": "PS2 Objektų Detalių Atstumas",
+  "1338": "Išjungti",
+  "1339": "Ekranas"
+}

game/assets/jak2/text/game_custom_text_nl-NL.json

@@ -139,6 +139,9 @@
   "129d": "Horizontale Gevoeligheid",
   "129e": "Verticale Gevoeligheid",
   "129f": "Speler Beweging",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Verberg Cursor Automatisch",
   "1301": "Toetsenbindingen Opnieuw Toewijzen",
   "1302": "Toetencombinaties Voor Controller",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_no-NO.json

@@ -139,6 +139,9 @@
   "129d": "Horizontal Sensitivity",
   "129e": "Vertical Sensitivity",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "Controller Binds",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_pl-PL.json

@@ -1,13 +1,13 @@
 {
-  "1a3": "Proszę Nie Odłączać Ani Podłączać Żadnych Urządzeń, Wyłączać Systemu Oraz Nie Wyłączać Gry",
-  "1b5": "Kiedy Ta Ikona Jest Na Ekranie, Proszę Nie Odłączać Ani Podłączać Żadnych Urządzeń, Wyłączać Systemu Oraz Nie Wyłączać Gry",
+  "1a3": "Proszę nie odłączać ani podłączać żadnych urządzeń, wyłączać systemu oraz nie wyłączać gry",
+  "1b5": "Kiedy ta ikona jest na ekranie, proszę nie odłączać ani podłączać żadnych urządzeń, wyłączać systemu oraz nie wyłączać gry",
   "1100": "Not in a mission",
   "1101": "Playing a bonus mission",
-  "1102": "Scatter Gun Training Course",
-  "1103": "Blaster Training Course",
-  "1104": "Vulcan Fury Training Course",
-  "1105": "Peace Maker Training Course",
-  "1106": "Onin Game",
+  "1102": "Kurs szkoleniowy Broni Rozpryskowej",
+  "1103": "Kurs szkoleniowy Blastera",
+  "1104": "Kurs szkoleniowy Furii Wulkanu",
+  "1105": "Kurs szkoleniowy Twórcy Pokoju",
+  "1106": "Gra Onina",
   "1107": "Metal Head Mash",
   "1200": "Tryb Wyświetlania",
   "1201": "W Oknie",
@@ -17,26 +17,26 @@
   "1205": "Custom",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
-  "1208": "Choose width and height ratio",
-  "1209": "Press <PAD_X> to confirm and exit.",
-  "120a": "Press <PAD_CIRCLE> to confirm and exit.",
-  "120b": "Ratio must not be lower than 4x3!",
+  "1208": "Wybierz stosunek szerokości i wysokości",
+  "1209": "Naciśnij <PAD_X> żeby potwierdzić i wyjść.",
+  "120a": "Naciśnij <PAD_CIRCLE> żeby potwierdzić i wyjść.",
+  "120b": "Rozdzielczość nie może być mniejsza niż 4x3!",
   "120c": "Odtwarzacz Muzyki",
   "120d": "Synchronizacja Pionowa",
   "120e": "Język Tekstu",
-  "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "120f": "OpenGOAL Sekrety",
+  "1210": "Szerokość",
+  "1211": "Wysokość",
   "1212": "??????????",
   "1213": "Now playing...",
   "1214": "No Track",
   "1215": "Domyślne",
   "1216": "Morph Gun",
-  "1217": "JET-Board",
-  "1218": "Titan Suit",
-  "1219": "Dark Jak",
+  "1217": "Deska Odrzutowa",
+  "1218": "Strój Tytana",
+  "1219": "Mroczny Jak",
   "121a": "Vehicle",
-  "121b": "Danger",
+  "121b": "Niebezpieczeństwo",
   "121c": "None",
   "121d": "Low",
   "121e": "Medium",
@@ -65,38 +65,38 @@
   "1235": "Weapons Factory",
   "1236": "Arena Race",
   "1237": "Dead Town",
-  "1238": "Window Size",
-  "1239": "Select Window Size",
+  "1238": "Rozmiar Okna",
+  "1239": "Wybierz rozmiar okna",
   "123a": "Rozdzielczość Gry",
-  "123b": "Select Game Resolution",
+  "123b": "Wybierz rozdzielczość gry",
   "123c": "Poziom Detali (Drugoplanowy)",
   "123d": "Poziom Detali (Pierwszoplanowy)",
-  "123f": "Pokaż Mówcę W Napisach",
+  "123f": "Pokaż Mówcę w Napisach",
   "1240": "Nigdy",
   "1241": "Poza Ekranem",
   "1242": "Zawsze",
   "1243": "Game Territory",
-  "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
-  "1246": "Japan (SCEI)",
+  "1244": "Ameryka (SCEA)",
+  "1245": "Europa (SCEE)",
+  "1246": "Japonia (SCEI)",
   "1247": "Korea (SCEK)",
   "1248": "MSAA",
   "1249": "~DX",
   "124a": "Controller LED Options",
-  "124b": "Show Player State",
-  "124c": "Show Amount of Health",
+  "124b": "Pokaż stan gracza",
+  "124c": "Pokaż ilość życia",
   "124d": "Wyłącz Autozapis",
   "124e": "Autozapis Wyłączony",
-  "124f": "Czy Na Pewno Chcesz Wyłączyć Autozapis?",
+  "124f": "Czy na pewnochcesz wyłączyć autozapis?",
   "1250": "Turbo JET-Board in Haven City",
-  "1251": "Enemy Health Bars",
-  "1252": "Vehicle Health Bars",
-  "1253": "Vehicle Invulnerability",
-  "1254": "Statistics Page",
+  "1251": "Paski życia wrogów",
+  "1252": "Paski zdrowia pojazdów",
+  "1253": "Niewrażliwość pojazdu",
+  "1254": "Strona Statystyk",
   "1255": "Automatically Grab Collectables",
-  "1256": "Music Player",
-  "1257": "No Textures Mode",
-  "1258": "Fast Movies",
+  "1256": "Odtwarzacz Muzyki",
+  "1257": "Tryb braku tekstur",
+  "1258": "Szybkie filmy",
   "1259": "Slow Movies",
   "125a": "Fast Gameplay",
   "125b": "Slow Gameplay",
@@ -129,8 +129,8 @@
   "1293": "Opcje Kontrolera",
   "1294": "Wybierz Kontroler",
   "1295": "Martwa Strefa Gałki Analogowej",
-  "1296": "Ignoruj, Jeśli Okno Nie Jest Aktywne",
-  "1297": "Led Kontrolera Pokazuje Zdrowie",
+  "1296": "Ignoruj, jeśli Okno nie jest Aktywne",
+  "1297": "Led Kontrolera pokazuje Zdrowie",
   "1298": "Use LED for Other States",
   "1299": "Użycie Klawiatury",
   "129a": "Użycie Myszy",
@@ -139,6 +139,9 @@
   "129d": "Czułość Pozioma",
   "129e": "Czułość Pionowa",
   "129f": "Poruszanie Się",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Automatycznie Chowaj Kursor",
   "1301": "Przypisz Przyciski",
   "1302": "Przyciski Kontrolera",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Skok",
+  "132d": "Skok z przykucnięcia",
+  "132e": "Szybki skok",
+  "132f": "Mroczny Jak",
+  "1330": "Mroczna Bomba",
+  "1331": "Mroczny Ładunek",
+  "1332": "Mroczny Gigant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_pt-BR.json

@@ -1,46 +1,46 @@
 {
-  "1a3": "Por Favor Não Remova Ou Insira Nenhum Periférico, Desligue O Seu Sistema Ou Remova O Jogo",
-  "1b5": "Enquanto Este Ícone Estiver Na Tela, Por Favor Não Remova Ou Insira Nenhum Periférico, Desligue O Seu Sistema Ou Remova O Jogo",
-  "1100": "Not in a mission",
-  "1101": "Playing a bonus mission",
-  "1102": "Scatter Gun Training Course",
-  "1103": "Blaster Training Course",
-  "1104": "Vulcan Fury Training Course",
-  "1105": "Peace Maker Training Course",
-  "1106": "Onin Game",
-  "1107": "Metal Head Mash",
-  "1200": "Modo De Exibição",
+  "1a3": "Por favor, não remova ou insira nenhum periférico, desligue o seu sistema ou remova o jogo",
+  "1b5": "Enquanto este ícone estiver na tela, por favor, não remova ou insira nenhum periférico, desligue o seu sistema ou remova o jogo",
+  "1100": "Não está em uma missão",
+  "1101": "Jogando uma missão bônus",
+  "1102": "Curso de Treinamento da Arma Dispersora",
+  "1103": "Curso de Treinamento da Devastadora",
+  "1104": "Curso de Treinamento da Fúria Vulcânica",
+  "1105": "Curso de Treinamento da Pacificadora",
+  "1106": "Jogo Onin",
+  "1107": "Esmaga Cabeça de Metal",
+  "1200": "Modo de Exibição",
   "1201": "Modo Janela",
   "1202": "Tela Cheia",
   "1203": "Sem Borda",
-  "1204": "Automatic",
-  "1205": "Custom",
+  "1204": "Automático",
+  "1205": "Personalizado",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
-  "1208": "Choose width and height ratio",
-  "1209": "Press <PAD_X> to confirm and exit.",
-  "120a": "Press <PAD_CIRCLE> to confirm and exit.",
-  "120b": "Ratio must not be lower than 4x3!",
-  "120c": "Tocador De Música",
+  "1208": "Escolha a proporção de largura e altura",
+  "1209": "Pressione <PAD_X> para confirmar e sair.",
+  "120a": "Pressione <PAD_CIRCLE> para confirmar e sair.",
+  "120b": "Proporção não pode ser inferior a 4x3!",
+  "120c": "Reprodutor de Música",
   "120d": "V-Sync",
-  "120e": "Idioma De Texto",
-  "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "120e": "Idioma do Texto",
+  "120f": "Segredos OpenGOAL",
+  "1210": "Largura",
+  "1211": "Altura",
   "1212": "??????????",
-  "1213": "Now playing...",
-  "1214": "No Track",
+  "1213": "Reproduzindo agora...",
+  "1214": "Nenhuma Trilha",
   "1215": "Padrão",
-  "1216": "Morph Gun",
-  "1217": "JET-Board",
-  "1218": "Titan Suit",
-  "1219": "Dark Jak",
-  "121a": "Vehicle",
-  "121b": "Danger",
-  "121c": "None",
-  "121d": "Low",
-  "121e": "Medium",
-  "121f": "High",
+  "1216": "Arma Metamórfica",
+  "1217": "TURBO-Prancha",
+  "1218": "Armadura Titã",
+  "1219": "Jak Sombrio",
+  "121a": "Veículo",
+  "121b": "Perigo",
+  "121c": "Nenhum",
+  "121d": "Baixo",
+  "121e": "Médio",
+  "121f": "Alto",
   "1220": "Haven Exploration",
   "1221": "Guard Pursuit",
   "1222": "Ram Head Battle (Alt)",
@@ -65,92 +65,95 @@
   "1235": "Weapons Factory",
   "1236": "Arena Race",
   "1237": "Dead Town",
-  "1238": "Window Size",
-  "1239": "Select Window Size",
-  "123a": "Resolução Do Jogo",
-  "123b": "Select Game Resolution",
-  "123c": "Nível De Detalhe (Fundo)",
-  "123d": "Nível De Detalhe (Primeiro Plano)",
-  "123f": "Mostrar Locutor Nas Legendas",
+  "1238": "Tamanho da Janela",
+  "1239": "Selecione o Tamanho da Janela",
+  "123a": "Resolução do Jogo",
+  "123b": "Selecione a Resolução do Jogo",
+  "123c": "Nível de Detalhe (Fundo)",
+  "123d": "Nível de Detalhe (Primeiro Plano)",
+  "123f": "Mostrar Locutor nas Legendas",
   "1240": "Nunca",
-  "1241": "Fora Da Tela",
+  "1241": "Fora da Tela",
   "1242": "Sempre",
-  "1243": "Game Territory",
-  "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
-  "1246": "Japan (SCEI)",
-  "1247": "Korea (SCEK)",
+  "1243": "Região do Jogo",
+  "1244": "América (SCEA)",
+  "1245": "Europa (SCEE)",
+  "1246": "Japão (SCEI)",
+  "1247": "Coréia (SCEK)",
   "1248": "MSAA",
   "1249": "~DX",
-  "124a": "Controller LED Options",
-  "124b": "Show Player State",
-  "124c": "Show Amount of Health",
-  "124d": "Desabilitar Auto-Save",
-  "124e": "Auto-Save Desabilitado",
-  "124f": "Tem Certeza Que Quer Desabilitar O Auto-Save?",
-  "1250": "Turbo JET-Board in Haven City",
-  "1251": "Enemy Health Bars",
-  "1252": "Vehicle Health Bars",
-  "1253": "Vehicle Invulnerability",
-  "1254": "Statistics Page",
-  "1255": "Automatically Grab Collectables",
-  "1256": "Music Player",
-  "1257": "No Textures Mode",
-  "1258": "Fast Movies",
-  "1259": "Slow Movies",
-  "125a": "Fast Gameplay",
-  "125b": "Slow Gameplay",
-  "125c": "Instant Travel in Haven City",
-  "125d": "Precursor Orb Tracker",
-  "125e": "Tempo Real Do Dia",
-  "125f": "Pacified Haven City",
-  "1260": "JET-Board Trick Display",
-  "1261": "Bad Weather",
-  "1262": "Nice Weather",
-  "1280": "Opções De Câmera",
-  "1281": "Left/Right (1st Person)",
-  "1282": "Up/Down (1st Person)",
-  "1283": "Left/Right (3rd Person)",
-  "1284": "Up/Down (3rd Person)",
-  "1285": "Reset to Default",
+  "124a": "Opções de LED do Controle",
+  "124b": "Exibir Estado do Jogador",
+  "124c": "Exibir Quantidade de Vida",
+  "124d": "Desabilitar Salvamento Automático",
+  "124e": "Salvamento Automático Desabilitado",
+  "124f": "Tem certeza que quer desabilitar o salvamento automático?",
+  "1250": "Super TURBO-Prancha na Cidade Bastião",
+  "1251": "Barras de Vida do Inimigo",
+  "1252": "Barras de Vida do Veículo",
+  "1253": "Invulnerabilidade do Veículo",
+  "1254": "Página de Estatísticas",
+  "1255": "Coletar Automaticamente os Colecionáveis",
+  "1256": "Reprodutor de Música",
+  "1257": "Modo Sem Texturas",
+  "1258": "Cinemáticas Rápidas",
+  "1259": "Cinemáticas Lentas",
+  "125a": "Jogabilidade Rápida",
+  "125b": "Jogabilidade Lenta",
+  "125c": "Viagem Instantânea para Cidade Bastião",
+  "125d": "Contador de Orbe Precursor",
+  "125e": "Tempo Real do Dia",
+  "125f": "Cidade Bastião Pacificada",
+  "1260": "Tela de Truques da TURBO-Prancha",
+  "1261": "Clima Ruim",
+  "1262": "Clima Bom",
+  "1280": "Opções de Câmera",
+  "1281": "Esquerda/Direita (1º Pessoa)",
+  "1282": "Cima/Baixo (1º Pessoa)",
+  "1283": "Esquerda/Direita (3º Pessoa)",
+  "1284": "Cima/Baixo (3º Pessoa)",
+  "1285": "Voltar ao Padrão",
   "1286": "Normal",
   "1287": "Invertido",
-  "1288": "Particle Culling",
-  "1289": "Mostrar Jogo No Discord",
-  "128a": "Default",
-  "128b": "Low",
-  "128c": "High",
-  "128d": "Credits",
-  "128e": "Frame Rate",
+  "1288": "Redução de Partículas",
+  "1289": "Mostrar Jogo no Discord",
+  "128a": "Padrão",
+  "128b": "Baixo",
+  "128c": "Alto",
+  "128d": "Créditos",
+  "128e": "Taxa de Quadros",
   "128f": "Diversos",
-  "1290": "Modo Speedrun",
-  "1291": "Input Options",
-  "1292": "Voltar Ao Padrão",
-  "1293": "Controller Options",
-  "1294": "Select Controller",
-  "1295": "Analog Deadzone",
-  "1296": "Ignore If Window Unfocused",
-  "1297": "Controller Led For Hp",
-  "1298": "Use LED for Other States",
-  "1299": "Enable Keyboard",
-  "129a": "Enable Mouse",
-  "129b": "Mouse Options",
-  "129c": "Track Camera",
-  "129d": "Horizontal Sensitivity",
-  "129e": "Vertical Sensitivity",
-  "129f": "Player Movement",
-  "1300": "Auto Hide Cursor",
-  "1301": "Reassign Binds",
-  "1302": "Controller Binds",
-  "1303": "Keyboard Binds",
-  "1304": "Mouse Binds",
-  "1305": "No Options",
-  "1306": "Waiting",
-  "1307": "Unset",
-  "1308": "Unknown",
-  "1309": "High-Resolution Sky",
-  "130a": "Fast Airlocks and Doors",
-  "130b": "Fast Elevators",
+  "1290": "Modo Speedrunner",
+  "1291": "Opções de Entrada",
+  "1292": "Voltar ao Padrão",
+  "1293": "Opções de Controle",
+  "1294": "Selecionar Controle",
+  "1295": "Zona Morta do Analógico",
+  "1296": "Ignorar Quando a Janela Não Estiver em Primeiro Plano",
+  "1297": "Usar LED do Controle para Vida",
+  "1298": "Usar LED do Controle para Outros Estados",
+  "1299": "Habilitar Teclado",
+  "129a": "Habilitar Mouse",
+  "129b": "Opções de Mouse",
+  "129c": "Seguir Câmera",
+  "129d": "Sensibilidade Horizontal",
+  "129e": "Sensibilidade Vertical",
+  "129f": "Movimento do Jogador",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
+  "1300": "Ocultar Automaticamente o Cursor",
+  "1301": "Reatribuir Mapeamento",
+  "1302": "Mapeamento do Controle",
+  "1303": "Mapeamento do Teclado",
+  "1304": "Mapeamento do Mouse",
+  "1305": "Sem Opções",
+  "1306": "Aguardando",
+  "1307": "Não Atribuído",
+  "1308": "Desconhecido",
+  "1309": "Céu de Alta Resolução",
+  "130a": "Câmaras e Portas Rápidas",
+  "130b": "Elevadores Rápidos",
   "130c": "Speedrun",
   "130d": "Any%",
   "130e": "Any% - Hoverless",
@@ -158,7 +161,33 @@
   "1310": "100%",
   "1311": "Any% - All Orbs",
   "1312": "Any% - Hero Mode",
-  "1313": "Local Time",
-  "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1313": "Tempo Local",
+  "1314": "Aviso!",
+  "1315": "Esta configuração é altamente experimental. Quando não jogado a 60 quadros por segundo, problemas visuais e de jogabilidade podem surgir como resultado.",
+  "1320": "Nenhum",
+  "1321": "Spin",
+  "1322": "Impulso",
+  "1323": "Flip",
+  "1324": "Grind no Trilho",
+  "1325": "Salto no Trilho",
+  "1326": "Nosegrab",
+  "1327": "Método",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Salto",
+  "132d": "Salto Agachado",
+  "132e": "Salto Rápido",
+  "132f": "Jak Sombrio",
+  "1330": "Bomba Sombria",
+  "1331": "Explosão Sombria",
+  "1332": "Gigante Sombrio",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_pt-PT.json

@@ -13,7 +13,7 @@
   "1201": "Modo Janela",
   "1202": "Ecrã Cheio",
   "1203": "Sem Borda",
-  "1204": "Automatic",
+  "1204": "Automático",
   "1205": "Custom",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
@@ -139,6 +139,9 @@
   "129d": "Sensibilidade Horizontal",
   "129e": "Sensibilidade Vertical",
   "129f": "Player Movement",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Auto Hide Cursor",
   "1301": "Reassign Binds",
   "1302": "Controller Binds",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/jak2/text/game_custom_text_sv-SE.json

@@ -13,7 +13,7 @@
   "1201": "Fönster",
   "1202": "Fullskärm",
   "1203": "Kantlös",
-  "1204": "Automatic",
+  "1204": "Automatisk",
   "1205": "Custom",
   "1206": "4x3 (PS2)",
   "1207": "16x9 (PS2)",
@@ -25,8 +25,8 @@
   "120d": "Vsynk",
   "120e": "Textspråk",
   "120f": "OpenGOAL Secrets",
-  "1210": "Width",
-  "1211": "Height",
+  "1210": "Vidd",
+  "1211": "Höjd",
   "1212": "??????????",
   "1213": "Now playing...",
   "1214": "No Track",
@@ -77,7 +77,7 @@
   "1242": "Alltid",
   "1243": "Game Territory",
   "1244": "America (SCEA)",
-  "1245": "Europe (SCEE)",
+  "1245": "Europa (SCEE)",
   "1246": "Japan (SCEI)",
   "1247": "Korea (SCEK)",
   "1248": "MSAA",
@@ -139,6 +139,9 @@
   "129d": "Horisontell Känslighet",
   "129e": "Vertikal Känslighet",
   "129f": "Spelarrörelse",
+  "12a0": "Object Shadows",
+  "12a1": "Normal",
+  "12a2": "Extended",
   "1300": "Dölj Pekaren Automatiskt",
   "1301": "Ställ Om Bindningar",
   "1302": "Kontrollbindningar",
@@ -160,5 +163,31 @@
   "1312": "Any% - Hero Mode",
   "1313": "Local Time",
   "1314": "Warning!",
-  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result."
+  "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.",
+  "1320": "None",
+  "1321": "Spin",
+  "1322": "Boost",
+  "1323": "Flip",
+  "1324": "Rail Grind",
+  "1325": "Rail Jump",
+  "1326": "Nosegrab",
+  "1327": "Method",
+  "1328": "Board Spin",
+  "1329": "Board Flip",
+  "132a": "Noseflip",
+  "132b": "Kickflip",
+  "132c": "Jump",
+  "132d": "Duck Jump",
+  "132e": "Quick Jump",
+  "132f": "Dark Jak",
+  "1330": "Dark Bomb",
+  "1331": "Dark Blast",
+  "1332": "Dark Giant",
+  "1333": "PS2 Options",
+  "1334": "Actor Culling",
+  "1335": "Force Environment Mapping",
+  "1336": "Fast Progress Menu",
+  "1337": "PS2 LOD Distance",
+  "1338": "Off",
+  "1339": "Display"
 }

game/assets/sdl_controller_db.txt

@@ -429,6 +429,8 @@
 03000000f70600000100000000000000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Windows,
 030000006b140000010c000000000000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000006b1400001106000000000000,Nacon Revolution 3 PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+0300000085320000170d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+0300000085320000190d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 030000006b140000100d000000000000,Nacon Revolution Infinity PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000006b140000080d000000000000,Nacon Revolution Unlimited Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000bd12000001c0000000000000,Nebular,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
@@ -1218,7 +1220,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 06000000adde0000efbe000002010000,Hidromancer Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000d81400000862000011010000,HitBox PS3 PC Analog Mode,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b12,x:b0,y:b3,platform:Linux,
 03000000c9110000f055000011010000,HJC Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
-03000000632500002605000010010000,HJDX,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 030000000d0f00000d00000000010000,Hori,a:b0,b:b6,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b3,rightshoulder:b7,start:b9,x:b1,y:b2,platform:Linux,
 030000000d0f00006d00000020010000,Hori EDGE 301,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:+a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000000d0f00008400000011010000,Hori Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
@@ -1528,9 +1529,10 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000b40400000a01000000010000,Sega Saturn,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Linux,
 030000001f08000001e4000010010000,SFC Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
 03000000632500002305000010010000,ShanWan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000632500002605000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000632500007505000010010000,Shanwan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000bc2000000055000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000f025000021c1000010010000,Shanwan Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-03000000632500007505000010010000,Shanwan PS3 PC,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
-03000000bc2000000055000010010000,Shanwan PS3 PC ,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000341a00000908000010010000,SL6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 050000004c050000cc09000001000000,Sony DualShock 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
 03000000ff000000cb01000010010000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
@@ -1871,9 +1873,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 36313938306539326233393732613361,Retro Bit SNES Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
 526574726f466c616720576972656420,Retro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,rightshoulder:b18,start:b10,x:b2,y:b3,platform:Android,
 61343739353764363165343237303336,Retro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,lefttrigger:b18,leftx:a0,lefty:a1,start:b10,x:b2,y:b3,platform:Android,
+526574726f696420506f636b65742043,Retroid Pocket,a:b1,b:b0,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+582d426f7820436f6e74726f6c6c6572,Retroid Pocket,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 38653130373365613538333235303036,Retroid Pocket 2,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
-526574726f696420506f636b65742043,Retroid Pocket Flip,a:b1,b:b0,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
-582d426f7820436f6e74726f6c6c6572,Retroid Pocket Flip,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
 64363363336633363736393038313463,Retrolink,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b6,platform:Android,
 37393234373533633333323633646531,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,
 5365616c6965436f6d707574696e6720,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,

game/graphics/opengl_renderer/BucketRenderer.h

@@ -40,7 +40,7 @@ struct SharedRenderState {
   u32 offset_of_s7;
 
   bool use_sky_cpu = true;
-  bool use_occlusion_culling = true;
+  bool use_occlusion_culling = false; // bad for multi
   math::Vector<u8, 4> fog_color = math::Vector<u8, 4>{0, 0, 0, 0};
   float fog_intensity = 1.f;
   bool no_multidraw = false;
@@ -87,6 +87,23 @@ struct SharedRenderState {
   u64 frame_idx = 0;
 
   bool stencil_dirty = false;
+
+  // camera matrices from GOAL:
+  struct MultiCameraGoalMatrices {
+    // the inv-rot matrix from GOAL. (pose of the primary camera in the world)
+    math::Matrix4f w_T_cpri;
+    // the inv-rot matrix of extra cameras from GOAL. (pose of extra camera in the world)
+    math::Matrix4f w_T_cextra[3];
+  } multi_camera_goal;
+
+  // per-camera info for multi-camera rendering.
+  struct Cam {
+    math::Matrix4f w_T_wprime; // for non merc
+    math::Matrix4f pri_cam_T_cam;
+  };
+
+  Cam cameras[4];
+  int camera_idx = 0;
 };
 
 /*!

game/graphics/opengl_renderer/OpenGLRenderer.cpp

@@ -2,6 +2,7 @@
 
 #include "common/goal_constants.h"
 #include "common/log/log.h"
+#include "common/math/geometry.h"
 #include "common/util/FileUtil.h"
 
 #include "game/graphics/opengl_renderer/BlitDisplays.h"
@@ -66,12 +67,61 @@ void GLAPIENTRY opengl_error_callback(GLenum source,
   }
 }
 
+class MultiCameraMatrixGrabber : public BucketRenderer {
+ public:
+  MultiCameraMatrixGrabber(const std::string& name, int my_id) : BucketRenderer(name, my_id) {}
+  void draw_debug_window() override {}
+  void render(DmaFollower& dma, SharedRenderState* render_state, ScopedProfilerNode&) override {
+    while (dma.current_tag_offset() != render_state->next_bucket) {
+      auto xfer = dma.read_and_advance();
+      if (xfer.size_bytes == sizeof(SharedRenderState::MultiCameraGoalMatrices) &&
+          render_state->camera_idx == 0) {
+        // grab camera data from GOAL:
+        memcpy(&render_state->multi_camera_goal, xfer.data,
+               sizeof(SharedRenderState::MultiCameraGoalMatrices));
+
+        math::Matrix4f cpri_T_w = inverse(render_state->multi_camera_goal.w_T_cpri);
+        // set up some helpful matrices:
+        for (int i = 0; i < 4; i++) {
+          auto& cam = render_state->cameras[i];
+
+          // what GOAL calls "inverse camera rot", but is really w_T_c
+          const auto& w_T_c = i == 0 ? render_state->multi_camera_goal.w_T_cpri
+                                     : render_state->multi_camera_goal.w_T_cextra[i - 1];
+          cam.w_T_wprime = render_state->multi_camera_goal.w_T_cpri * inverse(w_T_c);
+          cam.pri_cam_T_cam = cpri_T_w * w_T_c;
+        }
+      }
+    }
+  }
+};
+
 OpenGLRenderer::OpenGLRenderer(std::shared_ptr<TexturePool> texture_pool,
                                std::shared_ptr<Loader> loader,
                                GameVersion version)
     : m_render_state(texture_pool, loader, version),
       m_collide_renderer(version),
-      m_version(version) {
+      m_version(version),
+      m_skip_multi_buckets((int)jak2::BucketId::MAX_BUCKETS) {
+  for (auto bucket : {
+           jak1::BucketId::OCEAN_MID_AND_FAR,         // too lazy to fix
+           jak1::BucketId::OCEAN_NEAR,                // too lazy to fix
+           jak1::BucketId::SKY_DRAW,                  // needs goal fix
+           jak1::BucketId::TFRAG_TEX_LEVEL0,          // texture
+           jak1::BucketId::TFRAG_TEX_LEVEL1,          // texture
+           jak1::BucketId::SHRUB_TEX_LEVEL0,          // texture
+           jak1::BucketId::SHRUB_TEX_LEVEL1,          // texture
+           jak1::BucketId::ALPHA_TEX_LEVEL0,          // texture
+           jak1::BucketId::ALPHA_TEX_LEVEL1,          // texture
+           jak1::BucketId::PRIS_TEX_LEVEL0,           // texture
+           jak1::BucketId::PRIS_TEX_LEVEL1,           // texture
+           jak1::BucketId::WATER_TEX_LEVEL0,          // texture
+           jak1::BucketId::WATER_TEX_LEVEL1,          // texture
+           jak1::BucketId::PRE_SPRITE_TEX,            // texture
+       }) {
+    m_skip_multi_buckets[(int)bucket] = true;
+  }
+
   // requires OpenGL 4.3
 #ifndef __APPLE__
   // setup OpenGL errors
@@ -341,6 +391,8 @@ void OpenGLRenderer::init_bucket_renderers_jak1() {
   // 0 : ??
   // 1 : ??
   // 2 : ??
+  init_bucket_renderer<MultiCameraMatrixGrabber>("multicam", BucketCategory::OTHER,
+                                                 BucketId::BUCKET2);
   // 3 : SKY_DRAW
   init_bucket_renderer<SkyRenderer>("sky", BucketCategory::OTHER, BucketId::SKY_DRAW);
   // 4 : OCEAN_MID_AND_FAR
@@ -983,13 +1035,28 @@ void OpenGLRenderer::dispatch_buckets_jak1(DmaFollower dma,
   ASSERT(dma.current_tag_offset() == m_render_state.next_bucket);
   m_render_state.next_bucket += 16;
 
+  GLint old_viewport[4];
+  glGetIntegerv(GL_VIEWPORT, old_viewport);
+
   // loop over the buckets!
   for (size_t bucket_id = 0; bucket_id < m_bucket_renderers.size(); bucket_id++) {
     auto& renderer = m_bucket_renderers[bucket_id];
     auto bucket_prof = prof.make_scoped_child(renderer->name_and_id());
     g_current_renderer = renderer->name_and_id();
     // lg::info("Render: {} start", g_current_renderer);
+
+    // render primary camera:
+    m_render_state.camera_idx = 0;
+    auto dma_copy = dma;
+    glViewport(old_viewport[0], old_viewport[1], old_viewport[2] / 2, old_viewport[3] / 2);
     renderer->render(dma, &m_render_state, bucket_prof);
+    if (!m_skip_multi_buckets[bucket_id]) {
+      m_render_state.camera_idx = 1;
+      glViewport(old_viewport[0] + old_viewport[2] / 2, old_viewport[1] + old_viewport[3] / 2,
+                 old_viewport[2] / 2, old_viewport[3] / 2);
+      renderer->render(dma_copy, &m_render_state, bucket_prof);
+    }
+
     if (sync_after_buckets) {
       auto pp = scoped_prof("finish");
       glFinish();
@@ -1009,6 +1076,8 @@ void OpenGLRenderer::dispatch_buckets_jak1(DmaFollower dma,
     }
   }
 
+  glViewport(old_viewport[0], old_viewport[1], old_viewport[2], old_viewport[3]);
+
   // TODO ending data.
 }
 

game/graphics/opengl_renderer/OpenGLRenderer.h

@@ -103,6 +103,7 @@ class OpenGLRenderer {
   }
 
   SharedRenderState m_render_state;
+  std::vector<bool> m_skip_multi_buckets;
   Profiler m_profiler;
   SmallProfiler m_small_profiler;
   SubtitleEditor* m_subtitle_editor = nullptr;

game/graphics/opengl_renderer/ShadowRenderer.cpp

@@ -2,6 +2,8 @@
 
 #include <cfloat>
 
+#include "common/math/geometry.h"
+
 #include "third-party/imgui/imgui.h"
 
 ShadowRenderer::ShadowRenderer(const std::string& name, int my_id) : BucketRenderer(name, my_id) {
@@ -237,7 +239,15 @@ void ShadowRenderer::render(DmaFollower& dma,
     ASSERT(v1.kind == VifCode::Kind::UNPACK_V4_32);
     ASSERT(v1.immediate == Vu1Data::MATRIX);
     ASSERT(v1.num == 4);
-    memcpy(m_vu_data + v1.immediate, constants.data, v1.num * 16);
+
+    // such disgusting hacks
+    math::Matrix4f p;
+    memcpy(p.data(), constants.data, v1.num * 16);
+    auto& this_cam = render_state->cameras[render_state->camera_idx];
+    auto new_cam = (p * inverse(this_cam.pri_cam_T_cam));
+    memcpy(m_vu_data + v1.immediate, new_cam.data(), 16 * 4);
+
+    // memcpy(m_vu_data + v1.immediate, constants.data, v1.num * 16);
   }
 
   {

game/graphics/opengl_renderer/background/TFragment.cpp

@@ -447,8 +447,11 @@ void TFragment::render_tree(int geom,
   glEnable(GL_PRIMITIVE_RESTART);
   glPrimitiveRestartIndex(UINT32_MAX);
 
-  cull_check_all_slow(settings.camera.planes, tree.vis->vis_nodes, settings.occlusion_culling,
-                      m_cache.vis_temp.data());
+  // cull_check_all_slow(settings.camera.planes, tree.vis->vis_nodes, settings.occlusion_culling,
+  //                    m_cache.vis_temp.data());
+  for (size_t i = 0; i < tree.vis->vis_nodes.size(); i++) {
+    m_cache.vis_temp.data()[i] = 1;
+  }
 
   u32 total_tris;
   if (render_state->no_multidraw) {

game/graphics/opengl_renderer/background/Tie3.cpp

@@ -448,9 +448,12 @@ void Tie3::setup_tree(int idx,
   }
 
   if (!m_debug_all_visible) {
-    // need culling data
-    cull_check_all_slow(settings.camera.planes, tree.vis->vis_nodes, settings.occlusion_culling,
-                        tree.vis_temp.data());
+    for (size_t i = 0; i < tree.vis->vis_nodes.size(); i++) {
+      tree.vis_temp.data()[i] = 1;
+    }
+    //    cull_check_all_slow(settings.camera.planes, tree.vis->vis_nodes,
+    //    settings.occlusion_culling,
+    //                        tree.vis_temp.data());
   }
 
   u32 num_tris = 0;
@@ -504,8 +507,24 @@ void set_uniform(GLuint uniform, const math::Vector4f& val) {
 }
 }  // namespace
 
-void init_etie_cam_uniforms(const EtieUniforms& uniforms, const GoalBackgroundCameraData& data) {
-  glUniformMatrix4fv(uniforms.cam_no_persp, 1, GL_FALSE, data.rot[0].data());
+namespace {
+math::Matrix4f matrix_from_col_vectors(const math::Vector4f* vectors) {
+  math::Matrix4f ret;
+  for (int c = 0; c < 4; c++) {
+    for (int r = 0; r < 4; r++) {
+      ret(r, c) = vectors[c][r];
+    }
+  }
+  return ret;
+}
+}  // namespace
+
+void init_etie_cam_uniforms(const EtieUniforms& uniforms,
+                            const GoalBackgroundCameraData& data,
+                            SharedRenderState* render_state) {
+  auto& this_cam = render_state->cameras[render_state->camera_idx];
+  math::Matrix4f s_T_w = matrix_from_col_vectors(data.rot);
+  glUniformMatrix4fv(uniforms.cam_no_persp, 1, GL_FALSE, (s_T_w * this_cam.w_T_wprime).data());
 
   math::Vector4f perspective[2];
   float inv_fog = 1.f / data.fog[0];
@@ -550,7 +569,7 @@ void Tie3::draw_matching_draws_for_tree(int idx,
 
   if (use_envmap) {
     // if we use envmap, use the envmap-style math for the base draw to avoid rounding issue.
-    init_etie_cam_uniforms(m_etie_base_uniforms, m_common_data.settings.camera);
+    init_etie_cam_uniforms(m_etie_base_uniforms, m_common_data.settings.camera, render_state);
   }
 
   glBindVertexArray(tree.vao);
@@ -654,7 +673,7 @@ void Tie3::envmap_second_pass_draw(const Tree& tree,
   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
                render_state->no_multidraw ? tree.single_draw_index_buffer : tree.index_buffer);
 
-  init_etie_cam_uniforms(m_etie_uniforms, m_common_data.settings.camera);
+  init_etie_cam_uniforms(m_etie_uniforms, m_common_data.settings.camera, render_state);
   set_uniform(m_etie_uniforms.envmap_tod_tint, m_common_data.envmap_color);
 
   int last_texture = -1;
@@ -874,6 +893,8 @@ void do_wind_math(u16 wind_idx,
   // sd s2, 0(s5)
 }
 
+namespace {}  // namespace
+
 void Tie3::render_tree_wind(int idx,
                             int geom,
                             const TfragRenderSettings& settings,
@@ -887,10 +908,17 @@ void Tie3::render_tree_wind(int idx,
   // note: this isn't the most efficient because we might compute wind matrices for invisible
   // instances. TODO: add vis ids to the instance info to avoid this
   memset(tree.wind_matrix_cache.data(), 0, sizeof(float) * 16 * tree.wind_matrix_cache.size());
-  auto& cam_bad = settings.camera.camera;
+
+  auto& this_cam = render_state->cameras[render_state->camera_idx];
+  math::Matrix4f s_T_w = matrix_from_col_vectors(settings.camera.camera);
+  auto hacked_cam = s_T_w * this_cam.w_T_wprime;
+
+  // auto& cam_bad = settings.camera.camera;
   std::array<math::Vector4f, 4> cam;
-  for (int i = 0; i < 4; i++) {
-    cam[i] = cam_bad[i];
+  for (int c = 0; c < 4; c++) {
+    for (int r = 0; r < 4; r++) {
+      cam[c][r] = hacked_cam(r, c);
+    }
   }
 
   for (size_t inst_id = 0; inst_id < tree.instance_info->size(); inst_id++) {

game/graphics/opengl_renderer/background/background_common.cpp

@@ -1,6 +1,7 @@
 
 
 #include "background_common.h"
+#include "common/math/geometry.h"
 
 #ifdef __aarch64__
 #include "third-party/sse2neon/sse2neon.h"
@@ -171,6 +172,18 @@ DoubleDraw setup_tfrag_shader(SharedRenderState* render_state, DrawMode mode, Sh
   return draw_settings;
 }
 
+namespace {
+math::Matrix4f matrix_from_col_vectors(const math::Vector4f* vectors) {
+  math::Matrix4f ret;
+  for (int c = 0; c < 4; c++) {
+    for (int r = 0; r < 4; r++) {
+      ret(r, c) = vectors[c][r];
+    }
+  }
+  return ret;
+}
+}
+
 void first_tfrag_draw_setup(const TfragRenderSettings& settings,
                             SharedRenderState* render_state,
                             ShaderId shader) {
@@ -180,8 +193,10 @@ void first_tfrag_draw_setup(const TfragRenderSettings& settings,
   glUniform1i(glGetUniformLocation(id, "gfx_hack_no_tex"), Gfx::g_global_settings.hack_no_tex);
   glUniform1i(glGetUniformLocation(id, "decal"), false);
   glUniform1i(glGetUniformLocation(id, "tex_T0"), 0);
+  auto& this_cam = render_state->cameras[render_state->camera_idx];
+  math::Matrix4f s_T_w = matrix_from_col_vectors(settings.camera.camera);
   glUniformMatrix4fv(glGetUniformLocation(id, "camera"), 1, GL_FALSE,
-                     settings.camera.camera[0].data());
+                     (s_T_w * this_cam.w_T_wprime).data());
   glUniform4f(glGetUniformLocation(id, "hvdf_offset"), settings.camera.hvdf_off[0],
               settings.camera.hvdf_off[1], settings.camera.hvdf_off[2],
               settings.camera.hvdf_off[3]);

game/graphics/opengl_renderer/buckets.h

@@ -6,7 +6,7 @@ namespace jak1 {
 enum class BucketId {
   BUCKET0 = 0,
   BUCKET1 = 1,
-  // 2
+  BUCKET2 = 2,
   SKY_DRAW = 3,
   OCEAN_MID_AND_FAR = 4,
   TFRAG_TEX_LEVEL0 = 5,

game/graphics/opengl_renderer/foreground/Merc2.cpp

@@ -1,5 +1,8 @@
 #include "Merc2.h"
 
+#include "common/math/geometry.h"
+
+
 #ifdef __aarch64__
 #include "third-party/sse2neon/sse2neon.h"
 #else
@@ -840,6 +843,18 @@ void set_uniform(GLuint uniform, const math::Vector4f& val) {
 }
 }  // namespace
 
+namespace {
+math::Matrix4f matrix_from_col_vectors(const math::Vector4f* vectors) {
+  math::Matrix4f ret;
+  for (int c = 0; c < 4; c++) {
+    for (int r = 0; r < 4; r++) {
+      ret(r, c) = vectors[c][r];
+    }
+  }
+  return ret;
+}
+}  // namespace
+
 void Merc2::handle_setup_dma(DmaFollower& dma, SharedRenderState* render_state) {
   auto first = dma.read_and_advance();
 
@@ -882,16 +897,18 @@ void Merc2::handle_setup_dma(DmaFollower& dma, SharedRenderState* render_state)
   // 8 qw's of low memory data
   memcpy(&m_low_memory, first.data + 16, sizeof(LowMemory));
 
+  auto& this_cam = render_state->cameras[render_state->camera_idx];
+  math::Matrix4f p = matrix_from_col_vectors(m_low_memory.perspective);
+  auto new_cam = (p * inverse(this_cam.pri_cam_T_cam));
+
   switch_to_merc2(render_state);
   set_uniform(m_merc_uniforms.hvdf_offset, m_low_memory.hvdf_offset);
   set_uniform(m_merc_uniforms.fog, m_low_memory.fog);
-  glUniformMatrix4fv(m_merc_uniforms.perspective_matrix, 1, GL_FALSE,
-                     &m_low_memory.perspective[0].x());
+  glUniformMatrix4fv(m_merc_uniforms.perspective_matrix, 1, GL_FALSE, new_cam.data());
   switch_to_emerc(render_state);
   set_uniform(m_emerc_uniforms.hvdf_offset, m_low_memory.hvdf_offset);
   set_uniform(m_emerc_uniforms.fog, m_low_memory.fog);
-  glUniformMatrix4fv(m_emerc_uniforms.perspective_matrix, 1, GL_FALSE,
-                     &m_low_memory.perspective[0].x());
+  glUniformMatrix4fv(m_emerc_uniforms.perspective_matrix, 1, GL_FALSE, new_cam.data());
 
   // 1 qw with another 4 vifcodes.
   u32 vifcode_final_data[4];

game/graphics/opengl_renderer/loader/Loader.cpp

@@ -475,30 +475,28 @@ void Loader::update(TexturePool& texture_pool) {
               }
             }
           }
-
-          glBindTexture(GL_TEXTURE_2D, tex);
-          glDeleteTextures(1, &tex);
+          m_garbage_textures.push_back(tex);
         }
 
         for (auto& tie_geo : lev->tie_data) {
           for (auto& tie_tree : tie_geo) {
-            glDeleteBuffers(1, &tie_tree.vertex_buffer);
+            m_garbage_buffers.push_back(tie_tree.vertex_buffer);
             if (tie_tree.has_wind) {
-              glDeleteBuffers(1, &tie_tree.wind_indices);
+              m_garbage_buffers.push_back(tie_tree.wind_indices);
             }
-            glDeleteBuffers(1, &tie_tree.index_buffer);
+            m_garbage_buffers.push_back(tie_tree.index_buffer);
           }
         }
 
         for (auto& tfrag_geo : lev->tfrag_vertex_data) {
           for (auto& tfrag_buff : tfrag_geo) {
-            glDeleteBuffers(1, &tfrag_buff);
+            m_garbage_buffers.push_back(tfrag_buff);
           }
         }
 
-        glDeleteBuffers(1, &lev->collide_vertices);
-        glDeleteBuffers(1, &lev->merc_vertices);
-        glDeleteBuffers(1, &lev->merc_indices);
+        m_garbage_buffers.push_back(lev->collide_vertices);
+        m_garbage_buffers.push_back(lev->merc_vertices);
+        m_garbage_buffers.push_back(lev->merc_indices);
 
         for (auto& model : lev->level->merc_data.models) {
           auto& mercs = m_all_merc_models.at(model.name);
@@ -515,6 +513,21 @@ void Loader::update(TexturePool& texture_pool) {
     if (unload_timer.getMs() > 5.f) {
       fmt::print("Unload took {:.2f}\n", unload_timer.getMs());
     }
+
+    if (!m_garbage_buffers.empty()) {
+      did_gpu_stuff = true;
+      for (int i = 0; i < 5 && !m_garbage_buffers.empty(); i++) {
+        glDeleteBuffers(1, &m_garbage_buffers.back());
+        m_garbage_buffers.pop_back();
+      }
+    }
+
+    if (!did_gpu_stuff && !m_garbage_textures.empty()) {
+      for (int i = 0; i < 20 && !m_garbage_textures.empty(); i++) {
+        glDeleteTextures(1, &m_garbage_textures.back());
+        m_garbage_textures.pop_back();
+      }
+    }
   }
 
   if (loader_timer.getMs() > 5) {

game/graphics/opengl_renderer/loader/Loader.h

@@ -55,6 +55,8 @@ class Loader {
   std::vector<std::string> m_desired_levels;
   std::vector<std::string> m_active_levels;
   std::vector<std::unique_ptr<LoaderStage>> m_loader_stages;
+  std::vector<GLuint> m_garbage_textures;
+  std::vector<GLuint> m_garbage_buffers;
 
   fs::path m_base_path;
   int m_max_levels = 0;

game/graphics/opengl_renderer/loader/LoaderStages.cpp

@@ -4,7 +4,7 @@
 
 #include "common/global_profiler/GlobalProfiler.h"
 
-constexpr float LOAD_BUDGET = 2.5f;
+constexpr float LOAD_BUDGET = 4.5f;
 
 /*!
  * Upload a texture to the GPU, and give it to the pool.
@@ -40,7 +40,7 @@ class TextureLoaderStage : public LoaderStage {
  public:
   TextureLoaderStage() : LoaderStage("texture") {}
   bool run(Timer& timer, LoaderInput& data) override {
-    constexpr int MAX_TEX_BYTES_PER_FRAME = 1024 * 512;
+    constexpr int MAX_TEX_BYTES_PER_FRAME = 1024 * 1024;
 
     int bytes_this_run = 0;
     int tex_this_run = 0;
@@ -84,7 +84,6 @@ class TfragLoadStage : public LoaderStage {
           GLuint& tree_out = data.lev_data->tfrag_vertex_data[geo].emplace_back();
           glGenBuffers(1, &tree_out);
           glBindBuffer(GL_ARRAY_BUFFER, tree_out);
-
           glBufferData(GL_ARRAY_BUFFER,
                        in_tree.unpacked.vertices.size() * sizeof(tfrag3::PreloadedVertex), nullptr,
                        GL_STATIC_DRAW);
@@ -149,7 +148,6 @@ class TfragLoadStage : public LoaderStage {
             return true;
           }
         }
-
         return false;
       }
 

game/graphics/opengl_renderer/sprite/GlowRenderer.cpp

@@ -267,6 +267,10 @@ void copy_to_vertex(GlowRenderer::Vertex* vtx, const Vector4f& xyzw) {
 }
 }  // namespace
 
+bool GlowRenderer::at_max_capacity() {
+  return m_next_sprite == m_sprite_data_buffer.size();
+}
+
 SpriteGlowOutput* GlowRenderer::alloc_sprite() {
   ASSERT(m_next_sprite < m_sprite_data_buffer.size());
   return &m_sprite_data_buffer[m_next_sprite++];

game/graphics/opengl_renderer/sprite/GlowRenderer.h

@@ -6,6 +6,7 @@
 class GlowRenderer {
  public:
   GlowRenderer();
+  bool at_max_capacity();
   SpriteGlowOutput* alloc_sprite();
   void cancel_sprite();
 
@@ -87,8 +88,7 @@ class GlowRenderer {
 
   // max sprites should be 128 in simple sprite, plus 256 from aux = 384
   // 20 width = 20 * 20 = 400 sprites > 384.
-  // we multiply by 2 to get 4x as many max sprites (in-game the max is 4x)
-  static constexpr int kDownsampleBatchWidth = 20 * 2;
+  static constexpr int kDownsampleBatchWidth = 20;
   static constexpr int kMaxSprites = kDownsampleBatchWidth * kDownsampleBatchWidth;
   static constexpr int kMaxVertices = kMaxSprites * 32;  // check.
   static constexpr int kMaxIndices = kMaxSprites * 32;   // check.

game/graphics/opengl_renderer/sprite/Sprite3.cpp

@@ -232,8 +232,12 @@ void Sprite3::render_2d_group0(DmaFollower& dma,
   // glUniform4fv(glGetUniformLocation(shid, "hmge_scale"), 1, m_frame_data.hmge_scale.data());
   glUniform1f(glGetUniformLocation(shid, "deg_to_rad"), m_frame_data.deg_to_rad);
   glUniform1f(glGetUniformLocation(shid, "inv_area"), m_frame_data.inv_area);
+  auto& this_cam = render_state->cameras[render_state->camera_idx];
+
   glUniformMatrix4fv(glGetUniformLocation(shid, "camera"), 1, GL_FALSE,
-                     m_3d_matrix_data.camera.data());
+                     // m_3d_matrix_data.camera
+                     (m_3d_matrix_data.camera * this_cam.w_T_wprime)
+                         .data());
   glUniform4fv(glGetUniformLocation(shid, "xy_array"), 8, m_frame_data.xy_array[0].data());
   glUniform4fv(glGetUniformLocation(shid, "xyz_array"), 4, m_frame_data.xyz_array[0].data());
   glUniform4fv(glGetUniformLocation(shid, "st_array"), 4, m_frame_data.st_array[0].data());

game/graphics/opengl_renderer/sprite/Sprite3_Glow.cpp

@@ -220,6 +220,9 @@ void Sprite3::glow_dma_and_draw(DmaFollower& dma,
     ASSERT(shader_xfer.size_bytes == 5 * 16);
 
     if (m_enable_glow) {
+      if (m_glow_renderer.at_max_capacity()) {
+        m_glow_renderer.flush(render_state, prof);
+      }
       auto* out = m_glow_renderer.alloc_sprite();
       if (!glow_math(&consts, m_glow_renderer.new_mode, vecdata_xfer.data, shader_xfer.data, out)) {
         m_glow_renderer.cancel_sprite();

game/kernel/jak2/kprint.cpp

@@ -229,7 +229,6 @@ s32 format_impl_jak2(uint64_t* args) {
         case 'w':
         case 'y':
         case 'z':
-        case 1:  // jak 2 japanese encoding
           while (arg_start < format_ptr + 1) {
             *output_ptr = *arg_start;
             arg_start++;
@@ -517,12 +516,15 @@ s32 format_impl_jak2(uint64_t* args) {
         default:
           MsgErr("format: unknown code 0x%02x\n", format_ptr[1]);
           MsgErr("input was %s\n", format_cstring);
-          ASSERT(false);
+          // ASSERT(false);
+          goto copy_char_hack;
           break;
       }
       format_ptr++;
     } else {
-      // got normal char, just copy it
+    // got normal char, just copy it
+    copy_char_hack:  // we goto here if we get a bad code for ~, which sort of backtracks and falls
+                     // back to regular character copying
       *output_ptr = *format_ptr;
       output_ptr++;
     }

game/tools/subtitle_editor/subtitle_editor.cpp

@@ -463,14 +463,18 @@ void SubtitleEditor::draw_subtitle_options(GameSubtitleSceneInfo& scene, bool cu
       if (!line_meta.merge) {
         if (ImGui::BeginCombo(
                 "Speaker",
-                m_subtitle_db.m_banks[m_current_language]->m_speakers.at(line_speaker).c_str())) {
+                fmt::format("{} ({})",
+                            m_subtitle_db.m_banks[m_current_language]->m_speakers.at(line_speaker),
+                            line_speaker)
+                    .c_str())) {
           for (const auto& [speaker_id, localized_name] :
                m_subtitle_db.m_banks[m_current_language]->m_speakers) {
             const bool is_selected = speaker_id == line_speaker;
             if (is_selected) {
               ImGui::SetItemDefaultFocus();
             }
-            if (ImGui::Selectable(localized_name.c_str(), is_selected)) {
+            if (ImGui::Selectable(fmt::format("{} ({})", localized_name, speaker_id).c_str(),
+                                  is_selected)) {
               line_meta.speaker = speaker_id;
             }
           }
@@ -524,14 +528,16 @@ void SubtitleEditor::draw_new_scene_line_form() {
     current_speaker =
         m_subtitle_db.m_banks[m_current_language]->m_speakers.at(m_current_scene_speaker);
   }
-  if (ImGui::BeginCombo("Speaker", current_speaker.c_str())) {
+  if (ImGui::BeginCombo("Speaker",
+                        fmt::format("{} ({})", current_speaker, m_current_scene_speaker).c_str())) {
     for (const auto& [speaker_id, localized_name] :
          m_subtitle_db.m_banks[m_current_language]->m_speakers) {
       const bool is_selected = speaker_id == m_current_scene_speaker;
       if (is_selected) {
         ImGui::SetItemDefaultFocus();
       }
-      if (ImGui::Selectable(localized_name.c_str(), is_selected)) {
+      if (ImGui::Selectable(fmt::format("{} ({})", localized_name, speaker_id).c_str(),
+                            is_selected)) {
         m_current_scene_speaker = speaker_id;
       }
     }

goal_src/goal-lib.gc

@@ -543,11 +543,13 @@
     )
   )
 
-(defmacro eq-any? (val &rest pred)
-  "is val equal to any of the values in pred? evaluated using or, so it short circuits."
-  (with-gensyms (val-var)
-  `(let ((,val-var ,val))
-    (or ,@(apply (lambda (x) `(= ,val-var ,x)) pred)))
+(defmacro symbol-member? (sym lst)
+  "is sym present in lst? uses or, so it short circuits."
+  (with-gensyms (sym-var)
+  (fmt #t "{}" lst)
+  `(let ((,sym-var ,sym))
+                                                      ;; TODO fix this bug
+    (or ,@(apply (lambda (x) `(= ,sym-var (quote ,x))) (second lst))))
     )
   )
 

goal_src/jak1/engine/draw/drawable.gc

@@ -904,6 +904,16 @@
 
 (define *generic-effect-mode* 0)
 
+
+;; This contains the camera matrices. There must be one "primary camera" that matches *math-camera*. But the rest of the cameras are up to you.
+(deftype multi-camera (structure)
+  ((primary-camera matrix :inline)
+   (extra-cameras matrix 3 :inline)
+   )
+  )
+
+(define *multi-camera* (new 'global 'multi-camera))
+
 (defun real-main-draw-hook ()
   "The main drawing function. This dispatches all renderers and is called directly from the display-loop
   in main.gc"
@@ -937,6 +947,60 @@
     (reset! *dma-mem-usage*)
     )
 
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; Multi-camera mode: camera placement.
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+  ;; set primary camera to the normal camera.
+  (matrix-copy! (-> *multi-camera* primary-camera)
+                (-> *math-camera* inv-camera-rot)
+                )
+
+  ;; set secondary camera to some example different camera. This puts a camera 10 meters above the default, and
+  ;; point it at jak directly:
+  (let ((cam-pos (vector-copy! (new-stack-vector0) (-> *math-camera* inv-camera-rot vector 3))))
+    ;; shift up by 10 meters
+    (+! (-> cam-pos y) (meters 5))
+    ;; dir from camera to jak
+    (let* ((jak-dir (vector-! (new-stack-vector0)
+                              (if *target* (-> *target* root trans)
+                                  (new-stack-vector0))
+                              cam-pos
+                              ))
+           (mat (-> *multi-camera* extra-cameras 0))
+           )
+      ;; create rotation matrix to point camera at jak
+      (forward-down->inv-matrix
+        mat
+        jak-dir
+        (new 'static 'vector :y -1.))
+      ;; set position.
+      (vector-copy! (-> mat vector 3) cam-pos)
+      )
+    )
+
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; Multi-camera mode: send data to C++
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+  (with-dma-buffer-add-bucket ((buf (-> (current-frame) global-buf))
+                               (the bucket-id 2))
+    (dma-buffer-add-cnt-vif2
+      buf
+      (/ (size-of multi-camera) 16)
+      (the vif-tag 0)
+      (the vif-tag 0)
+      )
+    ;(&+! (-> buf base) 16)
+
+      (mem-copy! (-> buf base)
+                 (the pointer *multi-camera*)
+                 (size-of multi-camera)
+                 )
+      (&+! (-> buf base) (size-of multi-camera))
+    )
+
+
   ;; todo shrub matrix
 
   ;; initialize dma buckets that are generic sinks.

goal_src/jak1/engine/game/projectiles.gc

@@ -678,7 +678,8 @@
                 (+! f0-16 (-> self old-dist v1-35))
                 )
               ;; og:preserve-this changed for high fps. This fixes projectile collision issues
-              (if (or (and (logtest? (-> self root status) (cshape-moving-flags twall)) (< f0-16 (* (-> *display* time-adjust-ratio) 2048.0))) (< f0-16 (* (-> *display* time-adjust-ratio) 2048.0)))
+              (if (or (and (logtest? (-> self root status) (cshape-moving-flags twall)) (< f0-16 (* (-> *display* time-adjust-ratio) (meters 0.5))))
+                      (< f0-16 (* (-> *display* time-adjust-ratio) (meters 0.05))))
                   (set! gp-0 #t)
                   )
               )
@@ -863,10 +864,10 @@
   (projectile-method-27 self)
   (projectile-method-24 self)
   (when (not (type-type? (-> self type) projectile-blue))
-    (let ((a1-8 (new 'stack-no-clear 'collide-edge-hold-list)))
-      (set! (-> a1-8 num-allocs) (the-as uint 1))
-      (set! (-> a1-8 num-attempts) (the-as uint *touching-list*))
-      (find-overlapping-shapes (-> self root) (the-as overlaps-others-params a1-8))
+    (let ((a1-8 (new 'stack-no-clear 'overlaps-others-params)))
+      (set! (-> a1-8 options) (the-as uint 1))
+      (set! (-> a1-8 tlist) *touching-list*)
+      (find-overlapping-shapes (-> self root) a1-8)
       )
     )
   (set! (-> self event-hook) (-> (method-of-object self projectile-moving) event))

goal_src/jak1/engine/ui/text-h.gc

@@ -759,6 +759,7 @@
   (catalan                      #x1119)
   (icelandic                    #x111a)
   (polish                       #x111b)
+  (lithuanian                   #x111c)
   (scene-0                      #x1200)
   (scene-255                    #x12ff)
   (hint-0                       #x1300)

goal_src/jak1/pc/debug/default-menu-pc.gc

@@ -781,6 +781,7 @@
             (flag "br-portuguese" 13 dm-text-language)
             (flag "hungarian" 14 dm-text-language)
             (flag "polish" 19 dm-text-language)
+            (flag "lithuanian" 20 dm-text-language)
             )
          (flag "Fallback Text Search" #f ,(dm-lambda-boolean-flag *fallback-text-lookup?*))
          (flag "Discord RPC" #t ,(dm-lambda-boolean-flag (-> *pc-settings* discord-rpc?)))

goal_src/jak1/pc/pckernel-common.gc

@@ -683,6 +683,7 @@
     (("ps2-music?") (set! (-> obj ps2-music?) (file-stream-read-symbol file)))
     (("ps2-se?") (set! (-> obj ps2-se?) (file-stream-read-symbol file)))
     (("ps2-hints?") (set! (-> obj ps2-hints?) (file-stream-read-symbol file)))
+    (("ps2-shadow?") (set! (-> obj ps2-shadow?) (file-stream-read-symbol file)))
     (("ps2-lod-dist?") (set! (-> obj ps2-lod-dist?) (file-stream-read-symbol file)))
     (("force-envmap?") (set! (-> obj force-envmap?) (file-stream-read-symbol file)))
     (("force-actors?") (set! (-> obj ps2-actor-vis?) (not (file-stream-read-symbol file))))
@@ -769,6 +770,7 @@
   (format file "  (ps2-music? ~A)~%" (-> obj ps2-music?))
   (format file "  (ps2-se? ~A)~%" (-> obj ps2-se?))
   (format file "  (ps2-hints? ~A)~%" (-> obj ps2-hints?))
+  (format file "  (ps2-shadow? ~A)~%" (-> obj ps2-shadow?))
   (format file "  (ps2-lod-dist? ~A)~%" (-> obj ps2-lod-dist?))
   (format file "  (force-envmap? ~A)~%" (-> obj force-envmap?))
   (format file "  (use-vis? ~A)~%" (-> obj use-vis?))

goal_src/jak1/pc/pckernel-h.gc

@@ -180,6 +180,7 @@
    (ps2-hints? symbol) ;; if off, enables extra game hints
 
    ;; lod settings
+   (ps2-shadow? symbol) ;; if off, enables extended object shadows
    (ps2-lod-dist? symbol) ;; use original lod distances
    (force-envmap? symbol) ;; dont use envmap fading (force max).
    (shrub-dist-mod float) ;; shrub render distance modifier
@@ -398,6 +399,7 @@
   (set! (-> obj ps2-se?) #t)
   (set! (-> obj ps2-hints?) #t)
 
+  (set! (-> obj ps2-shadow?) #f)
   (set! (-> obj ps2-lod-dist?) #f)
   (set! (-> obj force-envmap?) #t)
   (set! (-> obj shrub-dist-mod) 1.0)

goal_src/jak1/pc/pckernel-impl.gc

@@ -68,6 +68,7 @@
   (korean 17)
   (russian 18)
   (polish 19)
+  (lithuanian 20)
 
   (custom 999) ;; temp
   )

goal_src/jak1/pc/progress-pc.gc

@@ -507,11 +507,11 @@
   )
 
 (def-language-remap-info *language-remap-info-pc*
-        (english uk-english french german spanish italian japanese portuguese br-portuguese swedish finnish danish norwegian dutch hungarian catalan icelandic polish))
+        (english uk-english french german spanish italian japanese portuguese br-portuguese swedish finnish danish norwegian dutch hungarian catalan icelandic polish lithuanian))
 (define *text-languages* (static-text-list-array
-        english uk-english french german spanish italian japanese portuguese br-portuguese swedish finnish danish norwegian dutch hungarian polish))
+        english uk-english french german spanish italian japanese portuguese br-portuguese swedish finnish danish norwegian dutch hungarian polish lithuanian))
 (define *subtitle-languages* (static-text-list-array
-        english uk-english french german spanish italian br-portuguese swedish finnish danish dutch polish))
+        english uk-english french german spanish italian br-portuguese swedish finnish danish dutch polish lithuanian))
 
 
 

goal_src/jak2/engine/ai/enemy-h.gc

@@ -275,10 +275,10 @@
    (actor-group                (pointer actor-group))
    (actor-group-count          int32)
    (neck                       joint-mod)
-   (on-notice                  symbol)
-   (on-active                  symbol)
-   (on-hostile                 symbol)
-   (on-death                   symbol)
+   (on-notice                  pair)
+   (on-active                  pair)
+   (on-hostile                 pair)
+   (on-death                   pair)
    (idle-anim-player           idle-control          :inline)
    (rand-gen                   symbol)
    )

goal_src/jak2/engine/ai/enemy.gc

@@ -552,20 +552,20 @@
       )
   )
 
-(defmethod enemy-method-135 ((this enemy) (arg0 int))
-  (let ((gp-0 (make-u128 0 0)))
-    (let ((v1-0 arg0))
+(defmethod enemy-method-135 ((this enemy) (sound int))
+  (let ((name (static-sound-name "")))
+    (let ((sound-type sound))
       (cond
-        ((zero? v1-0)
-         (set! gp-0 (the-as uint (-> this enemy-info sound-hit)))
+        ((zero? sound-type)
+         (set! name (-> this enemy-info sound-hit))
          )
-        ((= v1-0 1)
-         (set! gp-0 (the-as uint (-> this enemy-info sound-die)))
+        ((= sound-type 1)
+         (set! name (-> this enemy-info sound-die))
          )
         )
       )
-    (if (nonzero? gp-0)
-        (sound-play-by-name (the-as sound-name gp-0) (new-sound-id) 1024 0 0 (sound-group sfx) #t)
+    (if (nonzero? (the-as uint name))
+        (sound-play-by-name (the-as sound-name name) (new-sound-id) 1024 0 0 (sound-group sfx) #t)
         )
     )
   )
@@ -1090,10 +1090,10 @@
         )
       )
     )
-  (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice symbol))
-  (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active symbol))
-  (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile symbol))
-  (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death symbol))
+  (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice pair))
+  (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active pair))
+  (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile pair))
+  (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death pair))
   (if (-> this on-notice)
       (logior! (-> this enemy-flags) (enemy-flag auto-reset-penetrate))
       )
@@ -1841,7 +1841,7 @@ This commonly includes things such as:
      (drop-pickup (-> this fact) #t *entity-pool* (-> this fact) 0)
      (let ((s5-1 (-> this on-death)))
        (if s5-1
-           (script-eval (the-as pair s5-1) :vector (-> this root trans))
+           (script-eval s5-1 :vector (-> this root trans))
            )
        )
      )
@@ -1883,7 +1883,7 @@ This commonly includes things such as:
      (send-event (ppointer->process (-> this parent)) 'child-die)
      (let ((s5-3 (-> this on-death)))
        (if s5-3
-           (script-eval (the-as pair s5-3) :vector (-> this root trans))
+           (script-eval s5-3 :vector (-> this root trans))
            )
        )
      (cleanup-for-death this)
@@ -2282,7 +2282,7 @@ This commonly includes things such as:
       (logclear! (-> self enemy-flags) (enemy-flag jump-check-blocked))
       (let ((gp-0 (-> self on-active)))
         (if gp-0
-            (script-eval (the-as pair gp-0) :vector (-> self root trans))
+            (script-eval gp-0 :vector (-> self root trans))
             )
         )
       )
@@ -2331,7 +2331,7 @@ This commonly includes things such as:
       (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate))
       (let ((gp-0 (-> self on-notice)))
         (if gp-0
-            (script-eval (the-as pair gp-0) :vector (-> self root trans))
+            (script-eval gp-0 :vector (-> self root trans))
             )
         )
       )
@@ -2386,7 +2386,7 @@ This commonly includes things such as:
       (logclear! (-> self enemy-flags) (enemy-flag drawn-mirrored))
       (let ((gp-0 (-> self on-hostile)))
         (if gp-0
-            (script-eval (the-as pair gp-0) :vector (-> self root trans))
+            (script-eval gp-0 :vector (-> self root trans))
             )
         )
       )

goal_src/jak2/engine/camera/cam-states-dbg.gc

@@ -340,8 +340,9 @@
         (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
           (let ((f28-14 (analog-input (the-as int (-> *cpad-list* cpads arg3 leftx)) 128.0 48.0 110.0 -1.0))
                 (f30-14 (analog-input (the-as int (-> *cpad-list* cpads arg3 lefty)) 128.0 48.0 110.0 -1.0))
-                (f26-0 (analog-input (the-as int (-> *cpad-list* cpads arg3 rightx)) 128.0 48.0 110.0 -1.0))
-                (f0-60 (analog-input (the-as int (-> *cpad-list* cpads arg3 righty)) 128.0 48.0 110.0 -1.0))
+                ;; og:preserve-this
+                (f26-0 (analog-input-horizontal-first (the-as int (-> *cpad-list* cpads arg3 rightx)) 128.0 48.0 110.0 -1.0))
+                (f0-60 (analog-input-vertical-first (the-as int (-> *cpad-list* cpads arg3 righty)) 128.0 48.0 110.0 -1.0))
                 )
             (cond
               ((and (not s3-0) (cpad-hold? arg3 r2))

goal_src/jak2/engine/camera/cam-states.gc

@@ -500,7 +500,8 @@
                 (s5-0 (new-stack-matrix0))
                 )
             (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
-              (let ((f30-0 (analog-input
+              ;; og:preserve-this
+              (let ((f30-0 (analog-input-horizontal-first
                              (the-as int (+ (-> *cpad-list* cpads 0 rightx) -256 (-> *cpad-list* cpads 0 leftx)))
                              0.0
                              48.0
@@ -508,7 +509,7 @@
                              -1.0
                              )
                            )
-                    (f0-0 (analog-input
+                    (f0-0 (analog-input-vertical-first
                             (the-as int (+ (-> *cpad-list* cpads 0 righty) -256 (-> *cpad-list* cpads 0 lefty)))
                             0.0
                             48.0
@@ -517,24 +518,27 @@
                             )
                           )
                     )
-                (set! (-> s4-0 y) (- (-> s4-0 y) (* (- f30-0) (-> *CAM_EYE-bank* rot-speed))))
-                (set! (-> s4-0 x) (- (-> s4-0 x) (* (- f0-0) (-> *CAM_EYE-bank* rot-speed))))
+                ;; og:preserve-this changed for high fps
+                (set! (-> s4-0 y) (- (-> s4-0 y) (* (- f30-0) (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed)))))
+                (set! (-> s4-0 x) (- (-> s4-0 x) (* (- f0-0) (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed)))))
                 )
               )
+            ;; og:preserve-this changed for high fps
             (cond
-              ((< (-> *CAM_EYE-bank* rot-speed) (-> s4-0 x))
-               (set! (-> s4-0 x) (-> *CAM_EYE-bank* rot-speed))
+              ((< (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed)) (-> s4-0 x))
+               (set! (-> s4-0 x) (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed)))
                )
-              ((< (-> s4-0 x) (- (-> *CAM_EYE-bank* rot-speed)))
-               (set! (-> s4-0 x) (- (-> *CAM_EYE-bank* rot-speed)))
+              ((< (-> s4-0 x) (- (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed))))
+               (set! (-> s4-0 x) (- (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed))))
                )
               )
+            ;; og:preserve-this changed for high fps
             (cond
-              ((< (-> *CAM_EYE-bank* rot-speed) (-> s4-0 y))
-               (set! (-> s4-0 y) (-> *CAM_EYE-bank* rot-speed))
+              ((< (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed)) (-> s4-0 y))
+               (set! (-> s4-0 y) (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed)))
                )
-              ((< (-> s4-0 y) (- (-> *CAM_EYE-bank* rot-speed)))
-               (set! (-> s4-0 y) (- (-> *CAM_EYE-bank* rot-speed)))
+              ((< (-> s4-0 y) (- (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed))))
+               (set! (-> s4-0 y) (- (* (-> *display* base-clock time-adjust-ratio) (-> *CAM_EYE-bank* rot-speed))))
                )
               )
             (cond
@@ -821,11 +825,12 @@
          (s4-0 (new 'stack-no-clear 'matrix))
          )
     (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
+      ;; og:preserve-this
       (let ((f24-0
-              (analog-input (the-as int (-> *cpad-list* cpads 0 rightx)) 128.0 32.0 110.0 (* 8192.0 (seconds-per-frame)))
+              (analog-input-horizontal-third (the-as int (-> *cpad-list* cpads 0 rightx)) 128.0 32.0 110.0 (* 8192.0 (seconds-per-frame)))
               )
             (f1-2
-              (analog-input (the-as int (-> *cpad-list* cpads 0 righty)) 128.0 32.0 110.0 (* 8192.0 (seconds-per-frame)))
+              (analog-input-vertical-third (the-as int (-> *cpad-list* cpads 0 righty)) 128.0 32.0 110.0 (* 8192.0 (seconds-per-frame)))
               )
             (s2-0 (new-stack-matrix0))
             )
@@ -2221,7 +2226,8 @@
   )
 
 (defun cam-dist-analog-input ((arg0 int) (arg1 float))
-  (let ((f0-0 (the-as number 0.0)))
+  ;; og:preserve-this
+  (let ((f0-0 0.0))
     (cond
       ((< arg0 28)
        (set! f0-0 (- (fmin arg1 (* 0.083333336 (- 28.0 (the float arg0)) arg1))))
@@ -2230,7 +2236,11 @@
        (set! f0-0 (fmin arg1 (* 0.0125 (+ -160.0 (the float arg0)) arg1)))
        )
       )
-    (the-as float f0-0)
+    ;; og:preserve-this
+    (#if PC_PORT
+      (* (if (-> *pc-settings* third-camera-v-inverted?) 1.0 -1.0) f0-0)
+      f0-0
+      )
     )
   )
 
@@ -2411,7 +2421,8 @@
         )
     )
   (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
-    (let ((f30-2 (analog-input
+    ;; og:preserve-this
+    (let ((f30-2 (analog-input-horizontal-third
                    (the-as int (-> *cpad-list* cpads 0 rightx))
                    128.0
                    32.0
@@ -3317,7 +3328,8 @@
         )
     (when (not (paused?))
       (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
-        (let ((f0-0 (analog-input (the-as int (-> *cpad-list* cpads 0 righty)) 128.0 32.0 110.0 0.05)))
+        ;; og:preserve-this
+        (let ((f0-0 (analog-input-vertical-third (the-as int (-> *cpad-list* cpads 0 righty)) 128.0 32.0 110.0 0.05)))
           (cond
             ((< (* 0.05 (- 1.0 (-> self view-off-param))) f0-0)
              (+! (-> self view-off-param) (* 0.05 (- 1.0 (-> self view-off-param))))
@@ -3338,8 +3350,9 @@
             (lerp (-> *CAM_STICK-bank* min-z) (-> *CAM_STICK-bank* max-z) (-> self view-off-param))
             )
       (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
+        ;; og:preserve-this
         (let ((f0-16
-                (analog-input (the-as int (-> *cpad-list* cpads 0 rightx)) 128.0 32.0 110.0 (* 21845.334 (seconds-per-frame)))
+                (analog-input-horizontal-third (the-as int (-> *cpad-list* cpads 0 rightx)) 128.0 32.0 110.0 (* 21845.334 (seconds-per-frame)))
                 )
               (gp-0 (new-stack-matrix0))
               (s3-0 (new-stack-vector0))

goal_src/jak2/engine/common_objs/generic-obs.gc

@@ -2137,7 +2137,8 @@ This commonly includes things such as:
     (let ((s5-0 (new-stack-matrix0))
           (gp-0 (vector-reset! (new 'stack-no-clear 'vector)))
           )
-      (let* ((f0-0 (analog-input (the-as int (+ (-> *cpad-list* cpads 0 rightx) -128)) 0.0 48.0 110.0 -1.0))
+      ;; og:preserve-this
+      (let* ((f0-0 (analog-input-horizontal-third (the-as int (+ (-> *cpad-list* cpads 0 rightx) -128)) 0.0 48.0 110.0 -1.0))
              (f0-1 (* -546.13336 f0-0))
              (f0-3 (fmin 546.13336 (fmax -546.13336 f0-1)))
              )
@@ -2206,7 +2207,8 @@ This commonly includes things such as:
 (defbehavior cam-launcher-long-joystick camera-slave ()
   (when (not (logtest? (-> *camera* settings master-options) (cam-master-options IGNORE_ANALOG)))
     (let ((gp-0 (new-stack-matrix0)))
-      (let* ((f0-0 (analog-input (the-as int (+ (-> *cpad-list* cpads 0 rightx) -128)) 0.0 48.0 110.0 -1.0))
+      ;; og:preserve-this
+      (let* ((f0-0 (analog-input-horizontal-third (the-as int (+ (-> *cpad-list* cpads 0 rightx) -128)) 0.0 48.0 110.0 -1.0))
              (f0-1 (* -546.13336 f0-0))
              (f0-3 (fmin 546.13336 (fmax -546.13336 f0-1)))
              )

goal_src/jak2/engine/debug/debug.gc

@@ -1579,27 +1579,43 @@ Most functions take a boolean as their first argument. If the boolean is set to
                                  bucket
                                  )
       (set! (-> (new 'stack-no-clear 'vector) quad) (the-as uint128 0))
-      (let ((v1-7 arg4))
-        (draw-string-xy
-          "X"
-          buf
-          (+ x -5)
-          (+ y -4)
-          (cond
-            ((= v1-7 (mouse-buttons left))
-             (font-color red)
-             )
-            ((= v1-7 (mouse-buttons right))
-             (font-color yellow)
-             )
-            ((= v1-7 (mouse-buttons middle))
-             (font-color green)
-             )
-            (else
-              (font-color default)
+      (#cond
+        (PC_PORT
+          ;; just draw a + with lines at the position
+          (let ((color (case arg4
+                            (((mouse-buttons left)) (static-rgba #xff #x00 #x00 #x80))
+                            (((mouse-buttons right)) (static-rgba #xff #xff #x00 #x80))
+                            (((mouse-buttons middle)) (static-rgba #x00 #xff #x00 #x80))
+                            (else (static-rgba #xff #xff #xff #x80))
+                        )))
+            (draw-sprite2d-xy buf (- x 3) (- y 1) 5 1 color)
+            (draw-sprite2d-xy buf (- x 1) ( - y 3) 1 5 color)
+            ))
+        (#t
+          ;; print an X at the position (roughly)
+          (let ((v1-7 arg4))
+            (draw-string-xy
+              "X"
+              buf
+              (+ x -5)
+              (+ y -4)
+              (cond
+                ((= v1-7 (mouse-buttons left))
+                (font-color red)
+                )
+                ((= v1-7 (mouse-buttons right))
+                (font-color yellow)
+                )
+                ((= v1-7 (mouse-buttons middle))
+                (font-color green)
+                )
+                (else
+                  (font-color default)
+                  )
+                )
+              (font-flags shadow)
               )
             )
-          (font-flags shadow)
           )
         )
       )

goal_src/jak2/engine/game/main.gc

@@ -611,7 +611,8 @@
                           (suspend)
                           )
                         )
-                      (kernel-shutdown)
+                      ;; og:preserve-this
+                      (kernel-shutdown (runtime-exit-status exit))
                       (none)
                       )
                     (if (= *master-exit* 'movie)