regression

This bit of ff-squad-control code is trying to sort guards based on
their distance from some shared target. In some cases the
`vector-vector-distance` returns NaN. In the bubble sort below this
change, the < operation always returns #t when NaN is involved, so the
NaN guard gets swapped back and forth endlessly, causing an infinite
loop.

.dockerignore

@@ -0,0 +1,8 @@
+.cache/
+.git/
+build/
+decompiler_out/
+failures/
+iso_data/
+out/
+log/

.github/ISSUE_TEMPLATE/jak3-bug-report.yml

@@ -0,0 +1,75 @@
+name: "\U0001F41B Jak 3 Bug Report"
+description: Create a bug report for Jak 3.
+labels: ["jak3"]
+type: 'bug'
+body:
+  - type: checkboxes
+    attributes:
+      label: Acknowledgements
+      description: Take a couple minutes to help our maintainers work faster.
+      options:
+        - label: I have [searched](https://github.com/open-goal/jak-project/issues?q=is%3Aissue+is%3Aopen+label%3Abug+label%3Ajak3+sort%3Aupdated-desc+) for duplicate or closed bug reports
+          required: true
+        - label: I understand that I am supposed to provide my own legitimately obtained copy of the game
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of what the bug is. You may post screenshots or videos of the bug here.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: How To Reproduce
+      description: Steps to reproduce the behavior. You can also post a video of it here.
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Does this problem occur on original hardware or PCSX2?
+      description: Some things that may seem like bugs are actually exactly how the original game behaved.
+      options:
+        - Yes, it's unique to OpenGOAL
+        - Didn't check
+        - Not needed, bug is obvious
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of the expected behavior.
+      placeholder: When I do X, Y should happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Environment Information
+      description: "You can upload the [Support Package](https://github.com/open-goal/launcher#asking-for-help) provided by the Launcher here, or you can provide the following information: CPU, GPU, OS Version, OpenGOAL Version (found in the window's title bar)"
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Game Version
+      options:
+        - NTSC 1.0 (black label)
+        - NTSC Greatest Hits version (red label)
+        - PAL
+        - KO
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Have you set the game to something other than `60fps`?
+      options:
+        - "No"
+        - "Yes"
+    validations:
+      required: true
+

.github/workflows/build-matrix.yaml

@@ -51,10 +51,12 @@ jobs:
     with:
       cmakePreset: "Release-macos-x86_64-clang"
       cachePrefix: ""
+    secrets: inherit
 
   build_macos_arm:
     name: "🍎 MacOS"
     uses: ./.github/workflows/macos-build-arm.yaml
     with:
-      cmakePreset: "Release-macos-x86_64-clang"
+      cmakePreset: "Release-macos-arm64-clang"
       cachePrefix: ""
+    secrets: inherit

.github/workflows/compiler-output-check.yaml

@@ -8,12 +8,12 @@ on:
 jobs:
   build:
     name: Compare
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 60
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: master
 
@@ -26,11 +26,11 @@ jobs:
             libxi-dev zip ninja-build libgl1-mesa-dev libssl-dev
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
-          key: linux-ubuntu-20.04--Release-linux-clang-static-${{ github.sha }}
-          restore-keys: linux-ubuntu-20.04--Release-linux-clang-static
+          key: linux-ubuntu-22.04--Release-linux-clang-static-${{ github.sha }}
+          restore-keys: linux-ubuntu-22.04--Release-linux-clang-static
           max-size: 1000M
 
       - name: CMake Generation (master)
@@ -48,7 +48,7 @@ jobs:
           mv ./build ./build.master
 
       - name: Checkout PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           clean: "false"
 
@@ -94,5 +94,3 @@ jobs:
           if [ "$SCRIPT_EXIT_CODE" -ne 0 ]; then
             exit 1
           fi
-
-

.github/workflows/inform-pages-repo.yaml

@@ -12,7 +12,7 @@ jobs:
   gen-docs:
     name: Generate Documentation
     if: github.repository == 'open-goal/jak-project'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 45
     env: # overrides: https://github.com/mbitsnbites/buildcache/blob/master/doc/configuration.md
       BUILDCACHE_MAX_CACHE_SIZE: 1000000000 # 1gb
@@ -22,7 +22,7 @@ jobs:
       BUILDCACHE_LOG_FILE: ${{ github.workspace }}/buildcache.log
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Package Dependencies
         run: |
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Buildcache
         uses: mikehardy/[email protected]
         with:
-          cache_key: linux-ubuntu-20.04--Release-linux-clang
+          cache_key: linux-ubuntu-22.04--Release-linux-clang
           buildcache_tag: v0.28.1
 
       - name: CMake Generation
@@ -67,7 +67,7 @@ jobs:
           python ./scripts/ci/docs/append-file-docs.py
 
       - name: Upload Docs Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: opengoal-docs
           if-no-files-found: error
@@ -79,7 +79,7 @@ jobs:
         run: echo ${{ github.run_id }}
 
       - name: Send Dispatch
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
           token: ${{ secrets.BOT_PAT }}
           repository: 'open-goal/open-goal.github.io'

.github/workflows/linting.yaml

@@ -12,26 +12,24 @@ on:
 jobs:
   formatting:
     name: 📝 Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      # wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-      # sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main'
-      # sudo apt install clang-format-15
-      # --clang-format-executable $(which clang-format-15)
       - name: Get Package Dependencies
         run: |
           sudo apt update
-          sudo apt install clang-format
-          clang-format -version
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main'
+          sudo apt install clang-format-18
+          clang-format-18 -version
 
       - name: Check Clang-Formatting
         run: |
           chmod +x ./third-party/run-clang-format/run-clang-format.py
-          ./third-party/run-clang-format/run-clang-format.py -r common decompiler game goalc test tools lsp --color always
+          ./third-party/run-clang-format/run-clang-format.py -r common decompiler game goalc test tools lsp --color always --clang-format-executable $(which clang-format-18)
 
   required-checks:
     name: 📝 Required Checks
@@ -39,7 +37,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check for Trailing Whitespace in goal_src
         run: python ./scripts/ci/lint-trailing-whitespace.py
@@ -51,7 +49,9 @@ jobs:
         run: python ./scripts/ci/check-for-asserts.py
 
       - name: Check for Invalid Translation Characters
-        run: python ./scripts/ci/lint-characters.py
+        run: |
+          python ./scripts/ci/lint-characters.py
+          python ./scripts/ci/lint-autoglottonyms.py
 
   optional-checks:
     name: 📝 Optional Checks
@@ -59,7 +59,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Python Dependencies
         run: pip install unidiff colorama
@@ -67,6 +67,6 @@ jobs:
       - name: Check for Removed goal_src/ Code
         # FYI - if you run this `git diff` on windows, it creates a utf-16 LE file
         run: |
-          git fetch origin
+          git fetch origin master
           git diff origin/master > lint-changes.diff
           python ./scripts/ci/lint-gsrc-removals.py

.github/workflows/linux-build-clang.yaml

@@ -17,19 +17,19 @@ on:
 jobs:
   build:
     name: Clang
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 60
 
     steps:
       # minimal checkout if we're NOT uploading artifacts
       - name: Checkout Repository
         if: ${{ ! inputs.uploadArtifacts }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # full checkout with tags if we ARE uploading artifacts
       - name: Checkout Repository with Tags
         if: ${{ inputs.uploadArtifacts }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
@@ -43,11 +43,11 @@ jobs:
             libxi-dev zip ninja-build libgl1-mesa-dev libssl-dev
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
-          key: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
-          restore-keys: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
+          key: linux-ubuntu-22.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
+          restore-keys: linux-ubuntu-22.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
           max-size: 1000M
 
       - name: CMake Generation
@@ -76,7 +76,7 @@ jobs:
           strip ./build/lsp/lsp
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ inputs.uploadArtifacts }}
         with:
           name: opengoal-linux-${{ inputs.cachePrefix }}

.github/workflows/linux-build-gcc.yaml

@@ -13,12 +13,12 @@ on:
 jobs:
   build:
     name: GCC
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 60
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Package Dependencies
         run: |
@@ -34,11 +34,11 @@ jobs:
             sudo update-alternatives --set g++ /usr/bin/g++-10
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
-          key: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
-          restore-keys: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
+          key: linux-ubuntu-22.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
+          restore-keys: linux-ubuntu-22.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
           max-size: 1000M
 
       - name: CMake Generation
@@ -52,7 +52,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
 
       - name: Build Project
-        run: cmake --build build --parallel $((`nproc`)) -- -w dupbuild=warn
+        run: cmake --build build --parallel $((`nproc`))
 
       - name: Run Tests
         run: ./test.sh

.github/workflows/macos-build-arm.yaml

@@ -9,6 +9,10 @@ on:
       cachePrefix:
         required: true
         type: string
+      uploadArtifacts:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build:
@@ -18,13 +22,20 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Package Dependencies
-        run: brew install cmake ninja nasm
+        env:
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+          HOMEBREW_NO_ANALYTICS: 1
+        run: |
+          if ! brew install ninja nasm; then
+            brew update
+            brew install ninja nasm
+          fi
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
           key: macos-15-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
@@ -43,11 +54,23 @@ jobs:
       - name: Build Project
         run: cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
 
+      - name: List libraries of gk
+        run: otool -L ./build/game/gk
+
       - name: Run Tests
         run: ./test.sh
 
+      - name: Prepare artifacts
+        if: ${{ inputs.uploadArtifacts }}
+        run: |
+          strip ./build/goalc/goalc
+          strip ./build/decompiler/extractor
+          strip ./build/game/gk
+          strip ./build/lsp/lsp
+
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        if: ${{ inputs.uploadArtifacts }}
         with:
           name: opengoal-macos-arm-${{ inputs.cachePrefix }}
           if-no-files-found: error

.github/workflows/macos-build.yaml

@@ -17,32 +17,39 @@ on:
 jobs:
   build:
     name: Intel
-    runs-on: macos-13
+    runs-on: macos-15-intel
     timeout-minutes: 120
 
     steps:
       # minimal checkout if we're NOT uploading artifacts
       - name: Checkout Repository
         if: ${{ ! inputs.uploadArtifacts }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # full checkout with tags if we ARE uploading artifacts
       - name: Checkout Repository with Tags
         if: ${{ inputs.uploadArtifacts }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
 
       - name: Install Package Dependencies
-        run: brew install cmake nasm ninja
+        env:
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+          HOMEBREW_NO_ANALYTICS: 1
+        run: |
+          if ! brew install ninja nasm; then
+            brew update
+            brew install ninja nasm
+          fi
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
-          key: macos-13-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
-          restore-keys: macos-13-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
+          key: macos-15-intel-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
+          restore-keys: macos-15-intel-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}
           max-size: 1000M
 
       - name: CMake Generation
@@ -57,6 +64,9 @@ jobs:
       - name: Build Project
         run: cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
 
+      - name: List libraries of gk
+        run: otool -L ./build/game/gk
+
       - name: Run Tests
         run: ./test.sh
 
@@ -69,7 +79,7 @@ jobs:
           strip ./build/lsp/lsp
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ inputs.uploadArtifacts }}
         with:
           name: opengoal-macos-${{ inputs.cachePrefix }}

.github/workflows/release-pipeline.yaml

@@ -79,7 +79,7 @@ jobs:
       uploadArtifacts: true
     secrets: inherit
 
-  build_macos_arm:
+  build_macos_arm_rosetta:
     needs:
       - cut_release
     name: "🍎 MacOS"
@@ -98,18 +98,18 @@ jobs:
       - build_windows_clang
       - build_linux_clang
       - build_macos_intel
-      - build_macos_arm
+      - build_macos_arm_rosetta
     name: "Upload Artifacts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ needs.cut_release.outputs.new_tag }}
 
       - name: Prepare Artifact Folder
         run: mkdir -p ./ci-artifacts/final
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         name: Download all Artifacts
         with:
           path: ./ci-artifacts/

.github/workflows/update-controller-db.yaml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'open-goal/jak-project'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.BOT_PAT }}
 
@@ -19,7 +19,7 @@ jobs:
           wget -O ./game/assets/sdl_controller_db.txt https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.BOT_PAT }}
           author: 'OpenGOALBot <[email protected]>'

.github/workflows/windows-build-clang.yaml

@@ -25,12 +25,12 @@ jobs:
       # minimal checkout if we're NOT uploading artifacts
       - name: Checkout Repository
         if: ${{ ! inputs.uploadArtifacts }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # full checkout with tags if we ARE uploading artifacts
       - name: Checkout Repository with Tags
         if: ${{ inputs.uploadArtifacts }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
@@ -46,7 +46,7 @@ jobs:
           }
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
           key: windows-2022-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
@@ -76,10 +76,9 @@ jobs:
         run: ./build/bin/goalc-test.exe --gtest_color=yes --gtest_brief=0 --gtest_filter="-*MANUAL_TEST*"
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ inputs.uploadArtifacts }}
         with:
           name: opengoal-windows-${{ inputs.cachePrefix }}
           if-no-files-found: error
           path: ./build/bin
-

.github/workflows/windows-build-msvc.yaml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install NASM
         # TODO - Simplify this with just the first command once choco 2.0 rolls out everywhere
@@ -31,7 +31,7 @@ jobs:
           }
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].22
         with:
           variant: sccache
           key: windows-2022-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}
@@ -62,4 +62,3 @@ jobs:
           GTEST_OUTPUT: "xml:opengoal-test-report.xml"
         run: |
           ./build/bin/goalc-test.exe --gtest_color=yes --gtest_brief=0 --gtest_filter="-*MANUAL_TEST*"
-

.gitignore

@@ -86,4 +86,4 @@ __pycache__/
 /TODO.md
 unifont-15.0.03.ttf
 *.diff
-goalc-report.html
+goalc-report.html

.vs/launch.vs.json

@@ -224,6 +224,20 @@
         "-debug"
       ]
     },
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "gk.exe (bin\\gk.exe)",
+      "name": "Game - Jak 3 - Runtime (release)",
+      "args": [
+        "-v",
+        "--game",
+        "jak3",
+        "--",
+        "-boot",
+        "-fakeiso"
+      ]
+    },
     {
       "type": "default",
       "project": "CMakeLists.txt",
@@ -246,6 +260,17 @@
         "jak2"
       ]
     },
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "goalc.exe (bin\\goalc.exe)",
+      "name": "REPL - Jak 3",
+      "args": [
+        "--user-auto",
+        "--game",
+        "jak3"
+      ]
+    },
     {
       "type": "default",
       "project": "CMakeLists.txt",
@@ -339,6 +364,32 @@
         "--config-override \"{\\\"decompile_code\\\": false, \\\"levels_extract\\\": true, \\\"allowed_objects\\\": []}\""
       ]
     },
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "decompiler.exe (bin\\decompiler.exe)",
+      "name": "Decompiler - Jak X",
+      "args": [
+        "${workspaceRoot}/decompiler/config/jakx/jakx_config.jsonc",
+        "${workspaceRoot}/iso_data",
+        "${workspaceRoot}/decompiler_out",
+        "--version",
+        "ntsc_v1"
+      ]
+    },
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "decompiler.exe (bin\\decompiler.exe)",
+      "name": "Decompiler - Jak X - PAL",
+      "args": [
+        "${workspaceRoot}/decompiler/config/jakx/jakx_config.jsonc",
+        "${workspaceRoot}/iso_data",
+        "${workspaceRoot}/decompiler_out",
+        "--version",
+        "pal"
+      ]
+    },
     {
       "type": "default",
       "project": "CMakeLists.txt",
@@ -381,7 +432,7 @@
       "projectTarget": "extractor.exe (bin\\extractor.exe)",
       "name": "Tools - Extractor - Full",
       "args": [
-        "\"E:\\ISOs\\Jak\\Jak 1.iso\""
+        "D:\\ISOs\\Jak\\Temp\\bad.iso"
       ]
     },
     {

.vscode/launch.json

@@ -5,13 +5,31 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "run python script",
+      "name": "Run C++ Tests LLDB",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/goalc-test",
+      "args": [
+        "--gtest_brief=0",
+        "--gtest_filter=*CodeTester*",
+        "--gtest_break_on_failure"
+      ],
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}",
+      "environment": [],
+      "externalConsole": false,
+      "MIMode": "lldb"
+    },
+    {
+      "name": "Append File Docs",
       "type": "python",
       "request": "launch",
-      "program": "${workspaceFolder}/scripts/gsrc/compare-compilation-outputs.py",
+      "program": "${workspaceFolder}/scripts/ci/lint-characters.py",
       "console": "integratedTerminal",
       "cwd": "${workspaceFolder}",
-      "args": []
+      "args": [
+        "--fix"
+      ]
     },
   ]
-}
+}

.vscode/settings.json

@@ -8,5 +8,9 @@
     "editor.wordBasedSuggestions": "matchingDocuments",
     "editor.snippetSuggestions": "top"
   },
-  "cmake.configureOnOpen": false
+  "cmake.configureOnOpen": false,
+  "files.associations": {
+    "xhash": "cpp",
+    "vector": "cpp"
+  }
 }

.zed/debug.json

@@ -0,0 +1,62 @@
+// Project-local debug tasks
+//
+// For more documentation on how to configure debug tasks,
+// see: https://zed.dev/docs/debugger
+[
+  {
+    "label": "Game - Jak 1 (Windows)",
+    "build": "Build - gk",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/gk.exe",
+    "args": ["-v", "--game", "jak1", "--", "-fakeiso", "-debug"],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+  {
+    "label": "Game - Jak 2 (Windows)",
+    "build": "Build - gk",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/gk.exe",
+    "args": ["-v", "--game", "jak2", "--", "-fakeiso", "-debug"],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+  {
+    "label": "Game - Jak 3 (Windows)",
+    "build": "Build - gk",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/gk.exe",
+    "args": ["-v", "--game", "jak3", "--", "-fakeiso", "-debug"],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+  {
+    "label": "REPL - Jak 1 (Windows)",
+    "build": "Build - goalc",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/goalc.exe",
+    "args": ["--user-auto", "--game", "jak1"],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+  {
+    "label": "REPL - Jak 2 (Windows)",
+    "build": "Build - goalc",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/goalc.exe",
+    "args": ["--user-auto", "--game", "jak2"],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+  {
+    "label": "REPL - Jak 3 (Windows)",
+    "build": "Build - goalc",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/goalc.exe",
+    "args": ["--user-auto", "--game", "jak3"],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+  {
+    "label": "Tests - Unit - Draft Only (Windows)",
+    "build": "Build - goalc-test",
+    "program": "$ZED_WORKTREE_ROOT/out/build/Debug/bin/goalc-test.exe",
+    "args": ["--gtest_brief=0", "--gtest_filter=\"*Draft*\""],
+    "request": "launch",
+    "adapter": "CodeLLDB",
+  },
+]

.zed/tasks.json

@@ -0,0 +1,111 @@
+// Project tasks configuration. See https://zed.dev/docs/tasks for documentation.
+[
+  {
+    "label": "Generate CMake - Release",
+    "command": "task gen-cmake-release",
+  },
+  {
+    "label": "Generate CMake - Debug",
+    "command": "task gen-cmake-debug",
+  },
+  {
+    "label": "Build Project - Release",
+    "command": "task build-release",
+  },
+  {
+    "label": "Build Project - Debug",
+    "command": "task build-debug",
+  },
+  {
+    "label": "Build - goalc",
+    "command": "task build-debug",
+    "env": {
+      "CMAKE_BUILD_ADDITIONAL_ARGS": "--target goalc",
+    },
+    "cwd": "$ZED_WORKTREE_ROOT",
+  },
+  {
+    "label": "Build - goalc-test",
+    "command": "task build-debug",
+    "env": {
+      "CMAKE_BUILD_ADDITIONAL_ARGS": "--target goalc-test",
+    },
+    "cwd": "$ZED_WORKTREE_ROOT",
+  },
+  {
+    "label": "Build - gk",
+    "command": "task build-debug",
+    "env": {
+      "CMAKE_BUILD_ADDITIONAL_ARGS": "--target gk",
+    },
+    "cwd": "$ZED_WORKTREE_ROOT",
+  },
+  {
+    "label": "Tests - Unit - Brief",
+    "command": "task unit-tests",
+    "env": {
+      "TEST_FILTER": "--gtest_brief=0",
+    },
+  },
+  {
+    "label": "Tests - Unit - Verbose",
+    "command": "task unit-tests",
+    "env": {
+      "TEST_FILTER": "--gtest_brief=1",
+    },
+  },
+  {
+    "label": "Tests - Unit - Type Consistency",
+    "command": "task unit-tests",
+    "env": {
+      "TEST_FILTER": "--gtest_brief=0 --gtest_filter=\"*TypeConsistency*\"",
+    },
+  },
+  {
+    "label": "Tests - Unit - WithGameTests",
+    "command": "task unit-tests",
+    "env": {
+      "TEST_FILTER": "--gtest_brief=0 --gtest_filter=\"*WithGameTests*\"",
+    },
+  },
+  {
+    "label": "Tests - Offline Tests",
+    "command": "task offline-tests-fast",
+  },
+  {
+    "label": "Tests - Formatter",
+    "command": "task unit-tests",
+    "env": {
+      "TEST_FILTER": "--gtest_brief=0 --gtest_filter=\"*FormatterTests*\"",
+    },
+  },
+  {
+    "label": "Run - Game (Jak 1)",
+    "command": "task run-game",
+    "env": {
+      "GAME": "jak1",
+    },
+  },
+  {
+    "label": "Run - Game (Jak 2)",
+    "command": "task run-game",
+    "env": {
+      "GAME": "jak2",
+    },
+  },
+  {
+    "label": "Run - Game (Jak 3)",
+    "command": "task run-game",
+    "env": {
+      "GAME": "jak3",
+    },
+  },
+  {
+    "label": "Run - Decompiler",
+    "command": "task decomp",
+  },
+  {
+    "label": "Format",
+    "command": "task format",
+  },
+]

CMakeLists.txt

@@ -32,6 +32,19 @@ if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json" )
         "${PROJECT_SOURCE_DIR}/build/compile_commands.json")
 endif()
 
+# NOTE - for SDL, i think SDL3 regressed this - https://github.com/libsdl-org/SDL/pull/6455
+# a more recent issue - https://github.com/libsdl-org/SDL/issues/12078
+if (APPLE)
+  enable_language(OBJC)
+  execute_process(
+    COMMAND xcrun --show-sdk-path
+        OUTPUT_VARIABLE MACOSX_SYSROOT
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    # Tell CMake to use it
+    set(CMAKE_OSX_SYSROOT "${MACOSX_SYSROOT}" CACHE PATH "macOS SDK path" FORCE)
+endif()
+
 # Setup compiler flags
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     message(STATUS "Clang Detected - Setting Defaults")
@@ -121,11 +134,12 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         -Wsign-promo \
         -fdiagnostics-color=always"
         )
-    
-    # pin to AVX for macOS, hopefully all macOS runners have atleast this architecture
-    # technically speaking, SSE4 is the cutoff for Apple Silicon so...only a matter of time!
-    if(NOT CMAKE_CXX_COMPILER_TARGET STREQUAL "arm64-apple-darwin")
+
+    # TODO - make a proper flag for arm compiling
+    if (CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "x86_64")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+    else()
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mcrc")
     endif()
 
     # additional c++ flags for release mode for our projects
@@ -175,16 +189,15 @@ endif()
 
 function(build_third_party_lib dir_name target_name)
     add_subdirectory(third-party/${dir_name} EXCLUDE_FROM_ALL)
-    if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-        # For Microsoft Visual C++ Compiler (MSVC)
-        target_compile_options(${target_name} PRIVATE /w)
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        # For GNU Compiler Collection (GCC) or Clang
-        target_compile_options(${target_name} PRIVATE -w)
+    # Convert all public include dirs to SYSTEM
+    get_target_property(INCLUDES ${target_name} INTERFACE_INCLUDE_DIRECTORIES)
+    if(INCLUDES)
+        set_target_properties(${target_name} PROPERTIES
+            INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${INCLUDES}"
+        )
     endif()
 endfunction()
 
-
 # Dependencies and Libraries
 # includes relative to top level jak-project folder
 include_directories(./)
@@ -197,6 +210,9 @@ include_directories(SYSTEM third-party/inja)
 # TODO - probably integrate with ZSTD since we have it already
 set(CURL_USE_LIBSSH2 OFF)
 set(CURL_ZLIB OFF)
+# suddenly became enabled on macOS atleast, only needed for unicode URLs
+# wasn't being properly statically linked
+set(USE_LIBIDN2 OFF)
 if(WIN32)
     set(CURL_USE_SCHANNEL ON) # native Windows SSL support
 elseif(APPLE)
@@ -254,9 +270,9 @@ build_third_party_lib(zstd libzstd_static)
 # build SDL
 include(SDLOptions)
 if(STATICALLY_LINK)
-    build_third_party_lib(SDL SDL2-static)
+    build_third_party_lib(SDL SDL3-static)
 else()
-    build_third_party_lib(SDL SDL2)
+    build_third_party_lib(SDL SDL3-shared)
 endif()
 
 # build imgui

CMakePresets.json

@@ -62,12 +62,22 @@
       "name": "base-linux-debug",
       "hidden": true,
       "inherits": "base",
-      "binaryDir": "${sourceDir}/build/Release/bin",
+      "binaryDir": "${sourceDir}/build/Debug/bin",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install/${presetName}"
       }
     },
+    {
+      "name": "base-macos-debug",
+      "hidden": true,
+      "inherits": "base",
+      "binaryDir": "${sourceDir}/build/Debug/bin",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
+      }
+    },
     {
       "name": "base-macos-release",
       "hidden": true,
@@ -174,6 +184,12 @@
       "description": "Build with Clang as Release without Debug Symbols",
       "inherits": ["base-linux-release", "base-clang"]
     },
+    {
+      "name": "Debug-macos-arm64-clang",
+      "displayName": "MacOS ARM64 Debug (clang)",
+      "description": "Build for ARM64 with Clang as Debug",
+      "inherits": ["base-macos-arm64", "base-macos-debug", "base-clang"]
+    },
     {
       "name": "Release-macos-arm64-clang",
       "displayName": "MacOS ARM64 Release (clang)",
@@ -225,6 +241,12 @@
         "ZYDIS_BUILD_SHARED_LIB": "OFF"
       }
     },
+    {
+      "name": "Debug-linux-clang",
+      "displayName": "Linux Release (clang)",
+      "description": "Build with Clang as Release with Debug Symbols",
+      "inherits": ["base-linux-debug", "base-clang"]
+    },
     {
       "name": "Debug-linux-clang-static",
       "displayName": "Linux Static Release (clang)",

LICENSE

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2020-2025 OpenGOAL Team
+Copyright (c) 2020-2026 OpenGOAL Team
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

README.md

@@ -13,7 +13,7 @@
 ## Please read first <!-- omit from toc -->
 
 > [!IMPORTANT]
-> Our repositories on GitHub are primarily for development of the project and tracking active issues. Most of the information you will find here pertains to setting up the project for development purposes and is not relevant to the end-user.
+> Our repositories on GitHub are for development of the project and tracking active issues. Most of the information you will find here pertains to setting up the project for development purposes and is not relevant to the end-user.
 
 For a setup guide on how to install and play the game there is the following video that you can check out: https://youtu.be/K84UUMnkJc4
 
@@ -22,45 +22,27 @@ For questions or additional information pertaining to the project, we have a Dis
 Additionally, you can find further documentation and answers to **frequently asked questions** on the project's main website: https://opengoal.dev
 
 > [!WARNING]
-> **Do not use this decompilation project without providing your own legally purchased copy of the game.** We do not distribute any assets from the game - you must use your own legitimately obtained PS2 copy of the game. We support every retail PAL, NTSC, and NTSC-J build, including Greatest Hits copies.
+> **Do not use this decompilation project without the use of your own legally purchased copy of the game.** OpenGOAL does not include any assets from the original games, so you must provide your own legitimately obtained PS2 copy of the game. OpenGOAL supports every retail PAL, NTSC, and NTSC-J build, including Greatest Hits copies. Please note that does NOT include any of the later releases (PS3/PS4/PS5).
 
 - [Project Description](#project-description)
   - [Current Status](#current-status)
   - [Methodology](#methodology)
 - [Setting up a Development Environment](#setting-up-a-development-environment)
-  - [Docker](#docker)
-  - [Linux](#linux)
-    - [Ubuntu (20.04)](#ubuntu-2004)
-    - [Arch](#arch)
-    - [Fedora](#fedora)
-  - [Windows](#windows)
-    - [Required Software](#required-software)
-    - [Using Visual Studio](#using-visual-studio)
-  - [MacOS](#macos)
-    - [Intel Based](#intel-based)
-    - [Apple Silicon](#apple-silicon)
-  - [VSCode](#vscode)
-    - [Building and Debugging](#building-and-debugging)
+  - [OS Setup](#os-setup)
+  - [Editor Setup](#editor-setup)
   - [Building and Running the Game](#building-and-running-the-game)
     - [Extract Assets](#extract-assets)
-    - [Build the Game](#build-the-game)
+    - [Build the Game (Running the Compiler)](#build-the-game-running-the-compiler)
     - [Run the Game](#run-the-game)
       - [Connecting the REPL to the Game](#connecting-the-repl-to-the-game)
       - [Running the Game Without Auto-Booting](#running-the-game-without-auto-booting)
-    - [Interacting with the Game](#interacting-with-the-game)
 - [Technical Project Overview](#technical-project-overview)
-  - [`goalc`](#goalc)
-    - [Running the compiler](#running-the-compiler)
-  - [`decompiler`](#decompiler)
-    - [Running the decompiler](#running-the-decompiler)
-  - [`goal_src/`](#goal_src)
-  - [`game` runtime](#game-runtime)
 
 ## Project Description
 
-This project is to port the original Jak and Daxter and Jak II to PC. Over 98% of the games are written in GOAL, a custom Lisp language developed by Naughty Dog. Our strategy is:
+The project's goal is to port the original trilogy (Jak 1 -> Jak 3) to PC. Over 98% of the games were written in GOAL, a custom LISP language developed by Naughty Dog. Our strategy is:
 - decompile the original game code into human-readable GOAL code
-- develop our own compiler for GOAL and recompile game code for x86-64
+- develop our own compiler for GOAL and recompile the game code for x86-64
 - create a tool to extract game assets into formats that can be easily viewed or modified
 - create tools to repack game assets into a format that our port uses.
 
@@ -70,219 +52,50 @@ Our objectives are:
 - try to match things from the original game and development as possible. For example, the original GOAL compiler supported live modification of code while the game is running, so we do the same, even though it's not required for just porting the game.
 - support modifications. It should be possible to make edits to the code without everything else breaking.
 
-We support both Linux and Windows on x86-64.
-
-> We do not support, or plan to support the ARM architecture.  This means that this will not run on devices such as a mobile device.
+At the moment we support **x86_64** on Windows, Linux and macOS (via Rosetta translation).  There are no plans to ever make a mobile release.
 
 ### Current Status
 
-Jak 1 is largely playable from start to finish with a handful of bugs that are continually being ironed out. Jak 2 is in development.
+- Jak 1 has been considered in a polished, complete state for years at this point.
+- Jak 2 is considered in beta due to a few issues we are aware of that need fixing, however to the casual user, the game is essentially complete.
+- Jak 3 has a good amount of work left to do.
 
 ![](./docs/img/promosmall1.png)
 ![](./docs/img/promosmall2.png)
 
-YouTube playlist:
+YouTube playlist showcasing some of the early progress for Jak 1:
 https://www.youtube.com/playlist?list=PLWx9T30aAT50cLnCTY1SAbt2TtWQzKfXX
 
 ### Methodology
 
-To help with decompiling, we've built a decompiler that can process GOAL code and unpack game assets. We manually specify function types and locations where we believe the original code had type casts (or where they feel appropriate) until the decompiler succeeds, then we clean up the output of the decompiled code by adding comments and adjusting formatting, then save it in `goal_src`.
+To assist with decompiling, we've built a decompiler that can process GOAL code and unpack game assets. We manually specify function types and locations where we believe the original code had type casts (or where they feel appropriate) until the decompilation succeeds, then we clean up the output of the decompiled code by adding comments and adjusting formatting, then save it in `goal_src/`.
 
 Our decompiler is designed specifically for processing the output of the original GOAL compiler. As a result, when given correct casts, it often produces code that can be directly fed into a compiler and works perfectly. This is continually tested as part of our unit tests.
 
 ## Setting up a Development Environment
 
-The remainder of this README is catered towards people interested in building the project from source, typically with the intention on contributing as a developer.
+The remainder of this README is aimed at people interested in building the project from source, typically with the intention of contributing as a developer.
 
 If this does not sound like you and you just want to play the game, refer to the above section [Quick Start](#quick-start)
 
-### Docker
+### OS Setup
 
-All three Linux systems are supported using Docker. 
+- [Windows](/docs/setup/system/windows.md)
+- [Linux](/docs/setup/system/linux.md)
+- [MacOS](/docs/setup/system/macos.md)
+- [Docker](/docs/setup/system/docker.md)
 
-Pick your supported prefered flavour of linux and build your chosen image
+### Editor Setup
 
-```
-docker build -f docker/(Arch|Fedora|Ubuntu)/Dockerfile -t jak .
-```
+You can of course use whatever editor you want, but here is some documentation that should help you get started on some of the editor's we have used and have written about:
 
-This will create an image with all required dependencies and already built.
-
-```
-docker run -v "$(pwd)"/build:/home/jak/jak-project/build -it jak bash
-```
-
-Note: If you change the content of the `build/` directory you'll need to rerun the `build` command. Alternatively you can get the build via `docker cp`.
-
-This will link your `build/` folder to the images so can validate your build or test it on an external device. 
-
-Docker images can be linked into your IDE (e.g. CLion) to help with codesniffing, static analysis, run tests and continuous build.
-
-Unfortunately you'll still need task runner on your local machine to run the game or instead, manually run the game via the commands found in `Taskfile.yml`.
-
-### Linux
-
-#### Ubuntu (20.04)
-
-Install packages and init repository:
-
-```sh
-sudo apt install gcc make cmake ninja-build build-essential g++ nasm clang-format libxrandr-dev libxinerama-dev libxcursor-dev libpulse-dev libxi-dev python libgl1-mesa-dev libssl-dev
-sudo sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-```
-
-Compile:
-
-```sh
-cmake -B build && cmake --build build -j 8
-```
-
-Run tests:
-
-```sh
-./test.sh
-```
-
-Note: we have found that `clang` and `lld` are significantly faster to compile and link than `gcc`, generate faster code, and have better warning messages. To install these:
-
-```sh
-sudo apt install lld clang
-```
-
-and run `cmake` (in a fresh build directory) with:
-
-```sh
-cmake -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
-```
-
-#### Arch
-
-Install packages and init repository:
-
-```sh
-sudo pacman -S cmake libpulse base-devel nasm python libx11 libxrandr libxinerama libxcursor libxi
-yay -S go-task
-```
-
-For Arch only, replace `task` with `go-task` in the rest of the instructions.
-
-Compile:
-
-```sh
-cmake -B build && cmake --build build -j 8
-```
-
-Run tests:
-
-```sh
-./test.sh
-```
-
-#### Fedora
-
-Install packages and init repository:
-
-```sh
-sudo dnf install cmake python lld clang nasm libX11-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel pulseaudio-libs-devel mesa-libGL-devel
-sudo sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-```
-
-Compile with `clang`:
-
-```sh
-cmake -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build
-cmake --build build -j$(nproc)
-```
-
-Run tests:
-
-```sh
-./test.sh
-```
-
-### Windows
-
-#### Required Software
-
-We primarily use Visual Studio on Windows for C++ development.  Download the latest community edition from [here](https://visualstudio.microsoft.com/vs/).  At the time of writing this is Visual Studio 2022.
-
-You will require the `Desktop development with C++` workload.  This can be selected during the installation, or after via the `Visual Studio Installer`, modifying the Visual Studio Installation.
-
-On Windows, it's recommended to use a package manager, we use Scoop. Follow the steps on the bottom of the homepage [here](https://scoop.sh/) to get it.
-
-Once Scoop is installed, run the following commands:
-
-```sh
-scoop install git llvm nasm python task
-```
-
-#### Using Visual Studio
-
-Clone the repository by running the following command in your folder of choice.
-
-```sh
-git clone https://github.com/open-goal/jak-project.git
-```
-
-This will create a `jak-project` folder, open the project as a CMake project via Visual Studio.
-
-![](./docs/img/windows/open-project.png)
-
-Then build the entire project as `Windows Release (clang)`. You can also press Ctrl+Shift+B as a hotkey for Build All.  We currently prefer `clang` on Windows as opposed to `msvc`, though it should work as well!
-
-![](./docs/img/windows/release-build.png)
-![](./docs/img/windows/build-all.png)
-
-### MacOS
-
-> NOTE: Running the game requires an Apple Silicon Mac running macOS Sequoia, or an Intel Mac.
-
-Ensure that you have Xcode command line tools installed (this installs things like Apple Clang).  If you don't, you can run the following command:
-
-```bash
-xcode-select --install
-```
-
-On Apple Silicon, Rosetta 2 also must be installed:
-
-```bash
-softwareupdate --install-rosetta
-```
-
-#### Building for x86_64
-
-```bash
-brew install cmake nasm ninja go-task clang-format
-cmake -B build --preset=Release-macos-x86_64-clang
-cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
-```
-
-#### Building for ARM64 (experimental, unsupported)
-
-```bash
-brew install cmake ninja go-task clang-format
-cmake -B build --preset=Release-macos-arm64-clang
-cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))
-```
-
-You may have to add the MacOS SDK to your `LIBRARY_PATH`:
-- `export LIBRARY_PATH="$LIBRARY_PATH:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"`
-
-### VSCode
-
-If you either don't want to or cannot use Visual Studio for working with the C++ project, VSCode is a good alternatively.
-
-The `clangd` extension is [recommended](https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd) and requires `clangd` to be on your `$PATH`.  If you can run `clangd` in a terminal successfully then you should be good to go.
-
-Once you generate your CMake for the first time the clangd LSP should be able to index the project and give you intellisense.
-
-#### Building and Debugging
-
-TODO - Consider Contributing Documentation :)
+- [Visual Studio (Windows)](/docs/setup/dev/vs.md)
+- [Visual Studio Code](/docs/setup/dev/vscode.md)
+- [Zed](/docs/setup/dev/zed.md)
 
 ### Building and Running the Game
 
-Getting a running game involves 4 steps:
+Getting a running game involves 4 main steps:
 
 1. Build C++ tools (follow Getting Started steps above for your platform)
 2. Extract assets from the game
@@ -291,25 +104,16 @@ Getting a running game involves 4 steps:
 
 #### Extract Assets
 
-First, setup your settings so the following scripts know which game you are using, and which version. For the black label version of the game, run the following in a terminal:
+First, we have to setup our environment so we know which game and version we are operating with. For the black label version of Jak 1 we would run the following:
 
 ```sh
 task set-game-jak1
-task set-decomp-ntscv1
-```
-
-For other versions of the game, you will need to use a different `-set-decomp-<VERSION>` command. An example for the PAL version:
-
-```sh
-task set-game-jak1
-task set-decomp-pal
+task set-decomp-ntscv1 # or for example for PAL, `task set-decomp-pal`
 ```
 
 > Run `task --list` to see the other available options
 
-> At the time of writing, only Jak 1 is expected to work end-to-end!
-
-The first step is to extract your ISO file contents into the `iso_data/<game-name>` folder.  In the case of Jak 1 this is `iso_data/jak1`.
+Next, ensure you extract your ISO file contents into the relevant `iso_data/<game-name>` folder.  In the case of Jak 1 this is `iso_data/jak1`.
 
 Once this is done, open a terminal in the `jak-project` folder and run the following:
 
@@ -317,7 +121,7 @@ Once this is done, open a terminal in the `jak-project` folder and run the follo
 task extract
 ```
 
-#### Build the Game
+#### Build the Game (Running the Compiler)
 
 The next step is to build the game itself.  To do so, in the same terminal run the following:
 
@@ -354,7 +158,7 @@ g > (mi)
 
 #### Run the Game
 
-Finally the game can be ran.  Open a second terminal from the `jak-project` directory and run the following:
+Finally the game can be launched.  Open a second terminal from the `jak-project` directory and run the following:
 
 ```sh
 task boot-game
@@ -410,81 +214,6 @@ gc> (test-play)
 gc>
 ```
 
-#### Interacting with the Game
-
-In the graphics window, you can use the period key to bring up the debug menu. Controllers also work, using the same mapping as the original game.
-
-Check out the `pc_debug`, `examples` and `pc` folders under `goal_src` for some examples of GOAL code we wrote. The debug files that are not loaded automatically by the engine have instructions for how to run them.
-
 ## Technical Project Overview
 
-There are four main components to the project.
-
-1. `goalc` - the GOAL compiler for x86-64
-2. `decompiler` - our decompiler
-3. `goal_src/` - the folder containing all OpenGOAL / GOOS code
-4. `game` - aka the runtime written in C++
-
-Let's break down each component.
-
-### `goalc`
-
-Our implementation of GOAL is called OpenGOAL.
-
-All of the compiler source code is in `goalc/`. The compiler is controlled through a prompt which can be used to enter commands to compile, connect to a running GOAL program for interaction, run the OpenGOAL debugger, or, if you are connected to a running GOAL program, can be used as a REPL to run code interactively. In addition to compiling code files, the compiler has features to pack and build data files.
-
-#### Running the compiler
-
-**Environment Agnostic**
-
-If you have installed `task` as recommended above, you can run the compiler with `task repl`
-
-**Linux**
-
-To run the compiler on Linux, there is a script `scripts/shell/gc.sh`.
-
-**Windows**
-
-On Windows, there is a `scripts/batch/gc.bat` scripts and a `scripts/batch/gc-no-lt.bat` script, the latter of which will not attempt to automatically attach to a running target.
-
-### `decompiler`
-
-The second component to the project is the decompiler.
-
-The decompiler will output code and other data intended to be inspected by humans in the `decompiler_out` folder. Files in this folder will not be used by the compiler.
-
-#### Running the decompiler
-
-You must have a copy of the PS2 game and place all files from the DVD inside a folder corresponding to the game within `iso_data` folder (`jak1` for Jak 1 Black Label, etc.), as seen in this picture:
-
-![](./docs/img/iso_data-help.png)
-
-The decompiler will extract assets to the `assets` folder. These assets will be used by the compiler when building the port, and you may want to turn asset extraction off after running it once.
-
-**Environment Agnostic**
-
-If you have installed `task` as recommended above, you can run the compiler with `task decomp`
-
-**Linux**
-
-To run, you can use `scripts/shell/decomp.sh` to run the decompiler
-
-**Windows**
-
-To run, you can use `scripts/shell/decomp-jak1.bat` to run the decompiler
-
-### `goal_src/`
-
-The game source code, written in OpenGOAL, is located in `goal_src`. All GOAL and GOOS code should be in this folder.
-
-### `game` runtime
-
-The final component is the "runtime", located in `game`. This is the part of the game that's written in C++.
-
-In the port, that includes:
-- The "C Kernel", which contains the GOAL linker and some low-level GOAL language features. GOAL has a completely custom dynamically linked object file format so in order to load the first GOAL code, you need a linker written in C++. Some low-level functions for memory allocation, communicating with the I/O Processor, symbol table, strings, and the type system are also implemented in C, as these are required for the linker. It also listens for incoming messages from the compiler and passes them to the running game. This also initializes the game, by initializing the PS2 hardware, allocating the GOAL heaps, loading the GOAL kernel off of the DVD, and executing the kernel dispatcher function. This is in the `game/kernel` folder. This should be as close as possible to the game, and all differences should be noted with a comment.
-- Implementation of Sony's standard library. GOAL code can call C library functions, and Naughty Dog used some Sony library functions to access files, memory cards, controllers, and communicate with the separate I/O Processor. The library functions are in `game/sce`. Implementations of library features specific to the PC port are located in `game/system`.
-- The I/O Processor driver, OVERLORD. The PS2 had a separate CPU called the I/O Processor (IOP) that was directly connected to the DVD drive hardware and the sound hardware. Naughty Dog created a custom driver for the IOP that handled streaming data off of the DVD. It is much more complicated than I first expected. It's located in `game/overlord`. Like the C kernel, we try to keep this as close as possible to the actual game.
-- Sound code. Naughty Dog used a third party library for sound called `989SND`. Code for the library and an interface for it is located in `game/sound`.
-- PC specific graphics code. We have a functional OpenGL renderer and context that can create a game window and display graphics on it. The specific renderers used by the game however are mostly implemented. Aside from post-processing effects, everything in the game is rendered. This is located in `game/graphics`. While many liberties will be taken to make this work, the end result should very closely match the actual game.
-- Extra assets used by the port in some fashion, located in `game/assets`. These include extra text files, icons, etc.
+Some more detail about the various components of the project can be found [here](/docs/project-overview.md)

Taskfile.yml

@@ -10,33 +10,35 @@ dotenv:
 tasks:
   # SETTINGS / CONFIGURATION
   settings:
-    - '{{.PYTHON}} ./scripts/tasks/update-env.py --info'
+    - "{{.PYTHON}} ./scripts/tasks/update-env.py --info"
   set-game-jak1:
-    - '{{.PYTHON}} ./scripts/tasks/update-env.py --game jak1'
+    - "{{.PYTHON}} ./scripts/tasks/update-env.py --game jak1"
   set-game-jak2:
-    - '{{.PYTHON}} ./scripts/tasks/update-env.py --game jak2'
+    - "{{.PYTHON}} ./scripts/tasks/update-env.py --game jak2"
   set-game-jak3:
-    - '{{.PYTHON}} ./scripts/tasks/update-env.py --game jak3'
+    - "{{.PYTHON}} ./scripts/tasks/update-env.py --game jak3"
+  set-game-jakx:
+    - "{{.PYTHON}} ./scripts/tasks/update-env.py --game jakx"
   set-decomp-ntscv1:
     desc: "aka black label"
     cmds:
-      - '{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscv1'
+      - "{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscv1"
   set-decomp-ntscv2:
     desc: "aka red label"
     cmds:
-      - '{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscv2'
+      - "{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscv2"
   set-decomp-pal:
     desc: "PAL region version"
     cmds:
-      - '{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config pal'
+      - "{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config pal"
   set-decomp-ntscjp:
     desc: "NTSC-J region version"
     cmds:
-      - '{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscjp'
+      - "{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscjp"
   set-decomp-ntscko:
     desc: "NTSC-K region version"
     cmds:
-      - '{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscko'
+      - "{{.PYTHON}} ./scripts/tasks/update-env.py --decomp_config ntscko"
   # GENERAL
   extract:
     desc: "Extracts the game's assets from './iso_data' with the set decompiler config"
@@ -44,7 +46,7 @@ tasks:
       - sh: test -f {{.DECOMP_BIN_RELEASE_DIR}}/decompiler{{.EXE_FILE_EXTENSION}}
         msg: "Couldn't locate decompiler executable in '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler'"
     cmds:
-      - "{{.DECOMP_BIN_RELEASE_DIR}}/decompiler \"./decompiler/config/{{.DECOMP_CONFIG}}\" \"./iso_data\" \"./decompiler_out\" --version \"{{.DECOMP_CONFIG_VERSION}}\" --config-override '{\"decompile_code\": false, \"levels_extract\": true, \"allowed_objects\": []}'"
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": false, "levels_extract": true, "allowed_objects": []}'''
   boot-game:
     desc: "Boots the game, it will fail if it's not already compiled!"
     preconditions:
@@ -67,14 +69,35 @@ tasks:
     cmds:
       - "{{.GK_BIN_RELEASE_DIR}}/gk -v --game {{.GAME}} -- -fakeiso -debug"
   # DEVELOPMENT
+  clean-cmake:
+    desc: "Cleans up any existing cmake artifacts"
+    cmds:
+      - cmd: "{{.PYTHON}} ./scripts/tasks/delete-file-or-folder.py --path ./build"
+      - cmd: "{{.PYTHON}} ./scripts/tasks/delete-file-or-folder.py --path ./out/build"
   gen-cmake:
     desc: "Generate the CMake"
     cmds:
-      - "cmake -B build --preset={{.CMAKE_PRESET}}"
+      - "cmake {{.CMAKE_GEN_BUILD_DIR_DEBUG}} --preset={{.CMAKE_PRESET}}"
+  gen-cmake-release:
+    desc: "Generate the CMake"
+    cmds:
+      - "cmake {{.CMAKE_GEN_BUILD_DIR_RELEASE}} --preset={{.DEFAULT_CMAKE_RELEASE_PRESET}}"
+  gen-cmake-debug:
+    desc: "Generate the CMake"
+    cmds:
+      - "cmake {{.CMAKE_GEN_BUILD_DIR_DEBUG}} --preset={{.DEFAULT_CMAKE_DEBUG_PRESET}}"
   build:
     desc: "Build the project using the generated CMake"
     cmds:
-      - "cmake --build build --parallel {{.CMAKE_NUM_THREADS}}"
+      - "cmake {{.CMAKE_BUILD_DIR_DEBUG}} --parallel 8"
+  build-release:
+    desc: "Build the project using the generated CMake"
+    cmds:
+      - "cmake {{.CMAKE_BUILD_DIR_RELEASE}} --parallel 8"
+  build-debug:
+    desc: "Build the project using the generated CMake"
+    cmds:
+      - "cmake {{.CMAKE_BUILD_DIR_DEBUG}} --parallel 8 --target goalc"
   repl:
     desc: "Start the REPL"
     preconditions:
@@ -91,9 +114,9 @@ tasks:
   format:
     desc: "Format code"
     cmds:
-      - cmd: '{{.PYTHON}} ./scripts/cpp/format-includes.py'
-      - cmd: '{{.PYTHON}} ./scripts/ci/lint-trailing-whitespace.py --fix'
-      - cmd: '{{.PYTHON}} ./third-party/run-clang-format/run-clang-format.py -r common decompiler game goalc test tools lsp -i'
+      - cmd: "{{.PYTHON}} ./scripts/cpp/format-includes.py"
+      - cmd: "{{.PYTHON}} ./scripts/ci/lint-trailing-whitespace.py --fix"
+      - cmd: "{{.PYTHON}} ./third-party/run-clang-format/run-clang-format.py -r common decompiler game goalc test tools lsp -i"
       - task: format-json
   format-gsrc:
     desc: "Run formatter on gsrc file"
@@ -105,10 +128,10 @@ tasks:
   # DECOMPILING
   decomp:
     cmds:
-      - "{{.DECOMP_BIN_RELEASE_DIR}}/decompiler \"./decompiler/config/{{.DECOMP_CONFIG}}\" \"./iso_data\" \"./decompiler_out\" --version \"{{.DECOMP_CONFIG_VERSION}}\" --config-override '{\"decompile_code\": true, \"levels_extract\": false}'"
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": true, "levels_extract": false}'''
   decomp-file:
     cmds:
-      - "{{.DECOMP_BIN_RELEASE_DIR}}/decompiler \"./decompiler/config/{{.DECOMP_CONFIG}}\" \"./iso_data\" \"./decompiler_out\" --version \"{{.DECOMP_CONFIG_VERSION}}\" --config-override '{\"decompile_code\": true, \"levels_extract\": false, \"allowed_objects\": [\"{{.FILE}}\"]}'"
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": true, "levels_extract": false, "allowed_objects": ["{{.FILE}}"]}'''
   decomp-clean:
     cmds:
       - '{{.PYTHON}} ./scripts/tasks/clean-decomp.py --game "{{.GAME}}"'
@@ -137,18 +160,21 @@ tasks:
   # ASSET RIPPING
   rip-textures:
     cmds:
-      - "{{.DECOMP_BIN_RELEASE_DIR}}/decompiler \"./decompiler/config/{{.DECOMP_CONFIG}}\" \"./iso_data\" \"./decompiler_out\" --version \"{{.DECOMP_CONFIG_VERSION}}\" --config-override '{\"decompile_code\": false, \"levels_extract\": true, \"save_texture_pngs\": true}'"
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": false, "levels_extract": true, "save_texture_pngs": true}'''
   rip-levels:
     cmds:
-      - "{{.DECOMP_BIN_RELEASE_DIR}}/decompiler \"./decompiler/config/{{.DECOMP_CONFIG}}\" \"./iso_data\" \"./decompiler_out\" --version \"{{.DECOMP_CONFIG_VERSION}}\" --config-override '{\"decompile_code\": false, \"levels_extract\": true, \"rip_levels\": true}'"
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": false, "levels_extract": true, "rip_levels": true}'''
   rip-collision:
     cmds:
-      - "{{.DECOMP_BIN_RELEASE_DIR}}/decompiler \"./decompiler/config/{{.DECOMP_CONFIG}}\" \"./iso_data\" \"./decompiler_out\" --version \"{{.DECOMP_CONFIG_VERSION}}\" --config-override '{\"decompile_code\": false, \"levels_extract\": true, \"extract_collision\": true, \"rip_collision\": true}'"
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": false, "levels_extract": true, "extract_collision": true, "rip_collision": true}'''
+  rip-audio:
+    cmds:
+      - '{{.DECOMP_BIN_RELEASE_DIR}}/decompiler "./decompiler/config/{{.DECOMP_CONFIG}}" "./iso_data" "./decompiler_out" --version "{{.DECOMP_CONFIG_VERSION}}" --config-override ''{"decompile_code": false, "levels_extract": true, "rip_streamed_audio": true}'''
   # TOOLS
   analyze-ee-memory:
     cmds:
       - '{{.PYTHON}} ./scripts/tasks/extract-zip.py --file "{{.FILE}}" --out ./savestate_out/'
-      - '{{.MEMDUMP_BIN_RELEASE_DIR}}/memory_dump_tool ./savestate_out/eeMemory.bin --output-path ./ --game {{.GAME}} > ee-analysis.log'
+      - "{{.MEMDUMP_BIN_RELEASE_DIR}}/memory_dump_tool ./savestate_out/eeMemory.bin --output-path ./ --game {{.GAME}} > ee-analysis.log"
   watch-pcsx2:
     # {{.PYTHON}} -m pip install -U "watchdog[watchmedo]"
     cmds:
@@ -158,7 +184,7 @@ tasks:
   type-search:
     desc: Just an example to show it running
     cmds:
-      - "{{.TYPESEARCH_BIN_RELEASE_DIR}}/type_searcher --output-path ./search-results.json --game {{.GAME}} --fields '[{\"type\":\"int16\",\"offset\":2},{\"type\":\"int16\",\"offset\":4}]'"
+      - '{{.TYPESEARCH_BIN_RELEASE_DIR}}/type_searcher --output-path ./search-results.json --game {{.GAME}} --fields ''[{"type":"int16","offset":2},{"type":"int16","offset":4}]'''
   update-treesitter:
     desc: Updates locally built tree-sitter rules
     cmds:
@@ -168,10 +194,11 @@ tasks:
   fix-translations:
     desc: Finds and tries to fix invalid translation Characters
     cmds:
-      - '{{.PYTHON}} ./scripts/ci/lint-characters.py --fix'
+      - "{{.PYTHON}} ./scripts/ci/lint-autoglottonyms.py --fix"
+      - "{{.PYTHON}} ./scripts/ci/lint-characters.py --fix"
   lint:
     cmds:
-      - '{{.PYTHON}} ./scripts/ci/lint-trailing-whitespace.py'
+      - "{{.PYTHON}} ./scripts/ci/lint-trailing-whitespace.py"
   run-gpu-test:
     desc: "Runs the game's built in GPU test"
     preconditions:
@@ -180,30 +207,36 @@ tasks:
     cmds:
       - "{{.GK_BIN_RELEASE_DIR}}/gk -v --gpu-test opengl --gpu-test-out-path ./gpu-test.json"
   # TESTS
+  unit-tests:
+    cmds:
+      - "{{.GOALCTEST_BIN_DEBUG_DIR}}/goalc-test{{.EXE_FILE_EXTENSION}} {{.TEST_FILTER}}"
   offline-tests: # ran by jenkins
     cmds:
-      - '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --fail-on-cmp'
+      - '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test{{.EXE_FILE_EXTENSION}} --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --fail-on-cmp'
   offline-test-file:
     cmds:
-      - '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --file {{.FILE}}'
+      - '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test{{.EXE_FILE_EXTENSION}} --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --file {{.FILE}}'
   offline-tests-fast:
     cmds:
-      - '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --pretty-print --num_threads 32 --dump_current_output --fail-on-cmp'
+      - '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test{{.EXE_FILE_EXTENSION}} --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --pretty-print --num_threads 8 --dump_current_output --fail-on-cmp'
   # TODO - amalgamate offline-tests and this task, run twice if the previous step fails
   update-ref-tests:
     cmds:
-      - cmd: '{{.PYTHON}} ./scripts/tasks/delete-file-or-folder.py --path failures'
-      - cmd: '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --pretty-print --num_threads 32 --dump_current_output --fail-on-cmp'
+      - cmd: "{{.PYTHON}} ./scripts/tasks/delete-file-or-folder.py --path failures"
+      - cmd: '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test --iso_data_path "./iso_data/{{.GAME}}" --game {{.GAME}} --pretty-print --num_threads 8 --dump_current_output --fail-on-cmp'
         ignore_error: true
-      - '{{.PYTHON}} ./scripts/update_decomp_reference.py ./failures ./test/decompiler/reference/ --game {{.GAME}}'
+      - "{{.PYTHON}} ./scripts/update_decomp_reference.py ./failures ./test/decompiler/reference/ --game {{.GAME}}"
       - task: offline-tests-fast
   update-ref-file:
     cmds:
-      - cmd: '{{.PYTHON}} ./scripts/tasks/delete-file-or-folder.py --path failures'
+      - cmd: "{{.PYTHON}} ./scripts/tasks/delete-file-or-folder.py --path failures"
       - cmd: '{{.OFFLINETEST_BIN_RELEASE_DIR}}/offline-test --iso_data_path "./iso_data/{{.GAME}}" --file {{.FILE}} --game {{.GAME}} --dump_current_output --fail-on-cmp'
         ignore_error: true
-      - '{{.PYTHON}} ./scripts/update_decomp_reference.py ./failures ./test/decompiler/reference/ --game {{.GAME}}'
+      - "{{.PYTHON}} ./scripts/update_decomp_reference.py ./failures ./test/decompiler/reference/ --game {{.GAME}}"
       - task: offline-test-file
   type-test:
     cmds:
       - cmd: '{{.GOALCTEST_BIN_RELEASE_DIR}}/goalc-test --gtest_brief=0 --gtest_filter="*{{.TYPE_CONSISTENCY_TEST_FILTER}}*" --gtest_break_on_failure'
+  tests-filtered:
+    cmds:
+      - cmd: '{{.GOALCTEST_BIN_RELEASE_DIR}}/goalc-test --gtest_brief=0 --gtest_filter="*{{.FILTER}}*" --gtest_break_on_failure'

common/CMakeLists.txt

@@ -83,7 +83,11 @@ add_library(common
         util/dialogs.cpp
         util/diff.cpp
         util/FileUtil.cpp
-        util/FontUtils.cpp
+        util/font/dbs/font_db_jak1.cpp
+        util/font/dbs/font_db_jak2.cpp
+        util/font/dbs/font_db_jak3.cpp
+        util/font/font_utils_korean.cpp
+        util/font/font_utils.cpp
         util/FrameLimiter.cpp
         util/json_util.cpp
         util/os.cpp

common/audio/audio_formats.cpp

@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/BinaryWriter.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Write a wave file from a vector of samples.
@@ -57,7 +57,8 @@ void write_wave_file(const std::vector<s16>& left_samples,
 }
 
 std::pair<std::vector<s16>, std::vector<s16>> decode_adpcm(BinaryReader& reader,
-                                                           const bool stereo) {
+                                                           const bool stereo,
+                                                           const u32 version) {
   std::vector<s16> left_samples;
   std::vector<s16> right_samples;
   s32 left_sample_prev[2] = {0, 0};
@@ -85,7 +86,7 @@ std::pair<std::vector<s16>, std::vector<s16>> decode_adpcm(BinaryReader& reader,
       break;
     }
 
-    if (stereo && bytes_read == 0x2000) {
+    if (stereo && bytes_read == (version == 3 ? 0x1000 : 0x2000)) {
       // switch streams
       processing_left_chunk = !processing_left_chunk;
       bytes_read = 0;

common/audio/audio_formats.h

@@ -34,6 +34,8 @@ void write_wave_file(const std::vector<s16>& left_samples,
                      s32 sample_rate,
                      const fs::path& name);
 
-std::pair<std::vector<s16>, std::vector<s16>> decode_adpcm(BinaryReader& reader, const bool mono);
+std::pair<std::vector<s16>, std::vector<s16>> decode_adpcm(BinaryReader& reader,
+                                                           const bool mono,
+                                                           const u32 version);
 
 std::vector<u8> encode_adpcm(const std::vector<s16>& samples);

common/cross_os_debug/xdbg.cpp

@@ -11,7 +11,7 @@
 #include "common/goal_constants.h"
 #include "common/util/Timer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef __linux
 #include <fcntl.h>

common/cross_sockets/XSocket.cpp

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "common/log/log.h"
 // clang-format on
 

common/cross_sockets/XSocketClient.cpp

@@ -5,7 +5,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 // clang-format off
 #ifdef _WIN32

common/cross_sockets/XSocketServer.cpp

@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/common_types.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/custom_data/TFrag3Data.cpp

@@ -3,14 +3,9 @@
 #include <algorithm>
 #include <functional>
 
-#ifndef __aarch64__
-#include "xmmintrin.h"
-#else
-#include "third-party/sse2neon/sse2neon.h"
-#endif
-
 #include "common/log/log.h"
 #include "common/util/Assert.h"
+#include "common/util/simd_util.h"
 
 namespace tfrag3 {
 
@@ -93,10 +88,8 @@ math::Vector3f vopmsub(math::Vector3f acc, math::Vector3f a, math::Vector3f b) {
 }
 
 /*!
- * Compute the normal transformation for a TIE from the TIE matrix.
- * Note that this isn't identical to the original game - we're missing the vf14 scaling factor
- * For now, I just set this to 1, then normalize in the shader. Though I think we could avoid
- * this by figuring out the value of vf14 here (I am just too lazy right now).
+ * Compute the normal transformation for a TIE from the TIE matrix. This will return properly scaled
+ * normals.
  */
 std::array<math::Vector3f, 3> tie_normal_transform_v2(const std::array<math::Vector4f, 4>& m) {
   // let:
@@ -186,11 +179,21 @@ std::array<math::Vector3f, 3> tie_normal_transform_v2(const std::array<math::Vec
   // sqc2 vf12, -80(t8)
 }
 
+s16 saturate_for_s10(s16 s10) {
+  // our error should be 1 or less as an s8, or 4 as a s10.
+  ASSERT(s10 >= -520 && s10 < 520);
+  if (s10 < -512) {
+    return -512;
+  }
+  if (s10 > 511) {
+    return 511;
+  }
+  return s10;
+}
+
 u32 pack_to_gl_normal(s16 nx, s16 ny, s16 nz) {
-  ASSERT(nx >= -512 && nx <= 511);
-  ASSERT(ny >= -512 && ny <= 511);
-  ASSERT(nz >= -512 && nz <= 511);
-  return (nx & 0x3ff) | ((ny & 0x3ff) << 10) | ((nz & 0x3ff) << 20);
+  return (saturate_for_s10(nx) & 0x3ff) | ((saturate_for_s10(ny) & 0x3ff) << 10) |
+         ((saturate_for_s10(nz) & 0x3ff) << 20);
 }
 
 /*!
@@ -202,10 +205,10 @@ u32 unpack_tie_normal(const std::array<math::Vector3f, 3>& mat, s8 nx, s8 ny, s8
   nrm += mat[0] * nx;
   nrm += mat[1] * ny;
   nrm += mat[2] * nz;
-  // convert to s16 for OpenGL renderer
-  // nrm /= 0x100;  // number from EE asm
-  // nrm *= 0x200;  // for normalized s10 -> float conversion by OpenGL.
-  nrm *= 2;  // for normalized s10 -> float conversion by OpenGL.
+
+  // game used signed 8-bit normals, but OpenGL uses signed 10-bit
+  // multiply by 2^2 = 4
+  nrm *= 4;
 
   auto as_int = nrm.cast<s16>();
 

common/dma/dma.cpp

@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string DmaTag::print() const {
   std::string result;

common/dma/dma.h

@@ -11,7 +11,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 struct DmaStats {
   double sync_time_ms = 0;

common/dma/dma_copy.cpp

@@ -6,7 +6,7 @@
 #include "common/log/log.h"
 #include "common/util/Timer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Convert a DMA chain to an array of bytes that can be directly fed to VIF.

common/dma/gs.cpp

@@ -2,7 +2,6 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 std::string reg_descriptor_name(GifTag::RegisterDescriptor reg) {

common/formatter/formatter.cpp

@@ -6,12 +6,12 @@
 #include "common/formatter/rules/rule_config.h"
 #include "common/log/log.h"
 #include "common/util/FileUtil.h"
-#include "common/util/ast_util.h"
 #include "common/util/string_util.h"
 
 #include "tree_sitter/api.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 
 // Declare the `tree_sitter_opengoal` function, which is
 // implemented by the `tree-sitter-opengoal` library.

common/formatter/formatter_tree.cpp

@@ -2,7 +2,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string get_source_code(const std::string& source, const TSNode& node) {
   uint32_t start = ts_node_start_byte(node);

common/formatter/formatter_tree.h

@@ -46,7 +46,7 @@ class FormatterTreeNode {
 
   FormatterTreeNode() = default;
   FormatterTreeNode(const std::string& source, const TSNode& node);
-  FormatterTreeNode(const Metadata& _metadata) : metadata(_metadata){};
+  FormatterTreeNode(const Metadata& _metadata) : metadata(_metadata) {};
 
   bool is_list() const { return !token.has_value(); }
   std::string token_str() const {

common/formatter/rules/formatting_rules.cpp

@@ -4,7 +4,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace formatter_rules {
 

common/global_profiler/GlobalProfiler.cpp

@@ -9,7 +9,7 @@
 #include "common/util/FileUtil.h"
 #include "common/common_types.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 #ifdef OS_POSIX

common/global_profiler/GlobalProfiler.h

@@ -47,7 +47,7 @@ class GlobalProfiler {
 };
 
 struct ScopedEvent {
-  ScopedEvent(GlobalProfiler* _prof) : prof(_prof){};
+  ScopedEvent(GlobalProfiler* _prof) : prof(_prof) {};
   ScopedEvent(const ScopedEvent&) = delete;
   ScopedEvent& operator=(const ScopedEvent&) = delete;
   GlobalProfiler* prof = nullptr;

common/goal_constants.h

@@ -71,6 +71,15 @@ constexpr int LEVEL_MAX = 10;
 constexpr int LEVEL_TOTAL = LEVEL_MAX + 1;
 }  // namespace jak3
 
+namespace jakx {
+// for now, we don't have the ability to extend the size of the symbol table
+constexpr s32 GOAL_MAX_SYMBOLS = 0x4000;
+// amount of levels in level heap
+constexpr int LEVEL_MAX = 10;
+// total amount of levels, including ones outside level heap (default-level)
+constexpr int LEVEL_TOTAL = LEVEL_MAX + 1;
+}  // namespace jakx
+
 constexpr s32 max_symbols(GameVersion version) {
   switch (version) {
     case GameVersion::Jak1:
@@ -79,6 +88,8 @@ constexpr s32 max_symbols(GameVersion version) {
       return jak2::GOAL_MAX_SYMBOLS;
     case GameVersion::Jak3:
       return jak3::GOAL_MAX_SYMBOLS;
+    case GameVersion::JakX:
+      return jakx::GOAL_MAX_SYMBOLS;
   }
 }
 

common/goos/Interpreter.cpp

@@ -16,7 +16,9 @@
 #include "common/util/string_util.h"
 #include "common/util/unicode_util.h"
 
-#include "fmt/core.h"
+#include "fmt/args.h"
+#include "fmt/base.h"
+#include "fmt/format.h"
 
 namespace goos {
 Interpreter::Interpreter(const std::string& username) {
@@ -1769,26 +1771,16 @@ Object Interpreter::eval_format(const Object& form,
     throw_eval_error(form, "format string must be a string");
   }
 
-  // Note: this might be relying on internal implementation details of libfmt to work properly
-  // and isn't a great solution.
-  std::vector<fmt::basic_format_arg<fmt::format_context>> args2;
-  std::vector<std::string> strings;
+  fmt::dynamic_format_arg_store<fmt::format_context> arg_store;
   for (size_t i = 2; i < args.unnamed.size(); i++) {
     if (args.unnamed.at(i).is_string()) {
-      strings.push_back(args.unnamed.at(i).as_string()->data);
+      arg_store.push_back(args.unnamed.at(i).as_string()->data);
     } else {
-      strings.push_back(args.unnamed.at(i).print());
+      arg_store.push_back(args.unnamed.at(i).print());
     }
   }
 
-  for (auto& x : strings) {
-    args2.push_back(fmt::detail::make_arg<fmt::format_context>(x));
-  }
-
-  auto formatted =
-      fmt::vformat(format_str.as_string()->data,
-                   fmt::format_args(args2.data(), static_cast<unsigned>(args2.size())));
-
+  auto formatted = fmt::vformat(format_str.as_string()->data, arg_store);
   if (truthy(dest)) {
     lg::print("{}", formatted.c_str());
   }

common/goos/Object.cpp

@@ -47,7 +47,7 @@
 #include "common/util/crc32.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/Object.h

@@ -57,7 +57,7 @@
 #include "common/util/Assert.h"
 #include "common/util/crc32.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/ParseHelpers.cpp

@@ -1,6 +1,6 @@
 #include "ParseHelpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/PrettyPrinter.cpp

@@ -15,7 +15,7 @@
 #include "common/goos/PrettyPrinter2.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace pretty_print {
 

common/goos/PrettyPrinter2.cpp

@@ -3,7 +3,6 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 namespace pretty_print {

common/goos/Printer.cpp

@@ -6,7 +6,7 @@
 #include "common/goos/Object.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace pretty_print {
 namespace {

common/goos/Reader.cpp

@@ -13,9 +13,10 @@
 
 #include "common/log/log.h"
 #include "common/util/FileUtil.h"
-#include "common/util/FontUtils.h"
+#include "common/util/font/font_utils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 
 namespace goos {
 
@@ -155,39 +156,6 @@ Reader::Reader() {
   for (const char* c = bonus; *c; c++) {
     m_valid_symbols_chars[(int)*c] = true;
   }
-
-  // table of characters that are valid in source code:
-  for (auto& x : m_valid_source_text_chars) {
-    x = false;
-  }
-  for (int i = ' '; i <= '~'; i++) {
-    m_valid_source_text_chars[i] = true;
-  }
-  m_valid_source_text_chars[(int)'\n'] = true;
-  m_valid_source_text_chars[(int)'\t'] = true;
-  m_valid_source_text_chars[(int)'\r'] = true;
-
-  // allow every character that gets transformed to something else
-  for (auto& [version, font] : g_font_banks) {
-    for (auto& remap : *font->encode_info()) {
-      for (auto rc : remap.chars) {
-        m_valid_source_text_chars[(u8)rc] = true;
-      }
-    }
-    for (auto& remap : *font->replace_info()) {
-      for (auto rc : remap.to) {
-        m_valid_source_text_chars[(u8)rc] = true;
-      }
-      for (auto rc : remap.from) {
-        m_valid_source_text_chars[(u8)rc] = true;
-      }
-    }
-  }
-  m_valid_source_text_chars[0] = false;
-}
-
-bool Reader::is_valid_source_char(char c) const {
-  return m_valid_source_text_chars[(u8)c];
 }
 
 /*!
@@ -265,17 +233,6 @@ Object Reader::internal_read(std::shared_ptr<SourceText> text,
         fmt::format("Text file {} has invalid encoding", text->get_description()));
   }
 
-  // validate the input
-  for (int offset = check_encoding ? 3 : 0; offset < text->get_size(); offset++) {
-    if (!is_valid_source_char(text->get_text()[offset])) {
-      // failed.
-      int line_number = text->get_line_idx(offset) + 1;
-      throw std::runtime_error(fmt::format("Invalid character found on line {} of {}: 0x{:x}",
-                                           line_number, text->get_description(),
-                                           (u8)text->get_text()[offset]));
-    }
-  }
-
   // first create stream
   TextStream ts(text);
 
@@ -300,15 +257,6 @@ Object Reader::internal_read(std::shared_ptr<SourceText> text,
   }
 }
 
-bool Reader::check_string_is_valid(const std::string& str) const {
-  for (auto c : str) {
-    if (!is_valid_source_char(c)) {
-      return false;
-    }
-  }
-  return true;
-}
-
 /*!
  * Given a stream starting at the first character of a token, get the token. Doesn't consume
  * whitespace at the end and leaves the stream on the first character after the token.
@@ -904,4 +852,13 @@ std::string get_readable_string(const char* in) {
   }
   return result;
 }
+
+std::string get_byte_string(const char* in) {
+  std::string result;
+  while (*in) {
+    result += fmt::format("\\c{:02x}", uint8_t(*in));
+    in++;
+  }
+  return result;
+}
 }  // namespace goos

common/goos/Reader.h

@@ -75,7 +75,6 @@ class Reader {
                           const std::optional<std::string>& string_name = {});
   std::optional<Object> read_from_stdin(const std::string& prompt, REPL::Wrapper& repl);
   Object read_from_file(const std::vector<std::string>& file_path, bool check_encoding = false);
-  bool check_string_is_valid(const std::string& str) const;
 
   SymbolTable symbolTable;
   TextDb db;
@@ -101,12 +100,10 @@ class Reader {
   void add_reader_macro(const std::string& shortcut, std::string replacement);
 
   bool m_valid_symbols_chars[256];
-  bool m_valid_source_text_chars[256];
-
-  bool is_valid_source_char(char c) const;
 
   std::unordered_map<std::string, std::string> m_reader_macros;
 };
 
+std::string get_byte_string(const char* in);
 std::string get_readable_string(const char* in);
 }  // namespace goos

common/goos/TextDB.cpp

@@ -15,7 +15,7 @@
 
 #include "common/util/FileUtil.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/TextDB.h

@@ -41,7 +41,7 @@ class SourceText {
   // want
   virtual bool terminate_compiler_error() { return true; }
 
-  virtual ~SourceText(){};
+  virtual ~SourceText() {};
 
  protected:
   void build_offsets();

common/log/log.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace lg {
 
@@ -72,7 +72,7 @@ void print(const std::string& format, Args&&... args) {
 }
 template <typename... Args>
 void print(const fmt::text_style& ts, const std::string& format, Args&&... args) {
-  std::string formatted_message = fmt::format(ts, format, std::forward<Args>(args)...);
+  std::string formatted_message = fmt::vformat(ts, format, fmt::make_format_args(args...));
   internal::log_print(formatted_message.c_str());
 }
 

common/math/Vector.h

@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace math {
 

common/repl/config.cpp

@@ -2,7 +2,7 @@
 
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace REPL {
 void to_json(json& j, const Config& obj) {

common/repl/config.h

@@ -29,7 +29,7 @@ void from_json(const json& j, KeyBind& obj);
 // TODO - per-game config
 struct Config {
   GameVersion game_version;
-  Config(GameVersion _game_version) : game_version(_game_version){};
+  Config(GameVersion _game_version) : game_version(_game_version) {};
 
   // this is the default REPL configuration
   int nrepl_port = 8181;

common/repl/nrepl/ReplClient.cpp

@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/repl/nrepl/ReplServer.cpp

@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/repl/repl_wrapper.cpp

@@ -6,7 +6,8 @@
 #include "common/versions/versions.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 #include "third-party/replxx/include/replxx.hxx"
 
 namespace REPL {
@@ -41,7 +42,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "  .        ---        .");
   message +=
       fmt::format("  Project Path: {}\n",
-                  fmt::format(fg(fmt::color::gray), file_util::get_jak_project_dir().string()));
+                  fmt::styled(file_util::get_jak_project_dir().string(), fg(fmt::color::gray)));
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "  -       :===:       -");
   std::string effective_iso_path;
   if (repl_config.iso_path.empty()) {
@@ -50,7 +51,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
     effective_iso_path = repl_config.iso_path;
   }
   message +=
-      fmt::format("  ISO Data Path: {}\n", fmt::format(fg(fmt::color::gray), effective_iso_path));
+      fmt::format("  ISO Data Path: {}\n", fmt::styled(effective_iso_path, fg(fmt::color::gray)));
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "  --.   .--: :--.   .--");
   message += "  nREPL:";
   if (!nrepl_alive) {
@@ -63,7 +64,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
   message += "  Source File Search Dirs: ";
   const auto search_dir_string =
       fmt::format("{}", fmt::join(repl_config.asm_file_search_dirs, ","));
-  message += fmt::format("[{}]\n", fmt::format(fg(fmt::color::gray), search_dir_string));
+  message += fmt::format("[{}]\n", fmt::styled(search_dir_string, fg(fmt::color::gray)));
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "   .-=====-. .-=====-");
   message += fmt::format("    {} or {} for basic help and usage\n",
                          fmt::format(fg(fmt::color::cyan), "(repl-help)"),

common/serialization/subtitles/subtitles.cpp

@@ -5,7 +5,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/json_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void open_subtitle_project(const std::string& project_kind,
                            const std::string& file_path,
@@ -64,7 +64,7 @@ const std::unordered_map<GameVersion, std::vector<std::string>> locale_lookup =
     {GameVersion::Jak2, {"en-US", "fr-FR", "de-DE", "es-ES", "it-IT", "jp-JP", "ko-KR", "en-GB"}},
     {GameVersion::Jak3,
      {"en-US", "fr-FR", "de-DE", "es-ES", "it-IT", "cm-CM", "jp-JP", "ko-KR", "ru-RU", "pt-PT",
-      "nl-NL", "en-GB"}}};
+      "nl-NL", "en-GB", "fi-FI"}}};
 
 std::string lookup_locale_code(const GameVersion game_version, const int language_id) {
   if (locale_lookup.find(game_version) == locale_lookup.end() ||

common/serialization/subtitles/subtitles_v1.cpp

@@ -5,7 +5,7 @@
 
 #include "subtitles_v2.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void to_json(json& j, const SubtitleCutsceneLineMetadataV1& obj) {
   json_serialize(frame_start);

common/serialization/subtitles/subtitles_v2.cpp

@@ -5,7 +5,7 @@
 
 #include "subtitles_v1.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void to_json(json& j, const SubtitleLineMetadata& obj) {
   json_serialize(frame_start);

common/serialization/subtitles/subtitles_v2.h

@@ -2,7 +2,7 @@
 
 #include "common/serialization/subtitles/subtitles.h"
 #include "common/util/Assert.h"
-#include "common/util/FontUtils.h"
+#include "common/util/font/font_utils.h"
 #include "common/util/json_util.h"
 
 struct SubtitleLineMetadata {
@@ -124,7 +124,6 @@ class GameSubtitleBank {
   std::optional<std::string> m_file_base_path;
 
   std::map<std::string, GameSubtitleSceneInfo> m_base_scenes;
-  std::map<std::string, GameSubtitleSceneInfo> m_lang_scenes;
   std::map<std::string, GameSubtitleSceneInfo> m_scenes;
   bool scene_exists(const std::string& name) const { return m_scenes.find(name) != m_scenes.end(); }
   GameSubtitleSceneInfo new_scene_from_meta(

common/serialization/text/text_ser.cpp

@@ -2,6 +2,7 @@
 
 #include "common/goos/ParseHelpers.h"
 #include "common/goos/Reader.h"
+#include "common/util/font/font_utils_korean.h"
 
 int64_t get_int(const goos::Object& obj) {
   if (obj.is_int()) {
@@ -44,7 +45,7 @@ std::string get_string(const goos::Object& x) {
 void parse_text_goal(const goos::Object& data,
                      GameTextDB& db,
                      const GameTextDefinitionFile& /*file_info*/) {
-  const GameTextFontBank* font = nullptr;
+  GameTextFontBank* font = nullptr;
   std::vector<std::shared_ptr<GameTextBank>> banks;
   std::string possible_group_name;
 
@@ -122,9 +123,15 @@ void parse_text_goal(const goos::Object& data,
                 if (b_i >= int(banks.size())) {
                   throw std::runtime_error(fmt::format("Too many strings in text id #x{:x}", id));
                 }
-
-                auto line = font->convert_utf8_to_game(entry.as_string()->data);
-                banks[b_i++]->set_line(id, line);
+                if (font->is_language_id_korean(b_i)) {
+                  // korean changes differently!
+                  auto line = font->convert_utf8_to_game_korean(entry.as_string()->data);
+                  banks[b_i]->set_line(id, line);
+                } else {
+                  auto line = font->convert_utf8_to_game(entry.as_string()->data);
+                  banks[b_i]->set_line(id, line);
+                }
+                b_i++;
               } else {
                 throw std::runtime_error(fmt::format("Non-string value in text id #x{:x}", id));
               }
@@ -165,8 +172,15 @@ void parse_text_goal(const goos::Object& data,
               throw std::runtime_error(fmt::format("Too many strings in text id #x{:x}", id));
             }
 
-            auto line = font->convert_utf8_to_game(entry.as_string()->data);
-            banks[i++]->set_line(id, line);
+            if (font->is_language_id_korean(i)) {
+              // handle korean differently!
+              auto line = font->convert_utf8_to_game_korean(entry.as_string()->data);
+              banks[i]->set_line(id, line);
+            } else {
+              auto line = font->convert_utf8_to_game(entry.as_string()->data);
+              banks[i]->set_line(id, line);
+            }
+            i++;
           } else {
             throw std::runtime_error(fmt::format("Non-string value in text id #x{:x}", id));
           }
@@ -230,15 +244,20 @@ void parse_text_json(const nlohmann::json& json,
   } else {
     bank = db.bank_by_id(file_info.group_name.value(), file_info.language_id);
   }
-  const GameTextFontBank* font = get_font_bank(file_info.text_version);
+  GameTextFontBank* font = get_font_bank(file_info.text_version);
   // Parse the file
   for (const auto& [text_id, text_value] : json.items()) {
     auto line_id = std::stoi(text_id, nullptr, 16);
     if (text_value.is_string()) {
       // single line replacement
-      auto line = font->convert_utf8_to_game(text_value);
-      // TODO - lint duplicate line definitions across text files
-      bank->set_line(line_id, line);
+      if (font->is_language_id_korean(file_info.language_id)) {
+        auto line = font->convert_utf8_to_game_korean(text_value);
+        bank->set_line(line_id, line);
+      } else {
+        auto line = font->convert_utf8_to_game(text_value);
+        bank->set_line(line_id, line);
+      }
+
     } else if (text_value.is_array()) {
       // multi-line replacement starting from line_id
       //  (e.g. for Jak 1 credits, start from x0b00)
@@ -247,8 +266,14 @@ void parse_text_json(const nlohmann::json& json,
           throw std::runtime_error(fmt::format(
               "Non string provided for line {} / text id #x{} of _credits", idx, line_id));
         }
-        auto line = font->convert_utf8_to_game(raw_line);
-        bank->set_line(line_id++, line);  // increment line_id
+
+        if (font->is_language_id_korean(file_info.language_id)) {
+          auto line = font->convert_utf8_to_game_korean(raw_line);
+          bank->set_line(line_id++, line);  // increment line_id
+        } else {
+          auto line = font->convert_utf8_to_game(raw_line);
+          bank->set_line(line_id++, line);  // increment line_id
+        }
       }
     } else {
       // Unexpected value type

common/serialization/text/text_ser.h

@@ -11,7 +11,7 @@
 #include "common/goos/Object.h"
 #include "common/log/log.h"
 #include "common/util/Assert.h"
-#include "common/util/FontUtils.h"
+#include "common/util/font/font_utils.h"
 #include "common/util/json_util.h"
 #include "common/versions/versions.h"
 

common/symbols.h

@@ -324,6 +324,180 @@ constexpr int FIX_SYM_NETWORK_BOOTSTRAP = 0x294;
 
 }  // namespace jak3_symbols
 
+namespace jakx_symbols {
+
+constexpr int FIX_SYM_EMPTY_CAR = -0x8;
+constexpr int S7_OFF_FIX_SYM_EMPTY_PAIR = -0x6 - 1;
+constexpr int FIX_SYM_EMPTY_CDR = -0x4;
+constexpr int FIX_SYM_FALSE = 0x0;  // GOAL boolean #f (note that this is equal to the $s7 register)
+constexpr int FIX_SYM_TRUE = 0x4;   // GOAL boolean #t
+constexpr int FIX_SYM_FUNCTION_TYPE = 0x8;
+constexpr int FIX_SYM_BASIC = 0xc;
+constexpr int FIX_SYM_STRING_TYPE = 0x10;
+constexpr int FIX_SYM_SYMBOL_TYPE = 0x14;
+constexpr int FIX_SYM_TYPE_TYPE = 0x18;
+constexpr int FIX_SYM_OBJECT_TYPE = 0x1c;
+constexpr int FIX_SYM_LINK_BLOCK = 0x20;
+constexpr int FIX_SYM_INTEGER = 0x24;
+constexpr int FIX_SYM_SINTEGER = 0x28;
+constexpr int FIX_SYM_UINTEGER = 0x2c;
+constexpr int FIX_SYM_BINTEGER = 0x30;
+constexpr int FIX_SYM_INT8 = 0x34;
+constexpr int FIX_SYM_INT16 = 0x38;
+constexpr int FIX_SYM_INT32 = 0x3c;
+constexpr int FIX_SYM_INT64 = 0x40;
+constexpr int FIX_SYM_INT128 = 0x44;
+constexpr int FIX_SYM_UINT8 = 0x48;
+constexpr int FIX_SYM_UINT16 = 0x4c;
+constexpr int FIX_SYM_UINT32 = 0x50;
+constexpr int FIX_SYM_UINT64 = 0x54;
+constexpr int FIX_SYM_UINT128 = 0x58;
+constexpr int FIX_SYM_FLOAT = 0x5c;
+constexpr int FIX_SYM_PROCESS_TREE = 0x60;
+constexpr int FIX_SYM_PROCESS_TYPE = 0x64;
+constexpr int FIX_SYM_THREAD = 0x68;
+constexpr int FIX_SYM_STRUCTURE = 0x6c;
+constexpr int FIX_SYM_PAIR_TYPE = 0x70;
+constexpr int FIX_SYM_POINTER = 0x74;
+constexpr int FIX_SYM_NUMBER = 0x78;
+constexpr int FIX_SYM_ARRAY = 0x7c;
+constexpr int FIX_SYM_VU_FUNCTION = 0x80;
+constexpr int FIX_SYM_CONNECTABLE = 0x84;
+constexpr int FIX_SYM_STACK_FRAME = 0x88;
+constexpr int FIX_SYM_FILE_STREAM = 0x8c;
+constexpr int FIX_SYM_HEAP = 0x90;
+constexpr int FIX_SYM_NOTHING_FUNC = 0x94;
+constexpr int FIX_SYM_DELETE_BASIC = 0x98;
+constexpr int FIX_SYM_STATIC = 0x9c;
+constexpr int FIX_SYM_GLOBAL_HEAP = 0xa0;
+constexpr int FIX_SYM_DEBUG = 0xa4;
+constexpr int FIX_SYM_LOADING_LEVEL = 0xa8;
+constexpr int FIX_SYM_LOADING_PACKAGE = 0xac;
+constexpr int FIX_SYM_PROCESS_LEVEL_HEAP = 0xb0;
+constexpr int FIX_SYM_STACK = 0xb4;
+constexpr int FIX_SYM_SCRATCH = 0xb8;
+constexpr int FIX_SYM_SCRATCH_TOP = 0xbc;
+constexpr int FIX_SYM_ZERO_FUNC = 0xc0;
+constexpr int FIX_SYM_ASIZE_OF_BASIC_FUNC = 0xc4;
+constexpr int FIX_SYM_COPY_BASIC_FUNC = 0xc8;  // bugged name
+constexpr int FIX_SYM_LEVEL = 0xcc;
+constexpr int FIX_SYM_ART_GROUP = 0xd0;
+constexpr int FIX_SYM_TEXTURE_PAGE_DIR = 0xd4;
+constexpr int FIX_SYM_TEXTURE_PAGE = 0xd8;
+constexpr int FIX_SYM_SOUND = 0xdc;
+constexpr int FIX_SYM_DGO = 0xe0;
+constexpr int FIX_SYM_TOP_LEVEL = 0xe4;
+constexpr int FIX_SYM_QUOTE = 0xe8;
+constexpr int FIX_SYM_LISTENER_LINK_BLOCK = 0xec;
+constexpr int FIX_SYM_LISTENER_FUNCTION = 0xf0;
+constexpr int FIX_SYM_STACK_TOP = 0xf4;
+constexpr int FIX_SYM_STACK_BASE = 0xf8;
+constexpr int FIX_SYM_STACK_SIZE = 0xfc;
+constexpr int FIX_SYM_KERNEL_FUNCTION = 0x100;
+constexpr int FIX_SYM_KERNEL_PACKAGES = 0x104;
+constexpr int FIX_SYM_KERNEL_BOOT_MESSAGE = 0x108;
+constexpr int FIX_SYM_KERNEL_BOOT_MODE = 0x10c;
+constexpr int FIX_SYM_KERNEL_BOOT_LEVEL = 0x110;
+constexpr int FIX_SYM_KERNEL_BOOT_ART_GROUP = 0x114;
+constexpr int FIX_SYM_KERNEL_DEBUG = 0x118;
+constexpr int FIX_SYM_KERNEL_VERSION = 0x11c;
+constexpr int FIX_SYM_KERNEL_DISPATCHER = 0x120;
+constexpr int FIX_SYM_SYNC_DISPATCHER = 0x124;
+constexpr int FIX_SYM_PRINT_COLLUMN = 0x128;
+constexpr int FIX_SYM_DEBUG_SEGMENT = 300;
+constexpr int FIX_SYM_ENABLE_METHOD_SET = 0x130;
+constexpr int FIX_SYM_SQL_RESULT = 0x134;
+constexpr int FIX_SYM_COLLAPSE_QUOTE = 0x138;
+constexpr int FIX_SYM_LEVEL_TYPE_LIST = 0x13C;
+constexpr int FIX_SYM_DECI_COUNT = 0x140;
+constexpr int FIX_SYM_USER = 0x144;
+constexpr int FIX_SYM_VIDEO_MODE = 0x148;
+constexpr int FIX_SYM_BOOT_VIDEO_MODE = 0x14C;
+constexpr int FIX_SYM_BOOT = 0x150;
+constexpr int FIX_SYM_DEMO = 0x154;
+constexpr int FIX_SYM_DEMO_SHARED = 0x158;
+constexpr int FIX_SYM_PREVIEW = 0x15C;
+constexpr int FIX_SYM_KIOSK = 0x160;
+constexpr int FIX_SYM_PLAY_BOOT = 0x164;
+constexpr int FIX_SYM_SIN = 0x168;
+constexpr int FIX_SYM_COS = 0x16C;
+constexpr int FIX_SYM_PUT_DISPLAY_ENV = 0x170;
+constexpr int FIX_SYM_SYNCV = 0x174;
+constexpr int FIX_SYM_SYNC_PATH = 0x178;
+constexpr int FIX_SYM_RESET_PATH = 0x17C;
+constexpr int FIX_SYM_RESET_GRAPH = 0x180;
+constexpr int FIX_SYM_DMA_SYNC = 0x184;
+constexpr int FIX_SYM_GS_PUT_IMR = 0x188;
+constexpr int FIX_SYM_GS_GET_IMR = 0x18C;
+constexpr int FIX_SYM_GS_STORE_IMAGE = 400;
+constexpr int FIX_SYM_FLUSH_CACHE = 0x194;
+constexpr int FIX_SYM_CPAD_OPEN = 0x198;
+constexpr int FIX_SYM_CPAD_GET_DATA = 0x19C;
+constexpr int FIX_SYM_MOUSE_GET_DATA = 0x1A0;
+constexpr int FIX_SYM_KEYBD_GET_DATA = 0x1A4;
+constexpr int FIX_SYM_INSTALL_HANDLER = 0x1A8;
+constexpr int FIX_SYM_INSTALL_DEBUG_HANDLER = 0x1AC;
+constexpr int FIX_SYM_FILE_STREAM_OPEN = 0x1B0;
+constexpr int FIX_SYM_FILE_STREAM_CLOSE = 0x1B4;
+constexpr int FIX_SYM_FILE_STREAM_LENGTH = 0x1B8;
+constexpr int FIX_SYM_FILE_STREAM_SEEK = 0x1BC;
+constexpr int FIX_SYM_FILE_STREAM_READ = 0x1C0;
+constexpr int FIX_SYM_FILE_STREAM_WRITE = 0x1C4;
+constexpr int FIX_SYM_SCF_GET_LANGUAGE = 0x1C8;
+constexpr int FIX_SYM_SCF_GET_TIME = 0x1CC;
+constexpr int FIX_SYM_SCF_GET_ASPECT = 0x1D0;
+constexpr int FIX_SYM_SCF_GET_VOLUME = 0x1D4;
+constexpr int FIX_SYM_SCF_GET_TERRITORY = 0x1D8;
+constexpr int FIX_SYM_SCF_GET_TIMEOUT = 0x1DC;
+constexpr int FIX_SYM_SCF_GET_INACTIVE_TIMEOUT = 0x1E0;
+constexpr int FIX_SYM_DMA_TO_IOP = 0x1E4;
+constexpr int FIX_SYM_KERNEL_SHUTDOWN = 0x1E8;
+constexpr int FIX_SYM_AYBABTU = 0x1EC;
+constexpr int FIX_SYM_STRING_TO_SYMBOL = 0x1F0;
+constexpr int FIX_SYM_SYMBOL_TO_STRING = 500;
+constexpr int FIX_SYM_PRINT = 0x1F8;
+constexpr int FIX_SYM_INSPECT = 0x1FC;
+constexpr int FIX_SYM_LOAD = 0x200;
+constexpr int FIX_SYM_LOADB = 0x204;
+constexpr int FIX_SYM_LOADO = 0x208;
+constexpr int FIX_SYM_UNLOAD = 0x20C;
+constexpr int FIX_SYM_FORMAT = 0x210;
+constexpr int FIX_SYM_MALLOC = 0x214;
+constexpr int FIX_SYM_KMALLOC = 0x218;
+constexpr int FIX_SYM_KMEMOPEN = 0x21C;
+constexpr int FIX_SYM_KMEMCLOSE = 0x220;
+constexpr int FIX_SYM_NEW_DYNAMIC_STRUCTURE = 0x224;
+constexpr int FIX_SYM_METHOD_SET = 0x228;
+constexpr int FIX_SYM_LINK = 0x22C;
+constexpr int FIX_SYM_LINK_BUSY = 0x230;
+constexpr int FIX_SYM_LINK_RESET = 0x234;
+constexpr int FIX_SYM_LINK_BEGIN = 0x238;
+constexpr int FIX_SYM_LINK_RESUME = 0x23C;
+constexpr int FIX_SYM_DGO_LOAD = 0x240;
+constexpr int FIX_SYM_SQL_QUERY = 0x244;
+constexpr int FIX_SYM_MC_RUN = 0x248;
+constexpr int FIX_SYM_MC_FORMAT = 0x24C;
+constexpr int FIX_SYM_MC_UNFORMAT = 0x250;
+constexpr int FIX_SYM_MC_CREATE_FILE = 0x254;
+constexpr int FIX_SYM_MC_SAVE = 600;
+constexpr int FIX_SYM_MC_LOAD = 0x25C;
+constexpr int FIX_SYM_MC_CHECK_RESULT = 0x260;
+constexpr int FIX_SYM_MC_GET_SLOT_INFO = 0x264;
+constexpr int FIX_SYM_MC_MAKEFILE = 0x268;
+constexpr int FIX_SYM_KSET_LANGUAGE = 0x26C;
+constexpr int FIX_SYM_RPC_CALL = 0x270;
+constexpr int FIX_SYM_RPC_BUSY = 0x274;
+constexpr int FIX_SYM_TEST_LOAD_DGO_C = 0x278;
+constexpr int FIX_SYM_SYMLINK2 = 0x27c;
+constexpr int FIX_SYM_SYMLINK3 = 0x280;
+constexpr int FIX_SYM_ULTIMATE_MEMCPY = 0x284;
+constexpr int FIX_SYM_PLAY = 0x288;
+constexpr int FIX_SYM_SYMBOL_STRING = 0x28c;
+constexpr int FIX_SYM_KERNEL_SYMBOL_WARNINGS = 0x290;
+constexpr int FIX_SYM_NETWORK_BOOTSTRAP = 0x294;
+
+}  // namespace jakx_symbols
+
 constexpr int false_symbol_offset() {
   return jak1_symbols::FIX_SYM_FALSE;
 }
@@ -334,6 +508,7 @@ constexpr int true_symbol_offset(GameVersion version) {
       return jak1_symbols::FIX_SYM_TRUE;
     case GameVersion::Jak2:
     case GameVersion::Jak3:
+    case GameVersion::JakX:
       return jak2_symbols::FIX_SYM_TRUE;
   }
 }
@@ -344,6 +519,7 @@ constexpr int empty_pair_offset_from_s7(GameVersion version) {
       return jak1_symbols::FIX_SYM_EMPTY_PAIR;
     case GameVersion::Jak2:
     case GameVersion::Jak3:
+    case GameVersion::JakX:
       // minus 1 for the symbol table pointer's offset.
       return jak2_symbols::S7_OFF_FIX_SYM_EMPTY_PAIR;
   }

common/type_system/Type.cpp

@@ -10,7 +10,7 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 std::string reg_kind_to_string(RegClass kind) {

common/type_system/TypeFieldLookup.cpp

@@ -9,7 +9,7 @@
 
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 // debug prints for the reverse lookup

common/type_system/TypeSpec.cpp

@@ -7,7 +7,7 @@
 
 #include <stdexcept>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 bool TypeTag::operator==(const TypeTag& other) const {
   return name == other.name && value == other.value;

common/type_system/TypeSystem.cpp

@@ -15,7 +15,7 @@
 #include "common/util/math_util.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 template <typename... Args>
@@ -1100,6 +1100,7 @@ void TypeSystem::add_builtin_types(GameVersion version) {
       break;
     case GameVersion::Jak2:
     case GameVersion::Jak3:
+    case GameVersion::JakX:
       symbol_type = add_builtin_structure("object", "symbol", true);
       symbol_type->override_offset(1);
       break;

common/type_system/defenum.cpp

@@ -13,7 +13,7 @@
 #include "common/util/BitUtils.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 const goos::Object& car(const goos::Object* x) {

common/type_system/deftype.cpp

@@ -13,7 +13,7 @@
 #include "common/type_system/state.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Missing Features

common/util/Assert.h

@@ -43,5 +43,8 @@
 
 #define ASSERT(EX) ((void)0)
 #define ASSERT_MSG(EXPR, STR) ((void)0)
+#define ASSERT_NOT_REACHED() ((void)0)
+#define ASSERT_NOT_REACHED_MSG(STR) ((void)0)
+#define ASSERT_EQ_IMM(EXPR, EXPECTED) ((void)0)
 
 #endif

common/util/FileUtil.cpp

@@ -22,7 +22,7 @@
 // This disables the use of PCLMULQDQ which is probably ok, but let's just be safe and disable it
 // because nobody will care if png compression is 10% slower.
 #define FPNG_NO_SSE 1
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/fpng/fpng.cpp"
 #include "third-party/fpng/fpng.h"
 #include "third-party/lzokay/lzokay.hpp"

common/util/FontUtils.h

@@ -1,98 +0,0 @@
-#pragma once
-
-/*!
- * @file FontUtils.h
- *
- * Code for handling text and strings in Jak 1's "large font" format.
- *
- * MAKE SURE THIS FILE IS ENCODED IN UTF-8!!! The various strings here depend on it.
- * Always verify the encoding if string detection suddenly goes awry.
- */
-
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "common/common_types.h"
-#include "common/versions/versions.h"
-
-// version of the game text file's text encoding. Not real, but we need to differentiate them
-// somehow, since the encoding changes.
-enum class GameTextVersion {
-  JAK1_V1 = 10,  // jak 1 (ntsc-u v1)
-  JAK1_V2 = 11,  // jak 1 (pal+)
-  JAK2 = 20,     // jak 2
-  JAK3 = 30,     // jak 3
-  JAKX = 40      // jak x
-};
-
-extern const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap;
-
-const std::string& get_text_version_name(GameTextVersion version);
-GameTextVersion get_text_version_from_name(const std::string& name);
-
-/*!
- * What bytes a set of characters (UTF-8) correspond to. You can convert to and fro.
- */
-struct EncodeInfo {
-  std::string chars;
-  std::vector<u8> bytes;
-};
-/*!
- * Replace an unconventional string of characters with/from something more readable.
- * For example, turns Ñ into N + ~ + a bunch of modifiers.
- */
-struct ReplaceInfo {
-  std::string from;
-  std::string to;
-};
-
-/*!
- * All the information to convert UTF-8 text into game text.
- */
-class GameTextFontBank {
-  GameTextVersion m_version;  // the version of the game text. we determine this ourselves.
-  std::vector<EncodeInfo>* m_encode_info;
-  std::vector<ReplaceInfo>* m_replace_info;
-  std::unordered_set<char>* m_passthrus;
-
-  const EncodeInfo* find_encode_to_utf8(const char* in) const;
-  const EncodeInfo* find_encode_to_game(const std::string& in, int off = 0) const;
-  const ReplaceInfo* find_replace_to_utf8(const std::string& in, int off = 0) const;
-  const ReplaceInfo* find_replace_to_game(const std::string& in, int off = 0) const;
-
-  std::string replace_to_utf8(std::string& str) const;
-  std::string replace_to_game(std::string& str) const;
-  std::string encode_utf8_to_game(std::string& str) const;
-
- public:
-  GameTextFontBank(GameTextVersion version,
-                   std::vector<EncodeInfo>* encode_info,
-                   std::vector<ReplaceInfo>* replace_info,
-                   std::unordered_set<char>* passthrus);
-
-  const std::vector<EncodeInfo>* encode_info() const { return m_encode_info; }
-  const std::vector<ReplaceInfo>* replace_info() const { return m_replace_info; }
-  const std::unordered_set<char>* passthrus() const { return m_passthrus; }
-
-  GameTextVersion version() const { return m_version; }
-
-  // TODO - methods would help make this code a lot better for different game versions
-  // hacking it for now
-  bool valid_char_range(const char in) const;
-
-  std::string convert_utf8_to_game(std::string str, bool escape = false) const;
-  std::string convert_game_to_utf8(const char* in) const;
-};
-
-extern GameTextFontBank g_font_bank_jak1_v1;
-extern GameTextFontBank g_font_bank_jak1_v2;
-extern GameTextFontBank g_font_bank_jak2;
-extern std::map<GameTextVersion, GameTextFontBank*> g_font_banks;
-
-const GameTextFontBank* get_font_bank(GameTextVersion version);
-const GameTextFontBank* get_font_bank_from_game_version(GameVersion version);
-const GameTextFontBank* get_font_bank(const std::string& name);
-bool font_bank_exists(GameTextVersion version);

common/util/Trie.h

@@ -36,6 +36,9 @@ class Trie {
   // Get all objects starting with the given prefix.
   std::vector<T*> lookup_prefix(const std::string& str) const;
 
+  // Finds the longest prefix match starting at offset `off` in string `in`.
+  const T* find_longest_prefix(const std::string& in, int off) const;
+
   // Get all nodes in the tree.
   std::vector<T*> get_all_nodes() const;
   ~Trie();
@@ -143,6 +146,23 @@ class Trie {
         }
       }
     }
+
+    const T* find_longest_prefix(const std::string& in, int off) const {
+      const Node* node = this;
+      const T* best = nullptr;
+
+      for (int j = off; j < (int)in.size(); ++j) {
+        unsigned char c = static_cast<unsigned char>(in[j]);
+        node = node->children[c];
+        if (!node) {
+          break;
+        }
+        if (node->value) {
+          best = node->value;
+        }
+      }
+      return best;
+    }
   };
 
   Node m_root;
@@ -182,9 +202,14 @@ std::vector<T*> Trie<T>::lookup_prefix(const std::string& str) const {
   return m_root.lookup_prefix(str.c_str());
 }
 
+template <typename T>
+const T* Trie<T>::find_longest_prefix(const std::string& in, int off) const {
+  return m_root.find_longest_prefix(in, off);
+}
+
 template <typename T>
 std::vector<T*> Trie<T>::get_all_nodes() const {
   std::vector<T*> result;
   m_root.get_all_children(result);
   return result;
-}
+}

common/util/compress.cpp

@@ -5,7 +5,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/zstd/lib/zstd.h"
 
 namespace compression {

common/util/crc32.h

@@ -10,17 +10,16 @@ u32 crc32(const u8* data, size_t size);
 
 #ifdef __aarch64__
 #include <arm_acle.h>
+// Computes CRC32C
 inline u32 crc32(const u8* data, size_t size) {
   u32 result = 0xffffffff;
   while (size >= 4) {
-    u32 x;
-    memcpy(&x, data, 4);
+    result = __crc32cw(result, *reinterpret_cast<const u32*>(data));
     data += 4;
     size -= 4;
-    result = __crc32w(result, x);
   }
   while (size) {
-    result = __crc32b(result, *data);
+    result = __crc32cb(result, *data);
     data++;
     size--;
   }
@@ -28,6 +27,7 @@ inline u32 crc32(const u8* data, size_t size) {
 }
 #else
 #include <immintrin.h>
+// Computes CRC32C
 inline u32 crc32(const u8* data, size_t size) {
   u32 result = 0xffffffff;
   while (size >= 4) {

common/util/dgo_util.cpp

@@ -5,7 +5,7 @@
 #include "common/util/Assert.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Assert false if the char[] has non-null data after the null terminated string.
@@ -25,7 +25,8 @@ std::string get_object_file_name(const std::string& original_name, const u8* dat
   const std::string art_group_text_strings[] = {
       fmt::format("/src/next/data/art-group{}/", versions::jak1::ART_FILE_VERSION),
       fmt::format("/src/jak2/final/art-group{}/", versions::jak2::ART_FILE_VERSION),
-      fmt::format("/src/jak3/final/art-group{}/", versions::jak3::ART_FILE_VERSION)};
+      fmt::format("/src/jak3/final/art-group{}/", versions::jak3::ART_FILE_VERSION),
+      fmt::format("/src/jakx/final/art-group{}/", versions::jakx::ART_FILE_VERSION)};
   const std::string suffix = "-ag.go";
 
   for (auto& art_group_text : art_group_text_strings) {

common/util/font/dbs/font_db_jak1.cpp

@@ -0,0 +1,597 @@
+#include "font_db_jak1.h"
+
+std::unordered_set<char> passthrus_jak1 = {'~', ' ', ',', '.', '-', '+', '(', ')', '!', ':', '?',
+                                           '=', '%', '*', '/', '#', ';', '<', '>', '@', '[', '_'};
+
+std::vector<EncodeInfo> encode_info_jak1 = {
+    // random
+    {"ˇ", "\x10"},      // caron
+    {"`", "\x11"},      // grave accent
+    {"'", "\x12"},      // apostrophe
+    {"^", "\x13"},      // circumflex
+    {"<TIL>", "\x14"},  // tilde
+    {"¨", "\x15"},      // umlaut
+    {"º", "\x16"},      // numero/overring
+    {"¡", "\x17"},      // inverted exclamation mark
+    {"¿", "\x18"},      // inverted question mark
+
+    {"海", "\x1a"},  // umi
+    {"Æ", "\x1b"},   // aesc
+    {"界", "\x1c"},  // kai
+    {"Ç", "\x1d"},   // c-cedilla
+    {"学", "\x1e"},  // gaku
+    {"ß", "\x1f"},   // eszett
+
+    {"ワ", "\x24"},  // wa
+
+    {"ヲ", "\x26"},  // wo
+    {"ン", "\x27"},  // -n
+
+    {"岩", "\x5c"},  // iwa
+    {"旧", "\x5d"},  // kyuu
+    {"空", "\x5e"},  // sora
+    //{"掘", "\x5f"},  // horu
+
+    {"ヮ", "\x60"},  // -wa
+    {"撃", "\x61"},  // utsu
+    {"賢", "\x62"},  // kashikoi
+    {"湖", "\x63"},  // mizuumi
+    {"口", "\x64"},  // kuchi
+    {"行", "\x65"},  // iku
+    {"合", "\x66"},  // ai
+    {"士", "\x67"},  // shi
+    {"寺", "\x68"},  // tera
+    {"山", "\x69"},  // yama
+    {"者", "\x6a"},  // mono
+    {"所", "\x6b"},  // tokoro
+    {"書", "\x6c"},  // kaku
+    {"小", "\x6d"},  // shou
+    {"沼", "\x6e"},  // numa
+    {"上", "\x6f"},  // ue
+    {"城", "\x70"},  // shiro
+    {"場", "\x71"},  // ba
+    {"出", "\x72"},  // shutsu
+    {"闇", "\x73"},  // yami
+    {"遺", "\x74"},  // nokosu
+    {"黄", "\x75"},  // ki
+    {"屋", "\x76"},  // ya
+    {"下", "\x77"},  // shita
+    {"家", "\x78"},  // ie
+    {"火", "\x79"},  // hi
+    {"花", "\x7a"},  // hana
+    {"レ", "\x7b"},  // re
+    {"Œ", "\x7c"},   // oe
+    {"ロ", "\x7d"},  // ro
+
+    {"青", "\x7f"},  // ao
+
+    {"・", "\x90"},  // nakaguro
+    {"゛", "\x91"},  // dakuten
+    {"゜", "\x92"},  // handakuten
+    {"ー", "\x93"},  // chouompu
+    {"『", "\x94"},  // nijuukagikakko left
+    {"』", "\x95"},  // nijuukagikakko right
+    // hiragana
+    {"ぁ", "\x96"},  // -a
+    {"あ", "\x97"},  // a
+    {"ぃ", "\x98"},  // -i
+    {"い", "\x99"},  // i
+    {"ぅ", "\x9a"},  // -u
+    {"う", "\x9b"},  // u
+    {"ぇ", "\x9c"},  // -e
+    {"え", "\x9d"},  // e
+    {"ぉ", "\x9e"},  // -o
+    {"お", "\x9f"},  // o
+    {"か", "\xa0"},  // ka
+    {"き", "\xa1"},  // ki
+    {"く", "\xa2"},  // ku
+    {"け", "\xa3"},  // ke
+    {"こ", "\xa4"},  // ko
+    {"さ", "\xa5"},  // sa
+    {"し", "\xa6"},  // shi
+    {"す", "\xa7"},  // su
+    {"せ", "\xa8"},  // se
+    {"そ", "\xa9"},  // so
+    {"た", "\xaa"},  // ta
+    {"ち", "\xab"},  // chi
+    {"っ", "\xac"},  // sokuon
+    {"つ", "\xad"},  // tsu
+    {"て", "\xae"},  // te
+    {"と", "\xaf"},  // to
+    {"な", "\xb0"},  // na
+    {"に", "\xb1"},  // ni
+    {"ぬ", "\xb2"},  // nu
+    {"ね", "\xb3"},  // ne
+    {"の", "\xb4"},  // no
+    {"は", "\xb5"},  // ha
+    {"ひ", "\xb6"},  // hi
+    {"ふ", "\xb7"},  // hu
+    {"へ", "\xb8"},  // he
+    {"ほ", "\xb9"},  // ho
+    {"ま", "\xba"},  // ma
+    {"み", "\xbb"},  // mi
+    {"む", "\xbc"},  // mu
+    {"め", "\xbd"},  // me
+    {"も", "\xbe"},  // mo
+    {"ゃ", "\xbf"},  // youon ya
+    {"や", "\xc0"},  // ya
+    {"ゅ", "\xc1"},  // youon yu
+    {"ゆ", "\xc2"},  // yu
+    {"ょ", "\xc3"},  // youon yo
+    {"よ", "\xc4"},  // yo
+    {"ら", "\xc5"},  // ra
+    {"り", "\xc6"},  // ri
+    {"る", "\xc7"},  // ru
+    {"れ", "\xc8"},  // re
+    {"ろ", "\xc9"},  // ro
+    {"ゎ", "\xca"},  // -wa
+    {"わ", "\xcb"},  // wa
+    {"を", "\xcc"},  // wo
+    {"ん", "\xcd"},  // -n
+    // katakana
+    {"ァ", "\xce"},  // -a
+    {"ア", "\xcf"},  // a
+    {"ィ", "\xd0"},  // -i
+    {"イ", "\xd1"},  // i
+    {"ゥ", "\xd2"},  // -u
+    {"ウ", "\xd3"},  // u
+    {"ェ", "\xd4"},  // -e
+    {"エ", "\xd5"},  // e
+    {"ォ", "\xd6"},  // -o
+    {"オ", "\xd7"},  // o
+    {"カ", "\xd8"},  // ka
+    {"キ", "\xd9"},  // ki
+    {"ク", "\xda"},  // ku
+    {"ケ", "\xdb"},  // ke
+    {"コ", "\xdc"},  // ko
+    {"サ", "\xdd"},  // sa
+    {"シ", "\xde"},  // shi
+    {"ス", "\xdf"},  // su
+    {"セ", "\xe0"},  // se
+    {"ソ", "\xe1"},  // so
+    {"タ", "\xe2"},  // ta
+    {"チ", "\xe3"},  // chi
+    {"ッ", "\xe4"},  // sokuon
+    {"ツ", "\xe5"},  // tsu
+    {"テ", "\xe6"},  // te
+    {"ト", "\xe7"},  // to
+    {"ナ", "\xe8"},  // na
+    {"ニ", "\xe9"},  // ni
+    {"ヌ", "\xea"},  // nu
+    {"ネ", "\xeb"},  // ne
+    {"ノ", "\xec"},  // no
+    {"ハ", "\xed"},  // ha
+    {"ヒ", "\xee"},  // hi
+    {"フ", "\xef"},  // hu
+    {"ヘ", "\xf0"},  // he
+    {"ホ", "\xf1"},  // ho
+    {"マ", "\xf2"},  // ma
+    {"ミ", "\xf3"},  // mi
+    {"ム", "\xf4"},  // mu
+    {"メ", "\xf5"},  // me
+    {"モ", "\xf6"},  // mo
+    {"ャ", "\xf7"},  // youon ya
+    {"ヤ", "\xf8"},  // ya
+    {"ュ", "\xf9"},  // youon yu
+    {"ユ", "\xfa"},  // yu
+    {"ョ", "\xfb"},  // youon yo
+    {"ヨ", "\xfc"},  // yo
+    {"ラ", "\xfd"},  // ra
+    {"リ", "\xfe"},  // ri
+    {"ル", "\xff"},  // ru
+    // kanji 2
+    {"宝", "\x1\x01"},  // takara
+
+    {"石", "\x1\x10"},  // ishi
+    {"赤", "\x1\x11"},  // aka
+    {"跡", "\x1\x12"},  // ato
+    {"川", "\x1\x13"},  // kawa
+    {"戦", "\x1\x14"},  // ikusa
+    {"村", "\x1\x15"},  // mura
+    {"隊", "\x1\x16"},  // tai
+    {"台", "\x1\x17"},  // utena
+    {"長", "\x1\x18"},  // osa
+    {"鳥", "\x1\x19"},  // tori
+    {"艇", "\x1\x1a"},  // tei
+    {"洞", "\x1\x1b"},  // hora
+    {"道", "\x1\x1c"},  // michi
+    {"発", "\x1\x1d"},  // hatsu
+    {"飛", "\x1\x1e"},  // tobu
+    {"噴", "\x1\x1f"},  // fuku
+
+    {"池", "\x1\xa0"},  // ike
+    {"中", "\x1\xa1"},  // naka
+    {"塔", "\x1\xa2"},  // tou
+    {"島", "\x1\xa3"},  // shima
+    {"部", "\x1\xa4"},  // bu
+    {"砲", "\x1\xa5"},  // hou
+    {"産", "\x1\xa6"},  // san
+    {"眷", "\x1\xa7"},  // kaerimiru
+    {"力", "\x1\xa8"},  // chikara
+    {"緑", "\x1\xa9"},  // midori
+    {"岸", "\x1\xaa"},  // kishi
+    {"像", "\x1\xab"},  // zou
+    {"谷", "\x1\xac"},  // tani
+    {"心", "\x1\xad"},  // kokoro
+    {"森", "\x1\xae"},  // mori
+    {"水", "\x1\xaf"},  // mizu
+    {"船", "\x1\xb0"},  // fune
+    {"™", "\x1\xb1"},   // trademark
+};
+
+std::vector<ReplaceInfo> replace_info_jak1 = {
+    // other
+    {"A~Y~-21H~-5Vº~Z", "Å"},
+    {"N~Y~-6Hº~Z~+10H", "Nº"},
+    {"O~Y~-16H~-1V/~Z", "Ø"},
+    {"A~Y~-6H~+3V,~Z", "Ą"},
+    {"E~Y~-6H~+2V,~Z", "Ę"},
+    {"L~Y~-16H~+0V/~Z", "Ł"},
+    {"Z~Y~-21H~-5Vº~Z", "Ż"},
+    {"E~Y~-20H~-5Vº~Z", "Ė"},
+    {"C~Y~-20H~-4Vˇ~Z", "Č"},
+    {"D~Y~-20H~-4Vˇ~Z", "Ď"},
+    {"S~Y~-22H~-4Vˇ~Z", "Š"},
+    {"Z~Y~-22H~-4Vˇ~Z", "Ž"},
+    {"U~Y~-13H~+2V,~Z", "Ų"},
+    {"U~Y~-18H~-10V-~Z", "Ū"},
+    {"D~Y~-25H~-1V-~Z", "Đ"},
+    {"I~Y~-8H~+1V,~Z", "Į"},
+    // czech specific
+    {"U~Y~-23H~-5Vº~Z", "Ů"},
+
+    // tildes
+    {"N~Y~-22H~-4V<TIL>~Z", "Ñ"},
+    {"A~Y~-21H~-5V<TIL>~Z", "Ã"},  // custom
+    {"O~Y~-22H~-4V<TIL>~Z", "Õ"},  // custom
+
+    // acute accents
+    {"A~Y~-21H~-5V'~Z", "Á"},
+    {"E~Y~-22H~-5V'~Z", "É"},
+    {"I~Y~-19H~-5V'~Z", "Í"},
+    {"O~Y~-22H~-4V'~Z", "Ó"},
+    {"U~Y~-24H~-3V'~Z", "Ú"},
+    {"C~Y~-21H~-5V'~Z", "Ć"},
+    {"N~Y~-21H~-5V'~Z", "Ń"},
+    {"S~Y~-21H~-5V'~Z", "Ś"},
+    {"Z~Y~-21H~-5V'~Z", "Ź"},
+    // czech specific
+    {"Y~Y~-25H~-4V'~Z", "Ý"},
+
+    // double acute accents
+    {"O~Y~-28H~-4V'~-9H'~Z", "Ő"},   // custom
+    {"U~Y~-27H~-4V'~-12H'~Z", "Ű"},  // custom
+
+    // circumflex
+    {"A~Y~-20H~-4V^~Z", "Â"},  // custom
+    {"E~Y~-20H~-5V^~Z", "Ê"},
+    {"I~Y~-19H~-5V^~Z", "Î"},
+    {"O~Y~-20H~-4V^~Z", "Ô"},  // custom
+    {"U~Y~-24H~-3V^~Z", "Û"},
+
+    // grave accents
+    {"A~Y~-21H~-5V`~Z", "À"},
+    {"E~Y~-22H~-5V`~Z", "È"},
+    {"I~Y~-19H~-5V`~Z", "Ì"},
+    {"O~Y~-22H~-4V`~Z", "Ò"},  // custom
+    {"U~Y~-24H~-3V`~Z", "Ù"},
+
+    // umlaut
+    {"A~Y~-21H~-5V¨~Z", "Ä"},
+    {"E~Y~-20H~-5V¨~Z", "Ë"},
+    {"I~Y~-19H~-5V¨~Z", "Ï"},  // custom
+    {"O~Y~-22H~-4V¨~Z", "Ö"},
+    {"O~Y~-22H~-3V¨~Z", "ö"},  // dumb
+    {"U~Y~-22H~-3V¨~Z", "Ü"},
+
+    // caron - Ǎ ǎ Ě ě Ǧ ǧ Ǐ ǐ Ǒ ǒ Ǔ ǔ Y̌ y̌
+    {"A~Y~-20H~-4Vˇ~Z", "Ǎ"},
+    {"E~Y~-20H~-5Vˇ~Z", "Ě"},
+    {"G~Y~-20H~-5Vˇ~Z", "Ǧ"},
+    {"I~Y~-19H~-5Vˇ~Z", "Ǐ"},
+    {"O~Y~-20H~-4Vˇ~Z", "Ǒ"},
+    {"U~Y~-24H~-3Vˇ~Z", "Ǔ"},
+    {"Y~Y~-24H~-3Vˇ~Z", "Y̌"},
+    // czech specific - Č Ň Ř Š Ž Ť
+    {"C~Y~-25H~-9Vˇ~Z", "Č"},
+    {"N~Y~-23H~-5Vˇ~Z", "Ň"},
+    {"R~Y~-24H~-5Vˇ~Z", "Ř"},
+    {"S~Y~-24H~-5Vˇ~Z", "Š"},
+    {"T~Y~-23H~-5Vˇ~Z", "Ť"},
+    {"Z~Y~-23H~-5Vˇ~Z", "Ž"},
+
+    // dakuten katakana
+    {"~Yウ~Z゛", "ヴ"},
+    {"~Yカ~Z゛", "ガ"},
+    {"~Yキ~Z゛", "ギ"},
+    {"~Yク~Z゛", "グ"},
+    {"~Yケ~Z゛", "ゲ"},
+    {"~Yコ~Z゛", "ゴ"},
+    {"~Yサ~Z゛", "ザ"},
+    {"~Yシ~Z゛", "ジ"},
+    {"~Yス~Z゛", "ズ"},
+    {"~Yセ~Z゛", "ゼ"},
+    {"~Yソ~Z゛", "ゾ"},
+    {"~Yタ~Z゛", "ダ"},
+    {"~Yチ~Z゛", "ヂ"},
+    {"~Yツ~Z゛", "ヅ"},
+    {"~Yテ~Z゛", "デ"},
+    {"~Yト~Z゛", "ド"},
+    {"~Yハ~Z゛", "バ"},
+    {"~Yヒ~Z゛", "ビ"},
+    {"~Yフ~Z゛", "ブ"},
+    {"~Yヘ~Z゛", "ベ"},
+    {"~Yホ~Z゛", "ボ"},
+    // handakuten katakana
+    {"~Yハ~Z゜", "パ"},
+    {"~Yヒ~Z゜", "ピ"},
+    {"~Yフ~Z゜", "プ"},
+    {"~Yヘ~Z゜", "ペ"},
+    {"~Yホ~Z゜", "ポ"},
+    // dakuten hiragana
+    {"~Yか~Z゛", "が"},
+    {"~Yき~Z゛", "ぎ"},
+    {"~Yく~Z゛", "ぐ"},
+    {"~Yけ~Z゛", "げ"},
+    {"~Yこ~Z゛", "ご"},
+    {"~Yさ~Z゛", "ざ"},
+    {"~Yし~Z゛", "じ"},
+    {"~Yす~Z゛", "ず"},
+    {"~Yせ~Z゛", "ぜ"},
+    {"~Yそ~Z゛", "ぞ"},
+    {"~Yた~Z゛", "だ"},
+    {"~Yち~Z゛", "ぢ"},
+    {"~Yつ~Z゛", "づ"},
+    {"~Yて~Z゛", "で"},
+    {"~Yと~Z゛", "ど"},
+    {"~Yは~Z゛", "ば"},
+    {"~Yひ~Z゛", "び"},
+    {"~Yふ~Z゛", "ぶ"},
+    {"~Yへ~Z゛", "べ"},
+    {"~Yほ~Z゛", "ぼ"},
+    // handakuten hiragana
+    {"~Yは~Z゜", "ぱ"},
+    {"~Yひ~Z゜", "ぴ"},
+    {"~Yふ~Z゜", "ぷ"},
+    {"~Yへ~Z゜", "ぺ"},
+    {"~Yほ~Z゜", "ぽ"},
+    // japanese punctuation
+    {",~+8H", "、"},
+    {"~+8H ", "　"},
+
+    // (hack) special case kanji
+    {"~~", "世"},
+
+    // playstation buttons
+    {"~Y~22L<~Z~Y~27L*~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_X>"},
+    {"~Y~22L<~Z~Y~26L;~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_TRIANGLE>"},
+    {"~Y~22L<~Z~Y~25L@~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_CIRCLE>"},
+    {"~Y~22L<~Z~Y~24L#~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_SQUARE>"},  // custom
+};
+
+std::vector<EncodeInfo> encode_info_jak1_v2 = {
+    // random
+    {"_", "\x03"},      // large space
+    {"ˇ", "\x10"},      // caron
+    {"`", "\x11"},      // grave accent
+    {"'", "\x12"},      // apostrophe
+    {"^", "\x13"},      // circumflex
+    {"<TIL>", "\x14"},  // tilde
+    {"¨", "\x15"},      // umlaut
+    {"º", "\x16"},      // numero/overring
+    {"¡", "\x17"},      // inverted exclamation mark
+    {"¿", "\x18"},      // inverted question mark
+
+    {"海", "\x1a"},  // umi
+    {"Æ", "\x1b"},   // aesc
+    {"界", "\x1c"},  // kai
+    {"Ç", "\x1d"},   // c-cedilla
+    {"学", "\x1e"},  // gaku
+    {"ß", "\x1f"},   // eszett
+
+    {"ワ", "\x24"},  // wa
+
+    {"ヲ", "\x26"},  // wo
+    {"ン", "\x27"},  // -n
+
+    {"岩", "\x5c"},  // iwa
+    {"旧", "\x5d"},  // kyuu
+    {"空", "\x5e"},  // sora
+    {"掘", "\x5f"},  // horu
+
+    {"ヮ", "\x60"},  // -wa
+    {"撃", "\x61"},  // utsu
+    {"賢", "\x62"},  // kashikoi
+    {"湖", "\x63"},  // mizuumi
+    {"口", "\x64"},  // kuchi
+    {"行", "\x65"},  // iku
+    {"合", "\x66"},  // ai
+    {"士", "\x67"},  // shi
+    {"寺", "\x68"},  // tera
+    {"山", "\x69"},  // yama
+    {"者", "\x6a"},  // mono
+    {"所", "\x6b"},  // tokoro
+    {"書", "\x6c"},  // kaku
+    {"小", "\x6d"},  // shou
+    {"沼", "\x6e"},  // numa
+    {"上", "\x6f"},  // ue
+    {"城", "\x70"},  // shiro
+    {"場", "\x71"},  // ba
+    {"出", "\x72"},  // shutsu
+    {"闇", "\x73"},  // yami
+    {"遺", "\x74"},  // nokosu
+    {"黄", "\x75"},  // ki
+    {"屋", "\x76"},  // ya
+    {"下", "\x77"},  // shita
+    {"家", "\x78"},  // ie
+    {"火", "\x79"},  // hi
+    {"花", "\x7a"},  // hana
+    {"レ", "\x7b"},  // re
+    {"Œ", "\x7c"},   // oe
+    {"ロ", "\x7d"},  // ro
+
+    {"青", "\x7f"},  // ao
+
+    {"・", "\x90"},  // nakaguro
+    {"゛", "\x91"},  // dakuten
+    {"゜", "\x92"},  // handakuten
+    {"ー", "\x93"},  // chouompu
+    {"『", "\x94"},  // nijuukagikakko left
+    {"』", "\x95"},  // nijuukagikakko right
+    // hiragana
+    {"ぁ", "\x96"},  // -a
+    {"あ", "\x97"},  // a
+    {"ぃ", "\x98"},  // -i
+    {"い", "\x99"},  // i
+    {"ぅ", "\x9a"},  // -u
+    {"う", "\x9b"},  // u
+    {"ぇ", "\x9c"},  // -e
+    {"え", "\x9d"},  // e
+    {"ぉ", "\x9e"},  // -o
+    {"お", "\x9f"},  // o
+    {"か", "\xa0"},  // ka
+    {"き", "\xa1"},  // ki
+    {"く", "\xa2"},  // ku
+    {"け", "\xa3"},  // ke
+    {"こ", "\xa4"},  // ko
+    {"さ", "\xa5"},  // sa
+    {"し", "\xa6"},  // shi
+    {"す", "\xa7"},  // su
+    {"せ", "\xa8"},  // se
+    {"そ", "\xa9"},  // so
+    {"た", "\xaa"},  // ta
+    {"ち", "\xab"},  // chi
+    {"っ", "\xac"},  // sokuon
+    {"つ", "\xad"},  // tsu
+    {"て", "\xae"},  // te
+    {"と", "\xaf"},  // to
+    {"な", "\xb0"},  // na
+    {"に", "\xb1"},  // ni
+    {"ぬ", "\xb2"},  // nu
+    {"ね", "\xb3"},  // ne
+    {"の", "\xb4"},  // no
+    {"は", "\xb5"},  // ha
+    {"ひ", "\xb6"},  // hi
+    {"ふ", "\xb7"},  // hu
+    {"へ", "\xb8"},  // he
+    {"ほ", "\xb9"},  // ho
+    {"ま", "\xba"},  // ma
+    {"み", "\xbb"},  // mi
+    {"む", "\xbc"},  // mu
+    {"め", "\xbd"},  // me
+    {"も", "\xbe"},  // mo
+    {"ゃ", "\xbf"},  // youon ya
+    {"や", "\xc0"},  // ya
+    {"ゅ", "\xc1"},  // youon yu
+    {"ゆ", "\xc2"},  // yu
+    {"ょ", "\xc3"},  // youon yo
+    {"よ", "\xc4"},  // yo
+    {"ら", "\xc5"},  // ra
+    {"り", "\xc6"},  // ri
+    {"る", "\xc7"},  // ru
+    {"れ", "\xc8"},  // re
+    {"ろ", "\xc9"},  // ro
+    {"ゎ", "\xca"},  // -wa
+    {"わ", "\xcb"},  // wa
+    {"を", "\xcc"},  // wo
+    {"ん", "\xcd"},  // -n
+    // katakana
+    {"ァ", "\xce"},  // -a
+    {"ア", "\xcf"},  // a
+    {"ィ", "\xd0"},  // -i
+    {"イ", "\xd1"},  // i
+    {"ゥ", "\xd2"},  // -u
+    {"ウ", "\xd3"},  // u
+    {"ェ", "\xd4"},  // -e
+    {"エ", "\xd5"},  // e
+    {"ォ", "\xd6"},  // -o
+    {"オ", "\xd7"},  // o
+    {"カ", "\xd8"},  // ka
+    {"キ", "\xd9"},  // ki
+    {"ク", "\xda"},  // ku
+    {"ケ", "\xdb"},  // ke
+    {"コ", "\xdc"},  // ko
+    {"サ", "\xdd"},  // sa
+    {"シ", "\xde"},  // shi
+    {"ス", "\xdf"},  // su
+    {"セ", "\xe0"},  // se
+    {"ソ", "\xe1"},  // so
+    {"タ", "\xe2"},  // ta
+    {"チ", "\xe3"},  // chi
+    {"ッ", "\xe4"},  // sokuon
+    {"ツ", "\xe5"},  // tsu
+    {"テ", "\xe6"},  // te
+    {"ト", "\xe7"},  // to
+    {"ナ", "\xe8"},  // na
+    {"ニ", "\xe9"},  // ni
+    {"ヌ", "\xea"},  // nu
+    {"ネ", "\xeb"},  // ne
+    {"ノ", "\xec"},  // no
+    {"ハ", "\xed"},  // ha
+    {"ヒ", "\xee"},  // hi
+    {"フ", "\xef"},  // hu
+    {"ヘ", "\xf0"},  // he
+    {"ホ", "\xf1"},  // ho
+    {"マ", "\xf2"},  // ma
+    {"ミ", "\xf3"},  // mi
+    {"ム", "\xf4"},  // mu
+    {"メ", "\xf5"},  // me
+    {"モ", "\xf6"},  // mo
+    {"ャ", "\xf7"},  // youon ya
+    {"ヤ", "\xf8"},  // ya
+    {"ュ", "\xf9"},  // youon yu
+    {"ユ", "\xfa"},  // yu
+    {"ョ", "\xfb"},  // youon yo
+    {"ヨ", "\xfc"},  // yo
+    {"ラ", "\xfd"},  // ra
+    {"リ", "\xfe"},  // ri
+    {"ル", "\xff"},  // ru
+    // kanji 2
+    {"宝", "\x1\x01"},  // takara
+
+    {"石", "\x1\x10"},  // ishi
+    {"赤", "\x1\x11"},  // aka
+    {"跡", "\x1\x12"},  // ato
+    {"川", "\x1\x13"},  // kawa
+    {"戦", "\x1\x14"},  // ikusa
+    {"村", "\x1\x15"},  // mura
+    {"隊", "\x1\x16"},  // tai
+    {"台", "\x1\x17"},  // utena
+    {"長", "\x1\x18"},  // osa
+    {"鳥", "\x1\x19"},  // tori
+    {"艇", "\x1\x1a"},  // tei
+    {"洞", "\x1\x1b"},  // hora
+    {"道", "\x1\x1c"},  // michi
+    {"発", "\x1\x1d"},  // hatsu
+    {"飛", "\x1\x1e"},  // tobu
+    {"噴", "\x1\x1f"},  // fuku
+
+    {"池", "\x1\xa0"},  // ike
+    {"中", "\x1\xa1"},  // naka
+    {"塔", "\x1\xa2"},  // tou
+    {"島", "\x1\xa3"},  // shima
+    {"部", "\x1\xa4"},  // bu
+    {"砲", "\x1\xa5"},  // hou
+    {"産", "\x1\xa6"},  // san
+    {"眷", "\x1\xa7"},  // kaerimiru
+    {"力", "\x1\xa8"},  // chikara
+    {"緑", "\x1\xa9"},  // midori
+    {"岸", "\x1\xaa"},  // kishi
+    {"像", "\x1\xab"},  // zou
+    {"谷", "\x1\xac"},  // tani
+    {"心", "\x1\xad"},  // kokoro
+    {"森", "\x1\xae"},  // mori
+    {"水", "\x1\xaf"},  // mizu
+    {"船", "\x1\xb0"},  // fune
+    {"™", "\x1\xb1"},   // trademark
+};
+
+GameTextFontBank g_font_bank_jak1_v1(GameTextVersion::JAK1_V1,
+                                     &encode_info_jak1,
+                                     &replace_info_jak1,
+                                     &passthrus_jak1);
+
+GameTextFontBank g_font_bank_jak1_v2(GameTextVersion::JAK1_V2,
+                                     &encode_info_jak1_v2,
+                                     &replace_info_jak1,
+                                     &passthrus_jak1);

common/util/font/dbs/font_db_jak1.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "common/util/font/font_utils.h"
+
+/*!
+ * ===========================
+ * GAME TEXT FONT BANK - JAK 1
+ * ===========================
+ * This font is used in:
+ * - Jak & Daxter: The Precursor Legacy (Black Label)
+ */
+
+extern GameTextFontBank g_font_bank_jak1_v1;
+/*!
+ * ================================
+ * GAME TEXT FONT BANK - JAK 1 (v2)
+ * ================================
+ * This font is used in:
+ * - Jak & Daxter: The Precursor Legacy (PAL)
+ * - ジャックＸダクスター　～　旧世界の遺産
+ * - Jak & Daxter: The Precursor Legacy (NTSC-U v2)
+ *
+ * It is the same as v1, but _ has been fixed and no longer overlaps 掘
+ */
+extern GameTextFontBank g_font_bank_jak1_v2;

common/util/font/dbs/font_db_jak2.cpp

@@ -0,0 +1,904 @@
+#include "font_db_jak2.h"
+
+std::unordered_set<char> passthrus_jak2 = {'~', ' ', ',', '.', '-', '+', '(', ')',
+                                           '!', ':', '?', '=', '%', '*', '/', '#',
+                                           ';', '<', '>', '@', '[', '_', ']'};
+
+std::vector<ReplaceInfo> replace_info_jak2 = {
+    // other
+    {"A~Y~-21H~-5Vº~Z", "Å"},
+    {"N~Y~-6Hº~Z~+10H", "Nº"},
+    // portuguese
+    {"~+4Vç~-4V", "ç"},
+
+    {"O~Y~-25H~-1V/~Z", "Ø"},
+    {"o~Y~-23H~+4V/~Z", "ø"},
+    {"A~Y~-13H~+8V,~Z", "Ą"},
+    {"a~Y~-8H~+6V,~Z", "ą"},
+    {"E~Y~-6H~+8V,~Z", "Ę"},
+    {"e~Y~-10H~+7V,~Z", "ę"},
+    {"L~Y~-21H~+0V/~Z", "Ł"},
+    {"l~Y~-16H~+0V/~Z", "ł"},  // TODO - this one is ugly, font character addition (small slash)
+    {"Z~Y~-25H~-11Vº~Z", "Ż"},
+    {"z~Y~-23H~-5Vº~Z", "ż"},
+    {"a~Y~-25H~-5Vº~Z", "å"},
+    {"S~Y~-21H~-5V'~Z", "Ś"},
+    {"s~Y~-25H~-5V'~Z", "ś"},
+    {"n~Y~-25H~-5V'~Z", "ń"},
+    {"c~Y~-25H~-5V'~Z", "ć"},
+    {"o~Y~-25H~-4V<TIL>~Z", "õ"},
+    {"a~Y~-25H~-4V<TIL>~Z", "ã"},
+    {"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", "Č"},
+    {"c~Y~-25H~-5Vˇ~Z", "č"},
+    {"D~Y~-27H~-10Vˇ~Z", "Ď"},
+    {"S~Y~-24H~-10Vˇ~Z", "Š"},
+    {"s~Y~-22H~-4Vˇ~Z", "š"},
+    {"Z~Y~-25H~-10Vˇ~Z", "Ž"},
+    {"z~Y~-23H~-4Vˇ~Z", "ž"},
+    {"U~Y~-15H~+5V,~Z", "Ų"},
+    {"u~Y~-15H~+5V,~Z", "ų"},
+    {"U~Y~-20H~-18V-~Z", "Ū"},
+    {"u~Y~-18H~-15V-~Z", "ū"},
+    {"D~Y~-28H~-1V-~Z", "Đ"},
+    {"d~Y~-13H~-10V-~Z", "đ"},
+    {"I~Y~-8H~+4V,~Z", "Į"},
+    {"i~Y~-8H~+4V,~Z", "į"},
+    // czech specific
+    {"U~Y~-24H~-7Vº~Z", "Ů"},
+    {"u~Y~-23H~-5Vº~Z", "ů"},
+    {"t~Y~-7H~-21V,~Z", "ť"},
+
+    // tildes
+    {"N~Y~-22H~-4V<TIL>~Z", "Ñ"},
+    {"n~Y~-24H~-4V<TIL>~Z", "ñ"},
+    {"A~Y~-21H~-5V<TIL>~Z", "Ã"},
+    {"O~Y~-22H~-4V<TIL>~Z", "Õ"},
+
+    // acute accents
+    {"A~Y~-21H~-5V'~Z", "Á"},
+    {"A~Y~-26H~-8V'~Z", "<Á_V2>"},  // unfortunate...
+    {"a~Y~-25H~-5V'~Z", "á"},
+    {"E~Y~-23H~-9V'~Z", "É"},
+    {"e~Y~-26H~-5V'~Z", "é"},
+    {"I~Y~-19H~-8V'~Z", "Í"},
+    {"i~Y~-19H~-8V'~Z", "í"},
+    {"O~Y~-22H~-4V'~Z", "Ó"},
+    {"o~Y~-26H~-4V'~Z", "ó"},
+    {"U~Y~-25H~-8V'~Z", "Ú"},
+    {"u~Y~-24H~-3V'~Z", "ú"},
+    {"Z~Y~-24H~-3V'~Z", "Ź"},
+    {"z~Y~-24H~-3V'~Z", "ź"},
+    // czech specific
+    {"Y~Y~-26H~-5V'~Z", "Ý"},
+    {"~+7Vy~-7V~Y~-24H~-3V'~Z", "ý"},
+
+    // circumflex
+    {"A~Y~-20H~-4V^~Z", "Â"},
+    {"a~Y~-24H~-5V^~Z", "â"},
+    {"E~Y~-20H~-5V^~Z", "Ê"},
+    {"e~Y~-25H~-4V^~Z", "ê"},
+    {"I~Y~-19H~-5V^~Z", "Î"},
+    {"i~Y~-19H~-8V^~Z", "î"},
+    {"O~Y~-20H~-4V^~Z", "Ô"},
+    {"o~Y~-25H~-4V^~Z", "ô"},
+    {"U~Y~-24H~-3V^~Z", "Û"},
+    {"u~Y~-23H~-3V^~Z", "û"},
+
+    // grave accents
+    {"A~Y~-26H~-8V`~Z", "À"},
+    {"a~Y~-25H~-5V`~Z", "à"},
+    {"E~Y~-23H~-9V`~Z", "È"},
+    {"e~Y~-26H~-5V`~Z", "è"},
+    {"I~Y~-19H~-5V`~Z", "Ì"},
+    {"i~Y~-19H~-8V`~Z", "ì"},
+    {"O~Y~-22H~-4V`~Z", "Ò"},
+    {"o~Y~-26H~-4V`~Z", "ò"},
+    {"U~Y~-24H~-3V`~Z", "Ù"},
+    {"u~Y~-24H~-3V`~Z", "ù"},
+
+    // umlaut
+    {"A~Y~-26H~-8V¨~Z", "Ä"},
+    {"a~Y~-25H~-5V¨~Z", "ä"},
+    {"E~Y~-20H~-5V¨~Z", "Ë"},
+    {"e~Y~-25H~-5V¨~Z", "ë"},
+    {"I~Y~-19H~-5V¨~Z", "Ï"},
+    {"i~Y~-26H~-4V¨~Z", "ï"},
+    {"O~Y~-26H~-8V¨~Z", "Ö"},
+    {"o~Y~-26H~-4V¨~Z", "ö"},
+    {"U~Y~-25H~-8V¨~Z", "Ü"},
+    {"u~Y~-24H~-3V¨~Z", "ü"},
+
+    // caron - Ǎ ǎ Ě ě Ǧ ǧ Ǐ ǐ Ǒ ǒ Ǔ ǔ Y̌ y̌
+    {"A~Y~-25H~-9Vˇ~Z", "Ǎ"},
+    {"a~Y~-24H~-5Vˇ~Z", "ǎ"},
+    {"E~Y~-22H~-8Vˇ~Z", "Ě"},
+    {"e~Y~-25H~-4Vˇ~Z", "ě"},
+    {"G~Y~-24H~-8Vˇ~Z", "Ǧ"},
+    {"~+7Vg~-7V~Y~-25H~-4Vˇ~Z", "ǧ"},
+    {"I~Y~-19H~-8Vˇ~Z", "Ǐ"},
+    {"i~Y~-19H~-8Vˇ~Z", "ǐ"},
+    {"O~Y~-25H~-7Vˇ~Z", "Ǒ"},
+    {"o~Y~-25H~-4Vˇ~Z", "ǒ"},
+    {"U~Y~-25H~-6Vˇ~Z", "Ǔ"},
+    {"u~Y~-24H~-3Vˇ~Z", "ǔ"},
+    {"Y~Y~-25H~-5Vˇ~Z", "Y̌"},
+    {"~+7Vy~-7V~Y~-25H~-3Vˇ~Z", "y̌"},
+    // czech specific - Č č Ň ň Ř ř Š š Ž ž Ť
+    {"C~Y~-25H~-9Vˇ~Z", "Č"},
+    {"c~Y~-24H~-5Vˇ~Z", "č"},
+    {"N~Y~-25H~-9Vˇ~Z", "Ň"},
+    {"n~Y~-24H~-5Vˇ~Z", "ň"},
+    {"R~Y~-25H~-9Vˇ~Z", "Ř"},
+    {"r~Y~-22H~-5Vˇ~Z", "ř"},
+    {"S~Y~-25H~-9Vˇ~Z", "Š"},
+    {"s~Y~-22H~-5Vˇ~Z", "š"},
+    {"T~Y~-24H~-7Vˇ~Z", "Ť"},
+    {"Z~Y~-25H~-9Vˇ~Z", "Ž"},
+    {"z~Y~-24H~-5Vˇ~Z", "ž"},
+
+    // dakuten katakana
+    {"~Yウ~Z゛", "ヴ"},
+    {"~Yカ~Z゛", "ガ"},
+    {"~Yキ~Z゛", "ギ"},
+    {"~Yク~Z゛", "グ"},
+    {"~Yケ~Z゛", "ゲ"},
+    {"~Yコ~Z゛", "ゴ"},
+    {"~Yサ~Z゛", "ザ"},
+    {"~Yシ~Z゛", "ジ"},
+    {"~Yス~Z゛", "ズ"},
+    {"~Yセ~Z゛", "ゼ"},
+    {"~Yソ~Z゛", "ゾ"},
+    {"~Yタ~Z゛", "ダ"},
+    {"~Yチ~Z゛", "ヂ"},
+    {"~Yツ~Z゛", "ヅ"},
+    {"~Yテ~Z゛", "デ"},
+    {"~Yト~Z゛", "ド"},
+    {"~Yハ~Z゛", "バ"},
+    {"~Yヒ~Z゛", "ビ"},
+    {"~Yフ~Z゛", "ブ"},
+    {"~Yヘ~Z゛", "ベ"},
+    {"~Yホ~Z゛", "ボ"},
+    // handakuten katakana
+    {"~Yハ~Z゜", "パ"},
+    {"~Yヒ~Z゜", "ピ"},
+    {"~Yフ~Z゜", "プ"},
+    {"~Yヘ~Z゜", "ペ"},
+    {"~Yホ~Z゜", "ポ"},
+    // dakuten hiragana
+    {"~Yか~Z゛", "が"},
+    {"~Yき~Z゛", "ぎ"},
+    {"~Yく~Z゛", "ぐ"},
+    {"~Yけ~Z゛", "げ"},
+    {"~Yこ~Z゛", "ご"},
+    {"~Yさ~Z゛", "ざ"},
+    {"~Yし~Z゛", "じ"},
+    {"~Yす~Z゛", "ず"},
+    {"~Yせ~Z゛", "ぜ"},
+    {"~Yそ~Z゛", "ぞ"},
+    {"~Yた~Z゛", "だ"},
+    {"~Yち~Z゛", "ぢ"},
+    {"~Yつ~Z゛", "づ"},
+    {"~Yて~Z゛", "で"},
+    {"~Yと~Z゛", "ど"},
+    {"~Yは~Z゛", "ば"},
+    {"~Yひ~Z゛", "び"},
+    {"~Yふ~Z゛", "ぶ"},
+    {"~Yへ~Z゛", "べ"},
+    {"~Yほ~Z゛", "ぼ"},
+    // handakuten hiragana
+    {"~Yは~Z゜", "ぱ"},
+    {"~Yひ~Z゜", "ぴ"},
+    {"~Yふ~Z゜", "ぷ"},
+    {"~Yへ~Z゜", "ぺ"},
+    {"~Yほ~Z゜", "ぽ"},
+    // japanese punctuation
+    {",~+8H", "、"},
+    {"~+8H ", "　"},
+
+    // playstation buttons
+    // - face
+    {"~Y~22L<~Z~Y~27L*~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_X>"},
+    {"~Y~22L<~Z~Y~26L;~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_TRIANGLE>"},
+    {"~Y~22L<~Z~Y~25L@~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_CIRCLE>"},
+    {"~Y~22L<~Z~Y~24L#~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_SQUARE>"},
+    // - dpad
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~3L~+17H~-13V<PAD_PART_DPAD_U>~Z~22L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_UP>"},
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~3L~+17H~-13V<PAD_PART_DPAD_U>~Z~3L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_DOWN>"},
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~22L~+17H~-13V<PAD_PART_DPAD_U>~Z~22L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_ANY>"},
+    // - shoulder
+    {"~Y~22L~-2H~-12V<PAD_PART_SHOULDER_TOP_LEFT><PAD_PART_SHOULDER_TOP_RIGHT>~Z~22L~-2H~+17V<PAD_"
+     "PART_SHOULDER_BOTTOM_LEFT><PAD_PART_SHOULDER_BOTTOM_RIGHT>~Z~1L~+4H~+3V<PAD_PART_L1_NAME>~Z~+"
+     "38H",
+     "<PAD_L1>"},
+    {"~Y~22L~-2H~-12V<PAD_PART_SHOULDER_TOP_LEFT><PAD_PART_SHOULDER_TOP_RIGHT>~Z~22L~-2H~+17V<PAD_"
+     "PART_SHOULDER_BOTTOM_LEFT><PAD_PART_SHOULDER_BOTTOM_RIGHT>~Z~1L~+6H~+3V<PAD_PART_R1_NAME>~Z~+"
+     "38H",
+     "<PAD_R1>"},
+    {"~Y~22L~-2H~-6V<PAD_PART_TRIGGER_TOP_LEFT><PAD_PART_TRIGGER_TOP_RIGHT>~Z~22L~-2H~+16V<PAD_"
+     "PART_TRIGGER_BOTTOM_LEFT><PAD_PART_TRIGGER_BOTTOM_RIGHT>~Z~1L~+5H~-2V<PAD_PART_R2_NAME>~Z~+"
+     "38H",
+     "<PAD_R2>"},
+    {"~Y~22L~-2H~-6V<PAD_PART_TRIGGER_TOP_LEFT><PAD_PART_TRIGGER_TOP_RIGHT>~Z~22L~-2H~+16V<PAD_"
+     "PART_TRIGGER_BOTTOM_LEFT><PAD_PART_TRIGGER_BOTTOM_RIGHT>~Z~1L~+5H~-2V<PAD_PART_L2_NAME>~Z~+"
+     "38H",
+     "<PAD_L2>"},
+    // - analog
+    {"~1L~+8H~Y<PAD_PART_STICK>~Z~6L~-16H<PAD_PART_STICK_LEFT>~Z~+16h~6L<PAD_PART_STICK_RIGHT>~Z~"
+     "6L~-15V<PAD_PART_STICK_DOWN>~Z~+13V~6L<PAD_PART_STICK_UP>~Z~-10H~+9V~6L<PAD_PART_STICK_UP_"
+     "LEFT>~Z~+10H~+9V~6L<PAD_PART_STICK_UP_RIGHT>~Z~-10H~-11V~6L<PAD_PART_STICK_DOWN_LEFT>~Z~+10H~"
+     "-11V~6L<PAD_PART_STICK_DOWN_RIGHT>~Z~+32H",
+     "<PAD_ANALOG_ANY>"},
+    {"~Y~1L~+8H<PAD_PART_STICK>~Z~6L~-8H<PAD_PART_STICK_LEFT>~Z~+24H~6L<PAD_PART_STICK_RIGHT>~Z~+"
+     "40H",
+     "<PAD_ANALOG_LEFT_RIGHT>"},
+    {"~Y~1L<PAD_PART_STICK>~Z~6L~-15V<PAD_PART_STICK_DOWN>~Z~+13V~6L<PAD_PART_STICK_UP>~Z~+26H",
+     "<PAD_ANALOG_UP_DOWN>"},
+
+    // icons
+    {"~Y~6L<~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<ICON_MISSION_COMPLETE>"},
+    {"~Y~3L<~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<ICON_MISSION_TODO>"},
+
+    // flags
+    {"~Y~6L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~1L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+45H",
+     "<FLAG_ITALIAN>"},
+    {"~Y~5L<FLAG_PART_FILL>~Z~3L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-1H~Y~5L<FLAG_PART_FILL>~Z~3L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~+26H",
+     "<FLAG_SPAIN>"},
+    {"~Y~39L~~~Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~39L~~~"
+     "Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_GERMAN>"},
+    {"~Y~7L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~1L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+47H",
+     "<FLAG_FRANCE>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_UK_CROSS_LEFT>~Z~7L<FLAG_PART_UK_FILL_LEFT>~]~-1H~Y~1L<"
+     "FLAG_PART_FILL>~Z~3L<FLAG_PART_UK_CROSS_RIGHT>~Z~7L<FLAG_PART_UK_FILL_RIGHT>~Z~+26H",
+     "<FLAG_UK>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_USA_STRIPES_LEFT>~Z~7L<FLAG_PART_USA_STARS>~]~-1H~Y~1L<"
+     "FLAG_PART_FILL>~Z~3L<FLAG_PART_USA_STRIPES_RIGHT>~Z~+26H",
+     "<FLAG_USA>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~39L<FLAG_PART_KOREA_TRIGRAMS_LEFT>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~39L<"
+     "FLAG_PART_KOREA_TRIGRAMS_RIGHT>~Z~-11H~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~-11H~3L<FLAG_PART_"
+     "KOREA_CIRCLE_TOP>~Z~+26H",
+     "<FLAG_KOREA>"},
+    {"~Y~1L<FLAG_PART_FILL>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~-11H~3L<FLAG_PART_JAPAN_SUN>~Z~+26H",
+     "<FLAG_JAPAN>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_FINLAND>"},
+    {"~Y~7L<FLAG_PART_FILL>~Z~5L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~7L<FLAG_PART_FILL>~Z~5L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_SWEDEN>"},
+    {"~Y~3L<FLAG_PART_FILL>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~1L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~3L<FLAG_PART_FILL>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_DENMARK>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-2H~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~-10H~1L<FLAG_PART_VERT_STRIPE_LEFT>~Z~-5H~1L<FLAG_PART_VERT_STRIPE_"
+     "LEFT>~Z~-23H~7L<FLAG_PART_VERT_STRIPE_RIGHT>~Z~-22H~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L"
+     "<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_NORWAY>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-2H~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~-10H~1L<FLAG_PART_VERT_STRIPE_LEFT>~Z~-5H~1L<FLAG_PART_VERT_STRIPE_"
+     "LEFT>~Z~-23H~3L<FLAG_PART_VERT_STRIPE_RIGHT>~Z~-22H~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L"
+     "<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_ICELAND>"},
+    {"~Y~6L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~3L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+4H~+2V~5L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~+47H",
+     "<FLAG_PORTUGUAL>"},
+    {"~Y~3L~~~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-2H~Y~3L~~"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_DUTCH>"},
+    {"~Y~26L<FLAG_PART_FILL>~]~-1H~Y~26L<FLAG_PART_FILL>~Z~-10H~-3V~5L<PAD_PART_DPAD_D>~Z~-10H"
+     "~+6V~5L<PAD_PART_DPAD_U>~Z~-5H~+1V~5L<PAD_PART_DPAD_L>~Z~-14H~+1V~5L<PAD_PART_DPAD_R>~Z"
+     "~-11H~+1V~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~+26H",
+     "<FLAG_BRAZIL>"},
+    {"~Y~3L~~~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~26L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-2H~Y~3L~~"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~26L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_HUNGARY>"},
+    {"~Y~3L<FLAG_PART_FILL>~Z~5L<FLAG_PART_USA_STRIPES_RIGHT>~]~-2H~Y~3L<FLAG_PART_FILL>~Z~5L"
+     "<FLAG_PART_USA_STRIPES_RIGHT>~Z~+26H",
+     "<FLAG_CATALAN>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-5V~3L<FLAG_PART_HORZ_STRIPE"
+     "_BOTTOM>~]~-2H~+5V~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-5V~3L"
+     "<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_POLAND>"},
+    {"~Y~5L~~~Z~26L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-2H~Y~5L~~"
+     "~Z~26L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_LITHUANIA>"},
+    {"~Y~1L<FLAG_PART_FILL>~]~-2H~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-5V~3L"
+     "<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-22H~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-22H~-5V~3L"
+     "<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-23H~7L<FLAG_PART_VERT_STRIPE_LEFT>~Z~-26H~-3V~7L"
+     "<PAD_PART_DPAD_D>~Z~+6V~-26H~7L<PAD_PART_DPAD_U>~Z~-21H~+1V~7L<PAD_PART_DPAD_L>~Z~+26H",
+     "<FLAG_CZECH>"},
+    {"~Y~3L~~~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~3L~~"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-11H~+2V~3L"
+     "<FLAG_PART_JAPAN_SUN>~Z~-9H~+2V~1L+~Z~-8V~-8H~7L-~Z~-8V~-3H~7L-~Z~+26H",
+     "<FLAG_CROATIA>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~21L<FLAG_PART_UK_CROSS_LEFT>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~21L<FLAG_PART_UK_CROSS_"
+     "RIGHT>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~-4H~1L<FLAG_PART_VERT_STRIPE_LEFT>~Z~1L~~"
+     "~Z~-11H~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~-8V~-8H~3L-~Z~-8V~-4H~3L-~Z~+26H",
+     "<FLAG_GALICIA>"},
+
+    // korean jamo -- only relevant for the language selection since
+    // non-korean languages don't run through the `convert-korean-text` function and hence the
+    // encoding is "normal"
+    {"~Y~Z\\c03.~Z\\c03\\c1a~Z\\c03\\cc8~Y~Z\\c03œ~Z\\c03k~Z\\c03\\cde~Y~Z\\c03\\c0f~Z\\c03ç",
+     "<LANGUAGE_KOREAN>",
+     "~Y~Z\x03.~Z\x03\x1a~Z\x03\xc8~Y~Z\x03œ~Z\x03k~Z\x03\xde~Y~Z\x03\x0f~Z\x03ç"},
+
+    // weird stuff
+    // - descenders
+    {"~+7Vp~-7V", "p"},
+    {"~+7Vy~-7V", "y"},
+    {"~+7Vg~-7V", "g"},
+    {"~+7Vq~-7V", "q"},
+    {"~+1Vj~-1V", "j"},
+
+    {"\\\\",
+     "~%"},  // this is 2 slashes, duplicated because we use an escape sequence when decompiling
+
+    // - symbols and ligatures
+    {"~-4H~-3V<SOMETHING>~+3V~-4H",
+     "<SUPERSCRIPT_QUOTE>"},  // used for the 4<__> place in spanish.  the 5th uses the same
+                              // character but looks different...?
+    {"~Y~-6Hº~Z~+10H", "°"},
+
+    // Color / Emphasis
+    {"~[~0L", "<COLOR_DEFAULT>"},
+    {"~[~1L", "<COLOR_WHITE>"},
+    {"~[~2L", "<COLOR_TRANSPARENT>"},
+    {"~[~3L", "<COLOR_RED>"},
+    {"~[~4L", "<COLOR_ORANGE>"},
+    {"~[~5L", "<COLOR_YELLOW>"},
+    {"~[~6L", "<COLOR_GREEN>"},
+    {"~[~7L", "<COLOR_BLUE>"},
+    {"~[~8L", "<COLOR_CYAN>"},
+    {"~[~9L", "<COLOR_PINK>"},
+    {"~[~10L", "<COLOR_MENU-SELECTED>"},
+    {"~[~11L", "<COLOR_MENU-SELECTED-PARENT>"},
+    {"~[~12L", "<COLOR_MENU>"},
+    {"~[~13L", "<COLOR_MENU-PARENT>"},
+    {"~[~14L", "<COLOR_MENU-FUNC-BAD>"},
+    {"~[~15L", "<COLOR_MENU-FLAG-ON>"},
+    {"~[~16L", "<COLOR_MENU-FLAG-ON-PARENT>"},
+    {"~[~17L", "<COLOR_MENU-FLAG-OFF>"},
+    {"~[~18L", "<COLOR_MENU-FLAG-OFF-PARENT>"},
+    {"~[~19L", "<COLOR_MENU-INVALID>"},
+    {"~[~20L", "<COLOR_FLAT-YELLOW>"},
+    {"~[~21L", "<COLOR_COLOR-21>"},
+    {"~[~22L", "<COLOR_PAD-BACK>"},
+    {"~[~23L", "<COLOR_PAD-SHINE>"},
+    {"~[~24L", "<COLOR_PAD-SQUARE>"},
+    {"~[~25L", "<COLOR_PAD-CIRCLE>"},
+    {"~[~26L", "<COLOR_PAD-TRIANGLE>"},
+    {"~[~27L", "<COLOR_PAD-CROSS>"},
+    {"~[~28L", "<COLOR_PROGRESS-OLD-BLUE>"},
+    {"~[~29L", "<COLOR_PROGRESS-OLD-YELLOW>"},
+    {"~[~30L", "<COLOR_PROGRESS-OLD-SELECTED>"},
+    {"~[~31L", "<COLOR_PROGRESS-OLD-PERCENT>"},
+    {"~[~32L", "<COLOR_PROGRESS>"},
+    {"~[~33L", "<COLOR_PROGRESS-SELECTED>"},
+    {"~[~34L", "<COLOR_PROGRESS-FORCE-SELECTED>"},
+    {"~[~35L", "<COLOR_PROGRESS-OPTION-OFF>"},
+    {"~[~36L", "<COLOR_COLOR-36>"},
+    {"~[~37L", "<COLOR_CREDITS-STAFF-TITLE-1>"},
+    {"~[~38L", "<COLOR_CREDITS-STAFF-TITLE-2>"},
+    {"~[~39L", "<COLOR_COLOR-39>"}};
+
+std::vector<EncodeInfo> encode_info_jak2 = {
+    {"ˇ", "\x10"},      // caron
+    {"`", "\x11"},      // grave accent
+    {"'", "\x12"},      // apostrophe
+    {"^", "\x13"},      // circumflex
+    {"<TIL>", "\x14"},  // tilde
+    {"¨", "\x15"},      // umlaut
+    {"º", "\x16"},      // numero/overring
+    {"¡", "\x17"},      // inverted exclamation mark
+    {"¿", "\x18"},      // inverted question mark
+    {"<SOMETHING>", "\x19"},
+    {"ç", "\x1d"},  // c-cedilla
+    {"Ç", "\x1e"},  // c-cedilla
+    {"ß", "\x1f"},  // eszett
+
+    {"œ", "\x5e"},  // ligature o+e
+
+    {"<FLAG_PART_HORZ_STRIPE_MIDDLE>", "\x7f"},
+    {"<FLAG_PART_HORZ_STRIPE_BOTTOM>", "\x80"},
+    {"<FLAG_PART_VERT_STRIPE_LARGE>", "\x81"},
+    {"<FLAG_PART_VERT_STRIPE_RIGHT>", "\x82"},
+    {"<FLAG_PART_VERT_STRIPE_LEFT>", "\x83"},
+    {"<FLAG_PART_VERT_STRIPE_MIDDLE>", "\x84"},
+    {"<FLAG_PART_FILL>", "\x85"},
+    {"<FLAG_PART_JAPAN_SUN>", "\x86"},
+    {"<FLAG_PART_KOREA_TRIGRAMS_LEFT>", "\x87"},
+    {"<FLAG_PART_KOREA_TRIGRAMS_RIGHT>", "\x88"},
+    {"<FLAG_PART_KOREA_CIRCLE_TOP>", "\x89"},
+    {"<FLAG_PART_KOREA_CIRCLE_FILL>", "\x8a"},
+    {"<FLAG_PART_TOP_BOTTOM_STRIPE>", "\x8b"},
+    {"<FLAG_PART_UK_CROSS_LEFT>", "\x8c"},
+    {"<FLAG_PART_UK_CROSS_RIGHT>", "\x8d"},
+    {"<FLAG_PART_UK_FILL_LEFT>", "\x8e"},
+    {"<FLAG_PART_UK_FILL_RIGHT>", "\x8f"},
+    {"<FLAG_PART_USA_STRIPES_RIGHT>", "\x90"},
+    {"<PAD_PART_STICK>", "\x91"},
+    {"<PAD_PART_SELECT>", "\x92"},
+    {"<PAD_PART_TRIGGER_BACK>", "\x93"},
+    {"<PAD_PART_R1_NAME>", "\x94"},
+    {"<PAD_PART_L1_NAME>", "\x95"},
+    {"<PAD_PART_R2_NAME>", "\x96"},
+    {"<PAD_PART_L2_NAME>", "\x97"},
+    {"<PAD_PART_STICK_UP>", "\x98"},
+    {"<PAD_PART_STICK_UP_RIGHT>", "\x99"},
+    {"<FLAG_PART_USA_STRIPES_LEFT>", "\x9a"},
+    {"<FLAG_PART_USA_STARS>", "\x9b"},
+    {"<PAD_PART_STICK_DOWN>", "\x9c"},
+    {"<PAD_PART_STICK_DOWN_LEFT>", "\x9d"},
+    {"<PAD_PART_STICK_LEFT>", "\x9e"},
+    {"<PAD_PART_STICK_UP_LEFT>", "\x9f"},
+    {"<PAD_PART_DPAD_D>", "\xa0"},
+    {"<PAD_PART_DPAD_L>", "\xa1"},
+    {"<PAD_PART_DPAD_U>", "\xa2"},
+    {"<PAD_PART_DPAD_R>", "\xa3"},
+    {"<PAD_PART_STICK_RIGHT>", "\xa4"},
+    {"<PAD_PART_STICK_DOWN_RIGHT>", "\xa5"},
+    {"<PAD_PART_SHOULDER_TOP_LEFT>", "\xa6"},
+    {"<PAD_PART_SHOULDER_TOP_RIGHT>", "\xa7"},
+    {"<PAD_PART_TRIGGER_TOP_LEFT>", "\xa8"},
+    {"<PAD_PART_TRIGGER_TOP_RIGHT>", "\xa9"},
+    {"<PAD_PART_TRIGGER_SHIM1>", "\xaa"},
+    {"<PAD_PART_TRIGGER_SHIM2>", "\xab"},
+    {"<PAD_PART_SHOULDER_SHIM2>", "\xac"},
+
+    {"<PAD_PART_SHOULDER_BOTTOM_LEFT>", "\xb0"},
+    {"<PAD_PART_SHOULDER_BOTTOM_RIGHT>", "\xb1"},
+    {"<PAD_PART_TRIGGER_BOTTOM_LEFT>", "\xb2"},
+    {"<PAD_PART_TRIGGER_BOTTOM_RIGHT>", "\xb3"},
+    // {"入", "\x1\x00"}},
+    // {"年", "\x1\x01"}},
+    // punctuation
+    {"・", "\x1\x10"},
+    {"゛", "\x1\x11"},
+    {"゜", "\x1\x12"},
+    {"ー", "\x1\x13"},
+    {"『", "\x1\x14"},
+    {"』", "\x1\x15"},
+    // hiragana
+    {"ぁ", "\x1\x16"},  // -a
+    {"あ", "\x1\x17"},  // a
+    {"ぃ", "\x1\x18"},  // -i
+    {"い", "\x1\x19"},  // i
+    {"ぅ", "\x1\x1a"},  // -u
+    {"う", "\x1\x1b"},  // u
+    {"ぇ", "\x1\x1c"},  // -e
+    {"え", "\x1\x1d"},  // e
+    {"ぉ", "\x1\x1e"},  // -o
+    {"お", "\x1\x1f"},  // o
+    {"か", "\x1\x20"},  // ka
+    {"き", "\x1\x21"},  // ki
+    {"く", "\x1\x22"},  // ku
+    {"け", "\x1\x23"},  // ke
+    {"こ", "\x1\x24"},  // ko
+    {"さ", "\x1\x25"},  // sa
+    {"し", "\x1\x26"},  // shi
+    {"す", "\x1\x27"},  // su
+    {"せ", "\x1\x28"},  // se
+    {"そ", "\x1\x29"},  // so
+    {"た", "\x1\x2a"},  // ta
+    {"ち", "\x1\x2b"},  // chi
+    {"っ", "\x1\x2c"},  // sokuon
+    {"つ", "\x1\x2d"},  // tsu
+    {"て", "\x1\x2e"},  // te
+    {"と", "\x1\x2f"},  // to
+    {"な", "\x1\x30"},  // na
+    {"に", "\x1\x31"},  // ni
+    {"ぬ", "\x1\x32"},  // nu
+    {"ね", "\x1\x33"},  // ne
+    {"の", "\x1\x34"},  // no
+    {"は", "\x1\x35"},  // ha
+    {"ひ", "\x1\x36"},  // hi
+    {"ふ", "\x1\x37"},  // fu
+    {"へ", "\x1\x38"},  // he
+    {"ほ", "\x1\x39"},  // ho
+    {"ま", "\x1\x3a"},  // ma
+    {"み", "\x1\x3b"},  // mi
+    {"む", "\x1\x3c"},  // mu
+    {"め", "\x1\x3d"},  // me
+    {"も", "\x1\x3e"},  // mo
+    {"ゃ", "\x1\x3f"},  // youon ya
+    {"や", "\x1\x40"},  // ya
+    {"ゅ", "\x1\x41"},  // youon yu
+    {"ゆ", "\x1\x42"},  // yu
+    {"ょ", "\x1\x43"},  // youon yo
+    {"よ", "\x1\x44"},  // yo
+    {"ら", "\x1\x45"},  // ra
+    {"り", "\x1\x46"},  // ri
+    {"る", "\x1\x47"},  // ru
+    {"れ", "\x1\x48"},  // re
+    {"ろ", "\x1\x49"},  // ro
+    {"ゎ", "\x1\x4a"},  // -wa
+    {"わ", "\x1\x4b"},  // wa
+    {"を", "\x1\x4c"},  // wo
+    {"ん", "\x1\x4d"},  // -n
+    // katakana
+    {"ァ", "\x1\x4e"},  // -a
+    {"ア", "\x1\x4f"},  // a
+    {"ィ", "\x1\x50"},  // -i
+    {"イ", "\x1\x51"},  // i
+    {"ゥ", "\x1\x52"},  // -u
+    {"ウ", "\x1\x53"},  // u
+    {"ェ", "\x1\x54"},  // -e
+    {"エ", "\x1\x55"},  // e
+    {"ォ", "\x1\x56"},  // -o
+    {"オ", "\x1\x57"},  // o
+    {"カ", "\x1\x58"},  // ka
+    {"キ", "\x1\x59"},  // ki
+    {"ク", "\x1\x5a"},  // ku
+    {"ケ", "\x1\x5b"},  // ke
+    {"コ", "\x1\x5c"},  // ko
+    {"サ", "\x1\x5d"},  // sa
+    {"シ", "\x1\x5e"},  // shi
+    {"ス", "\x1\x5f"},  // su
+    {"セ", "\x1\x60"},  // se
+    {"ソ", "\x1\x61"},  // so
+    {"タ", "\x1\x62"},  // ta
+    {"チ", "\x1\x63"},  // chi
+    {"ッ", "\x1\x64"},  // sokuon
+    {"ツ", "\x1\x65"},  // tsu
+    {"テ", "\x1\x66"},  // te
+    {"ト", "\x1\x67"},  // to
+    {"ナ", "\x1\x68"},  // na
+    {"ニ", "\x1\x69"},  // ni
+    {"ヌ", "\x1\x6a"},  // nu
+    {"ネ", "\x1\x6b"},  // ne
+    {"ノ", "\x1\x6c"},  // no
+    {"ハ", "\x1\x6d"},  // ha
+    {"ヒ", "\x1\x6e"},  // hi
+    {"フ", "\x1\x6f"},  // fu
+    {"ヘ", "\x1\x70"},  // he
+    {"ホ", "\x1\x71"},  // ho
+    {"マ", "\x1\x72"},  // ma
+    {"ミ", "\x1\x73"},  // mi
+    {"ム", "\x1\x74"},  // mu
+    {"メ", "\x1\x75"},  // me
+    {"モ", "\x1\x76"},  // mo
+    {"ャ", "\x1\x77"},  // youon ya
+    {"ヤ", "\x1\x78"},  // ya
+    {"ュ", "\x1\x79"},  // youon yu
+    {"ユ", "\x1\x7a"},  // yu
+    {"ョ", "\x1\x7b"},  // youon yo
+    {"ヨ", "\x1\x7c"},  // yo
+    {"ラ", "\x1\x7d"},  // ra
+    {"リ", "\x1\x7e"},  // ri
+    {"ル", "\x1\x7f"},  // ru
+    {"レ", "\x1\x80"},  // re
+    {"ロ", "\x1\x81"},  // ro
+    {"ヮ", "\x1\x82"},  // -wa
+    {"ワ", "\x1\x83"},  // wa
+    {"ヲ", "\x1\x84"},  // wo
+    {"ン", "\x1\x85"},  // -n
+
+    {"位", "\x1\x8c"},
+    {"遺", "\x1\x8d"},
+    {"院", "\x1\x8e"},
+    {"映", "\x1\x8f"},
+    {"衛", "\x1\x90"},
+    {"応", "\x1\x91"},
+    {"下", "\x1\x92"},
+    {"画", "\x1\x93"},
+    {"解", "\x1\x94"},
+    {"開", "\x1\x95"},
+    {"外", "\x1\x96"},
+    {"害", "\x1\x97"},
+    {"蓋", "\x1\x98"},
+    {"完", "\x1\x99"},
+    {"換", "\x1\x9a"},
+    {"監", "\x1\x9b"},
+    {"間", "\x1\x9c"},
+    {"器", "\x1\x9d"},
+    {"記", "\x1\x9e"},
+    {"逆", "\x1\x9f"},
+    {"救", "\x1\xa0"},
+    {"金", "\x1\xa1"},
+    {"空", "\x1\xa2"},
+    {"掘", "\x1\xa3"},
+    {"警", "\x1\xa4"},
+    {"迎", "\x1\xa5"},
+    {"撃", "\x1\xa6"},
+    {"建", "\x1\xa7"},
+    {"源", "\x1\xa8"},
+    {"現", "\x1\xa9"},
+    {"言", "\x1\xaa"},
+    {"限", "\x1\xab"},
+    {"個", "\x1\xac"},
+    {"庫", "\x1\xad"},
+    {"後", "\x1\xae"},
+    {"語", "\x1\xaf"},
+    {"護", "\x1\xb0"},
+    {"交", "\x1\xb1"},
+    {"功", "\x1\xb2"},
+    {"向", "\x1\xb3"},
+    {"工", "\x1\xb4"},
+    {"攻", "\x1\xb5"},
+    {"溝", "\x1\xb6"},
+    {"行", "\x1\xb7"},
+    {"鉱", "\x1\xb8"},
+    {"降", "\x1\xb9"},
+    {"合", "\x1\xba"},
+    {"告", "\x1\xbb"},
+    {"獄", "\x1\xbc"},
+    {"彩", "\x1\xbd"},
+    {"作", "\x1\xbe"},
+    {"山", "\x1\xbf"},
+    {"使", "\x1\xc0"},
+    {"始", "\x1\xc1"},
+    {"試", "\x1\xc2"},
+    {"字", "\x1\xc3"},
+    {"寺", "\x1\xc4"},
+    {"時", "\x1\xc5"},
+    {"示", "\x1\xc6"},
+    {"自", "\x1\xc7"},
+    {"式", "\x1\xc8"},
+    {"矢", "\x1\xc9"},
+    {"射", "\x1\xca"},
+    {"者", "\x1\xcb"},
+    {"守", "\x1\xcc"},
+    {"手", "\x1\xcd"},
+    {"終", "\x1\xce"},
+    {"週", "\x1\xcf"},
+    {"出", "\x1\xd0"},
+    {"所", "\x1\xd1"},
+    {"書", "\x1\xd2"},
+    {"勝", "\x1\xd3"},
+    {"章", "\x1\xd4"},
+    {"上", "\x1\xd5"},
+    {"乗", "\x1\xd6"},
+    {"場", "\x1\xd7"},
+    {"森", "\x1\xd8"},
+    {"進", "\x1\xd9"},
+    {"人", "\x1\xda"},
+    {"水", "\x1\xdb"},
+    {"数", "\x1\xdc"},
+    {"制", "\x1\xdd"},
+    {"性", "\x1\xde"},
+    {"成", "\x1\xdf"},
+    {"聖", "\x1\xe0"},
+    {"石", "\x1\xe1"},
+    {"跡", "\x1\xe2"},
+    {"先", "\x1\xe3"},
+    {"戦", "\x1\xe4"},
+    {"船", "\x1\xe5"},
+    {"選", "\x1\xe6"},
+    {"走", "\x1\xe7"},
+    {"送", "\x1\xe8"},
+    {"像", "\x1\xe9"},
+    {"造", "\x1\xea"},
+    {"続", "\x1\xeb"},
+    {"対", "\x1\xec"},
+    {"袋", "\x1\xed"},
+    {"台", "\x1\xee"},
+    {"弾", "\x1\xef"},
+    {"地", "\x1\xf0"},
+    {"中", "\x1\xf1"},
+    {"敵", "\x1\xf2"},
+    {"転", "\x1\xf3"},
+    {"電", "\x1\xf4"},
+    {"塔", "\x1\xf5"},
+    {"頭", "\x1\xf6"},
+    {"動", "\x1\xf7"},
+    {"内", "\x1\xf8"},
+    {"日", "\x1\xf9"},
+    {"入", "\x1\xfa"},
+    {"年", "\x1\xfb"},
+    {"能", "\x1\xfc"},
+    {"廃", "\x1\xfd"},
+    {"排", "\x1\xfe"},
+    {"敗", "\x1\xff"},
+
+    {"発", "\x2\x10"},
+    {"反", "\x2\x11"},
+    {"必", "\x2\x12"},
+    {"表", "\x2\x13"},
+    {"武", "\x2\x14"},
+    {"壁", "\x2\x15"},
+    {"墓", "\x2\x16"},
+    {"放", "\x2\x17"},
+    {"方", "\x2\x18"},
+    {"砲", "\x2\x19"},
+    {"妨", "\x2\x1a"},
+    {"北", "\x2\x1b"},
+    {"本", "\x2\x1c"},
+    {"幕", "\x2\x1d"},
+    {"無", "\x2\x1e"},
+    {"迷", "\x2\x1f"},
+    {"面", "\x2\x20"},
+    {"戻", "\x2\x21"},
+    {"紋", "\x2\x22"},
+    {"薬", "\x2\x23"},
+    {"輸", "\x2\x24"},
+    {"勇", "\x2\x25"},
+    {"友", "\x2\x26"},
+    {"遊", "\x2\x27"},
+    {"容", "\x2\x28"},
+    {"要", "\x2\x29"},
+    {"利", "\x2\x2a"},
+    {"了", "\x2\x2b"},
+    {"量", "\x2\x2c"},
+    {"力", "\x2\x2d"},
+    {"練", "\x2\x2e"},
+    {"連", "\x2\x2f"},
+    {"録", "\x2\x30"},
+    {"話", "\x2\x31"},
+    {"墟", "\x2\x32"},
+    {"脱", "\x2\x33"},
+    // {"成", "\x2\x34"},
+    {"旗", "\x2\x35"},
+    {"破", "\x2\x36"},
+    {"壊", "\x2\x37"},
+    {"全", "\x2\x38"},
+    {"滅", "\x2\x39"},
+    {"機", "\x2\x3a"},
+    {"仲", "\x2\x3b"},
+    {"渓", "\x2\x3c"},
+    {"谷", "\x2\x3d"},
+    {"優", "\x2\x3e"},
+    {"探", "\x2\x3f"},
+    {"部", "\x2\x40"},
+    {"索", "\x2\x41"},
+    // {"乗", "\x2\x42"},
+    {"前", "\x2\x43"},
+    {"右", "\x2\x44"},
+    {"左", "\x2\x45"},
+    {"会", "\x2\x46"},
+    {"高", "\x2\x47"},
+    {"低", "\x2\x48"},
+    {"押", "\x2\x49"},
+    {"切", "\x2\x4a"},
+    {"替", "\x2\x4b"},
+    // {"対", "\x2\x4c"},
+    {"秒", "\x2\x4d"},
+    {"箱", "\x2\x4e"},
+    {"泳", "\x2\x4f"},
+    {"～", "\x2\x50"},
+
+    {"闇", "\x2\x56"},
+    {"以", "\x2\x57"},
+    {"屋", "\x2\x58"},
+    {"俺", "\x2\x59"},
+    {"化", "\x2\x5a"},
+    {"界", "\x2\x5b"},
+    {"感", "\x2\x5c"},
+    {"気", "\x2\x5d"},
+    {"却", "\x2\x5e"},
+    {"曲", "\x2\x5f"},
+    {"継", "\x2\x60"},
+    {"権", "\x2\x61"},
+    {"見", "\x2\x62"},
+    {"古", "\x2\x63"},
+    {"好", "\x2\x64"},
+    // {"高", "\x2\x65"},
+    {"才", "\x2\x66"},
+    {"士", "\x2\x67"},
+    {"子", "\x2\x68"},
+    {"次", "\x2\x69"},
+    {"主", "\x2\x6a"},
+    {"種", "\x2\x6b"},
+    {"讐", "\x2\x6c"},
+    {"女", "\x2\x6d"},
+    {"小", "\x2\x6e"},
+    {"焼", "\x2\x6f"},
+    {"証", "\x2\x70"},
+    {"神", "\x2\x71"},
+    {"身", "\x2\x72"},
+    {"寸", "\x2\x73"},
+    {"世", "\x2\x74"},
+    {"想", "\x2\x75"},
+    {"退", "\x2\x76"},
+    {"第", "\x2\x77"},
+    {"着", "\x2\x78"},
+    {"天", "\x2\x79"},
+    {"倒", "\x2\x7a"},
+    {"到", "\x2\x7b"},
+    {"突", "\x2\x7c"},
+    {"爆", "\x2\x7d"},
+    {"番", "\x2\x7e"},
+    {"負", "\x2\x7f"},
+    {"復", "\x2\x80"},
+    {"物", "\x2\x81"},
+    {"眠", "\x2\x82"},
+    {"予", "\x2\x83"},
+    {"用", "\x2\x84"},
+    {"落", "\x2\x85"},
+    {"緑", "\x2\x86"},
+
+    {"封", "\x2\x88"},
+    {"印", "\x2\x89"},
+    {"扉", "\x2\x8a"},
+    {"最", "\x2\x8b"},
+    {"刻", "\x2\x8c"},
+    {"足", "\x2\x8d"},
+};
+
+std::unordered_map<std::string, std::vector<std::string>> jamo_glyph_mappings_jak2 = {
+    {"0x06", {"ᄀ"}},      {"0x07", {"ᄁ"}},      {"0x08", {"ᄂ"}},      {"0x09", {"ᄃ"}},
+    {"0x0a", {"ᄄ"}},      {"0x0b", {"ᄅ"}},      {"0x0c", {"ᄆ"}},      {"0x0d", {"ᄇ"}},
+    {"0x0e", {"ᄈ"}},      {"0x0f", {"ᄋ"}},      {"0x10", {"ᄌ"}},      {"0x11", {"ᄍ"}},
+    {"0x12", {"ᄏ"}},      {"0x13", {"ᄐ"}},      {"0x14", {"ᄑ"}},      {"0x15", {"ᅡ"}},
+    {"0x16", {"ᅣ"}},       {"0x17", {"ᅵ"}},       {"0x18", {"ᅥ"}},       {"0x19", {"ᅧ"}},
+    {"0x1a", {"ᅡ"}},       {"0x1b", {"ᅣ"}},       {"0x1c", {"ᅵ"}},       {"0x1d", {"ᅥ"}},
+    {"0x1e", {"ᅧ"}},       {"0x1f", {"ᄂ"}},      {"0x20", {"ᄉ"}},      {"0x21", {"ᄊ"}},
+    {"0x22", {"ᅥ"}},       {"0x23", {"ᅧ"}},       {"0x24", {"ᅥ"}},       {"0x25", {"ᅧ"}},
+    {"0x26", {"ᄃ"}},      {"0x27", {"ᄄ"}},      {"0x28", {"ᄅ"}},      {"0x29", {"ᄐ"}},
+    {"0x2a", {"ᄑ"}},      {"0x2b", {"ᅧ"}},       {"0x2c", {"ᅧ"}},       {"0x2d", {"ᄎ"}},
+    {"0x2e", {"ᄒ"}},      {"0x2f", {"ᅥ"}},       {"0x30", {"ᅧ"}},       {"0x31", {"ᅥ"}},
+    {"0x32", {"ᅧ"}},       {"0x33", {"ᄀ"}},      {"0x34", {"ᄁ"}},      {"0x35", {"ᄂ"}},
+    {"0x36", {"ᄃ"}},      {"0x37", {"ᄄ"}},      {"0x38", {"ᄅ"}},      {"0x39", {"ᄆ"}},
+    {"0x3a", {"ᄇ"}},      {"0x3b", {"ᄈ"}},      {"0x3c", {"ᄋ"}},      {"0x3d", {"ᄌ"}},
+    {"0x3e", {"ᄍ"}},      {"0x3f", {"ᄏ"}},      {"0x40", {"ᄐ"}},      {"0x41", {"ᄑ"}},
+    {"0x42", {"ᅢ"}},       {"0x43", {"ᅤ"}},       {"0x44", {"ᅦ"}},       {"0x45", {"ᅨ"}},
+    {"0x46", {"ᅢ"}},       {"0x47", {"ᅤ"}},       {"0x48", {"ᅦ"}},       {"0x49", {"ᅨ"}},
+    {"0x4a", {"ᄂ"}},      {"0x4b", {"ᄉ"}},      {"0x4c", {"ᄊ"}},      {"0x4d", {"ᅦ"}},
+    {"0x4e", {"ᅨ"}},       {"0x4f", {"ᅦ"}},       {"0x50", {"ᅨ"}},       {"0x51", {"ᄃ"}},
+    {"0x52", {"ᄄ"}},      {"0x53", {"ᄅ"}},      {"0x54", {"ᄐ"}},      {"0x55", {"ᄑ"}},
+    {"0x56", {"ᅨ"}},       {"0x57", {"ᅨ"}},       {"0x58", {"ᄎ"}},      {"0x59", {"ᄒ"}},
+    {"0x5a", {"ᅦ"}},       {"0x5b", {"ᅨ"}},       {"0x5c", {"ᅦ"}},       {"0x5d", {"ᅨ"}},
+    {"0x5e", {"ᄀ"}},      {"0x5f", {"ᄏ"}},      {"0x60", {"ᅩ"}},       {"0x61", {"ᅭ"}},
+    {"0x62", {"ᅩ"}},       {"0x63", {"ᅭ"}},       {"0x64", {"ᄁ", "ᅫ"}}, {"0x65", {"ᄁ", "ᅩ"}},
+    {"0x66", {"ᄁ", "ᅩ"}}, {"0x67", {"ᄁ", "ᅭ"}}, {"0x68", {"ᄁ"}},      {"0x69", {"ᄂ"}},
+    {"0x6a", {"ᅳ"}},       {"0x6b", {"ᅮ"}},       {"0x6c", {"ᅲ"}},       {"0x6d", {"ᅳ"}},
+    {"0x6e", {"ᅮ"}},       {"0x6f", {"ᅲ"}},       {"0x70", {"ᄃ"}},      {"0x71", {"ᄄ"}},
+    {"0x72", {"ᄅ"}},      {"0x73", {"ᄆ"}},      {"0x74", {"ᄇ"}},      {"0x75", {"ᄈ"}},
+    {"0x76", {"ᄉ"}},      {"0x77", {"ᄊ"}},      {"0x78", {"ᄋ"}},      {"0x79", {"ᄌ"}},
+    {"0x7a", {"ᄍ"}},      {"0x7b", {"ᄎ"}},      {"0x7c", {"ᄐ"}},      {"0x7d", {"ᄑ"}},
+    {"0x7e", {"ᄒ"}},      {"0x7f", {"ᅩ"}},       {"0x80", {"ᅭ"}},       {"0x81", {"ᅳ"}},
+    {"0x82", {"ᅩ"}},       {"0x83", {"ᅭ"}},       {"0x84", {"ᅳ"}},       {"0x85", {"ᅮ"}},
+    {"0x86", {"ᅲ"}},       {"0x87", {"ᅮ"}},       {"0x88", {"ᅲ"}},       {"0x89", {"ᅮ", "ᆫ"}},
+    {"0x8a", {"ᅲ", "ᆫ"}},  {"0x8b", {"ᄀ"}},      {"0x8c", {"ᄏ"}},      {"0x8d", {"ᅩ"}},
+    {"0x8e", {"ᅩ"}},       {"0x8f", {"ᄁ", "ᅩ"}}, {"0x90", {"ᄁ", "ᅩ"}}, {"0x91", {"ᄁ"}},
+    {"0x92", {"ᄂ"}},      {"0x93", {"ᄃ"}},      {"0x94", {"ᄄ"}},      {"0x95", {"ᄅ"}},
+    {"0x96", {"ᄆ"}},      {"0x97", {"ᄇ"}},      {"0x98", {"ᄈ"}},      {"0x99", {"ᄉ"}},
+    {"0x9a", {"ᄊ"}},      {"0x9b", {"ᄋ"}},      {"0x9c", {"ᄌ"}},      {"0x9d", {"ᄍ"}},
+    {"0x9e", {"ᄎ"}},      {"0x9f", {"ᄐ"}},      {"0xa0", {"ᄑ"}},      {"0xa1", {"ᄒ"}},
+    {"0xa2", {"ᅩ"}},       {"0xa3", {"ᅳ"}},       {"0xa4", {"ᅩ"}},       {"0xa5", {"ᅳ"}},
+    {"0xa6", {"ᅡ"}},       {"0xa7", {"ᅵ"}},       {"0xa8", {"ᅡ"}},       {"0xa9", {"ᅵ"}},
+    {"0xaa", {"ᅯ"}},       {"0xab", {"ᅱ"}},       {"0xac", {"ᅯ"}},       {"0xad", {"ᅱ"}},
+    {"0xae", {"ᄀ"}},      {"0xaf", {"ᄏ"}},      {"0xb0", {"ᅫ"}},       {"0xb1", {"ᅫ"}},
+    {"0xb2", {"ᄆ"}},      {"0xb3", {"ᄁ"}},      {"0xb4", {"ᄂ"}},      {"0xb5", {"ᄃ"}},
+    {"0xb6", {"ᄄ"}},      {"0xb7", {"ᄅ"}},      {"0xb8", {"ᄇ"}},      {"0xb9", {"ᄉ"}},
+    {"0xba", {"ᄊ"}},      {"0xbb", {"ᄋ"}},      {"0xbc", {"ᄌ"}},      {"0xbd", {"ᄍ"}},
+    {"0xbe", {"ᄎ"}},      {"0xbf", {"ᄐ"}},      {"0xc0", {"ᄒ"}},      {"0xc1", {"ᅫ"}},
+    {"0xc2", {"ᅫ"}},       {"0xc3", {"ᅰ"}},       {"0xc4", {"ᅰ"}},       {"0xc5", {"ᆨ"}},
+    {"0xc6", {"ᆩ"}},       {"0xc7", {"ᆪ"}},       {"0xc8", {"ᆫ"}},       {"0xc9", {"ᆬ"}},
+    {"0xca", {"ᆭ"}},       {"0xcb", {"ᆮ"}},       {"0xcc", {"ᆯ"}},       {"0xcd", {"ᆰ"}},
+    {"0xce", {"ᆱ"}},       {"0xcf", {"ᆲ"}},       {"0xd0", {"ᆴ"}},       {"0xd1", {"ᆶ"}},
+    {"0xd2", {"ᆷ"}},       {"0xd3", {"ᆸ"}},       {"0xd4", {"ᆹ"}},       {"0xd5", {"ᆺ"}},
+    {"0xd6", {"ᆻ"}},       {"0xd7", {"ᆼ"}},       {"0xd8", {"ᆽ"}},       {"0xd9", {"ᆾ"}},
+    {"0xda", {"ᆿ"}},       {"0xdb", {"ᇀ"}},       {"0xdc", {"ᇁ"}},       {"0xdd", {"ᇂ"}},
+    {"0xde", {"ᆨ"}},       {"0xdf", {"ᆩ"}},       {"0xe0", {"ᆪ"}},       {"0xe1", {"ᆫ"}},
+    {"0xe2", {"ᆭ"}},       {"0xe3", {"ᆮ"}},       {"0xe4", {"ᆯ"}},       {"0xe5", {"ᆰ"}},
+    {"0xe6", {"ᆱ"}},       {"0xe7", {"ᆳ"}},       {"0xe8", {"ᆴ"}},       {"0xe9", {"ᆵ"}},
+    {"0xea", {"ᆶ"}},       {"0xeb", {"ᆷ"}},       {"0xec", {"ᆸ"}},       {"0xed", {"ᆺ"}},
+    {"0xee", {"ᆼ"}},       {"0xef", {"ᆽ"}},       {"0xf0", {"ᆾ"}},       {"0xf1", {"ᆿ"}},
+    {"0xf2", {"ᇀ"}},       {"0xf3", {"ᇁ"}},       {"0xf4", {"ᇂ"}},       {"0xf5", {"ᆨ"}},
+    {"0xf6", {"ᆫ"}},       {"0xf7", {"ᆯ"}},       {"0xf8", {"ᆱ"}},       {"0xf9", {"ᆷ"}},
+    {"0xfa", {"ᆸ"}},       {"0xfb", {"ᆺ"}},       {"0xfc", {"ᆻ"}},       {"0xfd", {"ᆼ"}},
+    {"0xfe", {"ᆨ"}},       {"0xff", {"ᆫ"}},       {"extra_0x86", {"ᆯ"}}, {"extra_0x87", {"ᆷ"}},
+    {"extra_0x88", {"ᆸ"}}, {"extra_0x89", {"ᆺ"}}, {"extra_0x8a", {"ᆻ"}}, {"extra_0x8b", {"ᆼ"}},
+};
+
+GameTextFontBank g_font_bank_jak2(GameTextVersion::JAK2,
+                                  &encode_info_jak2,
+                                  &replace_info_jak2,
+                                  &passthrus_jak2);

common/util/font/dbs/font_db_jak2.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "common/util/font/font_utils.h"
+
+extern std::unordered_map<std::string, std::vector<std::string>> jamo_glyph_mappings_jak2;
+
+/*!
+ * ================================
+ * GAME TEXT FONT BANK - JAK 2
+ * ================================
+ * This font is used in:
+ * - Jak II
+ * - Jak II: Renegade
+ * - ジャックＸダクスター2
+ */
+extern GameTextFontBank g_font_bank_jak2;

common/util/font/dbs/font_db_jak3.cpp

@@ -0,0 +1,938 @@
+#include "font_db_jak3.h"
+
+std::unordered_set<char> passthrus_jak3 = {'~', ' ', ',', '.', '-', '+', '(', ')',
+                                           '!', ':', '?', '=', '%', '*', '/', '#',
+                                           ';', '<', '>', '@', '[', '_', ']'};
+
+std::vector<ReplaceInfo> replace_info_jak3 = {
+    // other
+    {"A~Y~-21H~-5Vº~Z", "Å"},
+    {"N~Y~-6Hº~Z~+10H", "Nº"},
+    // portuguese
+    {"~+4Vç~-4V", "ç"},
+
+    {"O~Y~-25H~-1V/~Z", "Ø"},
+    {"o~Y~-23H~+4V/~Z", "ø"},
+    {"A~Y~-13H~+8V,~Z", "Ą"},
+    {"a~Y~-8H~+6V,~Z", "ą"},
+    {"E~Y~-6H~+8V,~Z", "Ę"},
+    {"e~Y~-10H~+7V,~Z", "ę"},
+    {"L~Y~-21H~+0V/~Z", "Ł"},
+    {"l~Y~-16H~+0V/~Z", "ł"},  // TODO - this one is ugly, font character addition (small slash)
+    {"Z~Y~-25H~-11Vº~Z", "Ż"},
+    {"z~Y~-23H~-5Vº~Z", "ż"},
+    {"a~Y~-25H~-5Vº~Z", "å"},
+    {"S~Y~-21H~-5V'~Z", "Ś"},
+    {"s~Y~-25H~-5V'~Z", "ś"},
+    {"n~Y~-25H~-5V'~Z", "ń"},
+    {"c~Y~-25H~-5V'~Z", "ć"},
+    {"o~Y~-25H~-4V<TIL>~Z", "õ"},
+    {"a~Y~-25H~-4V<TIL>~Z", "ã"},
+    {"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", "Č"},
+    {"c~Y~-25H~-5Vˇ~Z", "č"},
+    {"D~Y~-27H~-10Vˇ~Z", "Ď"},
+    {"S~Y~-24H~-10Vˇ~Z", "Š"},
+    {"s~Y~-22H~-4Vˇ~Z", "š"},
+    {"Z~Y~-25H~-10Vˇ~Z", "Ž"},
+    {"z~Y~-23H~-4Vˇ~Z", "ž"},
+    {"U~Y~-15H~+5V,~Z", "Ų"},
+    {"u~Y~-15H~+5V,~Z", "ų"},
+    {"U~Y~-20H~-18V-~Z", "Ū"},
+    {"u~Y~-18H~-15V-~Z", "ū"},
+    {"D~Y~-28H~-1V-~Z", "Đ"},
+    {"d~Y~-13H~-10V-~Z", "đ"},
+    {"I~Y~-8H~+4V,~Z", "Į"},
+    {"i~Y~-8H~+4V,~Z", "į"},
+    // czech specific
+    {"U~Y~-24H~-7Vº~Z", "Ů"},
+    {"u~Y~-23H~-5Vº~Z", "ů"},
+    {"t~Y~-7H~-21V,~Z", "ť"},
+
+    // tildes
+    {"N~Y~-22H~-4V<TIL>~Z", "Ñ"},
+    {"n~Y~-24H~-4V<TIL>~Z", "ñ"},
+    {"A~Y~-21H~-5V<TIL>~Z", "Ã"},
+    {"O~Y~-22H~-4V<TIL>~Z", "Õ"},
+
+    // acute accents
+    {"A~Y~-21H~-5V'~Z", "Á"},
+    {"A~Y~-26H~-8V'~Z", "<Á_V2>"},  // unfortunate...
+    {"a~Y~-25H~-5V'~Z", "á"},
+    {"E~Y~-23H~-9V'~Z", "É"},
+    {"e~Y~-26H~-5V'~Z", "é"},
+    {"I~Y~-19H~-8V'~Z", "Í"},
+    {"i~Y~-19H~-8V'~Z", "í"},
+    {"O~Y~-22H~-4V'~Z", "Ó"},
+    {"o~Y~-26H~-4V'~Z", "ó"},
+    {"U~Y~-25H~-8V'~Z", "Ú"},
+    {"u~Y~-24H~-3V'~Z", "ú"},
+    {"Z~Y~-24H~-3V'~Z", "Ź"},
+    {"z~Y~-24H~-3V'~Z", "ź"},
+    // czech specific
+    {"Y~Y~-26H~-5V'~Z", "Ý"},
+    {"~+7Vy~-7V~Y~-24H~-3V'~Z", "ý"},
+
+    // circumflex
+    {"A~Y~-20H~-4V^~Z", "Â"},
+    {"a~Y~-24H~-5V^~Z", "â"},
+    {"E~Y~-20H~-5V^~Z", "Ê"},
+    {"e~Y~-25H~-4V^~Z", "ê"},
+    {"I~Y~-19H~-5V^~Z", "Î"},
+    {"i~Y~-19H~-8V^~Z", "î"},
+    {"O~Y~-20H~-4V^~Z", "Ô"},
+    {"o~Y~-25H~-4V^~Z", "ô"},
+    {"U~Y~-24H~-3V^~Z", "Û"},
+    {"u~Y~-23H~-3V^~Z", "û"},
+
+    // grave accents
+    {"A~Y~-26H~-8V`~Z", "À"},
+    {"a~Y~-25H~-5V`~Z", "à"},
+    {"E~Y~-23H~-9V`~Z", "È"},
+    {"e~Y~-26H~-5V`~Z", "è"},
+    {"I~Y~-19H~-5V`~Z", "Ì"},
+    {"i~Y~-19H~-8V`~Z", "ì"},
+    {"O~Y~-22H~-4V`~Z", "Ò"},
+    {"o~Y~-26H~-4V`~Z", "ò"},
+    {"U~Y~-24H~-3V`~Z", "Ù"},
+    {"u~Y~-24H~-3V`~Z", "ù"},
+
+    // umlaut
+    {"A~Y~-26H~-8V¨~Z", "Ä"},
+    {"a~Y~-25H~-5V¨~Z", "ä"},
+    {"E~Y~-20H~-5V¨~Z", "Ë"},
+    {"e~Y~-25H~-5V¨~Z", "ë"},
+    {"I~Y~-19H~-5V¨~Z", "Ï"},
+    {"i~Y~-26H~-4V¨~Z", "ï"},
+    {"O~Y~-26H~-8V¨~Z", "Ö"},
+    {"o~Y~-26H~-4V¨~Z", "ö"},
+    {"U~Y~-25H~-8V¨~Z", "Ü"},
+    {"u~Y~-24H~-3V¨~Z", "ü"},
+
+    // caron - Ǎ ǎ Ě ě Ǧ ǧ Ǐ ǐ Ǒ ǒ Ǔ ǔ Y̌ y̌
+    {"A~Y~-25H~-9Vˇ~Z", "Ǎ"},
+    {"a~Y~-24H~-5Vˇ~Z", "ǎ"},
+    {"E~Y~-22H~-8Vˇ~Z", "Ě"},
+    {"e~Y~-25H~-4Vˇ~Z", "ě"},
+    {"G~Y~-24H~-8Vˇ~Z", "Ǧ"},
+    {"~+7Vg~-7V~Y~-25H~-4Vˇ~Z", "ǧ"},
+    {"I~Y~-19H~-8Vˇ~Z", "Ǐ"},
+    {"i~Y~-19H~-8Vˇ~Z", "ǐ"},
+    {"O~Y~-25H~-7Vˇ~Z", "Ǒ"},
+    {"o~Y~-25H~-4Vˇ~Z", "ǒ"},
+    {"U~Y~-25H~-6Vˇ~Z", "Ǔ"},
+    {"u~Y~-24H~-3Vˇ~Z", "ǔ"},
+    {"Y~Y~-25H~-5Vˇ~Z", "Y̌"},
+    {"~+7Vy~-7V~Y~-25H~-3Vˇ~Z", "y̌"},
+    // czech specific - Č č Ň ň Ř ř Š š Ž ž Ť
+    {"C~Y~-25H~-9Vˇ~Z", "Č"},
+    {"c~Y~-24H~-5Vˇ~Z", "č"},
+    {"N~Y~-25H~-9Vˇ~Z", "Ň"},
+    {"n~Y~-24H~-5Vˇ~Z", "ň"},
+    {"R~Y~-25H~-9Vˇ~Z", "Ř"},
+    {"r~Y~-22H~-5Vˇ~Z", "ř"},
+    {"S~Y~-25H~-9Vˇ~Z", "Š"},
+    {"s~Y~-22H~-5Vˇ~Z", "š"},
+    {"T~Y~-24H~-7Vˇ~Z", "Ť"},
+    {"Z~Y~-25H~-9Vˇ~Z", "Ž"},
+    {"z~Y~-24H~-5Vˇ~Z", "ž"},
+
+    // dakuten katakana
+    {"~Yウ~Z゛", "ヴ"},
+    {"~Yカ~Z゛", "ガ"},
+    {"~Yキ~Z゛", "ギ"},
+    {"~Yク~Z゛", "グ"},
+    {"~Yケ~Z゛", "ゲ"},
+    {"~Yコ~Z゛", "ゴ"},
+    {"~Yサ~Z゛", "ザ"},
+    {"~Yシ~Z゛", "ジ"},
+    {"~Yス~Z゛", "ズ"},
+    {"~Yセ~Z゛", "ゼ"},
+    {"~Yソ~Z゛", "ゾ"},
+    {"~Yタ~Z゛", "ダ"},
+    {"~Yチ~Z゛", "ヂ"},
+    {"~Yツ~Z゛", "ヅ"},
+    {"~Yテ~Z゛", "デ"},
+    {"~Yト~Z゛", "ド"},
+    {"~Yハ~Z゛", "バ"},
+    {"~Yヒ~Z゛", "ビ"},
+    {"~Yフ~Z゛", "ブ"},
+    {"~Yヘ~Z゛", "ベ"},
+    {"~Yホ~Z゛", "ボ"},
+    // handakuten katakana
+    {"~Yハ~Z゜", "パ"},
+    {"~Yヒ~Z゜", "ピ"},
+    {"~Yフ~Z゜", "プ"},
+    {"~Yヘ~Z゜", "ペ"},
+    {"~Yホ~Z゜", "ポ"},
+    // dakuten hiragana
+    {"~Yか~Z゛", "が"},
+    {"~Yき~Z゛", "ぎ"},
+    {"~Yく~Z゛", "ぐ"},
+    {"~Yけ~Z゛", "げ"},
+    {"~Yこ~Z゛", "ご"},
+    {"~Yさ~Z゛", "ざ"},
+    {"~Yし~Z゛", "じ"},
+    {"~Yす~Z゛", "ず"},
+    {"~Yせ~Z゛", "ぜ"},
+    {"~Yそ~Z゛", "ぞ"},
+    {"~Yた~Z゛", "だ"},
+    {"~Yち~Z゛", "ぢ"},
+    {"~Yつ~Z゛", "づ"},
+    {"~Yて~Z゛", "で"},
+    {"~Yと~Z゛", "ど"},
+    {"~Yは~Z゛", "ば"},
+    {"~Yひ~Z゛", "び"},
+    {"~Yふ~Z゛", "ぶ"},
+    {"~Yへ~Z゛", "べ"},
+    {"~Yほ~Z゛", "ぼ"},
+    // handakuten hiragana
+    {"~Yは~Z゜", "ぱ"},
+    {"~Yひ~Z゜", "ぴ"},
+    {"~Yふ~Z゜", "ぷ"},
+    {"~Yへ~Z゜", "ぺ"},
+    {"~Yほ~Z゜", "ぽ"},
+    // japanese punctuation
+    {",~+8H", "、"},
+    {"~+8H ", "　"},
+
+    // playstation buttons
+    // - face
+    {"~Y~22L<~Z~Y~27L*~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_X>"},
+    {"~Y~22L<~Z~Y~26L;~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_TRIANGLE>"},
+    {"~Y~22L<~Z~Y~25L@~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_CIRCLE>"},
+    {"~Y~22L<~Z~Y~24L#~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_SQUARE>"},
+    // - dpad
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~3L~+17H~-13V<PAD_PART_DPAD_U>~Z~22L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_UP>"},
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~3L~+17H~-13V<PAD_PART_DPAD_U>~Z~3L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_DOWN>"},
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~22L~+17H~-13V<PAD_PART_DPAD_U>~Z~22L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_ANY>"},
+    // - shoulder
+    {"~Y~22L~-2H~-12V<PAD_PART_SHOULDER_TOP_LEFT><PAD_PART_SHOULDER_TOP_RIGHT>~Z~22L~-2H~+17V<PAD_"
+     "PART_SHOULDER_BOTTOM_LEFT><PAD_PART_SHOULDER_BOTTOM_RIGHT>~Z~1L~+4H~+3V<PAD_PART_L1_NAME>~Z~+"
+     "38H",
+     "<PAD_L1>"},
+    {"~Y~22L~-2H~-12V<PAD_PART_SHOULDER_TOP_LEFT><PAD_PART_SHOULDER_TOP_RIGHT>~Z~22L~-2H~+17V<PAD_"
+     "PART_SHOULDER_BOTTOM_LEFT><PAD_PART_SHOULDER_BOTTOM_RIGHT>~Z~1L~+6H~+3V<PAD_PART_R1_NAME>~Z~+"
+     "38H",
+     "<PAD_R1>"},
+    {"~Y~22L~-2H~-6V<PAD_PART_TRIGGER_TOP_LEFT><PAD_PART_TRIGGER_TOP_RIGHT>~Z~22L~-2H~+16V<PAD_"
+     "PART_TRIGGER_BOTTOM_LEFT><PAD_PART_TRIGGER_BOTTOM_RIGHT>~Z~1L~+5H~-2V<PAD_PART_R2_NAME>~Z~+"
+     "38H",
+     "<PAD_R2>"},
+    {"~Y~22L~-2H~-6V<PAD_PART_TRIGGER_TOP_LEFT><PAD_PART_TRIGGER_TOP_RIGHT>~Z~22L~-2H~+16V<PAD_"
+     "PART_TRIGGER_BOTTOM_LEFT><PAD_PART_TRIGGER_BOTTOM_RIGHT>~Z~1L~+5H~-2V<PAD_PART_L2_NAME>~Z~+"
+     "38H",
+     "<PAD_L2>"},
+    // - analog
+    {"~1L~+8H~Y<PAD_PART_STICK>~Z~6L~-16H<PAD_PART_STICK_LEFT>~Z~+16h~6L<PAD_PART_STICK_RIGHT>~Z~"
+     "6L~-15V<PAD_PART_STICK_DOWN>~Z~+13V~6L<PAD_PART_STICK_UP>~Z~-10H~+9V~6L<PAD_PART_STICK_UP_"
+     "LEFT>~Z~+10H~+9V~6L<PAD_PART_STICK_UP_RIGHT>~Z~-10H~-11V~6L<PAD_PART_STICK_DOWN_LEFT>~Z~+10H~"
+     "-11V~6L<PAD_PART_STICK_DOWN_RIGHT>~Z~+32H",
+     "<PAD_ANALOG_ANY>"},
+    {"~Y~1L~+8H<PAD_PART_STICK>~Z~6L~-8H<PAD_PART_STICK_LEFT>~Z~+24H~6L<PAD_PART_STICK_RIGHT>~Z~+"
+     "40H",
+     "<PAD_ANALOG_LEFT_RIGHT>"},
+    {"~Y~1L<PAD_PART_STICK>~Z~6L~-15V<PAD_PART_STICK_DOWN>~Z~+13V~6L<PAD_PART_STICK_UP>~Z~+26H",
+     "<PAD_ANALOG_UP_DOWN>"},
+
+    // icons
+    {"~Y~6L<~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<ICON_MISSION_COMPLETE>"},
+    {"~Y~3L<~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<ICON_MISSION_TODO>"},
+
+    // flags
+    {"~Y~6L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~1L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+45H",
+     "<FLAG_ITALIAN>"},
+    {"~Y~5L<FLAG_PART_FILL>~Z~3L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-1H~Y~5L<FLAG_PART_FILL>~Z~3L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~+26H",
+     "<FLAG_SPAIN>"},
+    {"~Y~39L~~~Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~39L~~~"
+     "Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_GERMAN>"},
+    {"~Y~7L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~1L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+47H",
+     "<FLAG_FRANCE>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_UK_CROSS_LEFT>~Z~7L<FLAG_PART_UK_FILL_LEFT>~]~-1H~Y~1L<"
+     "FLAG_PART_FILL>~Z~3L<FLAG_PART_UK_CROSS_RIGHT>~Z~7L<FLAG_PART_UK_FILL_RIGHT>~Z~+26H",
+     "<FLAG_UK>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_USA_STRIPES_LEFT>~Z~7L<FLAG_PART_USA_STARS>~]~-1H~Y~1L<"
+     "FLAG_PART_FILL>~Z~3L<FLAG_PART_USA_STRIPES_RIGHT>~Z~+26H",
+     "<FLAG_USA>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~39L<FLAG_PART_KOREA_TRIGRAMS_LEFT>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~39L<"
+     "FLAG_PART_KOREA_TRIGRAMS_RIGHT>~Z~-11H~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~-11H~3L<FLAG_PART_"
+     "KOREA_CIRCLE_TOP>~Z~+26H",
+     "<FLAG_KOREA>"},
+    {"~Y~1L<FLAG_PART_FILL>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~-11H~3L<FLAG_PART_JAPAN_SUN>~Z~+26H",
+     "<FLAG_JAPAN>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_FINLAND>"},
+    {"~Y~7L<FLAG_PART_FILL>~Z~5L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~7L<FLAG_PART_FILL>~Z~5L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_SWEDEN>"},
+    {"~Y~3L<FLAG_PART_FILL>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~1L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~3L<FLAG_PART_FILL>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_DENMARK>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-2H~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~-10H~1L<FLAG_PART_VERT_STRIPE_LEFT>~Z~-5H~1L<FLAG_PART_VERT_STRIPE_"
+     "LEFT>~Z~-23H~7L<FLAG_PART_VERT_STRIPE_RIGHT>~Z~-22H~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L"
+     "<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_NORWAY>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-2H~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~-10H~1L<FLAG_PART_VERT_STRIPE_LEFT>~Z~-5H~1L<FLAG_PART_VERT_STRIPE_"
+     "LEFT>~Z~-23H~3L<FLAG_PART_VERT_STRIPE_RIGHT>~Z~-22H~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L"
+     "<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_ICELAND>"},
+    {"~Y~6L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~3L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+4H~5L<FLAG_PART_PORTUGUAL_1>~Z~+2H~3L<FLAG_PART_PORTUGUAL_2>~Z~+"
+     "2H~1L<FLAG_PART_PORTUGUAL_3>~Z~+47H",
+     "<FLAG_PORTUGUAL>"},
+    {"~Y~3L~~~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-2H~Y~3L~~"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_DUTCH>"},
+    {"~Y~26L<FLAG_PART_FILL>~]~-1H~Y~26L<FLAG_PART_FILL>~Z~-10H~-3V~5L<PAD_PART_DPAD_D>~Z~-10H"
+     "~+6V~5L<PAD_PART_DPAD_U>~Z~-5H~+1V~5L<PAD_PART_DPAD_L>~Z~-14H~+1V~5L<PAD_PART_DPAD_R>~Z"
+     "~-11H~+1V~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~+26H",
+     "<FLAG_BRAZIL>"},
+    {"~Y~3L~~~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~26L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-2H~Y~3L~~"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~26L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_HUNGARY>"},
+    {"~Y~3L<FLAG_PART_FILL>~Z~5L<FLAG_PART_USA_STRIPES_RIGHT>~]~-2H~Y~3L<FLAG_PART_FILL>~Z~5L"
+     "<FLAG_PART_USA_STRIPES_RIGHT>~Z~+26H",
+     "<FLAG_CATALAN>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-5V~3L<FLAG_PART_HORZ_STRIPE"
+     "_BOTTOM>~]~-2H~+5V~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-5V~3L"
+     "<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_POLAND>"},
+    {"~Y~5L~~~Z~26L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-2H~Y~5L~~"
+     "~Z~26L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_LITHUANIA>"},
+    {"~Y~1L<FLAG_PART_FILL>~]~-2H~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-5V~3L"
+     "<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-22H~3L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-22H~-5V~3L"
+     "<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-23H~7L<FLAG_PART_VERT_STRIPE_LEFT>~Z~-26H~-3V~7L"
+     "<PAD_PART_DPAD_D>~Z~+6V~-26H~7L<PAD_PART_DPAD_U>~Z~-21H~+1V~7L<PAD_PART_DPAD_L>~Z~+26H",
+     "<FLAG_CZECH>"},
+    {"~Y~3L~~~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~3L~~"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~-11H~+2V~3L"
+     "<FLAG_PART_JAPAN_SUN>~Z~-9H~+2V~1L+~Z~-8V~-8H~7L-~Z~-8V~-3H~7L-~Z~+26H",
+     "<FLAG_CROATIA>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~21L<FLAG_PART_UK_CROSS_LEFT>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>"
+     "~Z~1L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~21L<FLAG_PART_UK_CROSS_"
+     "RIGHT>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~-4H~1L<FLAG_PART_VERT_STRIPE_LEFT>~Z~1L~~"
+     "~Z~-11H~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~-8V~-8H~3L-~Z~-8V~-4H~3L-~Z~+26H",
+     "<FLAG_GALICIA>"},
+
+    // korean jamo -- only relevant for the language selection since
+    // non-korean languages don't run through the `convert-korean-text` function and hence the
+    // encoding is "normal"
+    {
+        "~Y~Z\\c03.~Z\\c03\\c1a~Z\\c03О~Y~Z\\c03œ~Z\\c03k~Z\\c03г~Y~Z\\c03\\c0f~Z\\c03ç",
+        "<LANGUAGE_KOREAN>",
+        "~Y~Z\x03.~Z\x03\x1a~Z\x03О~Y~Z\x03œ~Z\x03k~Z\x03г~Y~Z\x03\x0f~Z\x03ç",
+    },
+
+    // weird stuff
+    // - descenders
+    {"~+7Vp~-7V", "p"},
+    {"~+7Vy~-7V", "y"},
+    {"~+7Vg~-7V", "g"},
+    {"~+7Vq~-7V", "q"},
+    {"~+1Vj~-1V", "j"},
+
+    // - cryllic
+    {"~+2Vд~-2V", "д"},
+    {"~+4Vу~-4V", "у"},
+    {"~+4Vр~-4V", "р"},
+    {"~+3Vф~-3V", "ф"},
+    {"~+2Vц~-2V", "ц"},
+    {"~+2VД~-2V", "Д"},
+    {"~+2Vщ~-2V", "щ"},
+
+    {"\\\\",
+     "~%"},  // this is 2 slashes, duplicated because we use an escape sequence when decompiling
+
+    // - symbols and ligatures
+    {"~-4H~-3V<SOMETHING>~+3V~-4H",
+     "<SUPERSCRIPT_QUOTE>"},  // used for the 4<__> place in spanish.  the 5th uses the same
+                              // character but looks different...?
+    {"~Y~-6Hº~Z~+10H", "°"},
+
+    // Color / Emphasis
+    {"~[~0L", "<COLOR_DEFAULT>"},
+    {"~[~1L", "<COLOR_WHITE>"},
+    {"~[~2L", "<COLOR_TRANSPARENT>"},
+    {"~[~3L", "<COLOR_RED>"},
+    {"~[~4L", "<COLOR_ORANGE>"},
+    {"~[~5L", "<COLOR_YELLOW>"},
+    {"~[~6L", "<COLOR_GREEN>"},
+    {"~[~7L", "<COLOR_BLUE>"},
+    {"~[~8L", "<COLOR_CYAN>"},
+    {"~[~9L", "<COLOR_PINK>"},
+    {"~[~10L", "<COLOR_MENU-SELECTED>"},
+    {"~[~11L", "<COLOR_MENU-SELECTED-PARENT>"},
+    {"~[~12L", "<COLOR_MENU>"},
+    {"~[~13L", "<COLOR_MENU-PARENT>"},
+    {"~[~14L", "<COLOR_MENU-FUNC-BAD>"},
+    {"~[~15L", "<COLOR_MENU-FLAG-ON>"},
+    {"~[~16L", "<COLOR_MENU-FLAG-ON-PARENT>"},
+    {"~[~17L", "<COLOR_MENU-FLAG-OFF>"},
+    {"~[~18L", "<COLOR_MENU-FLAG-OFF-PARENT>"},
+    {"~[~19L", "<COLOR_MENU-INVALID>"},
+    {"~[~20L", "<COLOR_FLAT-YELLOW>"},
+    {"~[~21L", "<COLOR_COLOR-21>"},
+    {"~[~22L", "<COLOR_PAD-BACK>"},
+    {"~[~23L", "<COLOR_PAD-SHINE>"},
+    {"~[~24L", "<COLOR_PAD-SQUARE>"},
+    {"~[~25L", "<COLOR_PAD-CIRCLE>"},
+    {"~[~26L", "<COLOR_PAD-TRIANGLE>"},
+    {"~[~27L", "<COLOR_PAD-CROSS>"},
+    {"~[~28L", "<COLOR_PROGRESS-OLD-BLUE>"},
+    {"~[~29L", "<COLOR_PROGRESS-OLD-YELLOW>"},
+    {"~[~30L", "<COLOR_PROGRESS-OLD-SELECTED>"},
+    {"~[~31L", "<COLOR_PROGRESS-OLD-PERCENT>"},
+    {"~[~32L", "<COLOR_PROGRESS>"},
+    {"~[~33L", "<COLOR_PROGRESS-SELECTED>"},
+    {"~[~34L", "<COLOR_PROGRESS-FORCE-SELECTED>"},
+    {"~[~35L", "<COLOR_PROGRESS-OPTION-OFF>"},
+    {"~[~36L", "<COLOR_COLOR-36>"},
+    {"~[~37L", "<COLOR_CREDITS-STAFF-TITLE-1>"},
+    {"~[~38L", "<COLOR_CREDITS-STAFF-TITLE-2>"},
+    {"~[~39L", "<COLOR_COLOR-39>"}};
+
+std::vector<EncodeInfo> encode_info_jak3 = {
+    {"ˇ", "\x10"},      // caron
+    {"`", "\x11"},      // grave accent
+    {"'", "\x12"},      // apostrophe
+    {"^", "\x13"},      // circumflex
+    {"<TIL>", "\x14"},  // tilde
+    {"¨", "\x15"},      // umlaut
+    {"º", "\x16"},      // numero/overring
+    {"¡", "\x17"},      // inverted exclamation mark
+    {"¿", "\x18"},      // inverted question mark
+    {"<SOMETHING>", "\x19"},
+    {"ç", "\x1d"},  // c-cedilla
+    {"Ç", "\x1e"},  // c-cedilla
+    {"ß", "\x1f"},  // eszett
+
+    {"œ", "\x5e"},  // ligature o+e
+
+    {"<FLAG_PART_HORZ_STRIPE_MIDDLE>", "\x7f"},
+    {"<FLAG_PART_HORZ_STRIPE_BOTTOM>", "\x80"},
+    {"<FLAG_PART_VERT_STRIPE_LARGE>", "\x81"},
+    {"<FLAG_PART_VERT_STRIPE_RIGHT>", "\x82"},
+    {"<FLAG_PART_VERT_STRIPE_LEFT>", "\x83"},
+    {"<FLAG_PART_VERT_STRIPE_MIDDLE>", "\x84"},
+    {"<FLAG_PART_FILL>", "\x85"},
+    {"<FLAG_PART_JAPAN_SUN>", "\x86"},
+    {"<FLAG_PART_KOREA_TRIGRAMS_LEFT>", "\x87"},
+    {"<FLAG_PART_KOREA_TRIGRAMS_RIGHT>", "\x88"},
+    {"<FLAG_PART_KOREA_CIRCLE_TOP>", "\x89"},
+    {"<FLAG_PART_KOREA_CIRCLE_FILL>", "\x8a"},
+    {"<FLAG_PART_TOP_BOTTOM_STRIPE>", "\x8b"},
+    {"<FLAG_PART_UK_CROSS_LEFT>", "\x8c"},
+    {"<FLAG_PART_UK_CROSS_RIGHT>", "\x8d"},
+    {"<FLAG_PART_UK_FILL_LEFT>", "\x8e"},
+    {"<FLAG_PART_UK_FILL_RIGHT>", "\x8f"},
+    {"<FLAG_PART_USA_STRIPES_RIGHT>", "\x90"},
+    {"<PAD_PART_STICK>", "\x91"},
+    {"<PAD_PART_SELECT>", "\x92"},
+    {"<PAD_PART_TRIGGER_BACK>", "\x93"},
+    {"<PAD_PART_R1_NAME>", "\x94"},
+    {"<PAD_PART_L1_NAME>", "\x95"},
+    {"<PAD_PART_R2_NAME>", "\x96"},
+    {"<PAD_PART_L2_NAME>", "\x97"},
+    {"<PAD_PART_STICK_UP>", "\x98"},
+    {"<PAD_PART_STICK_UP_RIGHT>", "\x99"},
+    {"<FLAG_PART_USA_STRIPES_LEFT>", "\x9a"},
+    {"<FLAG_PART_USA_STARS>", "\x9b"},
+    {"<PAD_PART_STICK_DOWN>", "\x9c"},
+    {"<PAD_PART_STICK_DOWN_LEFT>", "\x9d"},
+    {"<PAD_PART_STICK_LEFT>", "\x9e"},
+    {"<PAD_PART_STICK_UP_LEFT>", "\x9f"},
+    {"<PAD_PART_DPAD_D>", "\xa0"},
+    {"<PAD_PART_DPAD_L>", "\xa1"},
+    {"<PAD_PART_DPAD_U>", "\xa2"},
+    {"<PAD_PART_DPAD_R>", "\xa3"},
+    {"<PAD_PART_STICK_RIGHT>", "\xa4"},
+    {"<PAD_PART_STICK_DOWN_RIGHT>", "\xa5"},
+    {"<PAD_PART_SHOULDER_TOP_LEFT>", "\xa6"},
+    {"<PAD_PART_SHOULDER_TOP_RIGHT>", "\xa7"},
+    {"<PAD_PART_TRIGGER_TOP_LEFT>", "\xa8"},
+    {"<PAD_PART_TRIGGER_TOP_RIGHT>", "\xa9"},
+    {"<PAD_PART_TRIGGER_SHIM1>", "\xaa"},
+    {"<PAD_PART_TRIGGER_SHIM2>", "\xab"},
+    {"<PAD_PART_SHOULDER_SHIM2>", "\xac"},
+
+    {"<PAD_PART_SHOULDER_BOTTOM_LEFT>", "\xb0"},
+    {"<PAD_PART_SHOULDER_BOTTOM_RIGHT>", "\xb1"},
+    {"<PAD_PART_TRIGGER_BOTTOM_LEFT>", "\xb2"},
+    {"<PAD_PART_TRIGGER_BOTTOM_RIGHT>", "\xb3"},
+
+    {"<FLAG_PART_PORTUGUAL_1>", "\xb4"},
+    {"<FLAG_PART_PORTUGUAL_2>", "\xb5"},
+    {"<FLAG_PART_PORTUGUAL_3>", "\xb6"},
+    // b7 have something...anything use it?
+
+    // cryllic
+    // - uppercase
+    {"А", "\xba"},
+    {"Б", "\xbb"},
+    {"В", "\xbc"},
+    {"Г", "\xbd"},
+    {"Д", "\xbe"},
+    {"Е", "\xbf"},
+    // "Ё" - if ever used in subtitles, likely uses the accents at the end
+    {"Ж", "\xc0"},
+    {"З", "\xc1"},
+    {"И", "\xc2"},
+    // blank (c3)
+    // c4
+    // "Й" - if ever used in subtitles, likely uses the accents at the end
+    {"К", "\xc4"},
+    {"Л", "\xc5"},
+    {"М", "\xc6"},
+    {"Н", "\xc7"},
+    {"О", "\xc8"},
+    {"П", "\xc9"},
+    {"Р", "\xca"},
+    {"С", "\xcb"},
+    {"Т", "\xcc"},
+    // blank (cd)
+    // ce
+    {"У", "\xce"},
+    {"Ф", "\xcf"},
+    {"Х", "\xd0"},
+    {"Ц", "\xd1"},
+    {"Ч", "\xd2"},
+    {"Ш", "\xd3"},
+    {"Щ", "\xd4"},
+    {"Ъ", "\xd5"},
+    {"Ы", "\xd6"},
+    {"Ь", "\xd7"},
+    // d8
+    {"Э", "\xd8"},
+    {"Ю", "\xd9"},
+    {"Я", "\xda"},
+    // - lowercase
+    {"а", "\xdb"},
+    {"б", "\xdc"},
+    {"в", "\xdd"},
+    {"г", "\xde"},
+    {"д", "\xdf"},
+    {"е", "\xe0"},
+    {"ё", "\xe1"},
+    // e2
+    {"ж", "\xe2"},
+    {"з", "\xe3"},
+    {"и", "\xe4"},
+    {"й", "\xe5"},
+    {"к", "\xe6"},
+    {"л", "\xe7"},
+    {"м", "\xe8"},
+    {"н", "\xe9"},
+    {"о", "\xea"},
+    {"п", "\xeb"},
+    // ec
+    {"р", "\xec"},
+    {"с", "\xed"},
+    {"т", "\xee"},
+    {"у", "\xef"},
+    {"ф", "\xf0"},
+    {"х", "\xf1"},
+    {"ц", "\xf2"},
+    {"ч", "\xf3"},
+    {"ш", "\xf4"},
+    {"щ", "\xf5"},
+    // f6
+    {"ъ", "\xf6"},
+    {"ы", "\xf7"},
+    {"ь", "\xf8"},
+    {"э", "\xf9"},
+    {"ю", "\xfa"},
+    {"я", "\xfb"},
+    // - extra accents
+    {"RU-TODO-1",
+     "\xfc"},  // NOTE: they never used this in the game text, maybe in subtitles though
+    {"RU-TODO-2",
+     "\xfd"},  // NOTE: they never used this in the game text, maybe in subtitles though
+
+    // {"入", "\x1\x00"}},
+    // {"年", "\x1\x01"}},
+    // punctuation
+    {"・", "\x1\x10"},
+    {"゛", "\x1\x11"},
+    {"゜", "\x1\x12"},
+    {"ー", "\x1\x13"},
+    {"『", "\x1\x14"},
+    {"』", "\x1\x15"},
+    // hiragana
+    {"ぁ", "\x1\x16"},  // -a
+    {"あ", "\x1\x17"},  // a
+    {"ぃ", "\x1\x18"},  // -i
+    {"い", "\x1\x19"},  // i
+    {"ぅ", "\x1\x1a"},  // -u
+    {"う", "\x1\x1b"},  // u
+    {"ぇ", "\x1\x1c"},  // -e
+    {"え", "\x1\x1d"},  // e
+    {"ぉ", "\x1\x1e"},  // -o
+    {"お", "\x1\x1f"},  // o
+    {"か", "\x1\x20"},  // ka
+    {"き", "\x1\x21"},  // ki
+    {"く", "\x1\x22"},  // ku
+    {"け", "\x1\x23"},  // ke
+    {"こ", "\x1\x24"},  // ko
+    {"さ", "\x1\x25"},  // sa
+    {"し", "\x1\x26"},  // shi
+    {"す", "\x1\x27"},  // su
+    {"せ", "\x1\x28"},  // se
+    {"そ", "\x1\x29"},  // so
+    {"た", "\x1\x2a"},  // ta
+    {"ち", "\x1\x2b"},  // chi
+    {"っ", "\x1\x2c"},  // sokuon
+    {"つ", "\x1\x2d"},  // tsu
+    {"て", "\x1\x2e"},  // te
+    {"と", "\x1\x2f"},  // to
+    {"な", "\x1\x30"},  // na
+    {"に", "\x1\x31"},  // ni
+    {"ぬ", "\x1\x32"},  // nu
+    {"ね", "\x1\x33"},  // ne
+    {"の", "\x1\x34"},  // no
+    {"は", "\x1\x35"},  // ha
+    {"ひ", "\x1\x36"},  // hi
+    {"ふ", "\x1\x37"},  // fu
+    {"へ", "\x1\x38"},  // he
+    {"ほ", "\x1\x39"},  // ho
+    {"ま", "\x1\x3a"},  // ma
+    {"み", "\x1\x3b"},  // mi
+    {"む", "\x1\x3c"},  // mu
+    {"め", "\x1\x3d"},  // me
+    {"も", "\x1\x3e"},  // mo
+    {"ゃ", "\x1\x3f"},  // youon ya
+    {"や", "\x1\x40"},  // ya
+    {"ゅ", "\x1\x41"},  // youon yu
+    {"ゆ", "\x1\x42"},  // yu
+    {"ょ", "\x1\x43"},  // youon yo
+    {"よ", "\x1\x44"},  // yo
+    {"ら", "\x1\x45"},  // ra
+    {"り", "\x1\x46"},  // ri
+    {"る", "\x1\x47"},  // ru
+    {"れ", "\x1\x48"},  // re
+    {"ろ", "\x1\x49"},  // ro
+    {"ゎ", "\x1\x4a"},  // -wa
+    {"わ", "\x1\x4b"},  // wa
+    {"を", "\x1\x4c"},  // wo
+    {"ん", "\x1\x4d"},  // -n
+    // katakana
+    {"ァ", "\x1\x4e"},  // -a
+    {"ア", "\x1\x4f"},  // a
+    {"ィ", "\x1\x50"},  // -i
+    {"イ", "\x1\x51"},  // i
+    {"ゥ", "\x1\x52"},  // -u
+    {"ウ", "\x1\x53"},  // u
+    {"ェ", "\x1\x54"},  // -e
+    {"エ", "\x1\x55"},  // e
+    {"ォ", "\x1\x56"},  // -o
+    {"オ", "\x1\x57"},  // o
+    {"カ", "\x1\x58"},  // ka
+    {"キ", "\x1\x59"},  // ki
+    {"ク", "\x1\x5a"},  // ku
+    {"ケ", "\x1\x5b"},  // ke
+    {"コ", "\x1\x5c"},  // ko
+    {"サ", "\x1\x5d"},  // sa
+    {"シ", "\x1\x5e"},  // shi
+    {"ス", "\x1\x5f"},  // su
+    {"セ", "\x1\x60"},  // se
+    {"ソ", "\x1\x61"},  // so
+    {"タ", "\x1\x62"},  // ta
+    {"チ", "\x1\x63"},  // chi
+    {"ッ", "\x1\x64"},  // sokuon
+    {"ツ", "\x1\x65"},  // tsu
+    {"テ", "\x1\x66"},  // te
+    {"ト", "\x1\x67"},  // to
+    {"ナ", "\x1\x68"},  // na
+    {"ニ", "\x1\x69"},  // ni
+    {"ヌ", "\x1\x6a"},  // nu
+    {"ネ", "\x1\x6b"},  // ne
+    {"ノ", "\x1\x6c"},  // no
+    {"ハ", "\x1\x6d"},  // ha
+    {"ヒ", "\x1\x6e"},  // hi
+    {"フ", "\x1\x6f"},  // fu
+    {"ヘ", "\x1\x70"},  // he
+    {"ホ", "\x1\x71"},  // ho
+    {"マ", "\x1\x72"},  // ma
+    {"ミ", "\x1\x73"},  // mi
+    {"ム", "\x1\x74"},  // mu
+    {"メ", "\x1\x75"},  // me
+    {"モ", "\x1\x76"},  // mo
+    {"ャ", "\x1\x77"},  // youon ya
+    {"ヤ", "\x1\x78"},  // ya
+    {"ュ", "\x1\x79"},  // youon yu
+    {"ユ", "\x1\x7a"},  // yu
+    {"ョ", "\x1\x7b"},  // youon yo
+    {"ヨ", "\x1\x7c"},  // yo
+    {"ラ", "\x1\x7d"},  // ra
+    {"リ", "\x1\x7e"},  // ri
+    {"ル", "\x1\x7f"},  // ru
+    {"レ", "\x1\x80"},  // re
+    {"ロ", "\x1\x81"},  // ro
+    {"ヮ", "\x1\x82"},  // -wa
+    {"ワ", "\x1\x83"},  // wa
+    {"ヲ", "\x1\x84"},  // wo
+    {"ン", "\x1\x85"},  // -n
+
+    {"位", "\x1\x8c"},
+    {"遺", "\x1\x8d"},
+    {"院", "\x1\x8e"},
+    {"映", "\x1\x8f"},
+    {"衛", "\x1\x90"},
+    {"応", "\x1\x91"},
+    {"下", "\x1\x92"},
+    {"画", "\x1\x93"},
+    {"解", "\x1\x94"},
+    {"開", "\x1\x95"},
+    {"外", "\x1\x96"},
+    {"害", "\x1\x97"},
+    {"蓋", "\x1\x98"},
+    {"完", "\x1\x99"},
+    {"換", "\x1\x9a"},
+    {"監", "\x1\x9b"},
+    {"間", "\x1\x9c"},
+    {"器", "\x1\x9d"},
+    {"記", "\x1\x9e"},
+    {"逆", "\x1\x9f"},
+    {"救", "\x1\xa0"},
+    {"金", "\x1\xa1"},
+    {"空", "\x1\xa2"},
+    {"掘", "\x1\xa3"},
+    {"警", "\x1\xa4"},
+    {"迎", "\x1\xa5"},
+    {"撃", "\x1\xa6"},
+    {"建", "\x1\xa7"},
+    {"源", "\x1\xa8"},
+    {"現", "\x1\xa9"},
+    {"言", "\x1\xaa"},
+    {"限", "\x1\xab"},
+    {"個", "\x1\xac"},
+    {"庫", "\x1\xad"},
+    {"後", "\x1\xae"},
+    {"語", "\x1\xaf"},
+    {"護", "\x1\xb0"},
+    {"交", "\x1\xb1"},
+    {"功", "\x1\xb2"},
+    {"向", "\x1\xb3"},
+    {"工", "\x1\xb4"},
+    {"攻", "\x1\xb5"},
+    {"溝", "\x1\xb6"},
+    {"行", "\x1\xb7"},
+    {"鉱", "\x1\xb8"},
+    {"降", "\x1\xb9"},
+    {"合", "\x1\xba"},
+    {"告", "\x1\xbb"},
+    {"獄", "\x1\xbc"},
+    {"彩", "\x1\xbd"},
+    {"作", "\x1\xbe"},
+    {"山", "\x1\xbf"},
+    {"使", "\x1\xc0"},
+    {"始", "\x1\xc1"},
+    {"試", "\x1\xc2"},
+    {"字", "\x1\xc3"},
+    {"寺", "\x1\xc4"},
+    {"時", "\x1\xc5"},
+    {"示", "\x1\xc6"},
+    {"自", "\x1\xc7"},
+    {"式", "\x1\xc8"},
+    {"矢", "\x1\xc9"},
+    {"射", "\x1\xca"},
+    {"者", "\x1\xcb"},
+    {"守", "\x1\xcc"},
+    {"手", "\x1\xcd"},
+    {"終", "\x1\xce"},
+    {"週", "\x1\xcf"},
+    {"出", "\x1\xd0"},
+    {"所", "\x1\xd1"},
+    {"書", "\x1\xd2"},
+    {"勝", "\x1\xd3"},
+    {"章", "\x1\xd4"},
+    {"上", "\x1\xd5"},
+    {"乗", "\x1\xd6"},
+    {"場", "\x1\xd7"},
+    {"森", "\x1\xd8"},
+    {"進", "\x1\xd9"},
+    {"人", "\x1\xda"},
+    {"水", "\x1\xdb"},
+    {"数", "\x1\xdc"},
+    {"制", "\x1\xdd"},
+    {"性", "\x1\xde"},
+    {"成", "\x1\xdf"},
+    {"聖", "\x1\xe0"},
+    {"石", "\x1\xe1"},
+    {"跡", "\x1\xe2"},
+    {"先", "\x1\xe3"},
+    {"戦", "\x1\xe4"},
+    {"船", "\x1\xe5"},
+    {"選", "\x1\xe6"},
+    {"走", "\x1\xe7"},
+    {"送", "\x1\xe8"},
+    {"像", "\x1\xe9"},
+    {"造", "\x1\xea"},
+    {"続", "\x1\xeb"},
+    {"対", "\x1\xec"},
+    {"袋", "\x1\xed"},
+    {"台", "\x1\xee"},
+    {"弾", "\x1\xef"},
+    {"地", "\x1\xf0"},
+    {"中", "\x1\xf1"},
+    {"敵", "\x1\xf2"},
+    {"転", "\x1\xf3"},
+    {"電", "\x1\xf4"},
+    {"塔", "\x1\xf5"},
+    {"頭", "\x1\xf6"},
+    {"動", "\x1\xf7"},
+    {"内", "\x1\xf8"},
+    {"日", "\x1\xf9"},
+    {"入", "\x1\xfa"},
+    {"年", "\x1\xfb"},
+    {"能", "\x1\xfc"},
+    {"廃", "\x1\xfd"},
+    {"排", "\x1\xfe"},
+    {"敗", "\x1\xff"},
+
+    {"発", "\x2\x10"},
+    {"反", "\x2\x11"},
+    {"必", "\x2\x12"},
+    {"表", "\x2\x13"},
+    {"武", "\x2\x14"},
+    {"壁", "\x2\x15"},
+    {"墓", "\x2\x16"},
+    {"放", "\x2\x17"},
+    {"方", "\x2\x18"},
+    {"砲", "\x2\x19"},
+    {"妨", "\x2\x1a"},
+    {"北", "\x2\x1b"},
+    {"本", "\x2\x1c"},
+    {"幕", "\x2\x1d"},
+    {"無", "\x2\x1e"},
+    {"迷", "\x2\x1f"},
+    {"面", "\x2\x20"},
+    {"戻", "\x2\x21"},
+    {"紋", "\x2\x22"},
+    {"薬", "\x2\x23"},
+    {"輸", "\x2\x24"},
+    {"勇", "\x2\x25"},
+    {"友", "\x2\x26"},
+    {"遊", "\x2\x27"},
+    {"容", "\x2\x28"},
+    {"要", "\x2\x29"},
+    {"利", "\x2\x2a"},
+    {"了", "\x2\x2b"},
+    {"量", "\x2\x2c"},
+    {"力", "\x2\x2d"},
+    {"練", "\x2\x2e"},
+    {"連", "\x2\x2f"},
+    {"録", "\x2\x30"},
+    {"話", "\x2\x31"},
+    {"墟", "\x2\x32"},
+    {"脱", "\x2\x33"},
+    // {"成", "\x2\x34"},
+    {"旗", "\x2\x35"},
+    {"破", "\x2\x36"},
+    {"壊", "\x2\x37"},
+    {"全", "\x2\x38"},
+    {"滅", "\x2\x39"},
+    {"機", "\x2\x3a"},
+    {"仲", "\x2\x3b"},
+    {"渓", "\x2\x3c"},
+    {"谷", "\x2\x3d"},
+    {"優", "\x2\x3e"},
+    {"探", "\x2\x3f"},
+    {"部", "\x2\x40"},
+    {"索", "\x2\x41"},
+    // {"乗", "\x2\x42"},
+    {"前", "\x2\x43"},
+    {"右", "\x2\x44"},
+    {"左", "\x2\x45"},
+    {"会", "\x2\x46"},
+    {"高", "\x2\x47"},
+    {"低", "\x2\x48"},
+    {"押", "\x2\x49"},
+    {"切", "\x2\x4a"},
+    {"替", "\x2\x4b"},
+    // {"対", "\x2\x4c"},
+    {"秒", "\x2\x4d"},
+    {"箱", "\x2\x4e"},
+    {"泳", "\x2\x4f"},
+    {"～", "\x2\x50"},
+
+    {"闇", "\x2\x56"},
+    {"以", "\x2\x57"},
+    {"屋", "\x2\x58"},
+    {"俺", "\x2\x59"},
+    {"化", "\x2\x5a"},
+    {"界", "\x2\x5b"},
+    {"感", "\x2\x5c"},
+    {"気", "\x2\x5d"},
+    {"却", "\x2\x5e"},
+    {"曲", "\x2\x5f"},
+    {"継", "\x2\x60"},
+    {"権", "\x2\x61"},
+    {"見", "\x2\x62"},
+    {"古", "\x2\x63"},
+    {"好", "\x2\x64"},
+    // {"高", "\x2\x65"},
+    {"才", "\x2\x66"},
+    {"士", "\x2\x67"},
+    {"子", "\x2\x68"},
+    {"次", "\x2\x69"},
+    {"主", "\x2\x6a"},
+    {"種", "\x2\x6b"},
+    {"讐", "\x2\x6c"},
+    {"女", "\x2\x6d"},
+    {"小", "\x2\x6e"},
+    {"焼", "\x2\x6f"},
+    {"証", "\x2\x70"},
+    {"神", "\x2\x71"},
+    {"身", "\x2\x72"},
+    {"寸", "\x2\x73"},
+    {"世", "\x2\x74"},
+    {"想", "\x2\x75"},
+    {"退", "\x2\x76"},
+    {"第", "\x2\x77"},
+    {"着", "\x2\x78"},
+    {"天", "\x2\x79"},
+    {"倒", "\x2\x7a"},
+    {"到", "\x2\x7b"},
+    {"突", "\x2\x7c"},
+    {"爆", "\x2\x7d"},
+    {"番", "\x2\x7e"},
+    {"負", "\x2\x7f"},
+    {"復", "\x2\x80"},
+    {"物", "\x2\x81"},
+    {"眠", "\x2\x82"},
+    {"予", "\x2\x83"},
+    {"用", "\x2\x84"},
+    {"落", "\x2\x85"},
+    {"緑", "\x2\x86"},
+
+    {"封", "\x2\x88"},
+    {"印", "\x2\x89"},
+    {"扉", "\x2\x8a"},
+    {"最", "\x2\x8b"},
+    {"刻", "\x2\x8c"},
+    {"足", "\x2\x8d"},
+};
+
+GameTextFontBank g_font_bank_jak3(GameTextVersion::JAK3,
+                                  &encode_info_jak3,
+                                  &replace_info_jak3,
+                                  &passthrus_jak3);

common/util/font/dbs/font_db_jak3.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "common/util/font/font_utils.h"
+
+/*!
+ * ================================
+ * GAME TEXT FONT BANK - JAK 3
+ * ================================
+ * This font is used in:
+ * - Jak 3
+ */
+// TODO cyrillic
+// TODO - current just using the jak 2 stuff (hopefully it's identical?)
+extern GameTextFontBank g_font_bank_jak3;

common/util/font/dbs/font_db_jakx.cpp

@@ -0,0 +1,888 @@
+#include "font_db_jakx.h"
+
+std::unordered_set<char> passthrus_jakx = {'~', ' ', ',', '.', '-', '+', '(', ')',
+                                           '!', ':', '?', '=', '%', '*', '/', '#',
+                                           ';', '<', '>', '@', '[', '_', ']'};
+
+std::vector<ReplaceInfo> replace_info_jakx = {
+    // other
+    {"A~Y~-21H~-5Vº~Z", "Å"},
+    {"N~Y~-6Hº~Z~+10H", "Nº"},
+    // portuguese
+    {"~+4Vç~-4V", "ç"},
+
+    {"O~Y~-25H~-1V/~Z", "Ø"},
+    {"o~Y~-23H~+4V/~Z", "ø"},
+    {"A~Y~-13H~+8V,~Z", "Ą"},
+    {"a~Y~-8H~+6V,~Z", "ą"},
+    {"E~Y~-6H~+8V,~Z", "Ę"},
+    {"e~Y~-10H~+7V,~Z", "ę"},
+    {"L~Y~-21H~+0V/~Z", "Ł"},
+    {"l~Y~-16H~+0V/~Z", "ł"},  // TODO - this one is ugly, font character addition (small slash)
+    {"Z~Y~-25H~-11Vº~Z", "Ż"},
+    {"z~Y~-23H~-5Vº~Z", "ż"},
+    {"a~Y~-25H~-5Vº~Z", "å"},
+    {"S~Y~-21H~-5V'~Z", "Ś"},
+    {"s~Y~-25H~-5V'~Z", "ś"},
+    {"n~Y~-25H~-5V'~Z", "ń"},
+    {"c~Y~-25H~-5V'~Z", "ć"},
+    {"o~Y~-25H~-4V<TIL>~Z", "õ"},
+    {"a~Y~-25H~-4V<TIL>~Z", "ã"},
+    {"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", "Č"},
+    {"c~Y~-25H~-5Vˇ~Z", "č"},
+    {"D~Y~-27H~-10Vˇ~Z", "Ď"},
+    {"S~Y~-24H~-10Vˇ~Z", "Š"},
+    {"s~Y~-22H~-4Vˇ~Z", "š"},
+    {"Z~Y~-25H~-10Vˇ~Z", "Ž"},
+    {"z~Y~-23H~-4Vˇ~Z", "ž"},
+    {"U~Y~-15H~+5V,~Z", "Ų"},
+    {"u~Y~-15H~+5V,~Z", "ų"},
+    {"U~Y~-20H~-18V-~Z", "Ū"},
+    {"u~Y~-18H~-15V-~Z", "ū"},
+    {"D~Y~-28H~-1V-~Z", "Đ"},
+    {"d~Y~-13H~-10V-~Z", "đ"},
+    {"I~Y~-8H~+4V,~Z", "Į"},
+    {"i~Y~-8H~+4V,~Z", "į"},
+    // czech specific
+    {"U~Y~-24H~-7Vº~Z", "Ů"},
+    {"u~Y~-23H~-5Vº~Z", "ů"},
+    {"t~Y~-7H~-21V,~Z", "ť"},
+
+    // tildes
+    {"N~Y~-22H~-4V<TIL>~Z", "Ñ"},
+    {"n~Y~-24H~-4V<TIL>~Z", "ñ"},
+    {"A~Y~-21H~-5V<TIL>~Z", "Ã"},
+    {"O~Y~-22H~-4V<TIL>~Z", "Õ"},
+
+    // acute accents
+    {"A~Y~-21H~-5V'~Z", "Á"},
+    {"A~Y~-26H~-8V'~Z", "<Á_V2>"},  // unfortunate...
+    {"a~Y~-25H~-5V'~Z", "á"},
+    {"E~Y~-23H~-9V'~Z", "É"},
+    {"e~Y~-26H~-5V'~Z", "é"},
+    {"I~Y~-19H~-8V'~Z", "Í"},
+    {"i~Y~-19H~-8V'~Z", "í"},
+    {"O~Y~-22H~-4V'~Z", "Ó"},
+    {"o~Y~-26H~-4V'~Z", "ó"},
+    {"U~Y~-25H~-8V'~Z", "Ú"},
+    {"u~Y~-24H~-3V'~Z", "ú"},
+    {"Z~Y~-24H~-3V'~Z", "Ź"},
+    {"z~Y~-24H~-3V'~Z", "ź"},
+    // czech specific
+    {"Y~Y~-26H~-5V'~Z", "Ý"},
+    {"~+7Vy~-7V~Y~-24H~-3V'~Z", "ý"},
+
+    // circumflex
+    {"A~Y~-20H~-4V^~Z", "Â"},
+    {"a~Y~-24H~-5V^~Z", "â"},
+    {"E~Y~-20H~-5V^~Z", "Ê"},
+    {"e~Y~-25H~-4V^~Z", "ê"},
+    {"I~Y~-19H~-5V^~Z", "Î"},
+    {"i~Y~-19H~-8V^~Z", "î"},
+    {"O~Y~-20H~-4V^~Z", "Ô"},
+    {"o~Y~-25H~-4V^~Z", "ô"},
+    {"U~Y~-24H~-3V^~Z", "Û"},
+    {"u~Y~-23H~-3V^~Z", "û"},
+
+    // grave accents
+    {"A~Y~-26H~-8V`~Z", "À"},
+    {"a~Y~-25H~-5V`~Z", "à"},
+    {"E~Y~-23H~-9V`~Z", "È"},
+    {"e~Y~-26H~-5V`~Z", "è"},
+    {"I~Y~-19H~-5V`~Z", "Ì"},
+    {"i~Y~-19H~-8V`~Z", "ì"},
+    {"O~Y~-22H~-4V`~Z", "Ò"},
+    {"o~Y~-26H~-4V`~Z", "ò"},
+    {"U~Y~-24H~-3V`~Z", "Ù"},
+    {"u~Y~-24H~-3V`~Z", "ù"},
+
+    // umlaut
+    {"A~Y~-26H~-8V¨~Z", "Ä"},
+    {"a~Y~-25H~-5V¨~Z", "ä"},
+    {"E~Y~-20H~-5V¨~Z", "Ë"},
+    {"e~Y~-25H~-5V¨~Z", "ë"},
+    {"I~Y~-19H~-5V¨~Z", "Ï"},
+    {"i~Y~-26H~-4V¨~Z", "ï"},
+    {"O~Y~-26H~-8V¨~Z", "Ö"},
+    {"o~Y~-26H~-4V¨~Z", "ö"},
+    {"U~Y~-25H~-8V¨~Z", "Ü"},
+    {"u~Y~-24H~-3V¨~Z", "ü"},
+
+    // caron - Ǎ ǎ Ě ě Ǧ ǧ Ǐ ǐ Ǒ ǒ Ǔ ǔ Y̌ y̌
+    {"A~Y~-25H~-9Vˇ~Z", "Ǎ"},
+    {"a~Y~-24H~-5Vˇ~Z", "ǎ"},
+    {"E~Y~-22H~-8Vˇ~Z", "Ě"},
+    {"e~Y~-25H~-4Vˇ~Z", "ě"},
+    {"G~Y~-24H~-8Vˇ~Z", "Ǧ"},
+    {"~+7Vg~-7V~Y~-25H~-4Vˇ~Z", "ǧ"},
+    {"I~Y~-19H~-8Vˇ~Z", "Ǐ"},
+    {"i~Y~-19H~-8Vˇ~Z", "ǐ"},
+    {"O~Y~-25H~-7Vˇ~Z", "Ǒ"},
+    {"o~Y~-25H~-4Vˇ~Z", "ǒ"},
+    {"U~Y~-25H~-6Vˇ~Z", "Ǔ"},
+    {"u~Y~-24H~-3Vˇ~Z", "ǔ"},
+    {"Y~Y~-25H~-5Vˇ~Z", "Y̌"},
+    {"~+7Vy~-7V~Y~-25H~-3Vˇ~Z", "y̌"},
+    // czech specific - Č č Ň ň Ř ř Š š Ž ž Ť
+    {"C~Y~-25H~-9Vˇ~Z", "Č"},
+    {"c~Y~-24H~-5Vˇ~Z", "č"},
+    {"N~Y~-25H~-9Vˇ~Z", "Ň"},
+    {"n~Y~-24H~-5Vˇ~Z", "ň"},
+    {"R~Y~-25H~-9Vˇ~Z", "Ř"},
+    {"r~Y~-22H~-5Vˇ~Z", "ř"},
+    {"S~Y~-25H~-9Vˇ~Z", "Š"},
+    {"s~Y~-22H~-5Vˇ~Z", "š"},
+    {"T~Y~-24H~-7Vˇ~Z", "Ť"},
+    {"Z~Y~-25H~-9Vˇ~Z", "Ž"},
+    {"z~Y~-24H~-5Vˇ~Z", "ž"},
+
+    // dakuten katakana
+    {"~Yウ~Z゛", "ヴ"},
+    {"~Yカ~Z゛", "ガ"},
+    {"~Yキ~Z゛", "ギ"},
+    {"~Yク~Z゛", "グ"},
+    {"~Yケ~Z゛", "ゲ"},
+    {"~Yコ~Z゛", "ゴ"},
+    {"~Yサ~Z゛", "ザ"},
+    {"~Yシ~Z゛", "ジ"},
+    {"~Yス~Z゛", "ズ"},
+    {"~Yセ~Z゛", "ゼ"},
+    {"~Yソ~Z゛", "ゾ"},
+    {"~Yタ~Z゛", "ダ"},
+    {"~Yチ~Z゛", "ヂ"},
+    {"~Yツ~Z゛", "ヅ"},
+    {"~Yテ~Z゛", "デ"},
+    {"~Yト~Z゛", "ド"},
+    {"~Yハ~Z゛", "バ"},
+    {"~Yヒ~Z゛", "ビ"},
+    {"~Yフ~Z゛", "ブ"},
+    {"~Yヘ~Z゛", "ベ"},
+    {"~Yホ~Z゛", "ボ"},
+    // handakuten katakana
+    {"~Yハ~Z゜", "パ"},
+    {"~Yヒ~Z゜", "ピ"},
+    {"~Yフ~Z゜", "プ"},
+    {"~Yヘ~Z゜", "ペ"},
+    {"~Yホ~Z゜", "ポ"},
+    // dakuten hiragana
+    {"~Yか~Z゛", "が"},
+    {"~Yき~Z゛", "ぎ"},
+    {"~Yく~Z゛", "ぐ"},
+    {"~Yけ~Z゛", "げ"},
+    {"~Yこ~Z゛", "ご"},
+    {"~Yさ~Z゛", "ざ"},
+    {"~Yし~Z゛", "じ"},
+    {"~Yす~Z゛", "ず"},
+    {"~Yせ~Z゛", "ぜ"},
+    {"~Yそ~Z゛", "ぞ"},
+    {"~Yた~Z゛", "だ"},
+    {"~Yち~Z゛", "ぢ"},
+    {"~Yつ~Z゛", "づ"},
+    {"~Yて~Z゛", "で"},
+    {"~Yと~Z゛", "ど"},
+    {"~Yは~Z゛", "ば"},
+    {"~Yひ~Z゛", "び"},
+    {"~Yふ~Z゛", "ぶ"},
+    {"~Yへ~Z゛", "べ"},
+    {"~Yほ~Z゛", "ぼ"},
+    // handakuten hiragana
+    {"~Yは~Z゜", "ぱ"},
+    {"~Yひ~Z゜", "ぴ"},
+    {"~Yふ~Z゜", "ぷ"},
+    {"~Yへ~Z゜", "ぺ"},
+    {"~Yほ~Z゜", "ぽ"},
+    // japanese punctuation
+    {",~+8H", "、"},
+    {"~+8H ", "　"},
+
+    // playstation buttons
+    // - face
+    {"~Y~22L<~Z~Y~27L*~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_X>"},
+    {"~Y~22L<~Z~Y~26L;~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_TRIANGLE>"},
+    {"~Y~22L<~Z~Y~25L@~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_CIRCLE>"},
+    {"~Y~22L<~Z~Y~24L#~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<PAD_SQUARE>"},
+    // - dpad
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~3L~+17H~-13V<PAD_PART_DPAD_U>~Z~22L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_UP>"},
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~3L~+17H~-13V<PAD_PART_DPAD_U>~Z~3L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_DOWN>"},
+    {"~Y~22L<PAD_PART_DPAD_L>~Z~22L~+17H~-13V<PAD_PART_DPAD_U>~Z~22L~+17H~+14V<PAD_PART_DPAD_D>~Z~"
+     "22L~+32H<PAD_PART_DPAD_R>~Z~+56H",
+     "<PAD_DPAD_ANY>"},
+    // - shoulder
+    {"~Y~22L~-2H~-12V<PAD_PART_SHOULDER_TOP_LEFT><PAD_PART_SHOULDER_TOP_RIGHT>~Z~22L~-2H~+17V<PAD_"
+     "PART_SHOULDER_BOTTOM_LEFT><PAD_PART_SHOULDER_BOTTOM_RIGHT>~Z~1L~+4H~+3V<PAD_PART_L1_NAME>~Z~+"
+     "38H",
+     "<PAD_L1>"},
+    {"~Y~22L~-2H~-12V<PAD_PART_SHOULDER_TOP_LEFT><PAD_PART_SHOULDER_TOP_RIGHT>~Z~22L~-2H~+17V<PAD_"
+     "PART_SHOULDER_BOTTOM_LEFT><PAD_PART_SHOULDER_BOTTOM_RIGHT>~Z~1L~+6H~+3V<PAD_PART_R1_NAME>~Z~+"
+     "38H",
+     "<PAD_R1>"},
+    {"~Y~22L~-2H~-6V<PAD_PART_TRIGGER_TOP_LEFT><PAD_PART_TRIGGER_TOP_RIGHT>~Z~22L~-2H~+16V<PAD_"
+     "PART_TRIGGER_BOTTOM_LEFT><PAD_PART_TRIGGER_BOTTOM_RIGHT>~Z~1L~+5H~-2V<PAD_PART_R2_NAME>~Z~+"
+     "38H",
+     "<PAD_R2>"},
+    {"~Y~22L~-2H~-6V<PAD_PART_TRIGGER_TOP_LEFT><PAD_PART_TRIGGER_TOP_RIGHT>~Z~22L~-2H~+16V<PAD_"
+     "PART_TRIGGER_BOTTOM_LEFT><PAD_PART_TRIGGER_BOTTOM_RIGHT>~Z~1L~+5H~-2V<PAD_PART_L2_NAME>~Z~+"
+     "38H",
+     "<PAD_L2>"},
+    // - analog
+    {"~1L~+8H~Y<PAD_PART_STICK>~Z~6L~-16H<PAD_PART_STICK_LEFT>~Z~+16h~6L<PAD_PART_STICK_RIGHT>~Z~"
+     "6L~-15V<PAD_PART_STICK_DOWN>~Z~+13V~6L<PAD_PART_STICK_UP>~Z~-10H~+9V~6L<PAD_PART_STICK_UP_"
+     "LEFT>~Z~+10H~+9V~6L<PAD_PART_STICK_UP_RIGHT>~Z~-10H~-11V~6L<PAD_PART_STICK_DOWN_LEFT>~Z~+10H~"
+     "-11V~6L<PAD_PART_STICK_DOWN_RIGHT>~Z~+32H",
+     "<PAD_ANALOG_ANY>"},
+    {"~Y~1L~+8H<PAD_PART_STICK>~Z~6L~-8H<PAD_PART_STICK_LEFT>~Z~+24H~6L<PAD_PART_STICK_RIGHT>~Z~+"
+     "40H",
+     "<PAD_ANALOG_LEFT_RIGHT>"},
+    {"~Y~1L<PAD_PART_STICK>~Z~6L~-15V<PAD_PART_STICK_DOWN>~Z~+13V~6L<PAD_PART_STICK_UP>~Z~+26H",
+     "<PAD_ANALOG_UP_DOWN>"},
+
+    // icons
+    {"~Y~6L<~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<ICON_MISSION_COMPLETE>"},
+    {"~Y~3L<~Z~Y~1L>~Z~Y~23L[~Z~+26H", "<ICON_MISSION_TODO>"},
+
+    // flags
+    {"~Y~6L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~1L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+45H",
+     "<FLAG_ITALIAN>"},
+    {"~Y~5L<FLAG_PART_FILL>~Z~3L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-1H~Y~5L<FLAG_PART_FILL>~Z~3L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~+26H",
+     "<FLAG_SPAIN>"},
+    {"~Y~39L~~~Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_HORZ_STRIPE_BOTTOM>~]~-1H~Y~39L~~~"
+     "Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_HORZ_STRIPE_BOTTOM>~Z~+26H",
+     "<FLAG_GERMAN>"},
+    {"~Y~7L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+15H~1L<FLAG_PART_VERT_STRIPE_LARGE>~Z~+30H~3L<FLAG_"
+     "PART_VERT_STRIPE_LARGE>~Z~+47H",
+     "<FLAG_FRANCE>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_UK_CROSS_LEFT>~Z~7L<FLAG_PART_UK_FILL_LEFT>~]~-1H~Y~1L<"
+     "FLAG_PART_FILL>~Z~3L<FLAG_PART_UK_CROSS_RIGHT>~Z~7L<FLAG_PART_UK_FILL_RIGHT>~Z~+26H",
+     "<FLAG_UK>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_USA_STRIPES_LEFT>~Z~7L<FLAG_PART_USA_STARS>~]~-1H~Y~1L<"
+     "FLAG_PART_FILL>~Z~3L<FLAG_PART_USA_STRIPES_RIGHT>~Z~+26H",
+     "<FLAG_USA>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~39L<FLAG_PART_KOREA_TRIGRAMS_LEFT>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~39L<"
+     "FLAG_PART_KOREA_TRIGRAMS_RIGHT>~Z~-11H~7L<FLAG_PART_KOREA_CIRCLE_FILL>~Z~-11H~3L<FLAG_PART_"
+     "KOREA_CIRCLE_TOP>~Z~+26H",
+     "<FLAG_KOREA>"},
+    {"~Y~1L<FLAG_PART_FILL>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~-11H~3L<FLAG_PART_JAPAN_SUN>~Z~+26H",
+     "<FLAG_JAPAN>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_FINLAND>"},
+    {"~Y~7L<FLAG_PART_FILL>~Z~5L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~5L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~7L<FLAG_PART_FILL>~Z~5L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_SWEDEN>"},
+    {"~Y~3L<FLAG_PART_FILL>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~1L<FLAG_PART_VERT_STRIPE_RIGHT>~]"
+     "~-1H~Y~3L<FLAG_PART_FILL>~Z~1L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~+26H",
+     "<FLAG_DENMARK>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~3L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~-19H~1L<FLAG_PART_VERT_STRIPE_MIDDLE>~Z~-23H~7L<FLAG_PART_VERT_"
+     "STRIPE_RIGHT>~Z~-23H~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~7L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~"
+     "+26H",
+     "<FLAG_NORWAY>"},
+    {"~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_PART_TOP_BOTTOM_STRIPE>~]~-1H~Y~1L<FLAG_PART_FILL>~Z~7L<FLAG_"
+     "PART_TOP_BOTTOM_STRIPE>~Z~-19H~1L<FLAG_PART_VERT_STRIPE_MIDDLE>~Z~-23H~3L<FLAG_PART_VERT_"
+     "STRIPE_RIGHT>~Z~-23H~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~3L<FLAG_PART_HORZ_STRIPE_MIDDLE>~Z~"
+     "+26H",
+     "<FLAG_ICELAND>"},
+
+    // weird stuff
+    // - descenders
+    {"~+7Vp~-7V", "p"},
+    {"~+7Vy~-7V", "y"},
+    {"~+7Vg~-7V", "g"},
+    {"~+7Vq~-7V", "q"},
+    {"~+1Vj~-1V", "j"},
+
+    // - cryllic
+    {"~+2Vд~-2V", "д"},
+    {"~+4Vу~-4V", "у"},
+    {"~+4Vр~-4V", "р"},
+    {"~+3Vф~-3V", "ф"},
+    {"~+2Vц~-2V", "ц"},
+    {"~+2VД~-2V", "Д"},
+    {"~+2Vщ~-2V", "щ"},
+
+    {"\\\\",
+     "~%"},  // this is 2 slashes, duplicated because we use an escape sequence when decompiling
+
+    // - symbols and ligatures
+    {"~-4H~-3V<SOMETHING>~+3V~-4H",
+     "<SUPERSCRIPT_QUOTE>"},  // used for the 4<__> place in spanish.  the 5th uses the same
+                              // character but looks different...?
+    {"~Y~-6Hº~Z~+10H", "°"},
+
+    // Color / Emphasis
+    {"~[~0L", "<COLOR_DEFAULT>"},
+    {"~[~1L", "<COLOR_WHITE>"},
+    {"~[~2L", "<COLOR_TRANSPARENT>"},
+    {"~[~3L", "<COLOR_RED>"},
+    {"~[~4L", "<COLOR_ORANGE>"},
+    {"~[~5L", "<COLOR_YELLOW>"},
+    {"~[~6L", "<COLOR_GREEN>"},
+    {"~[~7L", "<COLOR_BLUE>"},
+    {"~[~8L", "<COLOR_CYAN>"},
+    {"~[~9L", "<COLOR_PINK>"},
+    {"~[~10L", "<COLOR_MENU-SELECTED>"},
+    {"~[~11L", "<COLOR_MENU-SELECTED-PARENT>"},
+    {"~[~12L", "<COLOR_MENU>"},
+    {"~[~13L", "<COLOR_MENU-PARENT>"},
+    {"~[~14L", "<COLOR_MENU-FUNC-BAD>"},
+    {"~[~15L", "<COLOR_MENU-FLAG-ON>"},
+    {"~[~16L", "<COLOR_MENU-FLAG-ON-PARENT>"},
+    {"~[~17L", "<COLOR_MENU-FLAG-OFF>"},
+    {"~[~18L", "<COLOR_MENU-FLAG-OFF-PARENT>"},
+    {"~[~19L", "<COLOR_MENU-INVALID>"},
+    {"~[~20L", "<COLOR_FLAT-YELLOW>"},
+    {"~[~21L", "<COLOR_COLOR-21>"},
+    {"~[~22L", "<COLOR_PAD-BACK>"},
+    {"~[~23L", "<COLOR_PAD-SHINE>"},
+    {"~[~24L", "<COLOR_PAD-SQUARE>"},
+    {"~[~25L", "<COLOR_PAD-CIRCLE>"},
+    {"~[~26L", "<COLOR_PAD-TRIANGLE>"},
+    {"~[~27L", "<COLOR_PAD-CROSS>"},
+    {"~[~28L", "<COLOR_PROGRESS-OLD-BLUE>"},
+    {"~[~29L", "<COLOR_PROGRESS-OLD-YELLOW>"},
+    {"~[~30L", "<COLOR_PROGRESS-OLD-SELECTED>"},
+    {"~[~31L", "<COLOR_PROGRESS-OLD-PERCENT>"},
+    {"~[~32L", "<COLOR_PROGRESS>"},
+    {"~[~33L", "<COLOR_PROGRESS-SELECTED>"},
+    {"~[~34L", "<COLOR_PROGRESS-FORCE-SELECTED>"},
+    {"~[~35L", "<COLOR_PROGRESS-OPTION-OFF>"},
+    {"~[~36L", "<COLOR_COLOR-36>"},
+    {"~[~37L", "<COLOR_CREDITS-STAFF-TITLE-1>"},
+    {"~[~38L", "<COLOR_CREDITS-STAFF-TITLE-2>"},
+    {"~[~39L", "<COLOR_COLOR-39>"}};
+
+// TODO - cryllic
+
+std::vector<EncodeInfo> encode_info_jakx = {
+    {"ˇ", "\x10"},      // caron
+    {"`", "\x11"},      // grave accent
+    {"'", "\x12"},      // apostrophe
+    {"^", "\x13"},      // circumflex
+    {"<TIL>", "\x14"},  // tilde
+    {"¨", "\x15"},      // umlaut
+    {"º", "\x16"},      // numero/overring
+    {"¡", "\x17"},      // inverted exclamation mark
+    {"¿", "\x18"},      // inverted question mark
+    {"<SOMETHING>", "\x19"},
+    {"ç", "\x1d"},  // c-cedilla
+    {"Ç", "\x1e"},  // c-cedilla
+    {"ß", "\x1f"},  // eszett
+
+    {"œ", "\x5e"},  // ligature o+e
+
+    {"<FLAG_PART_HORZ_STRIPE_MIDDLE>", "\x7f"},
+    {"<FLAG_PART_HORZ_STRIPE_BOTTOM>", "\x80"},
+    {"<FLAG_PART_VERT_STRIPE_LARGE>", "\x81"},
+    {"<FLAG_PART_VERT_STRIPE_RIGHT>", "\x82"},
+    {"<FLAG_PART_VERT_STRIPE_LEFT>", "\x83"},
+    {"<FLAG_PART_VERT_STRIPE_MIDDLE>", "\x84"},
+    {"<FLAG_PART_FILL>", "\x85"},
+    {"<FLAG_PART_JAPAN_SUN>", "\x86"},
+    {"<FLAG_PART_KOREA_TRIGRAMS_LEFT>", "\x87"},
+    {"<FLAG_PART_KOREA_TRIGRAMS_RIGHT>", "\x88"},
+    {"<FLAG_PART_KOREA_CIRCLE_TOP>", "\x89"},
+    {"<FLAG_PART_KOREA_CIRCLE_FILL>", "\x8a"},
+    {"<FLAG_PART_TOP_BOTTOM_STRIPE>", "\x8b"},
+    {"<FLAG_PART_UK_CROSS_LEFT>", "\x8c"},
+    {"<FLAG_PART_UK_CROSS_RIGHT>", "\x8d"},
+    {"<FLAG_PART_UK_FILL_LEFT>", "\x8e"},
+    {"<FLAG_PART_UK_FILL_RIGHT>", "\x8f"},
+    {"<FLAG_PART_USA_STRIPES_RIGHT>", "\x90"},
+    {"<PAD_PART_STICK>", "\x91"},
+    {"<PAD_PART_SELECT>", "\x92"},
+    {"<PAD_PART_TRIGGER_BACK>", "\x93"},
+    {"<PAD_PART_R1_NAME>", "\x94"},
+    {"<PAD_PART_L1_NAME>", "\x95"},
+    {"<PAD_PART_R2_NAME>", "\x96"},
+    {"<PAD_PART_L2_NAME>", "\x97"},
+    {"<PAD_PART_STICK_UP>", "\x98"},
+    {"<PAD_PART_STICK_UP_RIGHT>", "\x99"},
+    {"<FLAG_PART_USA_STRIPES_LEFT>", "\x9a"},
+    {"<FLAG_PART_USA_STARS>", "\x9b"},
+    {"<PAD_PART_STICK_DOWN>", "\x9c"},
+    {"<PAD_PART_STICK_DOWN_LEFT>", "\x9d"},
+    {"<PAD_PART_STICK_LEFT>", "\x9e"},
+    {"<PAD_PART_STICK_UP_LEFT>", "\x9f"},
+    {"<PAD_PART_DPAD_D>", "\xa0"},
+    {"<PAD_PART_DPAD_L>", "\xa1"},
+    {"<PAD_PART_DPAD_U>", "\xa2"},
+    {"<PAD_PART_DPAD_R>", "\xa3"},
+    {"<PAD_PART_STICK_RIGHT>", "\xa4"},
+    {"<PAD_PART_STICK_DOWN_RIGHT>", "\xa5"},
+    {"<PAD_PART_SHOULDER_TOP_LEFT>", "\xa6"},
+    {"<PAD_PART_SHOULDER_TOP_RIGHT>", "\xa7"},
+    {"<PAD_PART_TRIGGER_TOP_LEFT>", "\xa8"},
+    {"<PAD_PART_TRIGGER_TOP_RIGHT>", "\xa9"},
+    {"<PAD_PART_TRIGGER_SHIM1>", "\xaa"},
+    {"<PAD_PART_TRIGGER_SHIM2>", "\xab"},
+    {"<PAD_PART_SHOULDER_SHIM2>", "\xac"},
+
+    {"<PAD_PART_SHOULDER_BOTTOM_LEFT>", "\xb0"},
+    {"<PAD_PART_SHOULDER_BOTTOM_RIGHT>", "\xb1"},
+    {"<PAD_PART_TRIGGER_BOTTOM_LEFT>", "\xb2"},
+    {"<PAD_PART_TRIGGER_BOTTOM_RIGHT>", "\xb3"},
+
+    // cryllic
+    // - uppercase
+    {"А", "\xba"},
+    {"Б", "\xbb"},
+    {"В", "\xbc"},
+    {"Г", "\xbd"},
+    {"Д", "\xbe"},
+    {"Е", "\xbf"},
+    // "Ё" - if ever used in subtitles, likely uses the accents at the end
+    {"Ж", "\xc0"},
+    {"З", "\xc1"},
+    {"И", "\xc2"},
+    // blank (c3)
+    // c4
+    // "Й" - if ever used in subtitles, likely uses the accents at the end
+    {"К", "\xc4"},
+    {"Л", "\xc5"},
+    {"М", "\xc6"},
+    {"Н", "\xc7"},
+    {"О", "\xc8"},
+    {"П", "\xc9"},
+    {"Р", "\xca"},
+    {"С", "\xcb"},
+    {"Т", "\xcc"},
+    // blank (cd)
+    // ce
+    {"У", "\xce"},
+    {"Ф", "\xcf"},
+    {"Х", "\xd0"},
+    {"Ц", "\xd1"},
+    {"Ч", "\xd2"},
+    {"Ш", "\xd3"},
+    {"Щ", "\xd4"},
+    {"Ъ", "\xd5"},
+    {"Ы", "\xd6"},
+    {"Ь", "\xd7"},
+    // d8
+    {"Э", "\xd8"},
+    {"Ю", "\xd9"},
+    {"Я", "\xda"},
+    // - lowercase
+    {"а", "\xdb"},
+    {"б", "\xdc"},
+    {"в", "\xdd"},
+    {"г", "\xde"},
+    {"д", "\xdf"},
+    {"е", "\xe0"},
+    {"ё", "\xe1"},
+    // e2
+    {"ж", "\xe2"},
+    {"з", "\xe3"},
+    {"и", "\xe4"},
+    {"й", "\xe5"},
+    {"к", "\xe6"},
+    {"л", "\xe7"},
+    {"м", "\xe8"},
+    {"н", "\xe9"},
+    {"о", "\xea"},
+    {"п", "\xeb"},
+    // ec
+    {"р", "\xec"},
+    {"с", "\xed"},
+    {"т", "\xee"},
+    {"у", "\xef"},
+    {"ф", "\xf0"},
+    {"х", "\xf1"},
+    {"ц", "\xf2"},
+    {"ч", "\xf3"},
+    {"ш", "\xf4"},
+    {"щ", "\xf5"},
+    // f6
+    {"ъ", "\xf6"},
+    {"ы", "\xf7"},
+    {"ь", "\xf8"},
+    {"э", "\xf9"},
+    {"ю", "\xfa"},
+    {"я", "\xfb"},
+    // - extra accents
+    {"RU-TODO-1",
+     "\xfc"},  // NOTE: they never used this in the game text, maybe in subtitles though
+    {"RU-TODO-2",
+     "\xfd"},  // NOTE: they never used this in the game text, maybe in subtitles though
+
+    // {"入", "\x1\x00"}},
+    // {"年", "\x1\x01"}},
+    // punctuation
+    {"・", "\x1\x10"},
+    {"゛", "\x1\x11"},
+    {"゜", "\x1\x12"},
+    {"ー", "\x1\x13"},
+    {"『", "\x1\x14"},
+    {"』", "\x1\x15"},
+    // hiragana
+    {"ぁ", "\x1\x16"},  // -a
+    {"あ", "\x1\x17"},  // a
+    {"ぃ", "\x1\x18"},  // -i
+    {"い", "\x1\x19"},  // i
+    {"ぅ", "\x1\x1a"},  // -u
+    {"う", "\x1\x1b"},  // u
+    {"ぇ", "\x1\x1c"},  // -e
+    {"え", "\x1\x1d"},  // e
+    {"ぉ", "\x1\x1e"},  // -o
+    {"お", "\x1\x1f"},  // o
+    {"か", "\x1\x20"},  // ka
+    {"き", "\x1\x21"},  // ki
+    {"く", "\x1\x22"},  // ku
+    {"け", "\x1\x23"},  // ke
+    {"こ", "\x1\x24"},  // ko
+    {"さ", "\x1\x25"},  // sa
+    {"し", "\x1\x26"},  // shi
+    {"す", "\x1\x27"},  // su
+    {"せ", "\x1\x28"},  // se
+    {"そ", "\x1\x29"},  // so
+    {"た", "\x1\x2a"},  // ta
+    {"ち", "\x1\x2b"},  // chi
+    {"っ", "\x1\x2c"},  // sokuon
+    {"つ", "\x1\x2d"},  // tsu
+    {"て", "\x1\x2e"},  // te
+    {"と", "\x1\x2f"},  // to
+    {"な", "\x1\x30"},  // na
+    {"に", "\x1\x31"},  // ni
+    {"ぬ", "\x1\x32"},  // nu
+    {"ね", "\x1\x33"},  // ne
+    {"の", "\x1\x34"},  // no
+    {"は", "\x1\x35"},  // ha
+    {"ひ", "\x1\x36"},  // hi
+    {"ふ", "\x1\x37"},  // fu
+    {"へ", "\x1\x38"},  // he
+    {"ほ", "\x1\x39"},  // ho
+    {"ま", "\x1\x3a"},  // ma
+    {"み", "\x1\x3b"},  // mi
+    {"む", "\x1\x3c"},  // mu
+    {"め", "\x1\x3d"},  // me
+    {"も", "\x1\x3e"},  // mo
+    {"ゃ", "\x1\x3f"},  // youon ya
+    {"や", "\x1\x40"},  // ya
+    {"ゅ", "\x1\x41"},  // youon yu
+    {"ゆ", "\x1\x42"},  // yu
+    {"ょ", "\x1\x43"},  // youon yo
+    {"よ", "\x1\x44"},  // yo
+    {"ら", "\x1\x45"},  // ra
+    {"り", "\x1\x46"},  // ri
+    {"る", "\x1\x47"},  // ru
+    {"れ", "\x1\x48"},  // re
+    {"ろ", "\x1\x49"},  // ro
+    {"ゎ", "\x1\x4a"},  // -wa
+    {"わ", "\x1\x4b"},  // wa
+    {"を", "\x1\x4c"},  // wo
+    {"ん", "\x1\x4d"},  // -n
+    // katakana
+    {"ァ", "\x1\x4e"},  // -a
+    {"ア", "\x1\x4f"},  // a
+    {"ィ", "\x1\x50"},  // -i
+    {"イ", "\x1\x51"},  // i
+    {"ゥ", "\x1\x52"},  // -u
+    {"ウ", "\x1\x53"},  // u
+    {"ェ", "\x1\x54"},  // -e
+    {"エ", "\x1\x55"},  // e
+    {"ォ", "\x1\x56"},  // -o
+    {"オ", "\x1\x57"},  // o
+    {"カ", "\x1\x58"},  // ka
+    {"キ", "\x1\x59"},  // ki
+    {"ク", "\x1\x5a"},  // ku
+    {"ケ", "\x1\x5b"},  // ke
+    {"コ", "\x1\x5c"},  // ko
+    {"サ", "\x1\x5d"},  // sa
+    {"シ", "\x1\x5e"},  // shi
+    {"ス", "\x1\x5f"},  // su
+    {"セ", "\x1\x60"},  // se
+    {"ソ", "\x1\x61"},  // so
+    {"タ", "\x1\x62"},  // ta
+    {"チ", "\x1\x63"},  // chi
+    {"ッ", "\x1\x64"},  // sokuon
+    {"ツ", "\x1\x65"},  // tsu
+    {"テ", "\x1\x66"},  // te
+    {"ト", "\x1\x67"},  // to
+    {"ナ", "\x1\x68"},  // na
+    {"ニ", "\x1\x69"},  // ni
+    {"ヌ", "\x1\x6a"},  // nu
+    {"ネ", "\x1\x6b"},  // ne
+    {"ノ", "\x1\x6c"},  // no
+    {"ハ", "\x1\x6d"},  // ha
+    {"ヒ", "\x1\x6e"},  // hi
+    {"フ", "\x1\x6f"},  // fu
+    {"ヘ", "\x1\x70"},  // he
+    {"ホ", "\x1\x71"},  // ho
+    {"マ", "\x1\x72"},  // ma
+    {"ミ", "\x1\x73"},  // mi
+    {"ム", "\x1\x74"},  // mu
+    {"メ", "\x1\x75"},  // me
+    {"モ", "\x1\x76"},  // mo
+    {"ャ", "\x1\x77"},  // youon ya
+    {"ヤ", "\x1\x78"},  // ya
+    {"ュ", "\x1\x79"},  // youon yu
+    {"ユ", "\x1\x7a"},  // yu
+    {"ョ", "\x1\x7b"},  // youon yo
+    {"ヨ", "\x1\x7c"},  // yo
+    {"ラ", "\x1\x7d"},  // ra
+    {"リ", "\x1\x7e"},  // ri
+    {"ル", "\x1\x7f"},  // ru
+    {"レ", "\x1\x80"},  // re
+    {"ロ", "\x1\x81"},  // ro
+    {"ヮ", "\x1\x82"},  // -wa
+    {"ワ", "\x1\x83"},  // wa
+    {"ヲ", "\x1\x84"},  // wo
+    {"ン", "\x1\x85"},  // -n
+
+    {"位", "\x1\x8c"},
+    {"遺", "\x1\x8d"},
+    {"院", "\x1\x8e"},
+    {"映", "\x1\x8f"},
+    {"衛", "\x1\x90"},
+    {"応", "\x1\x91"},
+    {"下", "\x1\x92"},
+    {"画", "\x1\x93"},
+    {"解", "\x1\x94"},
+    {"開", "\x1\x95"},
+    {"外", "\x1\x96"},
+    {"害", "\x1\x97"},
+    {"蓋", "\x1\x98"},
+    {"完", "\x1\x99"},
+    {"換", "\x1\x9a"},
+    {"監", "\x1\x9b"},
+    {"間", "\x1\x9c"},
+    {"器", "\x1\x9d"},
+    {"記", "\x1\x9e"},
+    {"逆", "\x1\x9f"},
+    {"救", "\x1\xa0"},
+    {"金", "\x1\xa1"},
+    {"空", "\x1\xa2"},
+    {"掘", "\x1\xa3"},
+    {"警", "\x1\xa4"},
+    {"迎", "\x1\xa5"},
+    {"撃", "\x1\xa6"},
+    {"建", "\x1\xa7"},
+    {"源", "\x1\xa8"},
+    {"現", "\x1\xa9"},
+    {"言", "\x1\xaa"},
+    {"限", "\x1\xab"},
+    {"個", "\x1\xac"},
+    {"庫", "\x1\xad"},
+    {"後", "\x1\xae"},
+    {"語", "\x1\xaf"},
+    {"護", "\x1\xb0"},
+    {"交", "\x1\xb1"},
+    {"功", "\x1\xb2"},
+    {"向", "\x1\xb3"},
+    {"工", "\x1\xb4"},
+    {"攻", "\x1\xb5"},
+    {"溝", "\x1\xb6"},
+    {"行", "\x1\xb7"},
+    {"鉱", "\x1\xb8"},
+    {"降", "\x1\xb9"},
+    {"合", "\x1\xba"},
+    {"告", "\x1\xbb"},
+    {"獄", "\x1\xbc"},
+    {"彩", "\x1\xbd"},
+    {"作", "\x1\xbe"},
+    {"山", "\x1\xbf"},
+    {"使", "\x1\xc0"},
+    {"始", "\x1\xc1"},
+    {"試", "\x1\xc2"},
+    {"字", "\x1\xc3"},
+    {"寺", "\x1\xc4"},
+    {"時", "\x1\xc5"},
+    {"示", "\x1\xc6"},
+    {"自", "\x1\xc7"},
+    {"式", "\x1\xc8"},
+    {"矢", "\x1\xc9"},
+    {"射", "\x1\xca"},
+    {"者", "\x1\xcb"},
+    {"守", "\x1\xcc"},
+    {"手", "\x1\xcd"},
+    {"終", "\x1\xce"},
+    {"週", "\x1\xcf"},
+    {"出", "\x1\xd0"},
+    {"所", "\x1\xd1"},
+    {"書", "\x1\xd2"},
+    {"勝", "\x1\xd3"},
+    {"章", "\x1\xd4"},
+    {"上", "\x1\xd5"},
+    {"乗", "\x1\xd6"},
+    {"場", "\x1\xd7"},
+    {"森", "\x1\xd8"},
+    {"進", "\x1\xd9"},
+    {"人", "\x1\xda"},
+    {"水", "\x1\xdb"},
+    {"数", "\x1\xdc"},
+    {"制", "\x1\xdd"},
+    {"性", "\x1\xde"},
+    {"成", "\x1\xdf"},
+    {"聖", "\x1\xe0"},
+    {"石", "\x1\xe1"},
+    {"跡", "\x1\xe2"},
+    {"先", "\x1\xe3"},
+    {"戦", "\x1\xe4"},
+    {"船", "\x1\xe5"},
+    {"選", "\x1\xe6"},
+    {"走", "\x1\xe7"},
+    {"送", "\x1\xe8"},
+    {"像", "\x1\xe9"},
+    {"造", "\x1\xea"},
+    {"続", "\x1\xeb"},
+    {"対", "\x1\xec"},
+    {"袋", "\x1\xed"},
+    {"台", "\x1\xee"},
+    {"弾", "\x1\xef"},
+    {"地", "\x1\xf0"},
+    {"中", "\x1\xf1"},
+    {"敵", "\x1\xf2"},
+    {"転", "\x1\xf3"},
+    {"電", "\x1\xf4"},
+    {"塔", "\x1\xf5"},
+    {"頭", "\x1\xf6"},
+    {"動", "\x1\xf7"},
+    {"内", "\x1\xf8"},
+    {"日", "\x1\xf9"},
+    {"入", "\x1\xfa"},
+    {"年", "\x1\xfb"},
+    {"能", "\x1\xfc"},
+    {"廃", "\x1\xfd"},
+    {"排", "\x1\xfe"},
+    {"敗", "\x1\xff"},
+
+    {"発", "\x2\x10"},
+    {"反", "\x2\x11"},
+    {"必", "\x2\x12"},
+    {"表", "\x2\x13"},
+    {"武", "\x2\x14"},
+    {"壁", "\x2\x15"},
+    {"墓", "\x2\x16"},
+    {"放", "\x2\x17"},
+    {"方", "\x2\x18"},
+    {"砲", "\x2\x19"},
+    {"妨", "\x2\x1a"},
+    {"北", "\x2\x1b"},
+    {"本", "\x2\x1c"},
+    {"幕", "\x2\x1d"},
+    {"無", "\x2\x1e"},
+    {"迷", "\x2\x1f"},
+    {"面", "\x2\x20"},
+    {"戻", "\x2\x21"},
+    {"紋", "\x2\x22"},
+    {"薬", "\x2\x23"},
+    {"輸", "\x2\x24"},
+    {"勇", "\x2\x25"},
+    {"友", "\x2\x26"},
+    {"遊", "\x2\x27"},
+    {"容", "\x2\x28"},
+    {"要", "\x2\x29"},
+    {"利", "\x2\x2a"},
+    {"了", "\x2\x2b"},
+    {"量", "\x2\x2c"},
+    {"力", "\x2\x2d"},
+    {"練", "\x2\x2e"},
+    {"連", "\x2\x2f"},
+    {"録", "\x2\x30"},
+    {"話", "\x2\x31"},
+    {"墟", "\x2\x32"},
+    {"脱", "\x2\x33"},
+    // {"成", "\x2\x34"},
+    {"旗", "\x2\x35"},
+    {"破", "\x2\x36"},
+    {"壊", "\x2\x37"},
+    {"全", "\x2\x38"},
+    {"滅", "\x2\x39"},
+    {"機", "\x2\x3a"},
+    {"仲", "\x2\x3b"},
+    {"渓", "\x2\x3c"},
+    {"谷", "\x2\x3d"},
+    {"優", "\x2\x3e"},
+    {"探", "\x2\x3f"},
+    {"部", "\x2\x40"},
+    {"索", "\x2\x41"},
+    // {"乗", "\x2\x42"},
+    {"前", "\x2\x43"},
+    {"右", "\x2\x44"},
+    {"左", "\x2\x45"},
+    {"会", "\x2\x46"},
+    {"高", "\x2\x47"},
+    {"低", "\x2\x48"},
+    {"押", "\x2\x49"},
+    {"切", "\x2\x4a"},
+    {"替", "\x2\x4b"},
+    // {"対", "\x2\x4c"},
+    {"秒", "\x2\x4d"},
+    {"箱", "\x2\x4e"},
+    {"泳", "\x2\x4f"},
+    {"～", "\x2\x50"},
+
+    {"闇", "\x2\x56"},
+    {"以", "\x2\x57"},
+    {"屋", "\x2\x58"},
+    {"俺", "\x2\x59"},
+    {"化", "\x2\x5a"},
+    {"界", "\x2\x5b"},
+    {"感", "\x2\x5c"},
+    {"気", "\x2\x5d"},
+    {"却", "\x2\x5e"},
+    {"曲", "\x2\x5f"},
+    {"継", "\x2\x60"},
+    {"権", "\x2\x61"},
+    {"見", "\x2\x62"},
+    {"古", "\x2\x63"},
+    {"好", "\x2\x64"},
+    // {"高", "\x2\x65"},
+    {"才", "\x2\x66"},
+    {"士", "\x2\x67"},
+    {"子", "\x2\x68"},
+    {"次", "\x2\x69"},
+    {"主", "\x2\x6a"},
+    {"種", "\x2\x6b"},
+    {"讐", "\x2\x6c"},
+    {"女", "\x2\x6d"},
+    {"小", "\x2\x6e"},
+    {"焼", "\x2\x6f"},
+    {"証", "\x2\x70"},
+    {"神", "\x2\x71"},
+    {"身", "\x2\x72"},
+    {"寸", "\x2\x73"},
+    {"世", "\x2\x74"},
+    {"想", "\x2\x75"},
+    {"退", "\x2\x76"},
+    {"第", "\x2\x77"},
+    {"着", "\x2\x78"},
+    {"天", "\x2\x79"},
+    {"倒", "\x2\x7a"},
+    {"到", "\x2\x7b"},
+    {"突", "\x2\x7c"},
+    {"爆", "\x2\x7d"},
+    {"番", "\x2\x7e"},
+    {"負", "\x2\x7f"},
+    {"復", "\x2\x80"},
+    {"物", "\x2\x81"},
+    {"眠", "\x2\x82"},
+    {"予", "\x2\x83"},
+    {"用", "\x2\x84"},
+    {"落", "\x2\x85"},
+    {"緑", "\x2\x86"},
+
+    {"封", "\x2\x88"},
+    {"印", "\x2\x89"},
+    {"扉", "\x2\x8a"},
+    {"最", "\x2\x8b"},
+    {"刻", "\x2\x8c"},
+    {"足", "\x2\x8d"},
+};
+
+GameTextFontBank g_font_bank_jakx(GameTextVersion::JAKX,
+                                  &encode_info_jakx,
+                                  &replace_info_jakx,
+                                  &passthrus_jakx);

common/util/font/dbs/font_db_jakx.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "common/util/font/font_utils.h"
+
+/*!
+ * ================================
+ * GAME TEXT FONT BANK - JAK X
+ * ================================
+ * This font is used in:
+ * - Jak X
+ */
+// TODO cyrillic
+// TODO - current just using the jak 3 stuff (hopefully it's identical?)
+extern GameTextFontBank g_font_bank_jak3;

common/util/font/font_utils.cpp

@@ -0,0 +1,365 @@
+/*!
+ * @file FontUtils.cpp
+ *
+ * Code for handling text and strings in Jak 1's "large font" format.
+ *
+ * MAKE SURE THIS FILE IS ENCODED IN UTF-8!!! The various strings here depend on it.
+ * Always verify the encoding if string detection suddenly goes awry.
+ */
+
+#include "font_utils.h"
+
+#include <algorithm>
+#include <stdexcept>
+#include <string_view>
+
+#include "common/util/Assert.h"
+#include "common/util/FileUtil.h"
+#include "common/util/font/dbs/font_db_jak1.h"
+#include "common/util/font/dbs/font_db_jak2.h"
+#include "common/util/font/dbs/font_db_jak3.h"
+#include "common/util/font/font_utils_korean.h"
+#include "common/util/string_util.h"
+#include "common/versions/versions.h"
+
+#include "fmt/format.h"
+
+void from_json(const json& j, KoreanLookupEntry& obj) {
+  json_deserialize_if_exists(defaultGlyph);
+  json_deserialize_if_exists(alternatives);
+}
+
+std::map<GameTextVersion, GameTextFontBank*> g_font_banks = {
+    {GameTextVersion::JAK1_V1, &g_font_bank_jak1_v1},
+    {GameTextVersion::JAK1_V2, &g_font_bank_jak1_v2},
+    {GameTextVersion::JAK2, &g_font_bank_jak2},
+    {GameTextVersion::JAK3, &g_font_bank_jak3}};
+
+const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap = {
+    {"jak1-v1", GameTextVersion::JAK1_V1},
+    {"jak1-v2", GameTextVersion::JAK1_V2},
+    {"jak2", GameTextVersion::JAK2},
+    {"jak3", GameTextVersion::JAK3}};
+
+const std::string& get_text_version_name(GameTextVersion version) {
+  for (auto& [name, ver] : sTextVerEnumMap) {
+    if (ver == version) {
+      return name;
+    }
+  }
+  throw std::runtime_error(fmt::format("invalid text version {}", fmt::underlying(version)));
+}
+
+GameTextVersion get_text_version_from_name(const std::string& name) {
+  return sTextVerEnumMap.at(name);
+}
+
+GameTextFontBank::GameTextFontBank(GameTextVersion version,
+                                   std::vector<EncodeInfo>* encode_info,
+                                   std::vector<ReplaceInfo>* replace_info,
+                                   std::unordered_set<char>* passthrus)
+    : m_version(version), m_passthrus(passthrus) {
+  // Insert the encode and replacement info into a Trie, much faster lookups that way
+  for (const auto& encoding : *encode_info) {
+    m_encode_to_utf8_trie.insert(encoding.game_bytes, encoding);
+    m_encode_to_game_trie.insert(encoding.utf8, encoding);
+  }
+  for (const auto& replacement : *replace_info) {
+    m_replace_to_utf8_trie.insert(replacement.game_encoding, replacement);
+    m_replace_to_game_trie.insert(replacement.utf8_string, replacement);
+  }
+}
+
+bool GameTextFontBank::is_language_id_korean(const int language_id) const {
+  if (m_version == GameTextVersion::JAK2 && language_id == 6) {
+    return true;
+  } else if (m_version == GameTextVersion::JAK3 && language_id == 7) {
+    return true;
+  }
+  return false;
+}
+
+GameTextFontBank* get_font_bank(GameTextVersion version) {
+  return g_font_banks.at(version);
+}
+
+GameTextFontBank* get_font_bank_from_game_version(GameVersion version) {
+  if (version == GameVersion::Jak1) {
+    // Jak 1 has been patched to use V2
+    return get_font_bank(GameTextVersion::JAK1_V2);
+  } else if (version == GameVersion::Jak2) {
+    auto font_bank = get_font_bank(GameTextVersion::JAK2);
+    return font_bank;
+  } else if (version == GameVersion::Jak3) {
+    return get_font_bank(GameTextVersion::JAK3);
+  } else {
+    ASSERT_MSG(false, "Unsupported game for get_font_bank_from_game_version");
+  }
+}
+
+GameTextFontBank* get_font_bank(const std::string& name) {
+  if (auto it = sTextVerEnumMap.find(name); it == sTextVerEnumMap.end()) {
+    throw std::runtime_error(fmt::format("unknown text version {}", name));
+  } else {
+    return get_font_bank(it->second);
+  }
+}
+
+bool font_bank_exists(GameTextVersion version) {
+  return g_font_banks.find(version) != g_font_banks.cend();
+}
+
+std::string GameTextFontBank::replace_to_game(const std::string& str) const {
+  std::string newstr;
+  newstr.reserve(str.size());
+  for (int i = 0; i < str.length();) {
+    const ReplaceInfo* remap = m_replace_to_game_trie.find_longest_prefix(str, i);
+    if (!remap) {
+      newstr.push_back(str[i]);
+      i += 1;
+    } else {
+      if (!remap->utf8_alternative.empty()) {
+        newstr.append(remap->utf8_alternative);
+      } else {
+        newstr.append(remap->game_encoding);
+      }
+      i += remap->utf8_string.size();
+    }
+  }
+  return newstr;
+}
+
+std::string GameTextFontBank::encode_utf8_to_game(const std::string& str) const {
+  std::string newstr;
+  newstr.reserve(str.size());
+  for (int i = 0; i < str.length();) {
+    auto match = m_encode_to_game_trie.find_longest_prefix(str, i);
+    if (!match) {
+      newstr.push_back(str[i]);
+      i += 1;
+    } else {
+      for (auto b : match->game_bytes) {
+        newstr.push_back(b);
+      }
+      i += match->utf8.size();
+    }
+  }
+  return newstr;
+}
+
+/*!
+ * Turn a normal readable string into a string readable in the in-game font encoding and converts
+ * \cXX escape sequences
+ */
+std::string GameTextFontBank::convert_utf8_to_game(const std::string& str) const {
+  return encode_utf8_to_game(replace_to_game(str));
+}
+
+std::string GameTextFontBank::replace_to_utf8(const std::string& str) const {
+  std::string result;
+  result.reserve(str.size());
+  for (size_t i = 0; i < str.size();) {
+    const ReplaceInfo* remap = m_replace_to_utf8_trie.find_longest_prefix(str, i);
+    if (!remap) {
+      result.push_back(str[i]);
+      i += 1;
+    } else {
+      result.append(remap->utf8_string);
+      i += remap->game_encoding.size();
+    }
+  }
+  return result;
+}
+
+bool GameTextFontBank::valid_char_range(const char& in) const {
+  if (m_version == GameTextVersion::JAK1_V1 || m_version == GameTextVersion::JAK1_V2) {
+    return ((in >= '0' && in <= '9') || (in >= 'A' && in <= 'Z') ||
+            m_passthrus->find(in) != m_passthrus->end()) &&
+           in != '\\';
+  } else if (m_version == GameTextVersion::JAK2 || m_version == GameTextVersion::JAK3 ||
+             m_version == GameTextVersion::JAKX) {
+    return ((in >= '0' && in <= '9') || (in >= 'A' && in <= 'Z') || (in >= 'a' && in <= 'z') ||
+            m_passthrus->find(in) != m_passthrus->end()) &&
+           in != '\\';
+  }
+  return false;
+}
+
+std::string GameTextFontBank::encode_game_to_utf8(const std::string& str) const {
+  std::string newstr;
+  newstr.reserve(str.size());
+  for (size_t i = 0; i < str.size();) {
+    auto encoding = m_encode_to_utf8_trie.find_longest_prefix(str, i);
+    if (!encoding) {
+      // No match: copy valid characters as-is, or escape unknown bytes
+      unsigned char c = static_cast<unsigned char>(str[i]);
+      if (valid_char_range(c) || c == '\n' || c == '\t' || c == '\\' || c == '"') {
+        newstr.push_back(c);
+      } else {
+        newstr += fmt::format("\\c{:02x}", c);
+      }
+      ++i;
+    } else {
+      // Found a match: append its UTF-8 sequence
+      newstr.append(encoding->utf8);
+      i += encoding->game_bytes.size();  // advance past matched game bytes
+    }
+  }
+  return newstr;
+}
+
+std::string GameTextFontBank::convert_game_to_utf8(const char* in) const {
+  // Encode and apply replacement ONCE
+  std::string decoded = replace_to_utf8(encode_game_to_utf8(in));
+
+  // Escape special characters while writing directly into result
+  std::string result;
+  result.reserve(decoded.size());
+  for (size_t i = 0; i < decoded.size(); ++i) {
+    char c = decoded[i];
+    if (c == '\n') {
+      result += "\\n";
+    } else if (c == '\t') {
+      result += "\\t";
+    } else if (c == '\\') {
+      if (i < decoded.size() - 1 && decoded[i + 1] == 'c') {
+        result.push_back(c);  // preserve \cXX
+      } else {
+        result += "\\\\";
+      }
+    } else if (c == '"') {
+      result += "\\\"";
+    } else {
+      result.push_back(c);
+    }
+  }
+
+  return result;
+}
+
+std::string GameTextFontBank::convert_utf8_to_game_korean(const std::string& str) {
+  ASSERT_MSG(m_version == GameTextVersion::JAK2 || m_version == GameTextVersion::JAK3,
+             "Korean is not supported for any game other than Jak 2 and Jak 3 right now");
+  if (!m_korean_db.has_value()) {
+    const auto db_file_path =
+        file_util::get_file_path({"game/assets/fonts/jak2_jak3_korean_db.json"});
+    if (file_util::file_exists(db_file_path)) {
+      auto raw_data = file_util::read_text_file(db_file_path);
+      auto json_data = parse_commented_json(raw_data, "jak2_jak3_korean_db.json");
+      std::unordered_map<std::string, KoreanLookupOrientations> temp_db;
+      json_data.get_to(temp_db);
+      m_korean_db = temp_db;
+    }
+  }
+
+  std::string output;
+  output.reserve(str.size());
+  std::string non_korean_buffer = "";
+  size_t i = 0;
+  while (i < str.size()) {
+    char32_t cp = str_util::next_utf8_char(str, i);
+    if (font_util_korean::is_korean_syllable(cp)) {
+      // flush any non-korean buffer
+      if (!non_korean_buffer.empty()) {
+        output += 0x3;
+        // encode / remap it
+        output += encode_utf8_to_game(replace_to_game(non_korean_buffer));
+        non_korean_buffer = "";
+      }
+      // write out the korean character
+      output += font_util_korean::game_encode_korean_syllable(str, cp, m_korean_db.value());
+    } else {
+      non_korean_buffer += str_util::utf8_encode(cp);
+    }
+  }
+  // flush any non-korean buffer
+  if (!non_korean_buffer.empty()) {
+    output += 0x3;
+    // encode / remap it
+    output += encode_utf8_to_game(replace_to_game(non_korean_buffer));
+    non_korean_buffer = "";
+  }
+  return output;
+}
+
+std::string GameTextFontBank::convert_korean_game_to_utf8(const char* in) const {
+  ASSERT_MSG(m_version == GameTextVersion::JAK2 || m_version == GameTextVersion::JAK3,
+             "Korean is not supported for any game other than Jak 2 and Jak 3 right now");
+  // Korean strings are fully bitstrings, in other words, it's just a bunch of bytes
+  // Some info on the layout:
+  // - Every korean syllable block starts with a `4`
+  //   - The following byte indicates how many glyphs are drawn for that syllable block
+  // - Each jamo that makes up the syllable block follows as a single byte
+  //   - Unless the jamo is part of the "extra" texture page, in which case it's preceeded by a `5`.
+  //   There are very few jamo that are and they are only applicable for the final consonant
+  // - The korean strings can contain non-korean characters.  These are preceeded by a `3`
+  //   - For example a space would be `3 20`
+  //   - It might be more accurate to say that a 3 signifies "consume characters as normal until
+  //   something else is encountered (ie. flags or more complex font encodings)"
+  std::string result;
+  std::string_view str(in);
+
+  u64 index = 0;
+  u8 curr_byte = 0;
+  bool in_syllable_block = false;
+  std::string jamo_buffer = "";
+  std::string non_korean_buffer = "";
+  int num_syllable_glyphs = 0;
+  while (index < str.length()) {
+    curr_byte = str.at(index);
+    // new syllable block
+    if (curr_byte == 4) {
+      in_syllable_block = true;
+      if (index + 1 < str.length()) {
+        num_syllable_glyphs = str.at(index + 1);
+        index++;
+      }
+      index++;
+      // flush any non-korean characters
+      if (!non_korean_buffer.empty()) {
+        // handle remap
+        std::string remapped_str = replace_to_utf8(encode_game_to_utf8(non_korean_buffer));
+        result += remapped_str;
+        non_korean_buffer = "";
+      }
+      continue;
+    }
+    if (in_syllable_block) {
+      // extra page
+      std::string glyph_key;
+      u8 hex_byte = curr_byte;
+      if (curr_byte == 5 && index + 1 < str.length()) {
+        hex_byte = str.at(index + 1);
+        glyph_key = fmt::format("extra_0x{:02x}", hex_byte);
+        index++;
+      } else {
+        glyph_key = fmt::format("0x{:02x}", hex_byte);
+      }
+      const auto jamo_list = jamo_glyph_mappings_jak2.find(glyph_key);
+      ASSERT_MSG(jamo_list != jamo_glyph_mappings_jak2.end(),
+                 fmt::format("{} not found in jamo glyph lookup table", glyph_key));
+      for (const auto& jamo : jamo_list->second) {
+        jamo_buffer += jamo;
+      }
+      num_syllable_glyphs--;
+      if (num_syllable_glyphs == 0) {
+        in_syllable_block = false;
+        result += font_util_korean::compose_korean_containing_text(jamo_buffer);
+        jamo_buffer = "";
+      }
+    } else {
+      if (curr_byte != 0x3) {
+        non_korean_buffer.push_back(curr_byte);
+      }
+    }
+    index++;
+  }
+  // flush any non-korean characters
+  if (!non_korean_buffer.empty()) {
+    // handle remap
+    std::string remapped_str = replace_to_utf8(encode_game_to_utf8(non_korean_buffer));
+    result += remapped_str;
+    non_korean_buffer = "";
+  }
+  return result;
+}

common/util/font/font_utils.h

@@ -0,0 +1,105 @@
+#pragma once
+
+#include <map>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+#include "common/common_types.h"
+#include "common/util/Trie.h"
+#include "common/util/font/font_utils_korean.h"
+#include "common/util/json_util.h"
+#include "common/versions/versions.h"
+
+/*!
+ * What bytes a set of characters (UTF-8) correspond to. You can convert to and fro.
+ */
+struct EncodeInfo {
+  std::string utf8;
+  std::string game_bytes;
+};
+
+/*!
+ * Replace an unconventional string of characters with/from something more readable.
+ * For example, turns Ñ into N + ~ + a bunch of modifiers.
+ */
+struct ReplaceInfo {
+  std::string game_encoding;
+  std::string utf8_string;
+  // for some replacements, we want to replace with something different when going from utf8 than
+  // when we originally matched it this is mostly applicable for when we have to max a string with
+  // hex chars that have been converted into `\c00` format but we want to insert the actual raw hex
+  // bytes back.
+  std::string utf8_alternative = "";
+};
+
+// version of the game text file's text encoding. Not real, but we need to differentiate them
+// somehow, since the encoding changes.
+enum class GameTextVersion {
+  JAK1_V1 = 10,  // jak 1 (ntsc-u v1)
+  JAK1_V2 = 11,  // jak 1 (pal+)
+  JAK2 = 20,     // jak 2
+  JAK3 = 30,     // jak 3
+  JAKX = 40      // jak x
+};
+
+/*!
+ * All the information to convert UTF-8 text into game text.
+ */
+class GameTextFontBank {
+  GameTextVersion m_version;  // the version of the game text. we determine this ourselves.
+
+  Trie<EncodeInfo> m_encode_to_utf8_trie;
+  Trie<EncodeInfo> m_encode_to_game_trie;
+  Trie<ReplaceInfo> m_replace_to_utf8_trie;
+  Trie<ReplaceInfo> m_replace_to_game_trie;
+
+  std::unordered_set<char>* m_passthrus;
+  // jamo=>6 orientations with their drawing info
+  std::optional<std::unordered_map<std::string, KoreanLookupOrientations>> m_korean_db =
+      std::nullopt;
+
+  std::string replace_to_utf8(const std::string& str) const;
+  std::string replace_to_game(const std::string& str) const;
+  std::string encode_utf8_to_game(const std::string& str) const;
+  std::string encode_game_to_utf8(const std::string& str) const;
+
+ public:
+  GameTextFontBank(GameTextVersion version,
+                   std::vector<EncodeInfo>* encode_info,
+                   std::vector<ReplaceInfo>* replace_info,
+                   std::unordered_set<char>* passthrus);
+
+  const std::unordered_set<char>* passthrus() const { return m_passthrus; }
+
+  GameTextVersion version() const { return m_version; }
+
+  // TODO - methods would help make this code a lot better for different game versions
+  // hacking it for now
+  bool valid_char_range(const char& in) const;
+  bool is_language_id_korean(const int language_id) const;
+
+  std::string convert_utf8_to_game(const std::string& str) const;
+  std::string convert_game_to_utf8(const char* in) const;
+
+  std::string convert_utf8_to_game_korean(const std::string& str);
+  std::string convert_korean_game_to_utf8(const char* in) const;
+};
+
+extern const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap;
+const std::string& get_text_version_name(GameTextVersion version);
+GameTextVersion get_text_version_from_name(const std::string& name);
+
+/*!
+ * ========================
+ * GAME TEXT FONT BANK LIST
+ * ========================
+ * The list of available font banks and a couple of helper functions.
+ */
+extern std::map<GameTextVersion, GameTextFontBank*> g_font_banks;
+GameTextFontBank* get_font_bank(GameTextVersion version);
+GameTextFontBank* get_font_bank_from_game_version(GameVersion version);
+GameTextFontBank* get_font_bank(const std::string& name);
+bool font_bank_exists(GameTextVersion version);

common/util/font/font_utils_korean.cpp

@@ -0,0 +1,403 @@
+/*
+    MIT License
+
+    Copyright (c) 2017 Jonghwan Hyeon
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+    https://github.com/jonghwanhyeon/hangul-jamo/blob/main/LICENSE
+
+    Code converted to C++ and deals with UTF-8 input
+*/
+
+#include "font_utils_korean.h"
+
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "common/log/log.h"
+#include "common/util/Assert.h"
+#include "common/util/string_util.h"
+
+#include "fmt/format.h"
+
+//
+// Reference: http://www.unicode.org/versions/Unicode8.0.0/ch03.pdf#G24646
+//
+
+const int BASE_OF_SYLLABLES = 0xAC00;
+
+const int BASE_OF_LEADING_CONSONANTS = 0x1100;
+const int BASE_OF_VOWELS = 0x1161;
+// One less than the beginning of the range of trailing consonants (0x11A8)
+const int BASE_OF_TRAILING_CONSONANTS = 0x11A7;
+
+const int NUMBER_OF_LEADING_CONSONANTS = 19;
+const int NUMBER_OF_VOWELS = 21;
+// One more than the number of trailing consonants
+const int NUMBER_OF_TRAILING_CONSONANTS = 28;
+
+const int NUMBER_OF_SYLLABLES_FOR_EACH_LEADING_CONSONANT =
+    NUMBER_OF_VOWELS * NUMBER_OF_TRAILING_CONSONANTS;
+const int NUMBER_OF_SYLLABLES =
+    NUMBER_OF_LEADING_CONSONANTS * NUMBER_OF_SYLLABLES_FOR_EACH_LEADING_CONSONANT;
+
+// TODO - fix all of these, these generated wrong
+const std::vector<std::string> LEADING_CONSONANTS = {"ㄱ", "ㄲ", "ㄴ", "ㄷ", "ㄸ", "ㄹ", "ㅁ",
+                                                     "ㅂ", "ㅃ", "ㅅ", "ㅆ", "ㅇ", "ㅈ", "ㅉ",
+                                                     "ㅊ", "ㅋ", "ㅌ", "ㅍ", "ㅎ"};
+
+const std::unordered_map<std::string, int> INDEX_BY_LEADING_CONSONANT = []() {
+  std::unordered_map<std::string, int> m;
+  for (size_t i = 0; i < LEADING_CONSONANTS.size(); ++i) {
+    m[LEADING_CONSONANTS[i]] = static_cast<int>(i);
+  }
+  return m;
+}();
+
+const std::vector<std::string> VOWELS = {"ㅏ", "ㅐ", "ㅑ", "ㅒ", "ㅓ", "ㅔ", "ㅕ",
+                                         "ㅖ", "ㅗ", "ㅘ", "ㅙ", "ㅚ", "ㅛ", "ㅜ",
+                                         "ㅝ", "ㅞ", "ㅟ", "ㅠ", "ㅡ", "ㅢ", "ㅣ"};
+
+const std::unordered_map<std::string, int> INDEX_BY_VOWEL = []() {
+  std::unordered_map<std::string, int> m;
+  for (size_t i = 0; i < VOWELS.size(); ++i) {
+    m[VOWELS[i]] = static_cast<int>(i);
+  }
+  return m;
+}();
+
+const std::vector<std::string> TRAILING_CONSONANTS = {
+    "",   "ᆨ",  "ᆩ", "ᆪ", "ᆫ",  "ᆬ", "ᆭ", "ᆮ", "ᆯ", "ᆯ", "ᆱ", "ㄼ", "ㄽ", "ㄾ",
+    "ㄿ", "ㅀ", "ᆷ", "ᆸ", "ㅄ", "ᆺ", "ᆻ", "ᆼ", "ᆽ", "ᆾ", "ᆿ", "ᇀ",  "ᇁ",  "ᇂ"};
+
+const std::unordered_map<std::string, int> INDEX_BY_TRAILING_CONSONANT = []() {
+  std::unordered_map<std::string, int> m;
+  for (size_t i = 0; i < TRAILING_CONSONANTS.size(); ++i) {
+    m[TRAILING_CONSONANTS[i]] = static_cast<int>(i);
+  }
+  return m;
+}();
+
+bool font_util_korean::is_korean_syllable(char32_t syllable) {
+  int index_of_syllable = syllable - BASE_OF_SYLLABLES;
+  return 0 <= index_of_syllable && index_of_syllable < NUMBER_OF_SYLLABLES;
+}
+
+inline bool is_jamo_character(const std::string& character) {
+  return (std::find(LEADING_CONSONANTS.begin(), LEADING_CONSONANTS.end(), character) !=
+          LEADING_CONSONANTS.end()) ||
+         (std::find(VOWELS.begin(), VOWELS.end(), character) != VOWELS.end()) ||
+         (std::find(TRAILING_CONSONANTS.begin(), TRAILING_CONSONANTS.end(), character) !=
+          TRAILING_CONSONANTS.end());
+}
+
+inline std::string codepoint_to_utf8(char32_t cp) {
+  std::string result;
+  if (cp <= 0x7F) {
+    result += static_cast<char>(cp);
+  } else if (cp <= 0x7FF) {
+    result += static_cast<char>(0xC0 | ((cp >> 6) & 0x1F));
+    result += static_cast<char>(0x80 | (cp & 0x3F));
+  } else if (cp <= 0xFFFF) {
+    result += static_cast<char>(0xE0 | ((cp >> 12) & 0x0F));
+    result += static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+    result += static_cast<char>(0x80 | (cp & 0x3F));
+  } else if (cp <= 0x10FFFF) {
+    result += static_cast<char>(0xF0 | ((cp >> 18) & 0x07));
+    result += static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
+    result += static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+    result += static_cast<char>(0x80 | (cp & 0x3F));
+  }
+  return result;
+}
+
+inline std::string compose_jamo_characters(const std::string& leading_consonant,
+                                           const std::string& vowel,
+                                           const std::optional<std::string>& trailing_consonant) {
+  const int index_of_leading_consonant = INDEX_BY_LEADING_CONSONANT.at(leading_consonant) *
+                                         NUMBER_OF_SYLLABLES_FOR_EACH_LEADING_CONSONANT;
+  const int index_of_vowel = INDEX_BY_VOWEL.at(vowel) * NUMBER_OF_TRAILING_CONSONANTS;
+  const int index_of_leading_consonant_and_vowel = index_of_leading_consonant + index_of_vowel;
+
+  int index_of_trailing = trailing_consonant.has_value()
+                              ? INDEX_BY_TRAILING_CONSONANT.at(trailing_consonant.value())
+                              : 0;
+  int index_of_syllable = index_of_leading_consonant_and_vowel + index_of_trailing;
+
+  return codepoint_to_utf8(BASE_OF_SYLLABLES + index_of_syllable);
+}
+
+std::vector<char32_t> utf8_to_codepoints(const std::string& text) {
+  std::vector<char32_t> codepoints;
+  size_t i = 0;
+  while (i < text.size()) {
+    char32_t cp = 0;
+    unsigned char c = text[i];
+    if (c < 0x80) {
+      cp = c;
+      ++i;
+    } else if ((c >> 5) == 0x6) {
+      cp = ((c & 0x1F) << 6) | (text[i + 1] & 0x3F);
+      i += 2;
+    } else if ((c >> 4) == 0xE) {
+      cp = ((c & 0x0F) << 12) | ((text[i + 1] & 0x3F) << 6) | (text[i + 2] & 0x3F);
+      i += 3;
+    } else if ((c >> 3) == 0x1E) {
+      cp = ((c & 0x07) << 18) | ((text[i + 1] & 0x3F) << 12) | ((text[i + 2] & 0x3F) << 6) |
+           (text[i + 3] & 0x3F);
+      i += 4;
+    } else {
+      ++i;
+    }
+    codepoints.push_back(cp);
+  }
+  return codepoints;
+}
+
+bool is_leading(char32_t c) {
+  // Replace with actual lookup (e.g. return LEADING_CONSONANTS.count(c) > 0;)
+  return (c >= 0x1100 && c <= 0x1112);
+}
+
+bool is_vowel(char32_t c) {
+  return (c >= 0x1161 && c <= 0x1175);
+}
+
+bool is_trailing(char32_t c) {
+  return (c >= 0x11A8 && c <= 0x11C2);
+}
+
+// Compose jamo into a syllable block
+char32_t compose_jamo(char32_t lead, char32_t vowel, std::optional<char32_t> trail = std::nullopt) {
+  char32_t l_index = lead - 0x1100;
+  char32_t v_index = vowel - 0x1161;
+  char32_t t_index = trail ? (*trail - 0x11A7) : 0;
+  return 0xAC00 + (l_index * 21 * 28) + (v_index * 28) + t_index;
+}
+
+std::string font_util_korean::compose_korean_containing_text(const std::string& text) {
+  std::string output;
+  std::vector<char32_t> cps = utf8_to_codepoints(text);
+
+  size_t i = 0;
+  while (i < cps.size()) {
+    char32_t first = cps[i];
+    char32_t second = (i + 1 < cps.size()) ? cps[i + 1] : 0;
+    char32_t third = (i + 2 < cps.size()) ? cps[i + 2] : 0;
+    char32_t fourth = (i + 3 < cps.size()) ? cps[i + 3] : 0;
+    if (is_leading(first) && is_vowel(second) && is_leading(third) && is_vowel(fourth)) {
+      char32_t syllable = compose_jamo(first, second);
+      output += codepoint_to_utf8(syllable);
+      i += 2;  // consume 2 codepoints
+    } else if (is_leading(first) && is_vowel(second) && is_trailing(third)) {
+      char32_t syllable = compose_jamo(first, second, third);
+      output += codepoint_to_utf8(syllable);
+      i += 3;  // consume 3 codepoints
+    } else if (is_leading(first) && is_vowel(second)) {
+      char32_t syllable = compose_jamo(first, second);
+      output += codepoint_to_utf8(syllable);
+      i += 2;  // consume 2 codepoints
+    } else {
+      output += codepoint_to_utf8(first);
+      i += 1;
+    }
+  }
+
+  return output;
+}
+
+// std::string font_util_korean::decompose_korean_containing_text(const std::string& text) {
+//   std::string output;
+//   size_t i = 0;
+//   while (i < text.size()) {
+//     char32_t cp = next_utf8_char(text, i);
+
+//     if (is_syllable(cp)) {
+//       // Decompose Hangul syllable block into jamo
+//       char32_t SIndex = cp - 0xAC00;
+//       char32_t L = 0x1100 + SIndex / (21 * 28);
+//       char32_t V = 0x1161 + (SIndex % (21 * 28)) / 28;
+//       char32_t T = 0x11A7 + (SIndex % 28);
+
+//       output += codepoint_to_utf8(L);
+//       output += codepoint_to_utf8(V);
+//       if (T != 0x11A7) {  // has final consonant
+//         output += codepoint_to_utf8(T);
+//       }
+//     } else {
+//       // For other characters, re-encode as-is
+//       output += codepoint_to_utf8(cp);
+//     }
+//   }
+//   return output;
+// }
+
+bool is_median_vowel_vertical(char32_t vowel) {
+  if ((vowel >= 0x1161 && vowel <= 0x1168) || vowel == 0x1175) {
+    return true;
+  }
+  return false;
+}
+
+bool is_median_vowel_horizontal(char32_t vowel) {
+  if (vowel == 0x1169 || (vowel >= 0x116D && vowel <= 0x116E) ||
+      (vowel >= 0x1172 && vowel <= 0x1173)) {
+    return true;
+  }
+  return false;
+}
+
+bool is_median_vowel_combined(char32_t vowel) {
+  if (vowel >= 0x1161 && vowel <= 0x1175 && !is_median_vowel_vertical(vowel) &&
+      !is_median_vowel_horizontal(vowel)) {
+    return true;
+  }
+  return false;
+}
+
+std::string glyph_hex_string_to_int(const std::string& str) {
+  try {
+    std::string result;
+    if (str_util::starts_with(str, "extra_")) {
+      // handle glyphs on the secondary texture page
+      result += 0x5;
+      std::string temp = str;
+      str_util::replace(temp, "extra_", "");
+      result += std::stoi(temp, nullptr, 0);
+    } else {
+      result += std::stoi(str, nullptr, 0);
+    }
+    return result;
+  } catch (std::exception& e) {
+    lg::error("Unable to convert hex_string_to_int: {}", str);
+    throw;
+  }
+}
+
+std::string font_util_korean::game_encode_korean_syllable(
+    const std::string& context,
+    const char32_t cp,
+    const std::unordered_map<std::string, KoreanLookupOrientations>& db) {
+  std::string output;
+  // Decompose Hangul syllable block into jamo
+  char32_t syllable_index = cp - BASE_OF_SYLLABLES;
+  char32_t initial = BASE_OF_LEADING_CONSONANTS + syllable_index / (21 * 28);
+  char32_t median = BASE_OF_VOWELS + (syllable_index % (21 * 28)) / 28;
+  char32_t final = BASE_OF_TRAILING_CONSONANTS + (syllable_index % 28);
+
+  bool final_present = final != BASE_OF_TRAILING_CONSONANTS;
+  int orientation = -1;
+  // Figure out which orientation we are dealing with
+  if (!final_present) {
+    // orientations 0 - 2
+    if (is_median_vowel_vertical(median)) {
+      orientation = 0;
+    } else if (is_median_vowel_horizontal(median)) {
+      orientation = 1;
+    } else if (is_median_vowel_combined(median)) {
+      orientation = 2;
+    }
+  } else {
+    // orientations 3 - 5
+    if (is_median_vowel_vertical(median)) {
+      orientation = 3;
+    } else if (is_median_vowel_horizontal(median)) {
+      orientation = 4;
+    } else if (is_median_vowel_combined(median)) {
+      orientation = 5;
+    }
+  }
+  ASSERT_MSG(orientation != -1,
+             fmt::format("Unable to deduce drawing orientation for korean syllable block in '{}'",
+                         context));
+
+  // now that we know the orientation, we can consult our lookup database to get the glyphs to
+  // use for all the involved jamo
+  //
+  // convert each jamo to utf-8 bytes since that is what our DB is encoded with.
+  // - first see if the jamo has an alternative drawing glyph, if not, use the default
+  //
+  // the order the glyphs are drawn in does not matter, as they all overlap anyway.
+  std::vector<std::string> glyphs_to_draw = {};
+  const auto initial_utf8 = codepoint_to_utf8(initial);
+  const auto median_utf8 = codepoint_to_utf8(median);
+  if (final == BASE_OF_TRAILING_CONSONANTS) {  // no final consonant
+    const auto initial_alt_lookup_key = fmt::format("<G>,{}", median_utf8);
+    const auto& initial_alts = db.at(initial_utf8).at(orientation).alternatives;
+    if (initial_alts.contains(initial_alt_lookup_key)) {
+      glyphs_to_draw.push_back(glyph_hex_string_to_int(initial_alts.at(initial_alt_lookup_key)));
+    } else {
+      glyphs_to_draw.push_back(
+          glyph_hex_string_to_int(db.at(initial_utf8).at(orientation).defaultGlyph));
+    }
+    const auto median_alt_lookup_key = fmt::format("{},<G>", initial_utf8);
+    const auto& median_alts = db.at(median_utf8).at(orientation).alternatives;
+    if (median_alts.contains(median_alt_lookup_key)) {
+      glyphs_to_draw.push_back(glyph_hex_string_to_int(median_alts.at(median_alt_lookup_key)));
+    } else {
+      glyphs_to_draw.push_back(
+          glyph_hex_string_to_int(db.at(median_utf8).at(orientation).defaultGlyph));
+    }
+  } else {
+    const auto final_utf8 = codepoint_to_utf8(final);
+    const auto initial_alt_lookup_key = fmt::format("<G>,{},{}", median_utf8, final_utf8);
+    const auto& initial_alts = db.at(initial_utf8).at(orientation).alternatives;
+    if (initial_alts.contains(initial_alt_lookup_key)) {
+      glyphs_to_draw.push_back(glyph_hex_string_to_int(initial_alts.at(initial_alt_lookup_key)));
+    } else {
+      glyphs_to_draw.push_back(
+          glyph_hex_string_to_int(db.at(initial_utf8).at(orientation).defaultGlyph));
+    }
+    const auto median_alt_lookup_key = fmt::format("{},<G>,{}", initial_utf8, final_utf8);
+    const auto& median_alts = db.at(median_utf8).at(orientation).alternatives;
+    if (median_alts.contains(median_alt_lookup_key)) {
+      glyphs_to_draw.push_back(glyph_hex_string_to_int(median_alts.at(median_alt_lookup_key)));
+    } else {
+      glyphs_to_draw.push_back(
+          glyph_hex_string_to_int(db.at(median_utf8).at(orientation).defaultGlyph));
+    }
+    const auto final_alt_lookup_key = fmt::format("{},{},<G>", initial_utf8, median_utf8);
+    const auto& final_alts = db.at(final_utf8).at(orientation).alternatives;
+    if (final_alts.contains(final_alt_lookup_key)) {
+      glyphs_to_draw.push_back(glyph_hex_string_to_int(final_alts.at(final_alt_lookup_key)));
+    } else {
+      glyphs_to_draw.push_back(
+          glyph_hex_string_to_int(db.at(final_utf8).at(orientation).defaultGlyph));
+    }
+  }
+
+  // Get rid of any duplicates in the glyphs
+  std::vector<std::string> final_glyphs_to_draw = {};
+  for (const auto& glyph : glyphs_to_draw) {
+    if (std::find(final_glyphs_to_draw.begin(), final_glyphs_to_draw.end(), glyph) ==
+        final_glyphs_to_draw.end()) {
+      final_glyphs_to_draw.push_back(glyph);
+    }
+  }
+
+  output += 0x4;
+  output += final_glyphs_to_draw.size();
+  for (const auto& glyph : final_glyphs_to_draw) {
+    output += glyph;
+  }
+  return output;
+}

common/util/font/font_utils_korean.h

@@ -0,0 +1,54 @@
+/*
+    MIT License
+
+    Copyright (c) 2017 Jonghwan Hyeon
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+    https://github.com/jonghwanhyeon/hangul-jamo/blob/main/LICENSE
+
+    Code converted to C++
+*/
+
+#pragma once
+
+#include <vector>
+
+#include "common/util/json_util.h"
+
+struct KoreanLookupEntry {
+  // glyph to use if no relevant alternative exists
+  std::string defaultGlyph;
+  // context=>glyph
+  // ie. "<G>,\u1166"
+  // when wanting to draw a specific jamo, it's spot is indicated by the <G>
+  std::unordered_map<std::string, std::string> alternatives;
+};
+void from_json(const json& j, KoreanLookupEntry& obj);
+
+typedef std::vector<KoreanLookupEntry> KoreanLookupOrientations;
+
+namespace font_util_korean {
+bool is_korean_syllable(char32_t syllable);
+std::string compose_korean_containing_text(const std::string& text);
+std::string game_encode_korean_syllable(
+    const std::string& context,
+    const char32_t cp,
+    const std::unordered_map<std::string, KoreanLookupOrientations>& db);
+};  // namespace font_util_korean

common/util/gltf_util.cpp

@@ -366,9 +366,11 @@ DrawMode make_default_draw_mode() {
 
 int texture_pool_debug_checker(TexturePool* pool) {
   const auto& existing = pool->textures_by_name.find("DEBUG_CHECKERBOARD");
-  if (existing == pool->textures_by_name.end()) {
+  if (existing == pool->textures_by_name.end() || existing->second.size() == 0) {
     size_t idx = pool->textures_by_idx.size();
-    pool->textures_by_name["DEBUG_CHECKERBOARD"] = idx;
+    std::vector<int> v;
+    v.push_back(idx);
+    pool->textures_by_name["DEBUG_CHECKERBOARD"] = v;
     auto& tex = pool->textures_by_idx.emplace_back();
     tex.w = 16;
     tex.h = 16;
@@ -386,25 +388,36 @@ int texture_pool_debug_checker(TexturePool* pool) {
     }
     return idx;
   } else {
-    return existing->second;
+    return existing->second[0];
   }
 }
 
 int texture_pool_add_texture(TexturePool* pool, const tinygltf::Image& tex, int alpha_shift) {
   const auto& existing = pool->textures_by_name.find(tex.name);
-  if (existing != pool->textures_by_name.end()) {
-    lg::info("Reusing image: {}", tex.name);
-    return existing->second;
+  if (existing != pool->textures_by_name.end() && existing->second.size() > 0) {
+    // name was found, see if we have a match on height+width+data
+    for (int ti : existing->second) {
+      auto& t = pool->textures_by_idx[ti];
+      if (t.w == tex.width && t.h == tex.height &&
+          memcmp(t.data.data(), tex.image.data(), t.data.size() * 4) == 0) {
+        lg::info("Reusing image: {} at idx {}", tex.name, ti);
+        return ti;
+      }
+    }
   } else {
-    lg::info("adding new texture: {}, size {} kB", tex.name, tex.width * tex.height * 4 / 1024);
+    // new name, insert empty vector
+    std::vector<int> v;
+    pool->textures_by_name[tex.name] = v;
   }
 
+  lg::info("adding new texture: {}, size {} kB", tex.name, tex.width * tex.height * 4 / 1024);
+
   ASSERT(tex.bits == 8);
   ASSERT(tex.component == 4);
   ASSERT(tex.pixel_type == TINYGLTF_TEXTURE_TYPE_UNSIGNED_BYTE);
 
   size_t idx = pool->textures_by_idx.size();
-  pool->textures_by_name[tex.name] = idx;
+  pool->textures_by_name[tex.name].push_back(idx);
   auto& tt = pool->textures_by_idx.emplace_back();
   tt.w = tex.width;
   tt.h = tex.height;
@@ -685,14 +698,15 @@ bool material_has_envmap(const tinygltf::Material& mat) {
 }
 
 bool envmap_is_valid(const tinygltf::Material& mat) {
-  if (material_has_envmap(mat) && mat.pbrMetallicRoughness.metallicRoughnessTexture.index < 0) {
+  auto envmap = material_has_envmap(mat);
+  if (envmap && mat.pbrMetallicRoughness.metallicRoughnessTexture.index < 0) {
     lg::warn(fmt::format(
         "Material \"{}\" has specular property set, but is missing a metallic roughness texture, "
         "ignoring envmap!",
         mat.name));
     return false;
   }
-  return true;
+  return envmap;
 }
 
 std::optional<int> find_single_skin(const tinygltf::Model& model,

common/util/gltf_util.h

@@ -59,7 +59,7 @@ ExtractedVertices gltf_vertices(const tinygltf::Model& model,
 DrawMode make_default_draw_mode();
 
 struct TexturePool {
-  std::unordered_map<std::string, int> textures_by_name;
+  std::unordered_map<std::string, std::vector<int>> textures_by_name;
   std::vector<tfrag3::Texture> textures_by_idx;
   std::map<std::pair<int, int>, int> envmap_textures_by_gltf_id;
 };

common/util/os.cpp

@@ -47,6 +47,7 @@ void __cpuidex(int result[4], int eax, int ecx) {
       : "0"(eax), "2"(ecx));
 }
 #else
+// TODO ARM - implement ARM64 detection, check for NEON instead of AVX
 // for now, just return 0's.
 void __cpuidex(int result[4], int eax, int ecx) {
   lg::warn("cpuid not implemented on this platform");

common/util/print_float.cpp

@@ -5,7 +5,7 @@
 #include "common/goal_constants.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/dragonbox.h"
 
 /*!

common/util/read_iso_file.cpp

@@ -79,7 +79,7 @@ void add_from_dir(FILE* fp, u32 sector, u32 size, IsoFile::Entry* parent) {
       } else {
         entry.name.pop_back();
         entry.name.pop_back();
-        entry.offset_in_file = SECTOR_SIZE * extent;
+        entry.offset_in_file = (u64)SECTOR_SIZE * (u64)extent;
         entry.size = dir_or_file_size;
       }
     }
@@ -92,7 +92,12 @@ void unpack_entry(FILE* fp,
                   const IsoFile::Entry& entry,
                   const fs::path& dest,
                   bool print_progress) {
-  fs::path path_to_entry = dest / entry.name;
+  std::string patched_name = entry.name;
+  if (entry.name == "WATER_AN.CGO") {
+    lg::warn("Detected WATER_AN.CGO, renaming to the proper WATER-AN.CGO");
+    patched_name = "WATER-AN.CGO";
+  }
+  fs::path path_to_entry = dest / patched_name;
   if (entry.is_dir) {
     fs::create_directory(path_to_entry);
     for (const auto& child : entry.children) {
@@ -100,15 +105,33 @@ void unpack_entry(FILE* fp,
     }
   } else {
     if (print_progress) {
-      lg::info("Extracting {}...", entry.name);
+      lg::info("Extracting {}, size 0x{:x} offset 0x{:x}...", patched_name, entry.size,
+               entry.offset_in_file);
     }
     std::vector<u8> buffer(entry.size);
     if (fseek_64(fp, entry.offset_in_file, SEEK_SET)) {
       ASSERT_MSG(false, "Failed to fseek iso when unpacking");
     }
-    if (fread(buffer.data(), buffer.size(), 1, fp) != 1) {
-      ASSERT_MSG(false, "Failed to fread iso when unpacking");
+
+    // https://github.com/open-goal/jak-project/issues/3979
+    // some people rarely get errors here, instead of trying to do a single fread
+    // let fread read in chunks so that we get a little more observability (see how many bytes it
+    // _can_ read)
+    //
+    // additionally, try to log the actual error
+    const auto bytes_read = fread(buffer.data(), 1, buffer.size(), fp);
+    if (bytes_read != buffer.size()) {
+      lg::error("did not read {} bytes, only read {}, in entry: {}", buffer.size(), bytes_read,
+                patched_name);
+      if (feof(fp)) {
+        lg::error("reached end of file before reading all expected bytes");
+      }
+      if (ferror(fp)) {
+        lg::error("generic error reading from file");
+      }
+      ASSERT_MSG(false, "Failed to fread iso entry when unpacking");
     }
+
     file_util::write_binary_file(path_to_entry.string(), buffer.data(), buffer.size());
     iso.files_extracted++;
     if (iso.shouldHash) {