Some tweaks to WIP (#4706)

* [Holiday] Custom rainbows

* Update soh/soh/Enhancements/Holiday/LL.h

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

.devcontainer/Dockerfile

@@ -1,65 +1,13 @@
 FROM mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04
 
-RUN apt-get update && apt-get upgrade -y \
-    && rm -rf /var/lib/apt/lists/*
-
-# download and install cmake from source
-# this ensures we use the same version as in the github runner image
-RUN apt-get purge -y cmake || true
-ARG CMAKE_VERSION=3.31.11
-# download
-WORKDIR /tmp
-RUN curl -fsSL \
-    https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz \
-    -o cmake.tar.gz \
- && tar -xzf cmake.tar.gz \
- && rm cmake.tar.gz
- # build and install
-WORKDIR /tmp/cmake-${CMAKE_VERSION}
-RUN ./bootstrap \
-      --prefix=/usr/local \
-      --parallel=$(nproc) \
- && make -j$(nproc) \
- && make install
-# clean up
-WORKDIR /
-RUN rm -rf /tmp/cmake-${CMAKE_VERSION}
-
-# download and install tinyxml2 from source
-# this ensures we have the cmake files needed for find_package
-RUN apt-get purge -y libtinyxml2-dev || true
-ARG TINYXML2_VERSION=11.0.0
-# download
-WORKDIR /tmp
-RUN curl -fsSL \
-    https://github.com/leethomason/tinyxml2/archive/refs/tags/${TINYXML2_VERSION}.tar.gz \
-    -o tinyxml2.tar.gz \
- && tar -xzf tinyxml2.tar.gz \
- && rm tinyxml2.tar.gz
- # build and install
-WORKDIR /tmp/tinyxml2-${TINYXML2_VERSION}
-RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
- && cmake --build build --parallel $(nproc) \
- && cmake --install build
-# clean up
-WORKDIR /
-RUN rm -rf /tmp/tinyxml2-${TINYXML2_VERSION}
-
-# install apt dependencies
-RUN apt-get update && apt-get install -y \
-      libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev \
-      libglew-dev nlohmann-json3-dev libspdlog-dev ninja-build libogg-dev \
-      libopus-dev opus-tools libopusfile-dev libvorbis-dev libespeak-ng-dev \
-      lsb-release git clang clang-format-14 zipcmp zipmerge ziptool \
-      libopengl-dev libbz2-dev libzip-dev \
- && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev ninja-build
 
 # Install latest SDL2
 RUN wget https://www.libsdl.org/release/SDL2-2.26.1.tar.gz && \
    tar -xzf SDL2-2.26.1.tar.gz && \
     cd SDL2-2.26.1 && \
     ./configure && \
-    make -j$(nproc) && \
+    make && \
     make install && \
     cd .. && \
     rm -rf SDL2-2.26.1 && \
@@ -71,7 +19,7 @@ RUN wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz &
    tar -xzf SDL2_net-2.2.0.tar.gz && \
     cd SDL2_net-2.2.0 && \
     ./configure && \
-    make -j$(nproc) && \
+    make && \
     make install && \
     cd .. && \
     rm -rf SDL2_net-2.2.0 && \

.github/workflows/apt-deps.txt

@@ -1 +1 @@
-libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build libogg-dev libopus-dev opus-tools libopusfile-dev libvorbis-dev libespeak-ng-dev
+libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build 

.github/workflows/clang-format.yml

@@ -1,21 +0,0 @@
-name: clang-format
-on: [pull_request]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  clang-format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 2
-      - name: Install clang-format
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clang-format-14
-      - name: Run clang-format
-        run: |
-          ./run-clang-format.sh
-          git diff --exit-code

.github/workflows/generate-builds.yml

@@ -6,44 +6,41 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-
   generate-soh-otr:
     runs-on: ubuntu-22.04
     steps:
-    - name: Git Checkout
-      uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Configure ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
-        save: ${{ github.ref_name == github.event.repository.default_branch }}
         key: ${{ runner.os }}-otr-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
           ${{ runner.os }}-otr-ccache-${{ github.ref }}
-          ${{ runner.os }}-otr-ccache
+          ${{ runner.os }}-otr-ccache-
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) libzip-dev zipcmp zipmerge ziptool
-    - name: Restore Cached deps folder
-      uses: actions/cache/restore@v5
+        sudo apt-get install -y $(cat .github/workflows/apt-deps.txt)
+    - name: Cache build folders
+      uses: actions/cache@v4
       with:
-        key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }}
+        key: ${{ runner.os }}-otr-build-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-deps-${{ github.ref }}-
-          ${{ runner.os }}-deps-
-        path: deps
-    - name: Create deps folder
-      run: mkdir -p deps
+          ${{ runner.os }}-otr-build-${{ github.ref }}
+          ${{ runner.os }}-otr-build-
+        path: |
+          build-cmake
+          SDL2-2.28.5
     - name: Install latest SDL
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "deps/SDL2-2.30.3" ]; then
-          wget https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz
-          tar -xzf SDL2-2.30.3.tar.gz -C deps
+        if [ ! -d "SDL2-2.28.5" ]; then
+          wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz
+          tar -xzf SDL2-2.28.5.tar.gz
         fi
-        cd deps/SDL2-2.30.3
+        cd SDL2-2.28.5
         ./configure --enable-hidapi-libusb
         make -j 10
         sudo make install
@@ -52,192 +49,158 @@ jobs:
       run: |
         sudo apt-get remove libtinyxml2-dev
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "deps/tinyxml2-10.0.0" ]; then
+        if [ ! -d "tinyxml2-10.0.0" ]; then
           wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz
-          tar -xzf 10.0.0.tar.gz -C deps
+          tar -xzf 10.0.0.tar.gz
         fi
-        cd deps/tinyxml2-10.0.0
-        mkdir -p build
+        cd tinyxml2-10.0.0
+        mkdir build
         cd build
         cmake ..
         make
         sudo make install
-    - name: Generate soh.o2r
+    - name: Generate soh.otr
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
-        cmake --build build-cmake --config Release --target GenerateSohOtr -j3
-    - name: Upload soh.o2r
-      uses: actions/upload-artifact@v7
+        cmake --build build-cmake --config Release --target GenerateSohOtr
+    - uses: actions/upload-artifact@v4
       with:
-        name: soh.o2r
-        path: soh.o2r
-        retention-days: 3
-
+        name: soh.otr
+        path: soh.otr
+        retention-days: 1
   build-macos:
     needs: generate-soh-otr
     runs-on: macos-14
     steps:
-    - name: Git Checkout
-      uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Configure ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
         create-symlink: true
-        save: ${{ github.ref_name == github.event.repository.default_branch }}
         key: ${{ runner.os }}-14-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
           ${{ runner.os }}-14-ccache-${{ github.ref }}
-          ${{ runner.os }}-14-ccache
-    # Needed to apply sudo for macports cache restore
+          ${{ runner.os }}-14-ccache-
     - name: Install gtar wrapper
       run: |
         sudo mv /opt/homebrew/bin/gtar /opt/homebrew/bin/gtar.orig
-        sudo cp .github/workflows/gtar /opt/homebrew/bin/gtar
+        sudo cp .github/workflows//gtar /opt/homebrew/bin/gtar
         sudo chmod +x /opt/homebrew/bin/gtar
-    - name: Restore Cached MacPorts
-      id: restore-cache-macports
-      uses: actions/cache/restore@v5
+    - name: Cache MacPorts
+      id: cache-macports
+      uses: actions/cache@v4
       with:
-        key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-
-          ${{ runner.os }}-14-macports-
         path: /opt/local/
-    # Updated PATH applies to the next step and onwards
+        key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-14-macports-
     - name: Install MacPorts (if necessary)
       run: |
-        if command -v /opt/local/bin/port 2>&1 >/dev/null; then
+        if [ -d /opt/local/ ]; then
           echo "MacPorts already installed"
         else
-          echo "Installing MacPorts"
-          wget https://github.com/macports/macports-base/releases/download/v2.11.5/MacPorts-2.11.5-14-Sonoma.pkg
-          sudo installer -pkg ./MacPorts-2.11.5-14-Sonoma.pkg -target /
+          wget https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3-14-Sonoma.pkg
+          sudo installer -pkg ./MacPorts-2.9.3-14-Sonoma.pkg -target /
         fi
-        echo "/opt/local/bin:/opt/local/sbin" >> "$GITHUB_PATH"
+        echo "/opt/local/bin:/opt/local/sbin" >> $GITHUB_PATH
     - name: Install dependencies
       run: |
         brew uninstall --ignore-dependencies libpng
         sudo port install $(cat .github/workflows/macports-deps.txt)
         brew install ninja
-    - name: Download soh.o2r
-      uses: actions/download-artifact@v7
+    - name: Download soh.otr
+      uses: actions/download-artifact@v4
       with:
-        name: soh.o2r
-        path: build-cmake/soh
+        name: soh.otr
     - name: Build SoH
       run: |
-        export PATH="/usr/lib/ccache:/opt/homebrew/opt/ccache/libexec:/usr/local/opt/ccache/libexec:$PATH"
         cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_REMOTE_CONTROL=1
         cmake --build build-cmake --config Release --parallel 10
+        mv soh.otr build-cmake/soh
         (cd build-cmake && cpack)
 
         mv _packages/*.dmg SoH.dmg
         mv README.md readme.txt
     - name: Upload build
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
       with:
         name: soh-mac
         path: |
           SoH.dmg
           readme.txt
-    - name: Save Cache MacPorts
-      if: ${{ github.ref_name == github.event.repository.default_branch }}
-      uses: actions/cache/save@v5
-      with:
-        key: ${{ steps.restore-cache-macports.outputs.cache-primary-key }}
-        path: /opt/local/
-
   build-linux:
     needs: generate-soh-otr
     runs-on: ubuntu-22.04
     steps:
-    - name: Git Checkout
-      uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install dependencies
       run: |
         sudo apt-get update
         sudo apt-get install -y $(cat .github/workflows/apt-deps.txt)
-    - name: Configure ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
-        save: ${{ github.ref_name == github.event.repository.default_branch }}
-        key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }}
+        key: linux-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-ccache-${{ github.ref }}
-          ${{ runner.os }}-ccache
-    - name: Restore Cached deps folder
-      id: restore-cache-deps
-      uses: actions/cache/restore@v5
+          linux-ccache-${{ github.ref }}
+          linux-ccache-
+    - name: Cache build folders
+      uses: actions/cache@v4
       with:
-        key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }}
+        key: linux-build-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-deps-${{ github.ref }}-
-          ${{ runner.os }}-deps-
-        path: deps
-    - name: Create deps folder
-      run: mkdir -p deps
+          linux-build-${{ github.ref }}
+          linux-build-
+        path: |
+          SDL2-2.28.5
+          SDL2_net-2.2.0
     - name: Install latest SDL
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "deps/SDL2-2.30.3" ]; then
-          wget https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz
-          tar -xzf SDL2-2.30.3.tar.gz -C deps
+        if [ ! -d "SDL2-2.28.5" ]; then
+          wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz
+          tar -xzf SDL2-2.28.5.tar.gz
         fi
-        cd deps/SDL2-2.30.3
+        cd SDL2-2.28.5
         ./configure --enable-hidapi-libusb
         make -j 10
         sudo make install
         sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
-    - name: Install latest SDL_net
-      run: |
-        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "deps/SDL2_net-2.2.0" ]; then
-          wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz
-          tar -xzf SDL2_net-2.2.0.tar.gz -C deps
-        fi
-        cd deps/SDL2_net-2.2.0
-        ./configure
-        make -j 10
-        sudo make install
-        sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
     - name: Install latest tinyxml2
       run: |
         sudo apt-get remove libtinyxml2-dev
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "deps/tinyxml2-10.0.0" ]; then
+        if [ ! -d "tinyxml2-10.0.0" ]; then
           wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz
-          tar -xzf 10.0.0.tar.gz -C deps
+          tar -xzf 10.0.0.tar.gz
         fi
-        cd deps/tinyxml2-10.0.0
-        mkdir -p build
+        cd tinyxml2-10.0.0
+        mkdir build
         cd build
         cmake ..
         make
         sudo make install
-    - name: Install libzip without crypto
+    - name: Install latest SDL_net
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "deps/libzip-1.10.1" ]; then
-          wget https://github.com/nih-at/libzip/releases/download/v1.10.1/libzip-1.10.1.tar.gz
-          tar -xzf libzip-1.10.1.tar.gz -C deps
+        if [ ! -d "SDL2_net-2.2.0" ]; then
+          wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz
+          tar -xzf SDL2_net-2.2.0.tar.gz
         fi
-        cd deps/libzip-1.10.1
-        mkdir -p build
-        cd build
-        cmake .. -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF
-        make
+        cd SDL2_net-2.2.0
+        ./configure
+        make -j 10
         sudo make install
-        sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/
-    - name: Download soh.o2r
-      uses: actions/download-artifact@v7
+        sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
+    - name: Download soh.otr
+      uses: actions/download-artifact@v4
       with:
-        name: soh.o2r
-        path: build-cmake/soh
+        name: soh.otr
     - name: Build SoH
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
@@ -251,79 +214,69 @@ jobs:
         CC: gcc-12
         CXX: g++-12
     - name: Upload build
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
       with:
         name: soh-linux
         path: |
           soh.appimage
           readme.txt
-    - name: Save Cache deps folder
-      if: ${{ github.ref_name == github.event.repository.default_branch }}
-      uses: actions/cache/save@v5
-      with:
-        key: ${{ steps.restore-cache-deps.outputs.cache-primary-key }}
-        path: deps
-
   build-windows:
     needs: generate-soh-otr
-    runs-on: windows-latest
+    runs-on: ${{ (vars.WINDOWS_RUNNER && fromJSON(vars.WINDOWS_RUNNER)) || 'windows-latest' }}
     steps:
     - name: Install dependencies
+      if: ${{ !vars.WINDOWS_RUNNER }}
       run: |
-        choco install ninja -y
+        choco install ninja
         Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-    - name: Git Checkout
-      uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Configure sccache
-      uses: hendrikmuhs/ccache-action@v1.2
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.14
       with:
         variant: sccache
-        max-size: "2G"
-        evict-old-files: job
-        save: ${{ github.ref_name == github.event.repository.default_branch }}
+        max-size: "1G"
         key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
           ${{ runner.os }}-ccache-${{ github.ref }}
-          ${{ runner.os }}-ccache
-    - name: Restore Cached VCPKG folder
-      id: restore-cache-vcpkg
-      uses: actions/cache/restore@v5
+          ${{ runner.os }}-ccache-
+    - name: Cache build folder
+      uses: actions/cache@v4
       with:
-        key: ${{ runner.os }}-vcpkg-${{ github.ref }}-${{ github.sha }}
+        key: ${{ runner.os }}-build-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-vcpkg-${{ github.ref }}-
-          ${{ runner.os }}-vcpkg-
-        path: vcpkg
+          ${{ runner.os }}-build-${{ github.ref }}
+          ${{ runner.os }}-build-
+        path: |
+          build-windows
+          vcpkg
     - name: Configure Developer Command Prompt
       uses: ilammy/msvc-dev-cmd@v1
-    - name: Download soh.o2r
-      uses: actions/download-artifact@v7
-      with:
-        name: soh.o2r
-        path: build-windows/soh
     - name: Build SoH
-      env:
+      env: 
         VCPKG_ROOT: ${{github.workspace}}/vcpkg
       run: |
         set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
         cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DBUILD_REMOTE_CONTROL=1
         cmake --build build-windows --config Release --parallel 10
 
-        (cd build-windows && cpack)
-        cd ..
-        mv _packages/*.zip _packages/soh-windows.zip
-    - name: Unzip package
-      run: Expand-Archive -Path _packages/soh-windows.zip -DestinationPath soh-windows
+        mkdir soh-windows
+        mv ./x64/Release/soh.exe ./soh-windows/soh.exe
+        mkdir soh-windows/debug
+        mkdir soh-windows/mods
+        New-Item soh-windows/mods/custom_otr_files_go_here.txt -type file
+        mv ./x64/Release/soh.pdb ./soh-windows/debug/soh.pdb
+        mv ./README.md ./soh-windows/readme.txt
+        mv ./build-windows/gamecontrollerdb.txt ./soh-windows/gamecontrollerdb.txt
+        mv ./x64/Release/assets ./soh-windows
+    - name: Download soh.otr
+      uses: actions/download-artifact@v4
+      with:
+        name: soh.otr
+        path: soh-windows
     - name: Upload build
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
       with:
         name: soh-windows
         path: soh-windows
-    - name: Save Cache VCPKG folder
-      if: ${{ github.ref_name == github.event.repository.default_branch }}
-      uses: actions/cache/save@v5
-      with:
-        key: ${{ steps.restore-cache-vcpkg.outputs.cache-primary-key }}
-        path: vcpkg

.github/workflows/macports-deps.txt

@@ -1 +1 @@
-libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal libogg +universal libopus +universal opusfile +universal libvorbis +universal
+libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal

.github/workflows/pr-artifacts.yml

@@ -12,7 +12,7 @@ jobs:
     if: ${{ github.event.workflow_run.event == 'pull_request' }}
     steps:
       - id: 'pr-number'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -37,7 +37,7 @@ jobs:
 
             return prNumber;
       - id: 'artifacts-text'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -48,7 +48,7 @@ jobs:
             });
 
             return allArtifacts.data.artifacts.reduce((acc, item) => {
-              if (item.name === "soh.o2r") return acc;
+              if (item.name === "soh.otr") return acc;
               acc += `
               - [${item.name}.zip](https://nightly.link/${context.repo.owner}/${context.repo.repo}/actions/artifacts/${item.id}.zip)`;
               return acc;

.github/workflows/test-builds-on-distros.yml

@@ -23,24 +23,24 @@ jobs:
       if: ${{ matrix.image == 'archlinux:base' }}
       run: |
         echo arch
-        echo pacman -S ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net
+        echo pacman -S ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
         pacman -Syu --noconfirm
-        pacman -S --noconfirm ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net
+        pacman -S --noconfirm ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
     - name: Install dependencies (dnf)
       if: ${{ matrix.image == 'fedora:39' }}
       run: |
         echo fedora
-        echo dnf install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} wget git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools tinyxml2-devel spdlog-devel
+        echo dnf install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} wget git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools tinyxml2-devel spdlog-devel boost-devel
         dnf -y upgrade
-        dnf -y install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} wget git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools tinyxml2-devel spdlog-devel
+        dnf -y install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} wget git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools tinyxml2-devel spdlog-devel boost-devel
     - name: Install dependencies (apt)
       if: ${{ matrix.image == 'ubuntu:mantic' || matrix.image == 'debian:bookworm' }}
       run: |
         echo debian based
-        echo apt-get install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'g++') || '' }} git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libopengl-dev
+        echo apt-get install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'g++') || '' }} git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev
         apt-get update
         apt-get -y full-upgrade
-        apt-get -y install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'g++') || '' }} git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libopengl-dev
+        apt-get -y install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'g++') || '' }} git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev
     - name: Install dependencies (zypper)
       if: ${{ matrix.image == 'opensuse/tumbleweed:latest' }}
       run: |
@@ -59,7 +59,7 @@ jobs:
         cmake ..
         make
         sudo make install
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Build SoH

.gitignore

@@ -2,12 +2,9 @@
 __pycache__/
 .pyc
 .DS_Store
-.cache/*
 
 # Text editor remnants
-.vscode/*
-!.vscode/tasks.json
-
+.vscode/
 .vs/
 .idea/
 cmake-build-**
@@ -403,6 +400,7 @@ ASALocalRun/
 lib/libgfxd/libgfxd.a
 ExporterTest/ExporterTest.a
 ZAPDUtils/ZAPDUtils.a
+.vscode/
 build/
 external/
 ZAPDUtils/build/
@@ -413,12 +411,10 @@ ReleaseObj/*
 .tags
 tags
 *.otr
-*.o2r
 *.sav
 shipofharkinian.ini
 shipofharkinian.json
 imgui.ini
-timesplitdata.json
 
 # Switch Stuff
 
@@ -455,8 +451,3 @@ _packages
 
 soh/src/boot/build.c
 soh/properties.h
-
-# Tools
-/clang-format
-/clang-format.exe
-*.o2r

.vscode/tasks.json

@@ -1,86 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Setup CMake Project",
-            "type": "shell",
-            "command": "cmake",
-            "args": [
-                "-S",
-                ".",
-                "-B",
-                "build-cmake",
-                "-G",
-                "Ninja"
-            ],
-            "windows": {
-                "args": [
-                    "-S",
-                    ".",
-                    "-B",
-                    "build/x64",
-                    "-G",
-                    "Visual Studio 17 2022",
-                    "-T",
-                    "v143",
-                    "-A",
-                    "x64"
-                ]
-            },
-            "group": "build",
-            "problemMatcher": []
-        },
-        {
-            "label": "Generate SOH OTR",
-            "type": "shell",
-            "command": "cmake",
-            "args": [
-                "--build",
-                "build-cmake",
-                "--target",
-                "GenerateSohOtr",
-                "--parallel"
-            ],
-            "windows": {
-                "args": [
-                    "--build",
-                    "./build/x64",
-                    "--target",
-                    "GenerateSohOtr"
-                ]
-            },
-            "group": "build",
-            "problemMatcher": []
-        },
-        {
-            "label": "Build Project",
-            "type": "shell",
-            "command": "cmake",
-            "args": [
-                "--build",
-                "build-cmake"
-            ],
-            "windows": {
-                "args": [
-                    "--build",
-                    "./build/x64"
-                ]
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "dependsOn": ["Generate SOH OTR"],
-            "problemMatcher": []
-        },
-        {
-            "label": "Build All",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "Setup CMake Project",
-                "Generate SOH OTR",
-                "Build Project"
-            ]
-        }
-    ]
-}

CMake/FindOgg.cmake

@@ -1,61 +0,0 @@
-# - Find ogg
-# Find the native ogg includes and libraries
-#
-#  OGG_INCLUDE_DIRS - where to find ogg.h, etc.
-#  OGG_LIBRARIES    - List of libraries when using ogg.
-#  OGG_FOUND        - True if ogg found.
-
-if (OGG_INCLUDE_DIR)
-	# Already in cache, be silent
-	set(OGG_FIND_QUIETLY TRUE)
-endif ()
-
-find_package (PkgConfig QUIET)
-pkg_check_modules (PC_OGG QUIET ogg>=1.3.0)
-
-set (OGG_VERSION ${PC_OGG_VERSION})
-
-find_path (OGG_INCLUDE_DIR ogg/ogg.h
-	HINTS
-		${PC_OGG_INCLUDEDIR}
-		${PC_OGG_INCLUDE_DIRS}
-		${OGG_ROOT}
-	)
-# MSVC built ogg may be named ogg_static.
-# The provided project files name the library with the lib prefix.
-find_library (OGG_LIBRARY
-	NAMES
-		ogg
-		ogg_static
-		libogg
-		libogg_static
-	HINTS
-		${PC_OGG_LIBDIR}
-		${PC_OGG_LIBRARY_DIRS}
-		${OGG_ROOT}
-	)
-# Handle the QUIETLY and REQUIRED arguments and set OGG_FOUND
-# to TRUE if all listed variables are TRUE.
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Ogg
-	REQUIRED_VARS
-		OGG_LIBRARY
-		OGG_INCLUDE_DIR
-	VERSION_VAR
-		OGG_VERSION
-	)
-
-if (OGG_FOUND)
-	set (OGG_LIBRARIES ${OGG_LIBRARY})
-	set (OGG_INCLUDE_DIRS ${OGG_INCLUDE_DIR})
-	
-	if(NOT TARGET Ogg::ogg)
-	add_library(Ogg::ogg UNKNOWN IMPORTED)
-		set_target_properties(Ogg::ogg PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIRS}"
-			IMPORTED_LOCATION "${OGG_LIBRARIES}"
-		)
-  endif ()
-endif ()
-
-mark_as_advanced (OGG_INCLUDE_DIR OGG_LIBRARY)

CMake/FindOpus.cmake

@@ -1,44 +0,0 @@
-# - FindOpus.cmake
-# Find the native opus includes and libraries
-#
-# OPUS_INCLUDE_DIRS - where to find opus/opus.h, etc.
-# OPUS_LIBRARIES - List of libraries when using libopus(file).
-# OPUS_FOUND - True if libopus found.
-
-if(OPUS_INCLUDE_DIR AND OPUS_LIBRARY AND OPUSFILE_LIBRARY)
-    # Already in cache, be silent
-    set(OPUS_FIND_QUIETLY TRUE)
-endif(OPUS_INCLUDE_DIR AND OPUS_LIBRARY AND OPUSFILE_LIBRARY)
-
-find_path(OPUS_INCLUDE_DIR
-    NAMES opusfile.h
-    PATH_SUFFIXES opus
-)
-
-# MSVC built opus may be named opus_static
-# The provided project files name the library with the lib prefix.
-find_library(OPUS_LIBRARY
-    NAMES opus opus_static libopus libopus_static
-)
-#find_library(OPUSFILE_LIBRARY
-#    NAMES opusfile opusfile_static libopusfile libopusfile_static
-#)
-
-# Handle the QUIETLY and REQUIRED arguments and set OPUS_FOUND
-# to TRUE if all listed variables are TRUE.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Opus DEFAULT_MSG
-    OPUS_LIBRARY OPUS_INCLUDE_DIR
-)
-
-if(OPUS_FOUND)
-    set(OPUS_LIBRARIES  ${OPUS_LIBRARY})
-    set(OPUS_INCLUDE_DIRS ${OPUS_INCLUDE_DIR})
-    if(NOT TARGET Opus::opus)
-    add_library(Opus::opus UNKNOWN IMPORTED)
-        set_target_properties(Opus::opus PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${OPUS_INCLUDE_DIRS}"
-            IMPORTED_LOCATION "${OPUS_LIBRARIES}"
-        )
-    endif()
-endif(OPUS_FOUND)

CMake/FindOpusFile.cmake

@@ -1,63 +0,0 @@
-# FindOpusFile.cmake
-# Locate the libopusfile library and its dependencies (libopus and libogg).
-# Defines the following variables on success:
-#   OPUSFILE_FOUND       - Indicates if opusfile was found
-#   OPUSFILE_INCLUDE_DIR - Directory containing opusfile.h
-#   OPUSFILE_LIBRARY     - Path to the opusfile library
-#   OPUSFILE_LIBRARIES   - Full list of libraries to link (opusfile, opus, ogg)
-
-# Use pkg-config to find opusfile if available
-find_package(PkgConf)
-if(PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_OPUSFILE QUIET opusfile)
-endif()
-
-# Search for the OpusFile header
-find_path(OPUSFILE_INCLUDE_DIR
-    NAMES opusfile.h
-    HINTS ${PC_OPUSFILE_INCLUDE_DIRS}
-    PATHS /usr/include/opus /usr/local/include/opus /opt/local/include/opus /opt/homebrew/include/opus
-    DOC "Directory where opusfile.h is located"
-)
-
-# Search for the OpusFile library
-find_library(OPUSFILE_LIBRARY
-    NAMES opusfile
-    HINTS ${PC_OPUSFILE_LIBRARY_DIRS}
-    DOC "Path to the libopusfile library"
-)
-
-# Search for the Opus library (dependency of OpusFile)
-find_library(OPUS_LIBRARY
-    NAMES opus
-    DOC "Path to the libopus library (dependency of libopusfile)"
-)
-
-# Search for the Ogg library (dependency of OpusFile)
-find_library(OGG_LIBRARY
-    NAMES ogg
-    DOC "Path to the libogg library (dependency of libopusfile)"
-)
-
-# Check if all required components are found
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpusFile
-    REQUIRED_VARS OPUSFILE_LIBRARY OPUSFILE_INCLUDE_DIR OPUS_LIBRARY OGG_LIBRARY
-    VERSION_VAR OPUSFILE_VERSION
-)
-
-# Define an imported target if everything is found
-if (OPUSFILE_FOUND)
-    add_library(Opusfile::Opusfile INTERFACE IMPORTED)
-
-    set_target_properties(Opusfile::Opusfile PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${OPUSFILE_INCLUDE_DIR}"
-        INTERFACE_LINK_LIBRARIES "${OPUSFILE_LIBRARY};${OPUS_LIBRARY};${OGG_LIBRARY}"
-    )
-
-    # Optionally expose the include and libraries separately
-    set(OPUSFILE_LIBRARIES ${OPUSFILE_LIBRARY} ${OPUS_LIBRARY} ${OGG_LIBRARY})
-    set(OPUSFILE_INCLUDE_DIRS ${OPUSFILE_INCLUDE_DIR})
-else()
-    set(OPUSFILE_FOUND FALSE)
-endif()

CMake/FindVorbis.cmake

@@ -1,210 +0,0 @@
-#[=======================================================================[.rst:
-FindVorbis
-----------
-
-Finds the native vorbis, vorbisenc amd vorbisfile includes and libraries.
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module provides the following imported targets, if found:
-
-``Vorbis::vorbis``
-  The Vorbis library
-``Vorbis::vorbisenc``
-  The VorbisEnc library
-``Vorbis::vorbisfile``
-  The VorbisFile library
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This will define the following variables:
-
-``Vorbis_Vorbis_INCLUDE_DIRS``
-  List of include directories when using vorbis.
-``Vorbis_Enc_INCLUDE_DIRS``
-  List of include directories when using vorbisenc.
-``Vorbis_File_INCLUDE_DIRS``
-  List of include directories when using vorbisfile.
-``Vorbis_Vorbis_LIBRARIES``
-  List of libraries when using vorbis.
-``Vorbis_Enc_LIBRARIES``
-  List of libraries when using vorbisenc.
-``Vorbis_File_LIBRARIES``
-  List of libraries when using vorbisfile.
-``Vorbis_FOUND``
-  True if vorbis and requested components found.
-``Vorbis_Vorbis_FOUND``
-  True if vorbis found.
-``Vorbis_Enc_FOUND``
-  True if vorbisenc found.
-``Vorbis_Enc_FOUND``
-  True if vorbisfile found.
-
-Cache variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-
-``Vorbis_Vorbis_INCLUDE_DIR``
-  The directory containing ``vorbis/vorbis.h``.
-``Vorbis_Enc_INCLUDE_DIR``
-  The directory containing ``vorbis/vorbisenc.h``.
-``Vorbis_File_INCLUDE_DIR``
-  The directory containing ``vorbis/vorbisenc.h``.
-``Vorbis_Vorbis_LIBRARY``
-  The path to the vorbis library.
-``Vorbis_Enc_LIBRARY``
-  The path to the vorbisenc library.
-``Vorbis_File_LIBRARY``
-  The path to the vorbisfile library.
-
-Hints
-^^^^^
-
-A user may set ``Vorbis_ROOT`` to a vorbis installation root to tell this module where to look.
-
-#]=======================================================================]
-
-if (Vorbis_Vorbis_INCLUDE_DIR)
-	# Already in cache, be silent
-	set (Vorbis_FIND_QUIETLY TRUE)
-endif ()
-
-set (Vorbis_Vorbis_FIND_QUIETLY TRUE)
-set (Vorbis_Enc_FIND_QUIETLY TRUE)
-set (Vorbis_File_FIND_QUIETLY TRUE)
-
-find_package (Ogg QUIET)
-
-find_package (PkgConfig QUIET)
-pkg_check_modules (PC_Vorbis_Vorbis QUIET vorbis)
-pkg_check_modules (PC_Vorbis_Enc QUIET vorbisenc)
-pkg_check_modules (PC_Vorbis_File QUIET vorbisfile)
-
-set (Vorbis_VERSION ${PC_Vorbis_Vorbis_VERSION})
-
-find_path (Vorbis_Vorbis_INCLUDE_DIR vorbis/codec.h
-	HINTS
-		${PC_Vorbis_Vorbis_INCLUDEDIR}
-		${PC_Vorbis_Vorbis_INCLUDE_DIRS}
-		${Vorbis_ROOT}
-	)
-
-find_path (Vorbis_Enc_INCLUDE_DIR vorbis/vorbisenc.h
-	HINTS
-		${PC_Vorbis_Enc_INCLUDEDIR}
-		${PC_Vorbis_Enc_INCLUDE_DIRS}
-		${Vorbis_ROOT}
-	)
-
-find_path (Vorbis_File_INCLUDE_DIR vorbis/vorbisfile.h
-	HINTS
-		${PC_Vorbis_File_INCLUDEDIR}
-		${PC_Vorbis_File_INCLUDE_DIRS}
-		${Vorbis_ROOT}
-	)
-
-find_library (Vorbis_Vorbis_LIBRARY
-	NAMES
-		vorbis
-		vorbis_static
-		libvorbis
-		libvorbis_static
-	HINTS
-		${PC_Vorbis_Vorbis_LIBDIR}
-		${PC_Vorbis_Vorbis_LIBRARY_DIRS}
-		${Vorbis_ROOT}
-	)
-
-find_library (Vorbis_Enc_LIBRARY
-	NAMES
-		vorbisenc
-		vorbisenc_static
-		libvorbisenc
-		libvorbisenc_static
-	HINTS
-		${PC_Vorbis_Enc_LIBDIR}
-		${PC_Vorbis_Enc_LIBRARY_DIRS}
-		${Vorbis_ROOT}
-	)
-
-find_library (Vorbis_File_LIBRARY
-	NAMES
-		vorbisfile
-		vorbisfile_static
-		libvorbisfile
-		libvorbisfile_static
-	HINTS
-		${PC_Vorbis_File_LIBDIR}
-		${PC_Vorbis_File_LIBRARY_DIRS}
-		${Vorbis_ROOT}
-	)
-
-include (FindPackageHandleStandardArgs)
-
-if (Vorbis_Vorbis_LIBRARY AND Vorbis_Vorbis_INCLUDE_DIR AND Ogg_FOUND)
-    set (Vorbis_Vorbis_FOUND TRUE)
-endif ()
-
-if (Vorbis_Enc_LIBRARY AND Vorbis_Enc_INCLUDE_DIR AND Vorbis_Vorbis_FOUND)
-    set (Vorbis_Enc_FOUND TRUE)
-endif ()
-
-if (Vorbis_Vorbis_FOUND AND Vorbis_File_LIBRARY AND Vorbis_File_INCLUDE_DIR)
-    set (Vorbis_File_FOUND TRUE)
-endif ()
-
-find_package_handle_standard_args (Vorbis
-	REQUIRED_VARS
-		Vorbis_Vorbis_LIBRARY
-		Vorbis_Vorbis_INCLUDE_DIR
-		Ogg_FOUND
-	HANDLE_COMPONENTS
-	VERSION_VAR Vorbis_VERSION)
-
-
-if (Vorbis_Vorbis_FOUND)
-	set (Vorbis_Vorbis_INCLUDE_DIRS ${VORBIS_INCLUDE_DIR})
-	set (Vorbis_Vorbis_LIBRARIES ${VORBIS_LIBRARY} ${OGG_LIBRARIES})
-    if (NOT TARGET Vorbis::vorbis)
-		add_library (Vorbis::vorbis UNKNOWN IMPORTED)
-		set_target_properties (Vorbis::vorbis PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${Vorbis_Vorbis_INCLUDE_DIR}"
-			IMPORTED_LOCATION "${Vorbis_Vorbis_LIBRARY}"
-			INTERFACE_LINK_LIBRARIES Ogg::ogg
-		)
-	endif ()
-
-	if (Vorbis_Enc_FOUND)
-		set (Vorbis_Enc_INCLUDE_DIRS ${Vorbis_Enc_INCLUDE_DIR})
-		set (Vorbis_Enc_LIBRARIES ${Vorbis_Enc_LIBRARY} ${Vorbis_Enc_LIBRARIES})
-		if (NOT TARGET Vorbis::vorbisenc)
-			add_library (Vorbis::vorbisenc UNKNOWN IMPORTED)
-			set_target_properties (Vorbis::vorbisenc PROPERTIES
-				INTERFACE_INCLUDE_DIRECTORIES "${Vorbis_Enc_INCLUDE_DIR}"
-				IMPORTED_LOCATION "${Vorbis_Enc_LIBRARY}"
-				INTERFACE_LINK_LIBRARIES Vorbis::vorbis
-			)
-		endif ()
-	endif ()
-
-	if (Vorbis_File_FOUND)
-		set (Vorbis_File_INCLUDE_DIRS ${Vorbis_File_INCLUDE_DIR})
-		set (Vorbis_File_LIBRARIES ${Vorbis_File_LIBRARY} ${Vorbis_File_LIBRARIES})
-		if (NOT TARGET Vorbis::vorbisfile)
-			add_library (Vorbis::vorbisfile UNKNOWN IMPORTED)
-			set_target_properties (Vorbis::vorbisfile PROPERTIES
-				INTERFACE_INCLUDE_DIRECTORIES "${Vorbis_File_INCLUDE_DIR}"
-				IMPORTED_LOCATION "${Vorbis_File_LIBRARY}"
-				INTERFACE_LINK_LIBRARIES Vorbis::vorbis
-			)
-		endif ()
-	endif ()
-
-endif ()
-
-mark_as_advanced (Vorbis_Vorbis_INCLUDE_DIR Vorbis_Vorbis_LIBRARY)
-mark_as_advanced (Vorbis_Enc_INCLUDE_DIR Vorbis_Enc_LIBRARY)
-mark_as_advanced (Vorbis_File_INCLUDE_DIR Vorbis_File_LIBRARY)

CMake/Packaging-2.cmake

@@ -1,9 +1,9 @@
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
-set(CPACK_COMPONENTS_ALL "ship")
+set(CPACK_COMPONENTS_ALL "ship" "extractor" "appimage")
 
-if (CPACK_GENERATOR STREQUAL "External")
-  list(APPEND CPACK_COMPONENTS_ALL "extractor" "appimage")
+if (NOT CPACK_GENERATOR STREQUAL "External")
+  list(REMOVE_ITEM CPACK_COMPONENTS_ALL "appimage")
 endif()
 
 if (CPACK_GENERATOR MATCHES "DEB|RPM")
@@ -24,5 +24,6 @@ if (CPACK_GENERATOR MATCHES "Bundle")
     set(CPACK_BUNDLE_NAME "soh")
     set(CPACK_BUNDLE_PLIST "macosx/Info.plist")
     set(CPACK_BUNDLE_ICON "macosx/soh.icns")
+    set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/soh-macos.sh")
     set(CPACK_BUNDLE_APPLE_CERT_APP "-")
 endif()

CMake/Packaging.cmake

@@ -60,7 +60,7 @@ if (NOT LINUXDEPLOY_EXECUTABLE)
   message(STATUS "Downloading linuxdeploy")
   set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy)
   file(DOWNLOAD 
-      https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage
+      https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
       ${LINUXDEPLOY_EXECUTABLE}
       INACTIVITY_TIMEOUT 10
       LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log

CMake/lus-cvars.cmake

@@ -1,5 +1,7 @@
 set(CVAR_VSYNC_ENABLED "${CVAR_PREFIX_SETTING}.VsyncEnabled" CACHE STRING "")
 set(CVAR_Z_FIGHTING_MODE "${CVAR_PREFIX_SETTING}.ZFightingMode" CACHE STRING "")
+set(CVAR_NEW_FILE_DROPPED "${CVAR_PREFIX_GENERAL}.NewFileDropped" CACHE STRING "")
+set(CVAR_DROPPED_FILE "${CVAR_PREFIX_GENERAL}.DroppedFile" CACHE STRING "")
 set(CVAR_INTERNAL_RESOLUTION "${CVAR_PREFIX_SETTING}.InternalResolution" CACHE STRING "")
 set(CVAR_MSAA_VALUE "${CVAR_PREFIX_SETTING}.MSAAValue" CACHE STRING "")
 set(CVAR_SDL_WINDOWED_FULLSCREEN "${CVAR_PREFIX_SETTING}.SdlWindowedFullscreen" CACHE STRING "")

CMake/soh-cvars.cmake

@@ -10,8 +10,6 @@ set(CVAR_PREFIX_TRACKER "gTrackers")
 set(CVAR_PREFIX_DEVELOPER_TOOLS "gDeveloperTools")
 set(CVAR_PREFIX_GENERAL "gGeneral")
 set(CVAR_PREFIX_REMOTE "gRemote")
-set(CVAR_PREFIX_GAMEPLAY_STATS "gGameplayStats")
-set(CVAR_PREFIX_TIME_DISPLAY "gTimeDisplay")
 add_compile_definitions(
 	CVAR_PREFIX_RANDOMIZER_ENHANCEMENT="${CVAR_PREFIX_RANDOMIZER_ENHANCEMENT}"
 	CVAR_PREFIX_RANDOMIZER_SETTING="${CVAR_PREFIX_RANDOMIZER_SETTING}"
@@ -25,6 +23,4 @@ add_compile_definitions(
 	CVAR_PREFIX_DEVELOPER_TOOLS="${CVAR_PREFIX_DEVELOPER_TOOLS}"
 	CVAR_PREFIX_GENERAL="${CVAR_PREFIX_GENERAL}"
 	CVAR_PREFIX_REMOTE="${CVAR_PREFIX_REMOTE}"
-	CVAR_PREFIX_GAMEPLAY_STATS="${CVAR_PREFIX_GAMEPLAY_STATS}"
-	CVAR_PREFIX_TIME_DISPLAY="${CVAR_PREFIX_TIME_DISPLAY}"
 )

CMakeLists.txt

@@ -1,17 +1,13 @@
-cmake_minimum_required(VERSION 3.26.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
 
 set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
 set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
-set(CMAKE_C_STANDARD 23 CACHE STRING "The C standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 9.2.1 LANGUAGES C CXX)
+project(Ship VERSION 8.0.6 LANGUAGES C CXX)
 include(CMake/soh-cvars.cmake)
 include(CMake/lus-cvars.cmake)
-set(SPDLOG_LEVEL_TRACE 0)
-set(SPDLOG_LEVEL_OFF 6)
-set(SPDLOG_MIN_CUTOFF SPDLOG_LEVEL_TRACE CACHE STRING "cutoff at trace")
 
 option(SUPPRESS_WARNINGS "Suppress warnings in LUS and src (decomp)" ON)
 if(SUPPRESS_WARNINGS)
@@ -38,7 +34,7 @@ math(EXPR PATCH_INDEX "${PROJECT_VERSION_PATCH}")
 # Use the patch number to select the correct word
 list(GET NATO_PHONETIC_ALPHABET ${PATCH_INDEX} PROJECT_PATCH_WORD)
 
-set(PROJECT_BUILD_NAME "Ackbar ${PROJECT_PATCH_WORD}" CACHE STRING "" FORCE)
+set(PROJECT_BUILD_NAME "Holiday 2024" CACHE STRING "" FORCE)
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE)
 
 execute_process(
@@ -57,10 +53,7 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-# Get only the first 7 characters of the hash
-string(SUBSTRING "${GIT_COMMIT_HASH}" 0 7 SHORT_COMMIT_HASH)
-
-set(CMAKE_PROJECT_GIT_COMMIT_HASH "${SHORT_COMMIT_HASH}" CACHE STRING "Git commit hash" FORCE)
+set(CMAKE_PROJECT_GIT_COMMIT_HASH "${GIT_COMMIT_HASH}" CACHE STRING "Git commit hash" FORCE)
 
 execute_process(
     COMMAND git describe --tags --abbrev=0 --exact-match HEAD
@@ -78,7 +71,6 @@ set(CMAKE_PROJECT_GIT_COMMIT_TAG "${GIT_COMMIT_TAG}" CACHE STRING "Git commit ta
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
 add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
 add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
-add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/Zc:preprocessor>)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     include(CMake/automate-vcpkg.cmake)
@@ -87,7 +79,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(VCPKG_TARGET_TRIPLET x64-windows-static)
 
     vcpkg_bootstrap()
-    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog libogg libvorbis opus opusfile)
+    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog)
+
     if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache")
         set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)
     endif()
@@ -157,10 +150,6 @@ set(GFX_DEBUG_DISASSEMBLER ON)
 
 # Tell LUS we're using F3DEX_GBI_2 (in a way that doesn't break libgfxd)
 set(GBI_UCODE F3DEX_GBI_2)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-
-# Enable MPQ and OTR support
-set(INCLUDE_MPQ_SUPPORT ON)
 
 ################################################################################
 # Set CONTROLLERBUTTONS_T
@@ -172,7 +161,6 @@ add_compile_definitions(CONTROLLERBUTTONS_T=uint32_t)
 ################################################################################
 add_subdirectory(libultraship ${CMAKE_BINARY_DIR}/libultraship)
 target_compile_options(libultraship PRIVATE "${WARNING_OVERRIDE}")
-target_compile_definitions(libultraship PUBLIC INCLUDE_MPQ_SUPPORT)
 add_subdirectory(ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
 add_subdirectory(OTRExporter)
 add_subdirectory(soh)
@@ -182,15 +170,24 @@ set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scri
 set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png")
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-install(FILES "${CMAKE_BINARY_DIR}/soh/soh.o2r" DESTINATION . COMPONENT ship)
+install(PROGRAMS "${CMAKE_BINARY_DIR}/linux/soh.sh" DESTINATION . COMPONENT appimage)
+install(FILES "${CMAKE_SOURCE_DIR}/soh.otr" DESTINATION . COMPONENT ship)
 install(TARGETS ZAPD DESTINATION ./assets/extractor COMPONENT extractor)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets COMPONENT extractor)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/xml COMPONENT extractor)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT extractor)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/extractor/xmls COMPONENT extractor)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION ./assets/extractor/filelists COMPONENT extractor)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT extractor)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT extractor)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT extractor)
 endif()
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/ COMPONENT ship)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/xml COMPONENT ship)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT ship)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/extractor/xmls COMPONENT ship)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION ./assets/extractor/filelists COMPONENT ship)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship)
 endif()
 
 find_package(Python3 COMPONENTS Interpreter)
@@ -198,42 +195,34 @@ find_package(Python3 COMPONENTS Interpreter)
 # Target to generate OTRs
 add_custom_target(
     ExtractAssets
-    COMMAND ${CMAKE_COMMAND} -E rm -f oot.o2r oot-mq.o2r soh.o2r
-
-    # copy LUS default shaders into assets/custom
-    COMMAND ${CMAKE_COMMAND} -E rm -r -f ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/fast/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
-
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root assets/xml --custom-otr-file soh.o2r "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
+    # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
+    COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f oot.otr oot-mq.otr soh.otr
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/soh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Running asset extraction..."
     DEPENDS ZAPD
-    BYPRODUCTS oot.o2r ${CMAKE_SOURCE_DIR}/oot.o2r oot-mq.o2r ${CMAKE_SOURCE_DIR}/oot-mq.o2r ${CMAKE_SOURCE_DIR}/soh.o2r
+    BYPRODUCTS oot.otr ${CMAKE_SOURCE_DIR}/oot.otr oot-mq.otr ${CMAKE_SOURCE_DIR}/oot-mq.otr ${CMAKE_SOURCE_DIR}/soh.otr
 )
 
 # Target to generate headers
 add_custom_target(
     ExtractAssetHeaders
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root assets/xml --gen-headers
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/soh
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --gen-headers
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Generating asset headers..."
     DEPENDS ZAPD
 )
 
-# Target to generate only soh.o2r
+# Target to generate only soh.otr
 add_custom_target(
     GenerateSohOtr
-    COMMAND ${CMAKE_COMMAND} -E rm -f soh.o2r
-
-    # copy LUS default shaders into assets/custom
-    COMMAND ${CMAKE_COMMAND} -E rm -r -f ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/fast/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
-
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.o2r "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
+    # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
+    COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f soh.otr
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DONLYSOHOTR=On -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/soh
-    COMMENT "Generating soh.o2r..."
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
+    COMMENT "Generating soh.otr..."
     DEPENDS ZAPD
 )
 
@@ -241,7 +230,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(ImageMagick COMPONENTS convert)
     if (ImageMagick_FOUND)
         execute_process (
-            COMMAND ${ImageMagick_convert_EXECUTABLE} ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/sohIcon.png
+            COMMAND ${ImageMagick_convert_EXECUTABLE} soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/sohIcon.png
             OUTPUT_VARIABLE outVar
         )
     endif()
@@ -250,35 +239,42 @@ endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 add_custom_target(CreateOSXIcons
     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset
-    COMMAND sips -z 16 16     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png
-    COMMAND sips -z 32 32     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png
-    COMMAND sips -z 32 32     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png
-    COMMAND sips -z 64 64     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png
-    COMMAND sips -z 128 128   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png
-    COMMAND sips -z 256 256   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png
-    COMMAND sips -z 256 256   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png
-    COMMAND sips -z 512 512   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png
-    COMMAND sips -z 512 512   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png
-    COMMAND cp                ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png
+    COMMAND sips -z 16 16     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png
+    COMMAND sips -z 32 32     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png
+    COMMAND sips -z 32 32     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png
+    COMMAND sips -z 64 64     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png
+    COMMAND sips -z 128 128   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png
+    COMMAND sips -z 256 256   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png
+    COMMAND sips -z 256 256   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png
+    COMMAND sips -z 512 512   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png
+    COMMAND sips -z 512 512   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png
+    COMMAND cp                soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png
     COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     COMMENT "Creating OSX icons ..."
     )
 add_dependencies(soh CreateOSXIcons)
 
-install(TARGETS ZAPD DESTINATION ${CMAKE_BINARY_DIR}/assets)
+install(TARGETS ZAPD DESTINATION ${CMAKE_BINARY_DIR}/assets/extractor)
 
 set(PROGRAM_PERMISSIONS_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/xml)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/extractor/xmls)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION ./assets/extractor/filelists)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols)
+install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols)
 
-# Rename the installed soh binary to drop the macos suffix
-INSTALL(CODE "FILE(RENAME \${CMAKE_INSTALL_PREFIX}/../MacOS/soh-macos \${CMAKE_INSTALL_PREFIX}/../MacOS/soh)")
+install(DIRECTORY ${CMAKE_BINARY_DIR}/assets
+        DESTINATION .
+        PATTERN ZAPD.out
+        PERMISSIONS ${PROGRAM_PERMISSIONS_EXECUTE}
+        )
 
 install(CODE "
     include(BundleUtilities)
-    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/soh\" \"\" \"${dirs}\")
+    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/soh-macos\" \"\" \"${dirs}\")
     ")
 
 endif()

PLAN_TRADUCCION.md

@@ -1,396 +0,0 @@
-# Plan de Implementación del Sistema de Traducción
-
-## Objetivo
-Crear un sistema de traducción dinámico que permita cargar idiomas desde archivos JSON externos **sin modificar los textos hardcodeados existentes**. Los textos en el código permanecen en inglés como fallback por defecto.
-
----
-
-## 1. Funcionamiento Clave
-
-### 1.1 Comportamiento
-- **Sin carpeta de idiomas**: El juego funciona exactamente como ahora con los textos hardcodeados en inglés
-- **Con carpeta de idiomas**: Cuando el usuario selecciona un idioma, se carga el JSON y se traducen los textos disponibles
-- **Fallback**: Si una traducción no existe en el JSON, se usa el texto hardcodeado (inglés)
-- **Persistencia**: El idioma seleccionado se guarda en la configuración y se carga automáticamente al iniciar
-
-### 1.2 Carpeta de Idiomas (opcional)
-```
-/lenguajes/
-  ├── Espanol.json
-  ├── Portugues.json
-  └── (otros idiomas).json
-```
-
-**Nota**: No se requiere English.json porque el inglés ya está hardcodeado en el código.
-
----
-
-## 2. Archivos Creados
-
-| Archivo | Descripción |
-|---------|-------------|
-| `soh/soh/SohGui/LanguageManager.h` | Header del manager de idiomas |
-| `soh/soh/SohGui/LanguageManager.cpp` | Implementación del manager |
-| `lenguajes/Espanol.json` | Traducción español (~950 claves) |
-| `soh/soh/Localization.h` | Stub para compatibilidad de compilación |
-| `soh/soh/Localization.cpp` | Stub para compatibilidad de compilación |
-
----
-
-## 3. Archivos Modificados (Implementación Base)
-
-| Archivo | Cambios |
-|---------|---------|
-| `soh/soh/SohGui/SohMenuSettings.cpp` | Agregar selector de idioma dinámico + carga automática al inicio |
-| `soh/soh/SohGui/SohMenu.cpp` | Aplicar traducción automática en DrawElement() con almacenamiento de nombres originales |
-| `soh/soh/SohGui/SohMenu.h` | Agregar mapa de nombres originales y tooltips originales |
-
----
-
-## 4. Ubicación de la Carpeta de Idiomas
-
-### 4.1 Ubicaciones Buscadas
-El sistema busca la carpeta `lenguajes` en este orden:
-1. **Directorio actual** (desde donde se ejecuta el juego)
-2. **Directorio de datos de la app** (~/.local/share/com.shipofharkinian.soh/)
-
-### 4.2 Cómo colocar los archivos
-```bash
-# Opción 1: Copiar junto al ejecutable (después de compilar)
-cp -r lenguajes build-cmake/soh/
-
-# Opción 2: En el directorio de datos de la app
-# Linux: ~/.local/share/com.shipofharkinian.soh/lenguajes/
-```
-
----
-
-## 5. Formato de Archivos JSON
-
-### 5.1 Estructura del JSON
-```json
-{
-  "language": "Español",
-  "strings": {
-    "Settings": "Configuración",
-    "Enabled": "Activado",
-    "Disabled": "Desactivado"
-  }
-}
-```
-
-### 5.2 Espanol.json (Completo)
-Actualmente incluye ~950 traducciones extraídas automáticamente de todos los archivos del menú.
-
----
-
-## 6. Implementación del LanguageManager
-
-### 6.1 LanguageManager.h
-```cpp
-class LanguageManager {
-public:
-    static LanguageManager& Instance();
-    
-    void Init();
-    void LoadLanguage(const std::string& languageName);
-    std::string GetString(const std::string& key);
-    std::vector<std::string> GetAvailableLanguages();
-    std::string GetCurrentLanguage();
-    bool IsTranslationLoaded();
-    
-private:
-    std::string currentLanguage;
-    std::map<std::string, std::string> translations;
-    bool translationLoaded;
-    
-    void ScanLanguageFiles();
-    bool LoadJsonFile(const std::string& path);
-    std::string GetLanguagesDirectory();
-};
-```
-
-### 6.2 Lógica de Funcionamiento
-```cpp
-std::string LanguageManager::GetString(const std::string& key) {
-    if (!translationLoaded || translations.empty()) {
-        return key;
-    }
-    auto it = translations.find(key);
-    if (it != translations.end()) {
-        return it->second;
-    }
-    return key; // Fallback al texto original
-}
-```
-
----
-
-## 7. Estado Actual de la Implementación
-
-### ✅ Completado
-- [x] LanguageManager.h/cpp - Carga de idiomas desde JSON
-- [x] Selector de idioma dinámico en Settings (usa CVar integer para el índice)
-- [x] Traducción automática de nombres de widgets en DrawElement()
-- [x] Almacenamiento de nombres originales con claves estables (sección|sidebar|columna|índice)
-- [x] Persistencia del idioma seleccionado
-- [x] Espanol.json con ~950 traducciones
-- [x] Compilación exitosa y funcional
-
-### ❌ Pendiente - Fase 1: Menú Completo (Riesgo Bajo-Medio)
-- [ ] Headers del menú principal (Settings, Enhancements, Randomizer, Network, Dev Tools)
-- [ ] Labels de sidebars (General, Audio, Graphics, Controls, etc.)
-- [ ] Tooltips de widgets (mensajes al pasar el mouse)
-- [ ] Opciones de combobox (temas, filtros de textura, etc.)
-- [ ] Mensajes de estado (disabled tooltips, mensajes de error)
-- [ ] Custom widgets que usan ImGui directo
-- [ ] Editor de resolución (labels de presets, textos de configuración)
-- [ ] Textos del sistema base de búsqueda (Search Results, Clear Search, No results found)
-- [ ] Botones del header (Quit SoH, Reset, Close Menu)
-- [ ] Nombres de botones N64 en UIWidgets (Modifier 1, Modifier 2)
-- [ ] Textos dinámicos en PreFunc (Connecting..., Connected, etc.)
-
-### ❌ Pendiente - Fase 2: Randomizer (Riesgo Alto)
-- [ ] Opciones del randomizer (settings.cpp - macros OPT_U8, OPT_BOOL)
-- [ ] Descripciones de opciones (option_descriptions.cpp)
-- [ ] Nombres de grupos de opciones (OptionGroup::SubGroup)
-- [ ] Textos custom del menú randomizer (ImGui directo)
-- [ ] Nombres de tricks y descripciones
-- [ ] Nombres de áreas
-- [ ] Textos del Plandomizer (Locations, Items, etc.)
-
----
-
-## 8. Análisis Completo de Textos por Categoría
-
-### Categoría 1: SohMenu.cpp - Mensajes de Estado
-**Archivo:** `soh/soh/SohGui/SohMenu.cpp`
-**Textos:** ~14 mensajes de disabledMap
-**Ejemplos:** "Disabling VSync not supported", "Debug Mode is Disabled", "Frame Advance is Disabled"
-**Cómo se dibujan:** Se concatenan en `Menu::MenuDrawItem()` como tooltips de widgets deshabilitados
-**Tipo:** `const char*` en struct `disabledInfo`
-**Riesgo:** BAJO
-
-### Categoría 2: SohMenuSettings.cpp - Widgets de Settings
-**Archivo:** `soh/soh/SohGui/SohMenuSettings.cpp`
-**Textos:** ~200 (nombres de widgets, tooltips, opciones de combobox)
-**Ejemplos de combobox options:** "Small", "Normal", "Large" (ImGui Scale), "Red", "Dark Red", "Orange" (temas), "Three-Point", "Linear", "None" (filtro textura)
-**Ejemplos de tooltips:** "Changes the Theme of the Menu Widgets.", "Allows controller navigation of the port menu..."
-**Cómo se dibujan:** Via `AddWidget().Tooltip("...")` y `.ComboMap(mapa)`
-**Tipo:** Tooltips como `std::string` en WidgetOptions, combobox como `std::map<int32_t, const char*>`
-**Riesgo:** MEDIO
-
-### Categoría 3: SohMenuEnhancements.cpp - Widgets de Enhancements
-**Archivo:** `soh/soh/SohGui/SohMenuEnhancements.cpp`
-**Textos:** ~500+ (nombres, tooltips, opciones de combobox, disabledTooltips)
-**Ejemplos de combobox options:** "Vanilla", "Faster Run", "Faster + Longer Jump" (Bunny Hood), "Plentiful", "Balanced", "Scarce", "Minimal" (Item Pool del randomizer)
-**Ejemplos de tooltips:** Textos largos de varias líneas explicando cada mejora
-**Cómo se dibujan:** Mismo patrón que Settings
-**Riesgo:** MEDIO-ALTO (volumen grande)
-
-### Categoría 4: SohMenuRandomizer.cpp - Widgets de Randomizer
-**Archivo:** `soh/soh/SohGui/SohMenuRandomizer.cpp`
-**Textos:** ~100 + datos del motor del randomizer
-**Ejemplos:** "Seed Entry", "Generate Randomizer", "Filter (inc,-exc)", "Disable All", "Enable All"
-**Cómo se dibujan:** Mix de `AddWidget()` y custom widgets con ImGui directo (`ImGui::Text()`, `ImGui::Button()`, `ImGui::BeginTable()`)
-**Datos del randomizer:** Nombres de ubicaciones, tricks, áreas vienen de `Rando::StaticData`, `TrickSetting`, `Option`
-**Riesgo:** ALTO (datos del randomizer pueden afectar compatibilidad con seeds)
-
-### Categoría 5: SohMenuNetwork.cpp - Widgets de Network
-**Archivo:** `soh/soh/SohGui/SohMenuNetwork.cpp`
-**Textos:** ~30
-**Ejemplos:** "Host & Port", "Enable##Sail", "Connecting...##Sail", "About Crowd Control"
-**Cómo se dibujan:** Mix de `AddWidget()` y textos ImGui directo
-**Riesgo:** BAJO
-
-### Categoría 6: SohMenuDevTools.cpp - Widgets de Dev Tools
-**Archivo:** `soh/soh/SohGui/SohMenuDevTools.cpp`
-**Textos:** ~50
-**Ejemplos:** "Debug Mode", "Frame Advance", "Log Level", "Trace", "Debug", "Info", "Warn"
-**Riesgo:** BAJO (herramientas de desarrollo, prioridad baja)
-
-### Categoría 7: Menu.cpp - Sistema Base del Menú
-**Archivo:** `soh/soh/SohGui/Menu.cpp`
-**Textos:** ~20
-**Ejemplos:** "This setting is disabled because: \n", "Search Results", "Clear Search", "No results found", "Quit SoH", "Reset", "Close Menu (Esc)"
-**Cómo se dibujan:** Directamente en `MenuDrawItem()` con llamadas ImGui
-**Riesgo:** MEDIO (textos del sistema core)
-
-### Categoría 8: UIWidgets.cpp - Widgets UI
-**Archivo:** `soh/soh/SohGui/UIWidgets.cpp`
-**Textos:** ~15
-**Ejemplos:** "Modifier 1", "Modifier 2", "Remove this button from the combination", "Resets this color to its default value"
-**Cómo se dibujan:** En `BtnSelector()` y Color Picker
-**Riesgo:** BAJO-MEDIO
-
-### Categoría 9: ResolutionEditor.cpp - Editor de Resolución
-**Archivo:** `soh/soh/SohGui/ResolutionEditor.cpp`
-**Textos:** ~40
-**Ejemplos:** "Off", "Custom", "Original (4:3)", "Widescreen (16:9)", "Pixel Perfect Mode", "Integer Scaling Settings"
-**Cómo se dibujan:** Mix de `AddWidget()` y `ResolutionCustomWidget()` con ImGui directo
-**Riesgo:** MEDIO
-
-### Categoría 10: Randomizer Settings - Opciones del Randomizer
-**Archivos:** 
-- `soh/soh/Enhancements/randomizer/settings.cpp`
-- `soh/soh/Enhancements/randomizer/option_descriptions.cpp`
-**Textos:** ~1000+
-**Ejemplos:** "Item Pool", "Logic", "Closed Forest", "Kakariko Gate", "Starting Age"
-**Cómo se dibujan:** Via macros `OPT_U8`, `OPT_BOOL` que crean objetos `Option`, no pasan por `AddWidget()`
-**Descripciones:** Textos largos en `option_descriptions.cpp` (~836 líneas)
-**Grupos:** `OptionGroup::SubGroup("Logic Options", ...)`, `OptionGroup::SubGroup("Logical Tricks", ...)`
-**Riesgo:** MUY ALTO (puede romper compatibilidad con seeds, spoiler logs, herramientas externas)
-
-### Categoría 11: SohMenu.h - Idiomas del Juego
-**Archivo:** `soh/soh/SohGui/SohMenu.h`
-**Textos:** 4 ("English", "German", "French", "Japanese")
-**Riesgo:** MUY BAJO (nombres propios de idiomas)
-
----
-
-## 9. Plan de Implementación Gradual (Opción C)
-
-### Fase 1: Menú Completo (sin Randomizer)
-**Objetivo:** Traducir todo el menú principal ~700 textos adicionales
-**Riesgo:** Medio
-**Tiempo estimado:** Moderado
-
-#### Paso 1.1: Headers y Sidebars
-- Modificar `DrawElement()` para traducir `section.label` y `sidebarOrder`
-- Usar claves estables basadas en índices (igual que widgets)
-- **Archivo:** `soh/soh/SohGui/SohMenu.cpp`
-
-#### Paso 1.2: Tooltips de Widgets
-- Agregar mapa `mOriginalTooltips` en SohMenu.h
-- Guardar tooltips originales con claves de índice
-- Traducir en `DrawElement()` antes de dibujar
-- **Archivos:** `SohMenu.h`, `SohMenu.cpp`
-
-#### Paso 1.3: Opciones de Combobox
-- Traducir en `PreFunc` de cada widget combobox
-- Usar mapas estáticos con traducción dinámica
-- **Archivos:** `SohMenuSettings.cpp`, `SohMenuEnhancements.cpp`, etc.
-
-#### Paso 1.4: Mensajes de Estado (disabledMap)
-- Traducir `disabledInfo.reason` en `MenuDrawItem()` al concatenar
-- **Archivo:** `soh/soh/SohGui/Menu.cpp`
-
-#### Paso 1.5: Textos del Sistema Base
-- Traducir textos de búsqueda, botones del header, diálogos de confirmación
-- **Archivo:** `soh/soh/SohGui/Menu.cpp`
-
-#### Paso 1.6: Custom Widgets
-- Envolver textos ImGui directo con `LanguageManager::Instance().GetString()`
-- **Archivos:** `SohMenuNetwork.cpp`, `SohMenuDevTools.cpp`, `ResolutionEditor.cpp`
-
-#### Paso 1.7: UIWidgets
-- Traducir labels de botones (Modifier 1, Modifier 2) y tooltips de Color Picker
-- **Archivo:** `soh/soh/SohGui/UIWidgets.cpp`
-
-### Fase 2: Randomizer (requiere diseño cuidadoso)
-**Objetivo:** Traducir opciones del randomizer ~1000+ textos
-**Riesgo:** Alto
-**Consideraciones:**
-- Los nombres de opciones se usan como keys en mapas y serialización
-- Puede afectar compatibilidad con seeds existentes y spoiler logs
-- Los nombres de tricks son parte de la cultura del speedrunning
-- Se necesita evaluar si traducir solo display names o también keys internas
-
-#### Paso 2.1: Opciones del Randomizer
-- Integrar `LanguageManager` en el sistema de `Option`
-- Traducir `GetName()` al renderizar, NO al crear la opción
-- **Archivo:** `soh/soh/Enhancements/randomizer/settings.cpp`
-
-#### Paso 2.2: Descripciones de Opciones
-- Traducir `mOptionDescriptions[]` al mostrar
-- **Archivo:** `soh/soh/Enhancements/randomizer/option_descriptions.cpp`
-
-#### Paso 2.3: Grupos de Opciones
-- Traducir nombres de `OptionGroup::SubGroup()` al renderizar
-- **Archivo:** `soh/soh/Enhancements/randomizer/settings.cpp`
-
-#### Paso 2.4: Custom Widgets del Randomizer
-- Traducir textos ImGui directo en el menú del randomizer
-- **Archivo:** `soh/soh/SohGui/SohMenuRandomizer.cpp`
-
-#### Paso 2.5: Tricks y Áreas (opcional, bajo demanda)
-- Traducir nombres de tricks y áreas
-- Evaluar impacto en la comunidad de speedrunning
-- **Archivos:** `soh/soh/Enhancements/randomizer/3drando/tricks.cpp`, etc.
-
----
-
-## 10. Notas Importantes
-
-- ✅ **Textos hardcodeados permanecen**: El código no se modifica, los textos en inglés quedan como están
-- ✅ **Sin carpeta de idiomas funciona igual**: Si no existe la carpeta, el juego funciona exactamente como antes
-- ✅ **Fallback automático**: Si falta una traducción, se muestra el texto original
-- ✅ **Selector dinámico**: Los nombres de idiomas vienen de los archivos JSON, no están hardcodeados
-- ✅ **Fácil agregar idiomas**: Solo hay que crear un nuevo archivo `.json` en la carpeta
-- ✅ **Persistencia**: El idioma seleccionado se guarda y se carga automáticamente al iniciar
-- ⚠️ **Ubicación de carpeta**: La carpeta `lenguajes` debe estar junto al ejecutable o en el directorio de datos de la app
-- ⚠️ **Claves estables**: Los nombres de widgets se traducen usando claves basadas en índices para evitar corrupción al cambiar idioma
-
----
-
-## 11. Cómo Compilar y Ejecutar
-
-```bash
-# 1. Compilar el proyecto
-cmake -H. -Bbuild-cmake -GNinja
-cmake --build build-cmake -j$(nproc)
-
-# 2. Copiar carpeta de idiomas junto al ejecutable
-cp -r lenguajes build-cmake/soh/
-
-# 3. Ejecutar desde la raíz del proyecto
-./build-cmake/soh/soh.elf
-```
-
----
-
-## 12. Resumen de Dificultad por Categoría
-
-| Categoría | Textos | Dificultad | Riesgo |
-|---|---|---|---|
-| Headers y Sidebars | ~30 | Media | Medio |
-| Tooltips del menú | ~400 | Media | Medio |
-| Opciones de combobox | ~150 | Media | Medio |
-| Mensajes de estado | ~30 | Baja | Bajo |
-| Custom widgets | ~80 | Media | Medio |
-| Editor de resolución | ~40 | Media | Medio |
-| Sistema base (búsqueda, botones) | ~20 | Media | Medio |
-| UIWidgets | ~15 | Baja | Bajo |
-| **Opciones del Randomizer** | ~1000+ | Muy Alta | **Muy Alto** |
-| Tricks y Áreas | ~100+ | Muy Alta | **Muy Alto** |
-
----
-
-## 13. Archivos de Referencia con Textos Hardcodeados
-
-### SohGui (ya analizados)
-- `SohMenu_hardcoded.txt`
-- `SohMenuSettings_hardcoded.txt`
-- `SohMenuEnhancements_hardcoded.txt`
-- `SohMenuRandomizer_hardcoded.txt`
-- `SohMenuNetwork_hardcoded.txt`
-- `SohMenuDevTools_hardcoded.txt`
-- `SohMenuBar_hardcoded.txt`
-- `ResolutionEditor_hardcoded.txt`
-
----
-
-## 14. Diferencias con el Plan Anterior
-
-| Aspecto | Plan Anterior | Plan Actual |
-|---------|---------------|--------------|
-| English.json | Obligatorio | No necesario (hardcodeado es fallback) |
-| Reemplazo de textos | Sí, en todos los archivos | No, solo agregar función GetString |
-| Archivos a modificar | 8+ archivos | 2 archivos (SohMenuSettings.cpp, SohMenu.cpp) |
-| Funcionamiento sin carpeta | Requiere English.json | Funciona igual que antes |
-| Stub Localization | No previsto | Necesario para compilar |
-| Persistencia de idioma | No implementada | ✅ Guardado y cargado automáticamente |
-| Strings en selector | Implementación con problemas | ✅ Solucionado con map estático |
-| Traducción de tooltips | No previsto | ✅ Implementado con claves estables |
-| Headers y Sidebars | No previsto | ⏳ Pendiente (Fase 1) |
-| Randomizer | No previsto | ⏳ Pendiente (Fase 2, requiere diseño) |

README.md

@@ -34,16 +34,16 @@ You can verify you have dumped a supported copy of the game by using the compati
 * You should see a notification saying `Processing OTR`, then, once the process is complete, you should get a notification saying `OTR Successfully Generated`, then the game should start.
 
 #### Nintendo Switch
-* Run one of the PC releases to generate an `oot.o2r` and/or `oot-mq.o2r` file. After launching the game on PC, you will be able to find these files in the same directory as `soh.exe` or `soh.appimage`. On macOS, these files can be found in `/Users/<username>/Library/Application Support/com.shipofharkinian.soh/`
+* Run one of the PC releases to generate an `oot.otr` and/or `oot-mq.otr` file. After launching the game on PC, you will be able to find these files in the same directory as `soh.exe` or `soh.appimage`. On macOS, these files can be found in `/Users/<username>/Library/Application Support/com.shipofharkinian.soh/`
 * Copy the files to your sd card
 ```
 sdcard
 └── switch
     └── soh
-        ├── oot-mq.o2r
-        ├── oot.o2r
+        ├── oot-mq.otr
+        ├── oot.otr
         ├── soh.nro
-        └── soh.o2r
+        └── soh.otr
 ```
 * Launch via Atmosphere's `Game+R` launcher method.
 
@@ -61,8 +61,7 @@ Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 ### Other shortcuts
 | Keys | Action |
 | - | - |
-| ESC | Toggle menu |
-| F2 | Toggle capture mouse input |
+| F1 | Toggle menubar |
 | F5 | Save state |
 | F6 | Change state |
 | F7 | Load state |
@@ -74,7 +73,7 @@ Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 # Project Overview
 Ship of Harkinian (SOH) is built atop a custom library dubbed libultraship (LUS). Back in the N64 days, there was an SDK distributed to developers named libultra; LUS is designed to mimic the functionality of libultra on modern hardware. In addition, we are dependant on the source code provided by the OOT decompilation project.
 
-In order for the game to function, you will require a **legally acquired** ROM for Ocarina of Time. Click [here](https://ship.equipment/) to check the compatibility of your specific rom. Any copyrighted assets are extracted from the ROM and reformatted as a .o2r archive file which the code uses.
+In order for the game to function, you will require a **legally acquired** ROM for Ocarina of Time. Click [here](https://ship.equipment/) to check the compatibility of your specific rom. Any copyrighted assets are extracted from the ROM and reformatted as a .otr archive file which the code uses.
 
 ### Graphics Backends
 Currently, there are three rendering APIs supported: DirectX11 (Windows), OpenGL (all platforms), and Metal (MacOS). You can change which API to use in the `Settings` menu of the menubar, which requires a restart.  If you're having an issue with crashing, you can change the API in the `shipofharkinian.json` file by finding the line `gfxbackend:""` and changing the value to `sdl` for OpenGL. DirectX 11 is the default on Windows.

copy-existing-otrs.cmake

@@ -1,37 +1,37 @@
 message(STATUS "Copying otr files...")
 
-if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/soh/oot.o2r)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.o2r ${SOURCE_DIR})
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.o2r ${BINARY_DIR}/soh/)
-    message(STATUS "Copied oot.o2r")
+if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot.otr)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${SOURCE_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${BINARY_DIR}/soh/)
+    message(STATUS "Copied oot.otr")
 endif()
-if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/soh/oot-mq.o2r)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.o2r ${SOURCE_DIR})
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.o2r ${BINARY_DIR}/soh/)
-    message(STATUS "Copied oot-mq.o2r")
+if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${SOURCE_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${BINARY_DIR}/soh/)
+    message(STATUS "Copied oot-mq.otr")
 endif()
-if(EXISTS ${SOURCE_DIR}/soh/soh.o2r)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.o2r ${SOURCE_DIR})
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.o2r ${BINARY_DIR}/soh/)
-    message(STATUS "Copied soh.o2r")
+if(EXISTS ${SOURCE_DIR}/OTRExporter/soh.otr)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.otr ${SOURCE_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.otr ${BINARY_DIR}/soh/)
+    message(STATUS "Copied soh.otr")
 endif()
 
 # Additionally for Windows, copy the otrs to the target dir, side by side with soh.exe
 if(SYSTEM_NAME MATCHES "Windows")
-    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/soh/oot.o2r)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.o2r ${TARGET_DIR})
+    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot.otr)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${TARGET_DIR})
     endif()
-    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/soh/oot-mq.o2r)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.o2r ${TARGET_DIR})
+    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${TARGET_DIR})
     endif()
-    if(EXISTS ${SOURCE_DIR}/soh/soh.o2r)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.o2r ${TARGET_DIR})
+    if(EXISTS ${SOURCE_DIR}/OTRExporter/soh.otr)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.otr ${TARGET_DIR})
     endif()
 endif()
 
-if(NOT ONLYSOHOTR AND (NOT EXISTS ${SOURCE_DIR}/oot.o2r AND NOT EXISTS ${SOURCE_DIR}/oot-mq.o2r))
+if(NOT ONLYSOHOTR AND (NOT EXISTS ${SOURCE_DIR}/oot.otr AND NOT EXISTS ${SOURCE_DIR}/oot-mq.otr))
     message(FATAL_ERROR "Failed to copy. No OTR files found.")
 endif()
-if(NOT EXISTS ${SOURCE_DIR}/soh.o2r)
+if(NOT EXISTS ${SOURCE_DIR}/soh.otr)
     message(FATAL_ERROR "Failed to copy. No soh OTR found.")
 endif()

docs/BUILDING.md

@@ -3,7 +3,7 @@
 ## Windows
 
 Requires:
-  * At least 8GB of RAM (machines with 4GB have seen compiler failures)
+  * At least 8GB of RAM (machines with 4GB have seen complier failures)
   * Visual Studio 2022 Community Edition with the C++ feature set
   * One of the Windows SDKs that comes with Visual Studio, for example the current Windows 10 version 10.0.19041.0
   * The `MSVC v143 - VS 2022 C++ build tools` component of Visual Studio
@@ -22,7 +22,7 @@ It is recommended that you install Python and Git standalone, the install proces
 
 _Note: Be sure to either clone with the ``--recursive`` flag or do ``git submodule update --init`` after cloning to pull in the libultraship submodule!_
 
-2. After setup and initial build, use the built-in OTR extraction to make your oot.o2r/oot-mq.o2r files.
+2. After setup and initial build, use the built-in OTR extraction to make your oot.otr/oot-mq.otr files.
 
 _Note: Instructions assume using powershell_
 ```powershell
@@ -34,7 +34,7 @@ cd Shipwright
 # Add `-DSUPPRESS_WARNINGS=0` to prevent suppression of warnings from LUS and decomp (src) files. set to 1 to re-enable suppression
 & 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64
 
-# Generate soh.o2r
+# Generate soh.otr
 & 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target GenerateSohOtr
 
 # Compile project
@@ -58,7 +58,7 @@ To develop using Visual Studio you only need to use cmake to generate the soluti
 To develop using Visual Studio Code or another editor you only need to open the repository in it.
 To build you'll need to follow the instructions from the building section.
 
-_Note: If you're using Visual Studio Code, the [CMake Tools plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
 
 _Experimental: You can also use another build system entirely rather than MSVC like [Ninja](https://ninja-build.org/) for possibly better performance._
 
@@ -90,94 +90,36 @@ C:\Program Files\CMake\bin\cmake.exe --build build-cmake --target ExtractAssetHe
 #### Debian/Ubuntu
 ```sh
 # using gcc
-apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libopengl-dev libopusfile-dev libvorbis-dev
+apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev
 
 # or using clang
-apt-get install clang git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libopengl-dev libopusfile-dev libvorbis-dev
+apt-get install clang git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev
 ```
 #### Arch
 ```sh
 # using gcc
-pacman -S gcc git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net opusfile libvorbis
+pacman -S gcc git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
 
 # or using clang
-pacman -S clang git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net opusfile libvorbis
+pacman -S clang git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tinyxml2 spdlog sdl2_net boost
 ```
 #### Fedora
 ```sh
 # using gcc
-dnf install gcc gcc-c++ git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel opusfile-devel libvorbis-devel
+dnf install gcc gcc-c++ git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel boost-devel
 
 # or using clang
-dnf install clang git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel opusfile-devel libvorbis-devel
+dnf install clang git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel boost-devel
 ```
-#### Nix
-You can use a `flake.nix` file to instantly setup a development environment using [Nix](https://nixos.org/). Write this `flake.nix` file in the root directory:
+#### openSUSE
+```sh
+# using gcc
+zypper in gcc gcc-c++ git cmake ninja SDL2-devel libpng16-devel libzip-devel libzip-tools nlohmann_json-devel tinyxml2-devel spdlog-devel
 
-```nix
-{
-  description = "Shipwright development environment";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in
-      {
-        devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            # Build tools
-            clang
-            git
-            cmake
-            ninja
-            lsb-release
-            pkg-config
-
-            # SDL2 libraries
-            SDL2
-            SDL2.dev
-            SDL2_net
-
-            # Other libraries
-            libpng
-            libzip
-            nlohmann_json
-            tinyxml-2
-            spdlog
-            libGL
-            libGL.dev
-            bzip2
-
-            # X11 libraries
-            xorg.libX11
-
-            # Audio libraries
-            libogg
-            libogg.dev
-            libvorbis
-            libvorbis.dev
-            libopus
-            libopus.dev
-            opusfile
-            opusfile.dev
-          ];
-          shellHook = ''
-            echo "Shipwright development environment loaded"
-            echo "Available tools: clang, git, cmake, ninja"
-          '';
-        };
-      });
-}
+# or using clang
+zypper in clang libstdc++-devel git cmake ninja SDL2-devel libpng16-devel libzip-devel libzip-tools nlohmann_json-devel tinyxml2-devel spdlog-devel
 ```
 
-Now type `nix develop` and you will be dropped into a shell with all dependencies, ensuring that all build commands work.
-
 ### Build
 
 _Note: If you're using Visual Studio Code, the [CMake Tools plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
@@ -196,7 +138,7 @@ git submodule update --init
 # Add `-DPython3_EXECUTABLE=$(which python3)` if you are using non-standard Python installations such as PyEnv
 cmake -H. -Bbuild-cmake -GNinja
 
-# Generate soh.o2r
+# Generate soh.otr
 cmake --build build-cmake --target GenerateSohOtr
 
 # Compile the project
@@ -231,11 +173,11 @@ cmake --build build-cmake --target ExtractAssetHeaders
 ```
 
 ## macOS
-Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, ninja, cmake, tinyxml2, nlohmann-json, libzip, opusfile, libvorbis` (can be installed via [homebrew](https://brew.sh/), macports, etc)
+Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, ninja, cmake, tinyxml2, nlohmann-json, libzip` (can be installed via [homebrew](https://brew.sh/), macports, etc)
 
 **Important: For maximum performance make sure you have ninja build tools installed!**
 
-_Note: If you're using Visual Studio Code, the [CMake Tools plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
 
 ```bash
 # Clone the repo
@@ -246,14 +188,14 @@ cd ShipWright
 git submodule update --init
 
 # Install development dependencies (assuming homebrew)
-brew install sdl2 libpng glew ninja cmake tinyxml2 nlohmann-json libzip opusfile libvorbis
+brew install sdl2 libpng glew ninja cmake tinyxml2 nlohmann-json libzip
 
 # Generate Ninja project
 # Add `-DCMAKE_BUILD_TYPE:STRING=Release` if you're packaging
 # Add `-DSUPPRESS_WARNINGS=0` to prevent suppression of warnings from LUS and decomp (src) files. set to 1 to re-enable suppression
 cmake -H. -Bbuild-cmake -GNinja
 
-# Generate soh.o2r
+# Generate soh.otr
 cmake --build build-cmake --target GenerateSohOtr
 
 # Compile the project
@@ -289,7 +231,7 @@ cmake --build build-cmake --target ExtractAssetHeaders
 
 ## Switch
 1. Requires that your build machine is setup with the tools necessary for your platform above
-2. Requires that you have the switch build tools installed
+2. Requires that you have the switch build tools installed 
 3. Clone the Ship of Harkinian repository
 4. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
 
@@ -310,7 +252,7 @@ cmake --build build-switch --target soh_nro
 
 ## Wii U
 1. Requires that your build machine is setup with the tools necessary for your platform above
-2. Requires that you have the Wii U build tools installed
+2. Requires that you have the Wii U build tools installed 
 3. Clone the Ship of Harkinian repository
 4. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
 
@@ -323,7 +265,7 @@ cmake --build build-cmake --target ExtractAssets
 # Setup cmake project for building for Wii U
 cmake -H. -Bbuild-wiiu -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
 # Build project and generate rpx
-cmake --build build-wiiu --target soh # --target soh_wuhb (for building .wuhb)
+cmake --build build-wiiu --target soh # --target soh_wuhb (for building .wuhb) 
 
 # Now you can run the executable in ./build-wiiu/soh/soh.rpx or the Wii U Homebrew Bundle in ./build-wiiu/soh/soh.wuhb
 # To develop the project open the repository in VSCode (or your preferred editor)

docs/CUSTOM_MUSIC.md

@@ -19,6 +19,6 @@ Once you have prepared your sequences folder:
     (*NOTE:* SoH can handle 1024 custom sequence in total. This includes the original music. Keep that in mind!)
 1. Click the "Finalize OTR" text in the green footer.
 1. Click "Generate OTR" and, using the file selection screen, save the file to the `mods` folder of your SoH installation.
-    - This `mods` folder should be in the same folder as your `oot.o2r` file.
+    - This `mods` folder should be in the same folder as your `oot.otr` file.
 
 Assuming you have done everything correctly, boot up SoH and select the SFX Editor from the enhancements dropdown menu. You should now be able to swap out any of the in game sequences/fanfares for the sequences added in your newly generated OTR file. If you have any trouble with this process, please reach out in the support section of the Discord.

docs/GAME_CONTROLLER_DB.md

@@ -1,38 +1,31 @@
 # SDL GameControllerDB
 
 The Ship of Harkinian utilizes a text file with SDL controller mappings for extended controller hardware support.
-This file is pulled from https://github.com/mdqinc/SDL_GameControllerDB during the build process as [a part of CMakeLists.txt](https://github.com/HarbourMasters/Shipwright/blob/bb643661f62865dfc757c185d0daaebb32f2d53d/soh/CMakeLists.txt#L760).
+This file is pulled from https://github.com/gabomdq/SDL_GameControllerDB during the build process as [a part of CMakeLists.txt](https://github.com/HarbourMasters/Shipwright/blob/bb643661f62865dfc757c185d0daaebb32f2d53d/soh/CMakeLists.txt#L760).
 
 ## Released versions
 
 | Release | sha | diff |
 | - | - | - |
-| Zhora Alfa 4.0.0 | [967daa8](https://github.com/mdqinc/SDL_GameControllerDB/tree/967daa8f89c48b01ed0f9c6a86ac849930442fc6) | |
-| Zhora Bravo 4.0.1 | [ccac7cd](https://github.com/mdqinc/SDL_GameControllerDB/tree/ccac7cd97f445955d4437e21c5f82123d9b4349b) | [+1](https://github.com/mdqinc/SDL_GameControllerDB/compare/967daa8...ccac7cd) |
-| Zhora Charlie 4.0.2 | [ff26eb0](https://github.com/mdqinc/SDL_GameControllerDB/tree/ff26eb04d0fe18356985d968119429d6012e7d75) | [+8/-3](https://github.com/mdqinc/SDL_GameControllerDB/compare/ccac7cd...ff26eb0) |
-| Zhora Delta 4.0.3 | [ad02da5](https://github.com/mdqinc/SDL_GameControllerDB/tree/ad02da5a95ca8005f2c1facc11a5a52f8522f0ee) | [+4/-5](https://github.com/mdqinc/SDL_GameControllerDB/compare/ff26eb0...ad02da5) |
-| Zohra Echo 4.0.4 | [c203690](https://github.com/mdqinc/SDL_GameControllerDB/tree/c203690b1e13980699802918d362cd9dadf89bd0) | [+8/-4](https://github.com/mdqinc/SDL_GameControllerDB/compare/ad02da5...c203690) |
-| Zhora Foxtrot 4.0.5 | [9db8101](https://github.com/mdqinc/SDL_GameControllerDB/tree/9db8101a5780d1b0721bf6de385e6ffe0d07dfc7) | [+6](https://github.com/mdqinc/SDL_GameControllerDB/compare/c203690...9db8101) |
-| Flynn Alfa 5.0.0 | [163cc5d](https://github.com/mdqinc/SDL_GameControllerDB/tree/163cc5d45e9fc2f1bb2b95ea7eee4bbc9a57955c) | [+29/-8](https://github.com/mdqinc/SDL_GameControllerDB/compare/9db8101...163cc5d) |
-| Flynn Bravo 5.0.1 | [7efce7d](https://github.com/mdqinc/SDL_GameControllerDB/tree/7efce7d3f309ec1fa409b1af09153f9eb77fbedf) | [-1](https://github.com/mdqinc/SDL_GameControllerDB/compare/163cc5d...7efce7d) |
-| Flynn Charlie 5.0.2 | [e607703](https://github.com/mdqinc/SDL_GameControllerDB/tree/e607703392145343e8aca42be052121c0b7bd1c9) | [+40/-17](https://github.com/mdqinc/SDL_GameControllerDB/compare/7efce7d...e607703) |
-| Bradley Alfa 5.1.0 | [2ba9676](https://github.com/mdqinc/SDL_GameControllerDB/tree/2ba96761af795c15e916cc97790b51e09dc0cd54) | [+1/-1](https://github.com/mdqinc/SDL_GameControllerDB/compare/e607703...2ba9676) |
-| Bradley Charlie 5.1.2 | [4f5d1d4](https://github.com/mdqinc/SDL_GameControllerDB/tree/4f5d1d497985b75f4a83a5de46f596dc4d7f002e) | [+5/-1](https://github.com/mdqinc/SDL_GameControllerDB/compare/2ba9676...4f5d1d4) |
-| Bradley Delta 5.1.3 | [9b73049](https://github.com/mdqinc/SDL_GameControllerDB/tree/9b73049ee62a2cc862d6ad94c2c777f2e8363a48) | [+4/-1](https://github.com/mdqinc/SDL_GameControllerDB/compare/4f5d1d4...9b73049) |
-| Bradley Echo 5.1.4 | [6d3801f](https://github.com/mdqinc/SDL_GameControllerDB/tree/6d3801fcfe74b1989de96403b7b560eba72a175c) | [+56/-21](https://github.com/mdqinc/SDL_GameControllerDB/compare/9b73049...6d3801f) |
-| Gibbs Alfa 6.0.0 | [0562b00](https://github.com/mdqinc/SDL_GameControllerDB/tree/0562b00eaf5c0308c49d329b79263d2dae1c3a85) | [+8/-2](https://github.com/mdqinc/SDL_GameControllerDB/compare/6d3801f...0562b00) |
-| Khan Alfa 6.1.0 | [436c7e3](https://github.com/mdqinc/SDL_GameControllerDB/tree/436c7e3d54a57189ea0ab44d05f36b7cc7ea496c) | [+31/-16](https://github.com/mdqinc/SDL_GameControllerDB/compare/0562b00...436c7e3) |
-| Khan Bravo 6.1.1 | [01cca2e](https://github.com/mdqinc/SDL_GameControllerDB/tree/01cca2e77f9bf9f1432be04f876f287eb78297fe) | [+23/-6](https://github.com/mdqinc/SDL_GameControllerDB/compare/436c7e3...01cca2e) |
-| Khan Charlie 6.1.2 | [6852946](https://github.com/mdqinc/SDL_GameControllerDB/tree/6852946487534c69b7d228fd4eb8c87cf6966475) | [+25/-15](https://github.com/mdqinc/SDL_GameControllerDB/compare/01cca2e...6852946) |
-| Spock Alfa 7.0.0 | [38bda81](https://github.com/mdqinc/SDL_GameControllerDB/tree/38bda816dc786f18493876f7bc30bc12dfd2636a) | [+15/-1](https://github.com/mdqinc/SDL_GameControllerDB/compare/6852946...38bda81) |
-| Spock Bravo 7.0.1 | [228d980](https://github.com/mdqinc/SDL_GameControllerDB/tree/228d980d3d791e9df3b096472f6b97459f8709fe) | [+7/-3](https://github.com/mdqinc/SDL_GameControllerDB/compare/38bda81...228d980) |
-| Spock Charlie 7.0.2 | [c5b4df0](https://github.com/mdqinc/SDL_GameControllerDB/tree/c5b4df0e1061175cb11e3ebbf8045178339864a5) | [+3](https://github.com/mdqinc/SDL_GameControllerDB/compare/228d980...c5b4df0) |
-| Sulu Alfa 7.1.0 | [a2cf171](https://github.com/mdqinc/SDL_GameControllerDB/tree/a2cf1711b4ebc646a3814705d2fb6aac5707bcae) | [+4/-1](https://github.com/mdqinc/SDL_GameControllerDB/compare/c5b4df0...a2cf171) |
-| Sulu Bravo 7.1.1 | [cc9f777](https://github.com/mdqinc/SDL_GameControllerDB/tree/cc9f777721f0cb30058d9eef52a295130b734a4a) | [+29/-9](https://github.com/mdqinc/SDL_GameControllerDB/compare/a2cf171...cc9f777) |
-| MacReady Alfa 8.0.0 | [c56329f](https://github.com/mdqinc/SDL_GameControllerDB/tree/c56329f4df93fc7a780bdbeae47a9c91447b629c) | [+67/-23](https://github.com/mdqinc/SDL_GameControllerDB/compare/cc9f777...c56329f) |
-| MacReady Bravo 8.0.1 | [721b575](https://github.com/mdqinc/SDL_GameControllerDB/tree/721b575d3053b21d6d30419bf74afb5b1d0fa7a4) | [+5/-5](https://github.com/mdqinc/SDL_GameControllerDB/compare/c56329f...721b575) |
-| MacReady Charlie 8.0.2 | [721b575](https://github.com/mdqinc/SDL_GameControllerDB/tree/721b575d3053b21d6d30419bf74afb5b1d0fa7a4) | [+0/-0](https://github.com/mdqinc/SDL_GameControllerDB/compare/721b575...721b575) |
-| MacReady Delta 8.0.3 | [d4ab609](https://github.com/mdqinc/SDL_GameControllerDB/tree/d4ab609121ee6e687bc3d3a7e80244b3b26d1164) | [+5/-3](https://github.com/mdqinc/SDL_GameControllerDB/compare/721b575...d4ab609) |
-| MacReady Echo 8.0.4 | [6555d47](https://github.com/mdqinc/SDL_GameControllerDB/tree/6555d47ecb5d9eebac0e3d8cd19a545e9d946c40) | [+2/-0](https://github.com/mdqinc/SDL_GameControllerDB/compare/d4ab609...6555d47) |
-| MacReady Foxtrot 8.0.5 | [037d6a1](https://github.com/mdqinc/SDL_GameControllerDB/tree/037d6a1533ed94fbc6a8c71e6f1f9aff1e46208a) | [+47/-14](https://github.com/mdqinc/SDL_GameControllerDB/compare/6555d47...037d6a1) |
-| MacReady Golf 8.0.6 | [075c154](https://github.com/mdqinc/SDL_GameControllerDB/tree/075c1549075ef89a397fd7e0663d21e53a2485fd) | [+340/-301](https://github.com/mdqinc/SDL_GameControllerDB/compare/037d6a1...075c154) |
+| Zhora Alfa 4.0.0 | [967daa8](https://github.com/gabomdq/SDL_GameControllerDB/tree/967daa8f89c48b01ed0f9c6a86ac849930442fc6) | |
+| Zhora Bravo 4.0.1 | [ccac7cd](https://github.com/gabomdq/SDL_GameControllerDB/tree/ccac7cd97f445955d4437e21c5f82123d9b4349b) | [+1](https://github.com/gabomdq/SDL_GameControllerDB/compare/967daa8...ccac7cd) |
+| Zhora Charlie 4.0.2 | [ff26eb0](https://github.com/gabomdq/SDL_GameControllerDB/tree/ff26eb04d0fe18356985d968119429d6012e7d75) | [+8/-3](https://github.com/gabomdq/SDL_GameControllerDB/compare/ccac7cd...ff26eb0) |
+| Zhora Delta 4.0.3 | [ad02da5](https://github.com/gabomdq/SDL_GameControllerDB/tree/ad02da5a95ca8005f2c1facc11a5a52f8522f0ee) | [+4/-5](https://github.com/gabomdq/SDL_GameControllerDB/compare/ff26eb0...ad02da5) |
+| Zohra Echo 4.0.4 | [c203690](https://github.com/gabomdq/SDL_GameControllerDB/tree/c203690b1e13980699802918d362cd9dadf89bd0) | [+8/-4](https://github.com/gabomdq/SDL_GameControllerDB/compare/ad02da5...c203690) |
+| Zhora Foxtrot 4.0.5 | [9db8101](https://github.com/gabomdq/SDL_GameControllerDB/tree/9db8101a5780d1b0721bf6de385e6ffe0d07dfc7) | [+6](https://github.com/gabomdq/SDL_GameControllerDB/compare/c203690...9db8101) |
+| Flynn Alfa 5.0.0 | [163cc5d](https://github.com/gabomdq/SDL_GameControllerDB/tree/163cc5d45e9fc2f1bb2b95ea7eee4bbc9a57955c) | [+29/-8](https://github.com/gabomdq/SDL_GameControllerDB/compare/9db8101...163cc5d) |
+| Flynn Bravo 5.0.1 | [7efce7d](https://github.com/gabomdq/SDL_GameControllerDB/tree/7efce7d3f309ec1fa409b1af09153f9eb77fbedf) | [-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/163cc5d...7efce7d) |
+| Flynn Charlie 5.0.2 | [e607703](https://github.com/gabomdq/SDL_GameControllerDB/tree/e607703392145343e8aca42be052121c0b7bd1c9) | [+40/-17](https://github.com/gabomdq/SDL_GameControllerDB/compare/7efce7d...e607703) |
+| Bradley Alfa 5.1.0 | [2ba9676](https://github.com/gabomdq/SDL_GameControllerDB/tree/2ba96761af795c15e916cc97790b51e09dc0cd54) | [+1/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/e607703...2ba9676) |
+| Bradley Charlie 5.1.2 | [4f5d1d4](https://github.com/gabomdq/SDL_GameControllerDB/tree/4f5d1d497985b75f4a83a5de46f596dc4d7f002e) | [+5/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/2ba9676...4f5d1d4) |
+| Bradley Delta 5.1.3 | [9b73049](https://github.com/gabomdq/SDL_GameControllerDB/tree/9b73049ee62a2cc862d6ad94c2c777f2e8363a48) | [+4/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/4f5d1d4...9b73049) |
+| Bradley Echo 5.1.4 | [6d3801f](https://github.com/gabomdq/SDL_GameControllerDB/tree/6d3801fcfe74b1989de96403b7b560eba72a175c) | [+56/-21](https://github.com/gabomdq/SDL_GameControllerDB/compare/9b73049...6d3801f) |
+| Gibbs Alfa 6.0.0 | [0562b00](https://github.com/gabomdq/SDL_GameControllerDB/tree/0562b00eaf5c0308c49d329b79263d2dae1c3a85) | [+8/-2](https://github.com/gabomdq/SDL_GameControllerDB/compare/6d3801f...0562b00) |
+| Khan Alfa 6.1.0 | [436c7e3](https://github.com/gabomdq/SDL_GameControllerDB/tree/436c7e3d54a57189ea0ab44d05f36b7cc7ea496c) | [+31/-16](https://github.com/gabomdq/SDL_GameControllerDB/compare/0562b00...436c7e3) |
+| Khan Bravo 6.1.1 | [01cca2e](https://github.com/gabomdq/SDL_GameControllerDB/tree/01cca2e77f9bf9f1432be04f876f287eb78297fe) | [+23/-6](https://github.com/gabomdq/SDL_GameControllerDB/compare/436c7e3...01cca2e) |
+| Khan Charlie 6.1.2 | [6852946](https://github.com/gabomdq/SDL_GameControllerDB/tree/6852946487534c69b7d228fd4eb8c87cf6966475) | [+25/-15](https://github.com/gabomdq/SDL_GameControllerDB/compare/01cca2e...6852946) |
+| Spock Alfa 7.0.0 | [38bda81](https://github.com/gabomdq/SDL_GameControllerDB/tree/38bda816dc786f18493876f7bc30bc12dfd2636a) | [+15/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/6852946...38bda81) |
+| Spock Bravo 7.0.1 | [228d980](https://github.com/gabomdq/SDL_GameControllerDB/tree/228d980d3d791e9df3b096472f6b97459f8709fe) | [+7/-3](https://github.com/gabomdq/SDL_GameControllerDB/compare/38bda81...228d980) |
+| Spock Charlie 7.0.2 | [c5b4df0](https://github.com/gabomdq/SDL_GameControllerDB/tree/c5b4df0e1061175cb11e3ebbf8045178339864a5) | [+3](https://github.com/gabomdq/SDL_GameControllerDB/compare/228d980...c5b4df0) |
+| Sulu Alfa 7.1.0 | [a2cf171](https://github.com/gabomdq/SDL_GameControllerDB/tree/a2cf1711b4ebc646a3814705d2fb6aac5707bcae) | [+4/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/c5b4df0...a2cf171) |
+| Sulu Bravo 7.1.1 | [cc9f777](https://github.com/gabomdq/SDL_GameControllerDB/tree/cc9f777721f0cb30058d9eef52a295130b734a4a) | [+29/-9](https://github.com/gabomdq/SDL_GameControllerDB/compare/a2cf171...cc9f777) |

docs/MODDING.md

@@ -41,28 +41,15 @@ You can name your branch whatever you want, but it's recommended to name it some
 
 The limit is your imagination. You can add new features, fix bugs, add new mods, or even change the way the game works. We will demonstrate this by creating a mod that changes the speed of the day/night cycle.
 
-Let's begin by finding where the time is updated. Thankfully in the save editor we have a slider already hooked up to the time of day so we can check there for reference. The save editor file is at `soh/soh/Enhancements/debugger/debugSaveEditor.cpp`, if we do a quick search within that file for time we will find the following at around line 217:
+Let's being by finding where the time is updated. Thankfully in the save editor we have a slider already hooked up to the time of day so we can check there for reference. The save editor file is at `soh/soh/Enhancements/debugger/debugSaveEditor.cpp`, if we do a quick search within that file for time we will find the following at line 400:
 
 ```cpp
-    SliderInt("Time", (int32_t*)&gSaveContext.dayTime, intSliderOptionsBase.Min(0).Max(0xFFFF).Tooltip("Time of day"));
-    if (Button("Dawn", buttonOptionsBase)) {
-        gSaveContext.dayTime = 0x4000;
-    }
-    ImGui::SameLine();
-    if (Button("Noon", buttonOptionsBase)) {
-        gSaveContext.dayTime = 0x8000;
-    }
-    ImGui::SameLine();
-    if (Button("Sunset", buttonOptionsBase)) {
-        gSaveContext.dayTime = 0xC001;
-    }
-    ImGui::SameLine();
-    if (Button("Midnight", buttonOptionsBase)) {
-        gSaveContext.dayTime = 0;
-    }
+const uint16_t dayTimeMin = 0;
+const uint16_t dayTimeMax = 0xFFFF;
+ImGui::SliderScalar("Time", ImGuiDataType_U16, &gSaveContext.dayTime, &dayTimeMin, &dayTimeMax);
 ```
 
-So this tells us that `gSaveContext.dayTime` is what we're looking for. Let's now do a global search for this to see if we can find where it is updated. We find the following in `soh/src/code/z_kankyo.c` around line 925:
+So this tells us that `gSaveContext.dayTime` is what we're looking for. Let's now do a global search for this to see if we can find where it is updated. We find the following in `soh/src/code/z_kankyo.c` line 925:
 
 ```cpp
 if (IS_DAY || gTimeIncrement >= 0x190) {
@@ -72,7 +59,7 @@ if (IS_DAY || gTimeIncrement >= 0x190) {
 }
 ```
 
-We can make a quick change to this code to verify this is indeed what we are looking for, lets multiply the gTimeIncrement by 10:
+We can make a quick change to this code to verify this is indeed what we are looking for, lets multiply the the gTimeIncrement by 10:
 
 ```diff
 if (IS_DAY || gTimeIncrement >= 0x190) {
@@ -84,19 +71,16 @@ if (IS_DAY || gTimeIncrement >= 0x190) {
 }
 ```
 
-Rebuild the game and launch it, then load a save file. You should see that the time of day is now moving much faster. Terrific! While we could wrap this up and call it a day, we could make this user configurable by making a few more changes. I think a slider would be good for this, there's a slider in the cheat menu that we can use as a reference. Let's find it in `soh/soh/SohGui/SohMenuEnhancements.cpp` around line 1565:
+Rebuild the game and launch it, then load a save file. You should see that the time of day is now moving much faster. Terrific! While we could wrap this up and call it a day, we could make this user configurable by making a few more changes. I think a slider would be good for this, there's a slider in the cheat menu that we can use as a reference. Let's find it in `soh/soh/SohMenuBar.cpp` around line 1120:
 
 ```cpp
-    AddWidget(path, "Hookshot Reach Multiplier: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
-        .CVar(CVAR_CHEAT("HookshotReachMultiplier"))
-        .Options(FloatSliderOptions().Format("%.2f").Min(1.0f).Max(5.0f));
+UIWidgets::EnhancementSliderFloat("Hookshot Reach Multiplier: %.1fx", "##gCheatHookshotReachMultiplier", "gCheatHookshotReachMultiplier", 1.0f, 5.0f, "", 1.0f, false);
 ```
-This adds a `Widget` which sets a CVar, which then sets the options of the slider. We'll make our minimum 0.2 to allow it to move slower, and our maximum 5.0 to allow it to move up to 5x faster. We'll also set the default to 1.0 so that it doesn't change the behavior by default. Copy this line and paste it below, then make the relevant changes:
+
+The float values being passed in here are `minimum`, `maximum`, and `default` respectively. We'll make our minimum 0.2 to allow it to move slower, and our maximum 5.0 to allow it to move up to 5x faster. We'll also set the default to 1.0 so that it doesn't change the behavior by default. Copy this line and paste it below, then make the relevant changes:
 
 ```cpp
-    AddWidget(path, "Time Multiplier: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
-        .CVar(CVAR_CHEAT("TimeOfDayMultiplier"))
-        .Options(FloatSliderOptions().Format("%.2f").Min(0.2f).Max(5.0f).DefaultValue(1.0f));
+UIWidgets::EnhancementSliderFloat("Time Multiplier: %.1fx", "##gCheatTimeMultiplier", "gCheatTimeMultiplier", 0.2f, 5.0f, "", 1.0f, false);
 ```
 
 Now we need to replace our hard coded values with the new variable. We can do this by replacing the `10` with a cvar call
@@ -104,10 +88,10 @@ Now we need to replace our hard coded values with the new variable. We can do th
 ```diff
 if (IS_DAY || gTimeIncrement >= 0x190) {
 -    gSaveContext.dayTime += gTimeIncrement * 10;
-+    gSaveContext.dayTime += gTimeIncrement * CVarGetFloat(CVAR_CHEAT("TimeOfDayMultiplier"),1.0f);
++    gSaveContext.dayTime += gTimeIncrement * CVarGetFloat("gCheatTimeMultiplier", 1.0f);
 } else {
 -    gSaveContext.dayTime += gTimeIncrement * 2 * 10;
-+   gSaveContext.dayTime += gTimeIncrement * 2 * CVarGetFloat(CVAR_CHEAT("TimeOfDayMultiplier"),1.0f);
++    gSaveContext.dayTime += gTimeIncrement * 2 * CVarGetFloat("gCheatTimeMultiplier", 1.0f);
 }
 ```
 

docs/VERSIONING.md

@@ -1,5 +1,5 @@
 ## About Versions
 
-The Ship of Harkinian's versioning system is a unique system, comprising of a three-numbered version (`x.y.z`) and a version codename.  The main version number `x` signifies major feature updates that require a new `oot.o2r` file.  The version number `y` signifies major feature updates and bugfixes that do not require a new `oot.o2r` file.  The version number `z` signifies minor updates such as a collection of bugfixes.
+The Ship of Harkinian's versioning system is a unique system, comprising of a three-numbered version (`x.y.z`) and a version codename.  The main version number `x` signifies major feature updates that require a new `oot.otr` file.  The version number `y` signifies major feature updates and bugfixes that do not require a new `oot.otr` file.  The version number `z` signifies minor updates such as a collection of bugfixes.
 
 The version codename consists of a sci-fi film character followed by a phonetic alphabet code word. The film character represents a major release version which increments with the major `x` or `y` version bumps. The code word represents a minor release version which increments with the minor `z` version bump.

docs/supportedHashes.json

@@ -30,49 +30,5 @@
     {
         "name": "PAL MQ (Debug)",
         "sha1": "cfecfdc58d650e71a200c81f033de4e6d617a9f6"
-    },
-    {
-        "name": "NTSC 1.0 (US)",
-        "sha1": "ad69c91157f6705e8ab06c79fe08aad47bb57ba7"
-    },
-    {
-        "name": "NTSC 1.1 (US)",
-        "sha1": "d3ecb253776cd847a5aa63d859d8c89a2f37b364"
-    },
-    {
-        "name": "NTSC 1.2 (US)",
-        "sha1": "41b3bdc48d98c48529219919015a1af22f5057c2"
-    },
-    {
-        "name": "NTSC 1.0 (JP)",
-        "sha1": "c892bbda3993e66bd0d56a10ecd30b1ee612210f"
-    },
-    {
-        "name": "NTSC 1.1 (JP)",
-        "sha1": "dbfc81f655187dc6fefd93fa6798face770d579d"
-    },
-    {
-        "name": "NTSC 1.2 (JP)",
-        "sha1": "fa5f5942b27480d60243c2d52c0e93e26b9e6b86"
-    },
-    {
-        "name": "NTSC GC (US)",
-        "sha1": "b82710ba2bd3b4c6ee8aa1a7e9acf787dfc72e9b"
-    },
-    {
-        "name": "NTSC MQ (US)",
-        "sha1": "8b5d13aac69bfbf989861cfdc50b1d840945fc1d"
-    },
-    {
-        "name": "NTSC GC (JP)",
-        "sha1": "0769c84615422d60f16925cd859593cdfa597f84"
-    },
-    {
-        "name": "NTSC GC (JP) (Collector's Edition)",
-        "sha1": "2ce2d1a9f0534c9cd9fa04ea5317b80da21e5e73"
-    },
-    {
-        "name": "NTSC MQ (JP)",
-        "sha1": "dd14e143c4275861fe93ea79d0c02e36ae8c6c2f"
     }
 ]

lenguajes/Espanol.json

@@ -1,954 +0,0 @@
-{
-  "language": "Español",
-  "strings": {
-    "English": "Inglés",
-    "German": "Alemán",
-    "French": "Francés",
-    "Japanese": "Japonés",
-    "Red": "Rojo",
-    "Dark Red": "Rojo Oscuro",
-    "Orange": "Naranja",
-    "Green": "Verde",
-    "Dark Green": "Verde Oscuro",
-    "Light Blue": "Azul Claro",
-    "Blue": "Azul",
-    "Dark Blue": "Azul Oscuro",
-    "Indigo": "Índigo",
-    "Violet": "Violeta",
-    "Purple": "Púrpura",
-    "Brown": "Marrón",
-    "Gray": "Gris",
-    "Dark Gray": "Gris Oscuro",
-    "Three-Point": "Tres Puntos",
-    "Linear": "Lineal",
-    "None": "Ninguno",
-    "Trace": "Rastro",
-    "Debug": "Depuración",
-    "Info": "Información",
-    "Warn": "Advertencia",
-    "Error": "Error",
-    "Critical": "Crítico",
-    "Off": "Apagado",
-    "Top Left": "Superior Izquierda",
-    "Top Right": "Superior Derecha",
-    "Bottom Left": "Inferior Izquierda",
-    "Bottom Right": "Inferior Derecha",
-    "Hidden": "Oculto",
-    "Normal": "Normal",
-    "Unbreakable": "Inquebrantable",
-    "Unbreakable + Always on Fire": "Inquebrantable + Siempre en Llamas",
-    "Navi": "Navi",
-    "NPCs": "NPCs",
-    "All": "Todos",
-    "Disabled": "Desactivado",
-    "Junk Items": "Objetos Basura",
-    "All Items": "Todos los Objetos",
-    "Both": "Ambos",
-    "Texture Only": "Solo Textura",
-    "Size Only": "Solo Tamaño",
-    "Ocarina of Time": "Ocarina del Tiempo",
-    "Any Ocarina": "Cualquier Ocarina",
-    "Always": "Siempre",
-    "Once": "Una vez",
-    "Never": "Nunca",
-    "Vanilla (1x)": "Original (1x)",
-    "Double (2x)": "Doble (2x)",
-    "Quadruple (4x)": "Cuádruple (4x)",
-    "Octuple (8x)": "Óctuple (8x)",
-    "Foolish (16x)": "Absurdo (16x)",
-    "Ridiculous (32x)": "Ridículo (32x)",
-    "Merciless (64x)": "Cruel (64x)",
-    "Pure Torture (128x)": "Pura Tortura (128x)",
-    "OHKO (256x)": "KO (256x)",
-    "No Damage": "Sin Daño",
-    "0.25 Hearts": "0.25 Corazones",
-    "0.5 Hearts": "0.5 Corazones",
-    "1 Heart": "1 Corazón",
-    "2 Hearts": "2 Corazones",
-    "4 Hearts": "4 Corazones",
-    "8 Hearts": "8 Corazones",
-    "Only in Rando": "Solo en Rando",
-    "Child Toggle": "Cambiar Niño",
-    "Both Ages": "Ambas Edades",
-    "Consistent Vanish": "Desvanecer Consistente",
-    "No Vanish": "Sin Desvanecer",
-    "Random": "Aleatorio",
-    "Random (Seeded)": "Aleatorio (Semilla)",
-    "Dungeons": "Mazmorras",
-    "Dungeons (Vanilla)": "Mazmorras (Original)",
-    "Dungeons (MQ)": "Mazmorras (MQ)",
-    "Dungeons Random": "Mazmorras Aleatorio",
-    "Dungeons Random (Seeded)": "Mazmorras Aleatorio (Semilla)",
-    "Vanilla": "Original",
-    "Maxed": "Maximizado",
-    "Default": "Por Defecto",
-    "Authentic": "Auténtico",
-    "File Select": "Selección de Archivo",
-    "Vanilla Plus": "Original Plus",
-    "Enhanced": "Mejorado",
-    "Randomizer": "Randomizer",
-    "Small": "Pequeño",
-    "Large": "Grande",
-    "X-Large": "Extra Grande",
-    "NTSC 1.0": "NTSC 1.0",
-    "NTSC 1.1": "NTSC 1.1",
-    "NTSC 1.2": "NTSC 1.2",
-    "NTSC-U GC": "NTSC-U GC",
-    "NTSC-J GC": "NTSC-J GC",
-    "NTSC-J GC (Collector's Edition)": "NTSC-J GC (Edición Coleccionista)",
-    "NTSC-U MQ": "NTSC-U MQ",
-    "NTSC-J MQ": "NTSC-J MQ",
-    "PAL 1.0": "PAL 1.0",
-    "PAL 1.1": "PAL 1.1",
-    "PAL GC": "PAL GC",
-    "PAL MQ": "PAL MQ",
-    "PAL GC-D": "PAL GC-D",
-    "PAL MQ-D": "PAL MQ-D",
-    "IQUE CN": "IQUE CN",
-    "IQUE TW": "IQUE TW",
-    "UNKNOWN": "DESCONOCIDO",
-    "Changes the Theme of the Menu Widgets.": "Cambia el tema de los widgets del menú.",
-    "Allows controller navigation of the port menu": "Permite navegación con controlador del menú de puertos",
-    "CAUTION: This will disable game inputs while the menu is visible.": "ADVERTENCIA: Esto deshabilitará las entradas del juego mientras el menú sea visible.",
-    "D-pad to move between items, A to select, B to move up in scope.": "D-pad para mover entre elementos, A para seleccionar, B para subir.",
-    "Sets the opacity of the background of the port menu.": "Establece la opacidad del fondo del menú de puertos.",
-    "Makes the cursor always visible, even in full screen.": "Hace el cursor siempre visible, incluso en pantalla completa.",
-    "Displays the Search menu as a sidebar entry in Settings instead of in the header.": "Muestra el menú de búsqueda como entrada lateral en Configuración.",
-    "Search input box gets autofocus when visible.": "La caja de búsqueda obtiene enfoque automático cuando es visible.",
-    "Allows pressing the Tab key to toggle alternate assets": "Permite presionar Tab para alternar assets alternativos",
-    "Opens the folder that contains the save and mods folders, etc.": "Abre la carpeta que contiene guardados y mods.",
-    "Configure what happens when starting or resetting the game.": "Configura qué sucede al iniciar o reiniciar el juego.",
-    "Default: LUS logo -> N64 logo": "Por defecto: Logo LUS -> Logo N64",
-    "Authentic: N64 logo only": "Auténtico: Solo logo N64",
-    "File Select: Skip to file select menu": "Selección de Archivo: Saltar al menú de selección",
-    "Enables text to speech for in game dialog": "Habilita texto a voz para diálogos del juego",
-    "Disables the automatic re-centering of the camera when idle.": "Deshabilita el recentrado automático de la cámara.",
-    "EXPERIMENTAL": "EXPERIMENTAL",
-    "Changes the scaling of the ImGui menu elements.": "Cambia la escala de los elementos del menú ImGui.",
-    "Ship Of Harkinian": "Ship Of Harkinian",
-    "Branch": "Rama",
-    "Commit": "Commit",
-    "Master Volume: %d %%": "Volumen Principal: %d %%",
-    "Main Music Volume: %d %%": "Volumen de Música Principal: %d %%",
-    "Sub Music Volume: %d %%": "Volumen de Música Secundaria: %d %%",
-    "Fanfare Volume: %d %%": "Volumen de Fanfarria: %d %%",
-    "Sound Effects Volume: %d %%": "Volumen de Efectos de Sonido: %d %%",
-    "Audio API (Needs reload)": "API de Audio (Necesita recargar)",
-    "Uses Matrix Interpolation to create extra frames": "Usa Interpolación de Matrices para crear cuadros extra",
-    "Toggles Fullscreen On/Off.": "Alternar Pantalla Completa.",
-    "Multiplies your output resolution by the value inputted": "Multiplica tu resolución de salida por el valor introducido",
-    "Activates MSAA (multi-sample anti-aliasing) from 2x up to 8x": "Activa MSAA (antialiasing multiamuestra) de 2x hasta 8x",
-    "Original (%d)": "Original (%d)",
-    "Match interpolation value to the refresh rate of your display.": "Coincidir valor de interpolación con tasa de refresco.",
-    "Renderer API (Needs reload)": "API del Renderizador (Necesita recargar)",
-    "Removes tearing, but clamps your max FPS to your displays refresh rate.": "Elimina tearing, pero limita FPS máximos.",
-    "Enables Windowed Fullscreen Mode.": "Habilita Modo Ventana Pantalla Completa.",
-    "Allows multiple windows to be opened at once.": "Permite múltiples ventanas a la vez.",
-    "Sets the applied Texture Filtering.": "Establece el filtro de textura aplicado.",
-    "Advanced Graphics Options": "Opciones Avanzadas de Gráficos",
-    "Controller Bindings": "Botones del Controlador",
-    "Enables the separate Bindings Window.": "Habilita la ventana de botones separada.",
-    "Input Viewer": "Visor de Entrada",
-    "Toggles the Input Viewer.": "Alterna el visor de entrada.",
-    "Input Viewer Settings": "Configuración del Visor de Entrada",
-    "Which corner of the screen notifications appear in.": "En qué esquina aparecen las notificaciones.",
-    "Duration (seconds):": "Duración (segundos):",
-    "How long notifications are displayed for.": "Cuánto tiempo se muestran las notificaciones.",
-    "Background Opacity": "Opacidad del Fondo",
-    "How opaque the background of notifications is.": "Qué tan opaco es el fondo de notificaciones.",
-    "Size:": "Tamaño:",
-    "How large notifications are.": "Qué tan grandes son las notificaciones.",
-    "Test Notification": "Probar Notificación",
-    "This is a test.": "Esto es una prueba.",
-    "Displays a test notification.": "Muestra una notificación de prueba.",
-    "Quality of Life": "Calidad de Vida",
-    "Saving": "Guardado",
-    "Save the game automatically on a 3 minute interval": "Guardar automáticamente cada 3 minutos",
-    "When loading a save, places Link at the last entrance": "Al cargar, coloca a Link en la última entrada",
-    "Containers Match Contents": "Contenedores equal Contenido",
-    "Chests of Agony": "Cofres de Agonía",
-    "Time of Day": "Hora del Día",
-    "Nighttime GS Always Spawn": "GS Nocturno Siempre Aparece",
-    "Pull Grave During the Day": "Tumbar de Día",
-    "Dampe Appears All Night": "Dampe Aparece Toda la Noche",
-    "Exit Market at Night": "Salir del Mercado de Noche",
-    "Shops and Games Always Open": "Tiendas y Juegos Siempre Abiertos",
-    "Pause Menu": "Menú de Pausa",
-    "Allow the Cursor to be on Any Slot": "Permitir Cursor en Cualquier Ranura",
-    "Pause Warp": "Teletransporte de Pausa",
-    "Controls": "Controles",
-    "Answer Navi Prompt with L Button": "Responder a Navi con Botón L",
-    "Don't Require Input for Credits Sequence": "No Requerir Input para Secuencia de Créditos",
-    "Include Held Inputs at the Start of Pause Buffer Input Window": "Incluir Inputs Sostenidos al Inicio de Ventana de Pausa",
-    "Pause Buffer Input Window: %d frames": "Ventana de Input de Pausa: %d cuadros",
-    "Simulated Input Lag: %d frames": "Lag de Input Simulado: %d cuadros",
-    "Item Count Messages": "Mensajes de Cantidad de Objetos",
-    "Gold Skulltula Tokens": "Tokens de Gold Skulltula",
-    "Pieces of Heart": "Piezas de Corazón",
-    "Heart Containers": "Contenedores de Corazón",
-    "Misc": "Varios",
-    "Disable Crit Wiggle": "Desactivar Crítico",
-    "Better Owl": "Mejor Búho",
-    "Quit Fishing at Door": "Salir de Pescar en Puerta",
-    "Instant Putaway": "Guardar Instantáneo",
-    "Navi Timer Resets on Scene Change": "Temporizador de Navi Resetea al Cambiar Escena",
-    "Link's Cow in Both Time Periods": "Vaca de Link en Ambos Períodos",
-    "Play Zelda's Lullaby to Open Sleeping Waterfall": "Tocar Canción de Zelda para Abrir Cascada Dormida",
-    "Skips & Speed-ups": "Saltos y Aceleraciones",
-    "Cutscenes": "Cinematicas",
-    "Skip Intro": "Saltar Introducción",
-    "Skip Entrance Cutscenes": "Saltar Cinemáticas de Entrada",
-    "Skip Story Cutscenes": "Saltar Cinemáticas de Historia",
-    "Skip Song Cutscenes": "Saltar Cinemáticas de Canciones",
-    "Skip Boss Introductions": "Saltar Introducciones de Jefes",
-    "Quick Boss Deaths": "Muertes Rápidas de Jefes",
-    "Skip One Point Cutscenes": "Saltar Cinemáticas de Un Punto",
-    "Skip Owl Interactions": "Saltar Interacciones del Búho",
-    "Skip Misc Interactions": "Saltar Interacciones Varias",
-    "Disable Title Card": "Desactivar Tarjeta de Título",
-    "Exclude Glitch-Aiding Cutscenes": "Excluir Cinemáticas de Glitch",
-    "Text": "Texto",
-    "Skip Pickup Messages": "Saltar Mensajes de Recolección",
-    "Skip Forced Dialog": "Saltar Diálogo Forzado",
-    "Skip Text": "Saltar Texto",
-    "Text Speed: %dx": "Velocidad de Texto: %dx",
-    "Slow Text Speed: %dx": "Velocidad de Texto Lento: %dx",
-    "Animations": "Animaciones",
-    "Faster Heavy Block Lift": "Levantar Bloque Pesado Más Rápido",
-    "Fast Chests": "Cofres Rápidos",
-    "Skip Water Take Breath Animation": "Saltar Animación de Respirar Bajo Agua",
-    "Vine/Ladder Climb Speed +%d": "Velocidad de Escalar Enredadera/Escalera +%d",
-    "Block Pushing Speed +%d": "Velocidad de Empujar Bloques +%d",
-    "Crawl Speed %dx": "Velocidad de Arrastre %dx",
-    "King Zra Speed: %.2fx": "Velocidad de Rey Zora: %.2fx",
-    "Skip Child Stealth": "Saltar Sigilo de Niño",
-    "Skip Tower Escape": "Saltar Escape de Torre",
-    "Skip Scarecrow's Song": "Saltar Canción del Espantapájaros",
-    "Faster Rupee Accumulator": "Acumulador de Rupias Más Rápido",
-    "No Skulltula Freeze": "Sin Congelamiento de Skulltula",
-    "Skip Save Confirmation": "Saltar Confirmación de Guardado",
-    "Link as Default File Name": "Link como Nombre de Archivo por Defecto",
-    "Biggoron Forge Time: %d days": "Tiempo de Forja de Biggoron: %d días",
-    "Mods": "Mods",
-    "Use Alternate Assets": "Usar Assets Alternativos",
-    "Disable Bomb Billboarding": "Desactivar Billboard de Bombas",
-    "Disable Grotto Fixed Rotation": "Desactivar Rotación Fija de Grotto",
-    "Ingame Text Spacing: %d": "Espaciado de Texto en Juego: %d",
-    "Models & Textures": "Modelos y Texturas",
-    "Disable LOD": "Desactivar LOD",
-    "Enemy Health Bars": "Barras de Salud de Enemigos",
-    "Enable 3D Dropped Items/Projectiles": "Habilitar Objetos 3D Lanzados",
-    "Animated Link in Pause Menu": "Link Animado en Menú de Pausa",
-    "Show Age-Dependent Equipment": "Mostrar Equipo Dependiente de Edad",
-    "Scale Adult Equipment as Child": "Escalar Equipo de Adulto como Niño",
-    "Show Gauntlets in First Person": "Mostrar Guanteletes en Primera Persona",
-    "Show Chains on Both Sides of Locked Doors": "Mostrar Cadenas en Ambos Lados de Puertas Cerradas",
-    "Color Temple of Time's Medallions": "Colorear Medallones del Templo del Tiempo",
-    "UI": "Interfaz",
-    "Minimal UI": "Interfaz Mínima",
-    "Disable Hot/Underwater Warning Text": "Desactivar Texto de Advertencia Calor/Submarino",
-    "Remember Minimap State Between Areas": "Recordar Estado del Minimapa Entre Áreas",
-    "Visual Stone of Agony": "Piedra Visual de Agonía",
-    "Disable HUD Heart Animations": "Desactivar Animaciones de Corazones HUD",
-    "Glitch Line-up Tick": "Ticks de Alineación de Glitch",
-    "Disable Black Bar Letterboxes": "Desactivar Carteleras Negras",
-    "Dynamic Wallet Icon": "Icono de Billetera Dinámico",
-    "Always Show Dungeon Entrances": "Siempre Mostrar Entradas de Mazmorras",
-    "More Info in File Select": "Más Info en Selección de Archivo",
-    "Better Ammo Rendering in Pause Menu": "Mejor Renderizado de Munición en Pausa",
-    "Enable Passage of Time on File Select": "Habilitar Paso del Tiempo en Selección",
-    "Misc.": "Varios",
-    "N64 Mode": "Modo N64",
-    "Remove Spin Attack Darkness": "Remover Oscuridad de Ataque Giratorio",
-    "Draw Distance": "Distancia de Dibujo",
-    "Increase Actor Draw Distance: %dx": "Aumentar Distancia de Dibujo de Actores: %dx",
-    "Kokiri Draw Distance": "Distancia de Dibujo Kokiri",
-    "Widescreen Actor Culling": "Culling de Actores Widescreen",
-    "Cull Glitch Useful Actors": "Culling de Actores Útiles para Glitch",
-    "Items": "Objetos",
-    "Equipment": "Equipo",
-    "Equip Items on Dpad": "Equipar Objetos en Dpad",
-    "Assignable Tunics and Boots": "Túnicas y Botas Asignables",
-    "Equipment Toggle": "Alternar Equipo",
-    "Allow Strength Equipment to be Toggled": "Permitir Alternar Equipo de Fuerza",
-    "Sword Toggle Options": "Opciones de Alternar Espada",
-    "Ask to Equip New Items": "Preguntar para Equipar Nuevos Objetos",
-    "Ocarina": "Ocarina",
-    "Prevent Dropped Ocarina Inputs": "Prevenir Inputs de Ocarina Suelta",
-    "Fast Ocarina Playback": "Reproducción Rápida de Ocarina",
-    "Time Travel with Song of Time": "Viajar en el Tiempo con Canción del Tiempo",
-    "Masks": "Máscaras",
-    "Bunny Hood Effect": "Efecto de Máscara de Conejo",
-    "Masks Equippable as Adult": "Máscaras Equipables como Adulto",
-    "Persistent Masks": "Máscaras Persistentes",
-    "Invisible Bunny Hood": "Máscara de Conejo Invisible",
-    "Mask Select in Inventory": "Selección de Máscara en Inventario",
-    "Explosives": "Explosivos",
-    "Deku Nuts Explode Bombs": "Nueces Deku Explotan Bombas",
-    "Remove Explosive Limit": "Remover Límite de Explosivos",
-    "Static Explosion Radius": "Radio de Explosión Estático",
-    "Prevent Bombchus Forcing First-Person": "Prevenir Bombchus Forzando Primera Persona",
-    "Better Bombchu Shopping": "Mejor Compra de Bombchus",
-    "Bow / Slingshot": "Arco/Honda",
-    "Equip Multiple Arrows at Once": "Equipar Múltiples Flechas a la Vez",
-    "Skip Magic Arrow Equip Animation": "Saltar Animación de Equipar Flecha Mágica",
-    "Blue Fire Arrows": "Flechas de Fuego Azul",
-    "Sunlight Arrows": "Flechas de Luz Solar",
-    "Bow as Child/Slingshot as Adult": "Arco como Niño/Honda como Adulto",
-    "Aiming Reticle for the Bow/Slingshot": "Retícula de Puntería para Arco/Honda",
-    "Hookshot": "Gancho",
-    "Targetable Hookshot Reticle": "Retícula de Gancho Dirigible",
-    "Boomerang": "Bumerang",
-    "Instant Boomerang Recall": "Retorno Instantáneo de Bumerang",
-    "Aim Boomerang in First-Person Mode": "Apuntar Bumerang en Modo Primera Persona",
-    "Aiming Reticle for Boomerang": "Retícula de Puntería para Bumerang",
-    "Magic Spells": "Hechizos",
-    "Better Farore's Wind": "Mejor Viento de Farore",
-    "Faster Farore's Wind": "Viento de Farore Más Rápido",
-    "Fixes": "Arreglos",
-    "Gameplay Fixes": "Arreglos de Jugabilidad",
-    "Fix the Gravedigging Tour Glitch": "Arreglar Glitch de Excursión de Excavación",
-    "Fix Raised Floor Switches": "Arreglar Interruptores de Piso Elevado",
-    "Popout Randomizer Settings Window": "Abrir Ventana de Configuración de Randomizer",
-    "Randomizer Settings": "Configuración de Randomizer",
-    "Enables the separate Randomizer Settings Window.": "Habilita la ventana separada de configuración de Randomizer.",
-    "Randomizer Enhancements": "Mejoras de Randomizer",
-    "Rando-Relevant Navi Hints": "Pistas de Navi Relevantes para Rando",
-    "Random Rupee Names": "Nombres Aleatorios de Rupias",
-    "Use Custom Key Models": "Usar Modelos de Llaves Personalizados",
-    "Map & Compass Colors Match Dungeon": "Colores de Mapa y Brújula igual a Mazmorra",
-    "Quest Item Fanfares": "Fanfarrias de Objetos de Misión",
-    "Mysterious Shuffled Items": "Objetos Mezclados Misteriosos",
-    "Simpler Boss Soul Models": "Modelos de Almas de Jefe Simples",
-    "Skip Get Item Animations": "Saltar Animaciones de Obtener Objeto",
-    "Item Scale: %.2f": "Escala de Objeto: %.2f",
-    "Popout Plandomizer Window": "Abrir Ventana de Plandomizer",
-    "Plandomizer Editor": "Editor de Plandomizer",
-    "Item Tracker": "Rastreador de Objetos",
-    "Toggle Item Tracker": "Alternar Rastreador de Objetos",
-    "Item Tracker Settings": "Configuración de Rastreador de Objetos",
-    "Popout Item Tracker Settings": "Abrir Configuración de Rastreador de Objetos",
-    "Entrance Tracker": "Rastreador de Entradas",
-    "Toggle Entrance Tracker": "Alternar Rastreador de Entradas",
-    "Entrance Tracker Settings": "Configuración de Rastreador de Entradas",
-    "Popout Entrance Tracker Settings": "Abrir Configuración de Rastreador de Entradas",
-    "Check Tracker": "Rastreador de Checks",
-    "Toggle Check Tracker": "Alternar Rastreador de Checks",
-    "Check Tracker Settings": "Configuración de Rastreador de Checks",
-    "Popout Check Tracker Settings": "Abrir Configuración de Rastreador de Checks",
-    "Popout Menu": "Abrir Menú",
-    "Debug Mode": "Modo Depuración",
-    "OoT Registry Editor": "Editor de Registro de OoT",
-    "Debug Save File Mode": "Modo de Archivo de Guardado de Depuración",
-    "OoT Skulltula Debug": "Depuración de Skulltula de OoT",
-    "Better Debug Warp Screen": "Mejor Pantalla de Teletransporte de Depuración",
-    "Debug Warp Screen Translation": "Traducción de Pantalla de Teletransporte",
-    "Resource logging": "Registro de Recursos",
-    "Frame Advance": "Avance de Cuadro",
-    "Advance 1": "Avanzar 1",
-    "Advance (Hold)": "Avanzar (Mantener)",
-    "Popout Stats Window": "Abrir Ventana de Estadísticas",
-    "Stats": "Estadísticas",
-    "Popout Console": "Abrir Consola",
-    "Console": "Consola",
-    "Popout Save Editor": "Abrir Editor de Guardado",
-    "Save Editor": "Editor de Guardado",
-    "Popout Hook Debugger": "Abrir Depurador de Hooks",
-    "Hook Debugger": "Depurador de Hooks",
-    "Popout Collision Viewer": "Abrir Visor de Colisiones",
-    "Collision Viewer": "Visor de Colisiones",
-    "Popout Actor Viewer": "Abrir Visor de Actores",
-    "Actor Viewer": "Visor de Actores",
-    "Popout Display List Viewer": "Abrir Visor de Lista de Display",
-    "Display List Viewer": "Visor de Lista de Display",
-    "Popout Value Viewer": "Abrir Visor de Valores",
-    "Value Viewer": "Visor de Valores",
-    "Popout Message Viewer": "Abrir Visor de Mensajes",
-    "Message Viewer": "Visor de Mensajes",
-    "Popout Gfx Debugger": "Abrir Depurador de Gráficos",
-    "Gfx Debugger": "Depurador de Gráficos",
-    "DirectX": "DirectX",
-    "OpenGL": "OpenGL",
-    "Metal": "Metal",
-    "Resolution Presets": "Preajustes de Resolución",
-    "Custom": "Personalizado",
-    "Original (4:3)": "Original (4:3)",
-    "Widescreen (16:9)": "Pantalla Amplia (16:9)",
-    "Nintendo 3DS (5:3)": "Nintendo 3DS (5:3)",
-    "16:10 (8:5)": "16:10 (8:5)",
-    "Ultrawide (21:9)": "Ultrawide (21:9)",
-    "Pixel Count Presets": "Preajustes de Cantidad de Píxeles",
-    "Native N64 (240p)": "Nativo N64 (240p)",
-    "2x (480p)": "2x (480p)",
-    "3x (720p)": "3x (720p)",
-    "4x (960p)": "4x (960p)",
-    "5x (1200p)": "5x (1200p)",
-    "6x (1440p)": "6x (1440p)",
-    "Full HD (1080p)": "Full HD (1080p)",
-    "4K (2160p)": "4K (2160p)",
-    "Set fixed vertical resolution": "Establecer resolución vertical fija",
-    "Horiz. Pixel Count": "Cantidad de Píxeles Horiz.",
-    "Force aspect ratio": "Forzar proporción de aspecto",
-    "Click to resolve": "Clic para resolver",
-    "Vertical Pixel Count": "Cantidad de Píxeles Vertical",
-    "Integer Scaling Settings": "Configuración de Escala Entera",
-    "Pixel Perfect Mode": "Modo Pixel Perfecto",
-    "Integer scale factor: {}": "Factor de escala entera: {}",
-    "Window exceeded.": "Ventana excedida.",
-    "Automatically scale image to fit viewport": "Escalar automáticamente imagen para ajustar",
-    "Additional Settings": "Configuración Adicional",
-    "If the image is stretched and you don't know why, click this.": "Si la imagen está estirada y no sabes por qué, haz clic.",
-    "Click to reenable aspect correction.": "Clic para rehabilitar corrección de aspecto.",
-    "Show a horizontal resolution field": "Mostrar campo de resolución horizontal",
-    "Allow integer scale factor to go +1 above maximum screen bounds.": "Permitir factor de escala entera +1 arriba del máximo.",
-    "A scroll bar may become visible if screen bounds are exceeded.": "Barra de desplazamiento puede aparecer.",
-    "Click to reset a console variable that may be causing this.": "Clic para reiniciar variable.",
-    "Viewport dimensions: {} x {}": "Dimensiones de viewport: {} x {}",
-    "Internal resolution: {} x {}": "Resolución interna: {} x {}",
-    "Enable advanced settings.": "Habilitar configuración avanzada.",
-    "Significant frame rate (FPS) drops may be occuring.": "Caídas significativas de FPS pueden estar ocurriendo.",
-    "N64 Mode is overriding these settings.": "Modo N64 está sobrescribiendo estas configuraciones.",
-    "Click to disable N64 mode": "Clic para desactivar modo N64",
-    "Aspect Ratio": "Proporción de Aspecto",
-    "Disabling VSync not supported": "Desactivar VSync no soportado",
-    "Windowed Fullscreen not supported": "Pantalla Completa en Ventana no soportada",
-    "Multi-viewports not supported": "Multi-viewports no soportado",
-    "Available Only on DirectX": "Solo Disponible en DirectX",
-    "Not Available on DirectX": "No Disponible en DirectX",
-    "Match Refresh Rate is Enabled": "Coincidir Tasa de Refresco está Habilitado",
-    "Advanced Resolution Enabled": "Resolución Avanzada Habilitada",
-    "Vertical Resolution Toggle Enabled": "Alternar Resolución Vertical Habilitado",
-    "N64 Mode Enabled": "Modo N64 Habilitado",
-    "Save Not Loaded": "Guardado No Cargado",
-    "Debug Mode is Disabled": "Modo Depuración está Desactivado",
-    "Frame Advance is Disabled": "Avance de Cuadro está Desactivado",
-    "Advanced Resolution is Disabled": "Resolución Avanzada está Desactivada",
-    "Vertical Resolution Toggle is Off": "Alternar Resolución Vertical está Apagado",
-    "A Wallmaster follows Link everywhere, don't get caught!": "¡Un Wallmaster sigue a Link a todas partes, no te dejes atrapar!",
-    "About": "Acerca de",
-    "About Crowd Control": "Acerca de Crowd Control",
-    "Accessibility": "Accesibilidad",
-    "Activates MSAA (multi-sample anti-aliasing) from 2x up to 8x, to smooth the edges of": "Activa MSAA (antialiasing multiamuestra) de 2x hasta 8x, para suavizar los bordes de",
-    "Additional Traps": "Trampas Adicionales",
-    "Adds a prompt to equip newly-obtained Swords, Shields, and Tunics.": "Agrega un aviso para equipar Espadas, Escudos y Túnicas recién obtenidas.",
-    "Adds back in a delay after unpausing before the game resumes playing again,": "Agrega un retraso después de despausar antes de que el juego se reanude,",
-    "Adjust the number of notes the Skull Kids play to start the first round.": "Ajusta el número de notas que tocan los Skull Kids para iniciar la primera ronda.",
-    "Adjust the number of notes you need to play to end the first round.": "Ajusta el número de notas que debes tocar para terminar la primera ronda.",
-    "Adjust the number of notes you need to play to end the second round.": "Ajusta el número de notas que debes tocar para terminar la segunda ronda.",
-    "Adjust the number of notes you need to play to end the third round.": "Ajusta el número de notas que debes tocar para terminar la tercera ronda.",
-    "Adjusts rate Dampe drops flames during race.": "Ajusta la velocidad a la que Dampe lanza llamas durante la carrera.",
-    "Adjusts the Horizontal Culling Plane to account for Widescreen Resolutions.": "Ajusta el Plano de Recorte Horizontal para tener en cuenta Resoluciones Panorámicas.",
-    "Adult Minimum Weight: %d lbs.": "Peso Mínimo Adulto: %d lbs.",
-    "Adult Starting Ammunition: %d arrows": "Munición Inicial Adulto: %d flechas",
-    "Advance 1 frame.": "Avanzar 1 cuadro.",
-    "Advance frames while the button is held.": "Avanzar cuadros mientras se mantiene el botón.",
-    "Aiming with a Bow or Slingshot will display a reticle as with the Hookshot": "Apuntar con Arco o Honda mostrará una retícula como con el Gancho",
-    "Aiming with the Boomerang will display a reticle as with the Hookshot.": "Apuntar con el Bumerán mostrará una retícula como con el Gancho.",
-    "All Dogs are Richard": "Todos los Perros son Richard",
-    "All Fish are Hyrule Loaches": "Todos los Peces son Lochas de Hyrule",
-    "All Major Bosses move and act twice as fast.": "Todos los Jefes Mayores se mueven y actúan el doble de rápido.",
-    "All Regular Enemies and Mini-Bosses move and act twice as fast.": "Todos los Enemigos Regulares y Mini-Jefes se mueven y actúan el doble de rápido.",
-    "All dogs can be traded in and will count as Richard.": "Todos los perros pueden ser intercambiados y contarán como Richard.",
-    "All fish will be caught instantly.": "Todos los peces se atrapan instantáneamente.",
-    "All##Skips": "Todos##Saltos",
-    "Allow Link to enter Jabu-Jabu without feeding him a fish.": "Permitir que Link entre a Jabu-Jabu sin alimentarlo con un pez.",
-    "Allow Link to put items away without having to wait around.": "Permitir que Link guarde objetos sin tener que esperar.",
-    "Allow background inputs": "Permitir entradas de fondo",
-    "Allow multi-windows": "Permitir múltiples ventanas",
-    "Allow unequipping Items": "Permitir Desequipar Objetos",
-    "Allows Bombchus to explode out of bounds. Similar to GameCube and Wii VC.": "Permite que las Bombchus exploten fuera de límites. Similar a GameCube y Wii VC.",
-    "Allows Child Link to use a Bow with Arrows.\n": "Permite que Link Niño use un Arco con Flechas.\n",
-    "Allows Link to bounce off walls when linear velocity is high enough, this is": "Permite que Link rebote en paredes cuando la velocidad lineal es suficientemente alta, esto es",
-    "Allows Link to freely change age by playing the Song of Time.\n": "Permite que Link cambie de edad libremente tocando la Canción del Tiempo.\n",
-    "Allows Link to unsheathe sword without slashing automatically.": "Permite que Link desenvaine la espada sin cortar automáticamente.",
-    "Allows Z-Targeting Gold Skulltulas.": "Permite Apuntar a las Gold Skulltulas.",
-    "Allows any item to be equipped, regardless of age.\n": "Permite equipar cualquier objeto, sin importar la edad.\n",
-    "Allows controller inputs to be picked up by the game even when the game window isn't": "Permite que el juego capture entradas del controlador incluso cuando la ventana del juego no está",
-    "Allows dogs to follow you anywhere you go, even if you leave the Market.": "Permite que los perros te sigan a donde vayas, incluso si sales del Mercado.",
-    "Allows equipping Shields, Tunics and Boots to C-Buttons/D-pad.": "Permite equipar Escudos, Túnicas y Botas a los Botones-C/D-pad.",
-    "Allows graves to be pulled when child during the day.": "Permite tumbar lápidas siendo niño durante el día.",
-    "Allows masks to be equipped normally from the pause menu as adult.": "Permite que las máscaras se equipen normalmente desde el menú de pausa como adulto.",
-    "Allows multiple windows to be opened at once. Requires a reload to take effect.": "Permite abrir múltiples ventanas a la vez. Requiere recargar para tener efecto.",
-    "Allows the cursor on the pause menu to be over any slot. Sometimes required in Randomizer": "Permite que el cursor del menú de pausa esté sobre cualquier ranura. A veces requerido en Randomizer",
-    "Allows unequipping items from C-Buttons/D-pad by hovering over an equipped": "Permite desequipar objetos de los Botones-C/d-pad pasando el cursor sobre un equipado",
-    "Allows you to control a Bombchu after dropping it.\n": "Permite controlar una Bombchu después de soltarla.\n",
-    "Allows you to have \"Link\" as a premade file name.": "Permite tener \"Link\" como nombre de archivo predeterminado.",
-    "Allows you to use any item at any location": "Permite usar cualquier objeto en cualquier ubicación",
-    "Allows you to walk through walls.": "Permite caminar a través de paredes.",
-    "Always Win Dampe Digging Game": "Ganar Siempre Juego de Excavación de Dampe",
-    "Always Win Goron Pot": "Ganar Siempre Olla Goron",
-    "Always get the Heart Piece/Purple Rupee from the Spinning Goron Pot.": "Obtener siempre la Pieza de Corazón/Rupia Púrpura de la Olla Giratoria Goron.",
-    "Always shows dungeon entrance icons on the Minimap.": "Siempre muestra iconos de entrada de mazmorras en el Minimapa.",
-    "Ammo": "Munición",
-    "Ammo Traps": "Trampas de Munición",
-    "Amy's block pushing puzzle instantly solved.": "Puzzle de empujar bloques de Amy resuelto instantáneamente.",
-    "Anti-aliasing (MSAA)": "Antialiasing (MSAA)",
-    "Any Ocarina + Master Sword": "Cualquier Ocarina + Espada Maestra",
-    "Arrow Cycle": "Ciclo de Flechas",
-    "Assignable Shields, Tunics and Boots": "Escudos, Túnicas y Botas Asignables",
-    "Audio": "Audio",
-    "Audio Fixes": "Arreglos de Audio",
-    "Autosave": "Autoguardado",
-    "Be sure to explore the Presets and Enhancements Menus for various Speedups and Quality of life changes!": "¡Asegúrate de explorar los menús de Preajustes y Mejoras para varias aceleraciones y cambios de calidad de vida!",
-    "Beta Quest": "Misión Beta",
-    "Beta Quest World: %d": "Mundo de Misión Beta: %d",
-    "Blue Fire dropped from bottle can be bottled.": "Fuego Azul derramado de botella puede ser embotellado.",
-    "Bomb Timer Multiplier: %.2fx": "Multiplicador de Temporizador de Bomba: %.2fx",
-    "Bomb Traps": "Trampas de Bomba",
-    "Bombchu Bowling": "Bolos de Bombchu",
-    "Bombchu Count: %d bombchus": "Cantidad de Bombchus: %d bombchus",
-    "Bombchus Out of Bounds": "Bombchus Fuera de Límites",
-    "Bombchus do not sell out when bought, and a 10 pack of Bombchus costs 99 rupees": "Las Bombchus no se agotan al comprarlas, y un paquete de 10 cuesta 99 rupias",
-    "Bombchus will sometimes drop in place of Bombs.": "Las Bombchus a veces caerán en lugar de Bombas.",
-    "Bonk Damage Multiplier": "Multiplicador de Daño por Golpe",
-    "Boot": "Inicio",
-    "Boot Sequence": "Secuencia de Inicio",
-    "Bottles": "Botellas",
-    "Bounce off Walls": "Rebotar en Paredes",
-    "Buffers your inputs to be executed a specified amount of frames later.": "Almacena tus entradas para ser ejecutadas una cantidad específica de cuadros después.",
-    "Bugs don't Despawn": "Los Bichos no Desaparecen",
-    "Burn Traps": "Trampas de Quemadura",
-    "Button Combination:": "Combinación de Botones:",
-    "Buttons that activate Speed Modifier 1.\n\n": "Botones que activan el Modificador de Velocidad 1.\n\n",
-    "Buttons to activate target switching.": "Botones para activar cambio de objetivo.",
-    "Camera Fixes": "Arreglos de Cámara",
-    "Cancel": "Cancelar",
-    "Causes your Wallet to fill and empty faster when you gain or lose money.": "Hace que tu Billetera se llene y vacíe más rápido al ganar o perder dinero.",
-    "Change Age": "Cambiar Edad",
-    "Changes Heart Piece and Heart Container functionality.\n\n": "Cambia la funcionalidad de Piezas de Corazón y Contenedores de Corazón.\n\n",
-    "Changes the behavior of debug file select creation (creating a save file on slot 1": "Cambia el comportamiento de creación de archivo de depuración (crear un archivo en la ranura 1",
-    "Changes the menu display from overlay to windowed.": "Cambia la visualización del menú de superpuesto a ventana.",
-    "Child Minimum Weight: %d lbs.": "Peso Mínimo Niño: %d lbs.",
-    "Child Starting Ammunition: %d seeds": "Munición Inicial Niño: %d semillas",
-    "Clear": "Limpiar",
-    "Clear Config": "Limpiar Configuración",
-    "Clear Cutscene Pointer": "Limpiar Puntero de Cinemática",
-    "Clear Devices": "Limpiar Dispositivos",
-    "Clears the cutscene pointer to a value safe for wrong warps.": "Limpia el puntero de cinemática a un valor seguro para wrong warps.",
-    "Climb Everything": "Escalar Todo",
-    "Configure what happens when starting or resetting the game.\n\n": "Configura qué sucede al iniciar o reiniciar el juego.\n\n",
-    "Connect to Crowd Control": "Conectar a Crowd Control",
-    "Connecting...": "Conectando...",
-    "Connecting...##Sail": "Conectando...##Sail",
-    "Containers of Agony": "Contenedores de Agonía",
-    "Convenience": "Conveniencia",
-    "Correctly centers the Navi text prompt on the HUD's C-Up button.": "Centra correctamente el aviso de texto de Navi en el botón C-Arriba del HUD.",
-    "Creates a new random seed value to be used when generating a randomizer": "Crea un nuevo valor de semilla aleatoria para usar al generar un randomizer",
-    "Crowd Control is a platform that allows viewers to interact": "Crowd Control es una plataforma que permite a los espectadores interactuar",
-    "Cuccos Needed By Anju: %d": "Cuccos Necesarios por Anju: %d",
-    "Cuccos Stay Put Multiplier: %dx": "Multiplicador de Cuccos Quietos: %dx",
-    "Current FPS": "FPS Actuales",
-    "Cursor Always Visible": "Cursor Siempre Visible",
-    "Customize Behavior##Bowling": "Personalizar Comportamiento##Bolos",
-    "Customize Behavior##Fishing": "Personalizar Comportamiento##Pesca",
-    "Customize Behavior##Frogs": "Personalizar Comportamiento##Ranas",
-    "Customize Behavior##LostWoods": "Personalizar Comportamiento##BosquePerdido",
-    "Customize Behavior##Shooting": "Personalizar Comportamiento##Tiro",
-    "Damage Multiplier": "Multiplicador de Daño",
-    "Dampe Drop Rate": "Tasa de Caída de Dampe",
-    "Dampe's Inferno": "Infierno de Dampe",
-    "Death Traps": "Trampas de Muerte",
-    "Debug Warp Screen": "Pantalla de Teletransporte Debug",
-    "Deku Sticks:": "Palos Deku:",
-    "Delete File on Death": "Eliminar Archivo al Morir",
-    "Despawn Timers": "Temporizadores de Desaparición",
-    "Desync Fixes": "Arreglos de Desincronización",
-    "Dev Tools": "Htas. Desarrollo",
-    "Disable 2D Pre-Rendered Scenes": "Desactivar Escenas Pre-renderizadas 2D",
-    "Disable Fixed Camera": "Desactivar Cámara Fija",
-    "Disable Haunted Wasteland Sandstorm": "Desactivar Tormenta de Arena del Páramo",
-    "Disable Idle Camera Re-Centering": "Desactivar Recentrado de Cámara en Reposo",
-    "Disable Jabu Wobble": "Desactivar Bamboleo de Jabu",
-    "Disable Kokiri Fade": "Desactivar Desvanecimiento Kokiri",
-    "Disable Link Spinning With Goron Pot": "Desactivar Giro de Link con Olla Goron",
-    "Disable Link's Sword Trail": "Desactivar Estela de Espada de Link",
-    "Disable Random Camera Wiggle at Low Health.": "Desactivar Movimiento Aleatorio de Cámara con Poca Salud.",
-    "Disable Screen Flash for Finishing Blow": "Desactivar Flash de Pantalla para Golpe Final",
-    "Disable the geometry wobble and camera distortion inside Jabu.": "Desactivar el bamboleo de geometría y distorsión de cámara dentro de Jabu.",
-    "Disabled: Paths vanish more the higher the resolution (Z-Fighting is based on resolution).\n": "Desactivado: Los caminos desaparecen más cuanto mayor es la resolución (Z-Fighting depende de la resolución).\n",
-    "Disables 2D pre-rendered backgrounds. Enable this when using a mod that": "Desactiva fondos pre-renderizados 2D. Habilita esto al usar un mod que",
-    "Disables Random Drops, except from the Goron Pot, Dampe, and Bosses.": "Desactiva Caídas Aleatorias, excepto de la Olla Goron, Dampe y Jefes.",
-    "Disables sandstorm effect in Haunted Wasteland.": "Desactiva el efecto de tormenta de arena en el Páramo Encantado.",
-    "Disables the Beating Animation of the Hearts on the HUD.": "Desactiva la Animación de Latido de los Corazones en el HUD.",
-    "Disables the sword trail effect when swinging Link's sword. Useful when": "Desactiva el efecto de estela de espada al balancear la espada de Link. Útil cuando",
-    "Disables the white screen flash on enemy kill.": "Desactiva el flash de pantalla blanca al matar enemigos.",
-    "Disables warning text when you don't have on the Goron/Zora Tunic": "Desactiva texto de advertencia cuando no tienes puesta la Túnica Goron/Zora",
-    "Dogs Follow You Everywhere": "Los Perros te Siguen a Todas Partes",
-    "Don't affect jump distance/velocity": "No afecta distancia/velocidad de salto",
-    "Don't increase crawl speed when exiting glitch-useful crawlspaces.": "No aumentar velocidad de arrastre al salir de espacios de arrastre útiles para glitches.",
-    "Don't scale image to fill window.": "No escalar imagen para llenar ventana.",
-    "Don't skip cutscenes that are associated with useful glitches. Currently, it is": "No saltar cinemáticas asociadas con glitches útiles. Actualmente, es",
-    "Drops": "Caídas",
-    "Drops Don't Despawn": "Las Caídas no Desaparecen",
-    "Drops from enemies, grass, etc. don't disappear after a set amount of time.": "Las caídas de enemigos, hierba, etc. no desaparecen después de un tiempo establecido.",
-    "Dying will delete your file.\n\n": "Morir eliminará tu archivo.\n\n",
-    "Early Eyeball Frog": "Rana Ojo Temprana",
-    "Easy Frame Advancing with Pause": "Avance de Cuadro Fácil con Pausa",
-    "Easy ISG": "ISG Fácil",
-    "Easy QPA": "QPA Fácil",
-    "Empty Bottles Faster": "Vaciar Botellas Más Rápido",
-    "Enable Beta Quest": "Habilitar Misión Beta",
-    "Enable Bombchu Drops": "Habilitar Caída de Bombchus",
-    "Enable Visual Guard Vision": "Habilitar Visión Visual de Guardia",
-    "Enable Vsync": "Habilitar Vsync",
-    "Enable##CrowdControl": "Habilitar##CrowdControl",
-    "Enable##Sail": "Habilitar##Sail",
-    "Enables Debug Mode, allowing you to select maps with L + R + Z, noclip": "Habilita el Modo Debug, permitiéndote seleccionar mapas con L + R + Z, noclip",
-    "Enables Skulltula Debug, when moving the cursor in the menu above various": "Habilita Debug de Skulltula, al mover el cursor en el menú sobre varios",
-    "Enables additional Trap variants.": "Habilita variantes adicionales de Trampas.",
-    "Enables the registry editor.": "Habilita el editor de registro.",
-    "Enables the separate Actor Viewer Window.": "Habilita la ventana separada de Visor de Actores.",
-    "Enables the separate Additional Timers Window.": "Habilita la ventana separada de Temporizadores Adicionales.",
-    "Enables the separate Audio Editor Window.": "Habilita la ventana separada de Editor de Audio.",
-    "Enables the separate Check Tracker Settings Window.": "Habilita la ventana separada de Configuración de Rastreador de Checks.",
-    "Enables the separate Collision Viewer Window.": "Habilita la ventana separada de Visor de Colisiones.",
-    "Enables the separate Console Window.": "Habilita la ventana separada de Consola.",
-    "Enables the separate Cosmetics Editor Window.": "Habilita la ventana separada de Editor de Cosméticos.",
-    "Enables the separate Display List Viewer Window.": "Habilita la ventana separada de Visor de Lista de Display.",
-    "Enables the separate Entrance Tracker Settings Window.": "Habilita la ventana separada de Configuración de Rastreador de Entradas.",
-    "Enables the separate Gameplay Stats Window.": "Habilita la ventana separada de Estadísticas de Jugabilidad.",
-    "Enables the separate Gfx Debugger Window.": "Habilita la ventana separada de Depurador de Gráficos.",
-    "Enables the separate Hook Debugger Window.": "Habilita la ventana separada de Depurador de Hooks.",
-    "Enables the separate Input Viewer Settings Window.": "Habilita la ventana separada de Configuración de Visor de Entradas.",
-    "Enables the separate Item Tracker Settings Window.": "Habilita la ventana separada de Configuración de Rastreador de Objetos.",
-    "Enables the separate Message Viewer Window.": "Habilita la ventana separada de Visor de Mensajes.",
-    "Enables the separate Mod Menu Window.": "Habilita la ventana separada de Menú de Mods.",
-    "Enables the separate Save Editor Window.": "Habilita la ventana separada de Editor de Guardado.",
-    "Enables the separate Stats Window.": "Habilita la ventana separada de Estadísticas.",
-    "Enables the separate Time Splits Window.": "Habilita la ventana separada de Divisiones de Tiempo.",
-    "Enables the separate Value Viewer Window.": "Habilita la ventana separada de Visor de Valores.",
-    "Enemies": "Enemigos",
-    "Enemies spawned by CrowdControl won't be considered for \"clear enemy": "Los enemigos generados por CrowdControl no se considerarán para \"enemigo despejado\"",
-    "Enemy Name Tags": "Etiquetas de Nombre de Enemigos",
-    "Enhancements": "Mejoras",
-    "Epona Boost": "Impulso de Epona",
-    "Every fish in the Fishing Pond will always be a Hyrule Loach.\n\n": "Todos los peces en el Estanque de Pesca siempre serán Loachas de Hyrule.\n\n",
-    "Exclude Glitch-Aiding Crawlspaces": "Excluir Espacios de Arrastre para Glitches",
-    "Excluded Locations": "Ubicaciones Excluidas",
-    "F5 to save, F6 to change slots, F7 to load": "F5 para guardar, F6 para cambiar ranuras, F7 para cargar",
-    "Fall Damage Multiplier": "Multiplicador de Daño por Caída",
-    "Faster + Longer Jump": "Salto Más Rápido + Largo",
-    "Faster Pause Menu": "Menú de Pausa Más Rápido",
-    "Faster Run": "Carrera Más Rápida",
-    "Faster Shadow Ship": "Barco de Sombra Más Rápido",
-    "Fireproof Deku Shield": "Escudo Deku Ignífugo",
-    "Fish don't Despawn": "Los Peces no Desaparecen",
-    "Fish never Escape": "Los Peces Nunca Escapan",
-    "Fish while Hovering": "Pescar mientras Flotas",
-    "Fishing": "Pesca",
-    "Fix Anubis Fireballs": "Arreglar Bolas de Fuego de Anubis",
-    "Fix Broken Giant's Knife Bug": "Arreglar Bug de Espada del Gigante Rota",
-    "Fix Bush Item Drops": "Arreglar Caídas de Objetos de Arbustos",
-    "Fix Camera Drift": "Arreglar Deriva de Cámara",
-    "Fix Camera Swing": "Arreglar Balanceo de Cámara",
-    "Fix Credits Timing (PAL)": "Arreglar Tiempo de Créditos (PAL)",
-    "Fix Dampé Going Backwards": "Arreglar Dampe Yendo Hacia Atrás",
-    "Fix Darunia Dancing too Fast": "Arreglar Darunia Bailando Demasiado Rápido",
-    "Fix Deku Nut Upgrade": "Arreglar Mejora de Nuez Deku",
-    "Fix Dungeon Entrances": "Arreglar Entradas de Mazmorras",
-    "Fix Enemies not Spawning Near Water": "Arreglar Enemigos que no Aparecen Cerca del Agua",
-    "Fix Falling from Vine Edges": "Arreglar Caída desde Bordes de Enredadera",
-    "Fix Gerudo Warrior's Clothing Colors": "Arreglar Colores de Ropa de Guerrera Gerudo",
-    "Fix Goron City Doors After Fire Temple": "Arreglar Puertas de Ciudad Goron Después del Templo del Fuego",
-    "Fix Hand Holding Hammer": "Arreglar Mano Sosteniendo Martillo",
-    "Fix Hanging Ledge Swing Rate": "Arreglar Velocidad de Balanceo de Borde Colgante",
-    "Fix Kokiri Forest Quest State": "Arreglar Estado de Misión del Bosque Kokiri",
-    "Fix L&R Pause Menu": "Arreglar Menú de Pausa L&R",
-    "Fix L&Z Page Switch in Pause Menu": "Arreglar Cambio de Página L&Z en Menú de Pausa",
-    "Fix Link's Eyes Open while Sleeping": "Arreglar Ojos de Link Abiertos mientras Duerme",
-    "Fix Megaton Hammer Crouch Stab": "Arreglar Puñalada Agachada con Martillo Megatón",
-    "Fix Missing Jingle after 5 Silver Rupees": "Arreglar Jingle Faltante después de 5 Rupias de Plata",
-    "Fix Navi Text HUD Position": "Arreglar Posición de Texto de Navi en HUD",
-    "Fix Out of Bounds Textures": "Arreglar Texturas Fuera de Límites",
-    "Fix Poacher's Saw Softlock": "Arreglar Softlock de Sierra de Cazador Furtivo",
-    "Fix Two-Handed Idle Animations": "Arreglar Animaciones de Inactividad a Dos Manos",
-    "Fix Vanishing Paths": "Arreglar Caminos que Desaparecen",
-    "Fix Zora Hint Dialogue": "Arreglar Diálogo de Pista Zora",
-    "Fixes camera slightly drifting to the left when standing still due to a": "Arregla la deriva leve de la cámara hacia la izquierda al estar quieto debido a un",
-    "Fixes camera swing rate when the player falls off a ledge and the camera": "Arregla la velocidad de balanceo de cámara cuando el jugador cae de un borde y la cámara",
-    "Fixes kokiri animation state to match their text state when getting": "Arregla el estado de animación de los kokiri para coincidir con su estado de texto al obtener",
-    "Fixes the Broken Giant's Knife flag not being reset when Medigoron fixes it.": "Arregla la bandera de Espada del Gigante Rota no siendo reiniciada cuando Medigoron la arregla.",
-    "Font Scale: %.2fx": "Escala de Fuente: %.2fx",
-    "Force aspect ratio:": "Forzar proporción de aspecto:",
-    "Forest Temple": "Templo del Bosque",
-    "Freeze Time": "Congelar Tiempo",
-    "Freeze Traps": "Trampas de Congelación",
-    "Freezes the time of day.": "Congela la hora del día.",
-    "Frogs' Ocarina Game": "Juego de Ocarina de las Ranas",
-    "General": "General",
-    "General Settings": "Configuración General",
-    "Generate Randomizer": "Generar Randomizer",
-    "Ghost Pepper": "Chile Fantasma",
-    "Gives you the glitched damage value of the quick put away glitch.": "Te da el valor de daño glitcheado del glitch de guardado rápido.",
-    "Glitch Aids": "Ayudas de Glitch",
-    "Glitch Restorations": "Restauraciones de Glitch",
-    "Graphical Fixes": "Arreglos Gráficos",
-    "Graphical Restorations": "Restauraciones Gráficas",
-    "Graphics": "Gráficos",
-    "Graphics Options": "Opciones de Gráficos",
-    "Grave Hole Jumps": "Saltos de Agujero de Tumba",
-    "Greatly decreases cast time of Farore's Wind magic spell.": "Disminuye enormemente el tiempo de lanzamiento del hechizo Viento de Farore.",
-    "Guarantee Bite": "Garantizar Mordida",
-    "Habanero": "Habanero",
-    "Health": "Salud",
-    "Hide Background": "Ocultar Fondo",
-    "Hides most of the UI when not needed.\n": "Oculta la mayor parte de la interfaz cuando no es necesaria.\n",
-    "Holding L makes you float into the air.": "Mantener L te hace flotar en el aire.",
-    "Holding down B skips text.": "Mantener presionado B salta el texto.",
-    "Hookshot Everything": "Gancho a Todo",
-    "Hookshot Reach Multiplier: %.2fx": "Multiplicador de Alcance del Gancho: %.2fx",
-    "Host & Port": "Anfitrión y Puerto",
-    "Hurt Container Mode": "Modo Contenedor Dañino",
-    "Hyper Bosses": "Jefes Hiper",
-    "Hyper Enemies": "Enemigos Hiper",
-    "I promise I have read the warning": "Prometo que he leído la advertencia",
-    "I understand, enable save states": "Entiendo, habilitar estados de guardado",
-    "If enabled, signs near loading zones will tell you where they lead to.": "Si está habilitado, los letreros cerca de zonas de carga te dirán a dónde llevan.",
-    "ImGui Menu Scaling": "Escalado de Menú ImGui",
-    "Infinite...": "Infinito...",
-    "Instant Age Change": "Cambio de Edad Instantáneo",
-    "Instant Fishing": "Pesca Instantánea",
-    "Instant Win": "Victoria Instantánea",
-    "Instant Win##Frogs": "Victoria Instantánea##Ranas",
-    "Instant Win##LostWoods": "Victoria Instantánea##BosquePerdido",
-    "Instantly return the Boomerang to Link by pressing its item button while": "Devuelve instantáneamente el Bumerán a Link presionando su botón de objeto mientras",
-    "Integer scales the image. Only available in Pixel Perfect Mode.": "Escala la imagen en números enteros. Solo disponible en Modo Pixel Perfect.",
-    "Internal Resolution": "Resolución Interna",
-    "Interval between Rupee reduction in Rupee Dash Mode.": "Intervalo entre reducción de Rupias en Modo Rupee Dash.",
-    "Introduces Options for unequipping Link's sword\n\n": "Introduce Opciones para desequipar la espada de Link\n\n",
-    "Item-related Fixes": "Arreglos Relacionados con Objetos",
-    "Ivan the Fairy (Coop Mode)": "Ivan el Hada (Modo Coop)",
-    "Jabber Nut Colors Match Kind": "Colores de Nueces Jabber Coinciden con Tipo",
-    "Jalapeño": "Jalapeño",
-    "Keese/Guay don't Target You": "Keese/Guay no te Apuntan",
-    "King Zora Speed: %.2fx": "Velocidad de Rey Zora: %.2fx",
-    "Knockback Traps": "Trampas de Retroceso",
-    "Language": "Idioma",
-    "Languages": "Idiomas",
-    "Leever Spawn Rate: %d seconds": "Tasa de Aparición de Leever: %d segundos",
-    "Link will not spin when the Goron Pot starts to spin.": "Link no girará cuando la Olla Goron comience a girar.",
-    "Loaches always Appear": "Las Lochas Siempre Aparecen",
-    "Loaches will always appear in the fishing pond instead of every four visits.": "Las lochas siempre aparecerán en el estanque de pesca en lugar de cada cuatro visitas.",
-    "Log Level": "Nivel de Registro",
-    "Logs some resources as XML when they're loaded in binary format.": "Registra algunos recursos como XML cuando se cargan en formato binario.",
-    "Lost Woods Ocarina Game": "Juego de Ocarina del Bosque Perdido",
-    "Magic": "Magia",
-    "Make Deku Nuts explode Bombs, similar to how they interact with Bombchus.": "Hace que las Nueces Deku exploten Bombas, similar a como interactúan con Bombchus.",
-    "Make crouch stabbing always do the same damage as a regular slash.": "Hace que la puñalada agachada siempre haga el mismo daño que un corte regular.",
-    "Makes Link always kick the chest to open it, instead of doing the longer": "Hace que Link siempre patee el cofre para abrirlo, en lugar de hacer la animación más larga",
-    "Makes all equipment visible, regardless of age.": "Hace que todo el equipo sea visible, sin importar la edad.",
-    "Makes every surface in the game climbable.": "Hace que cada superficie en el juego sea escalable.",
-    "Makes every surface in the game hookshotable.": "Hace que cada superficie en el juego sea alcanzable con el gancho.",
-    "Makes every tunic have the effects of every other tunic.": "Hace que cada túnica tenga los efectos de todas las demás túnicas.",
-    "Makes the L and R buttons in the pause menu the same color.": "Hace que los botones L y R en el menú de pausa sean del mismo color.",
-    "Manual seed entry": "Entrada manual de semilla",
-    "Map Select Button Combination:": "Combinación de Botones de Selección de Mapa:",
-    "Match Refresh Rate": "Coincidir Tasa de Refresco",
-    "Matches interpolation value to the refresh rate of your display.": "Coincide el valor de interpolación con la tasa de refresco de tu pantalla.",
-    "Matches the color of maps & compasses to the dungeon they belong to.": "Coincide el color de mapas y brújulas con la mazmorra a la que pertenecen.",
-    "Menu Background Opacity": "Opacidad de Fondo del Menú",
-    "Menu Controller Navigation": "Navegación de Controlador del Menú",
-    "Menu Settings": "Configuración del Menú",
-    "Menu Theme": "Tema del Menú",
-    "Mirrored World": "Mundo Espejado",
-    "Misc Restorations": "Restauraciones Varias",
-    "Miscellaneous": "Misceláneo",
-    "Modifies Damage taken after Bonking.": "Modifica el Daño recibido después de Golpearse.",
-    "Modifies damage taken after falling into a void:\n": "Modifica el daño recibido al caer en un vacío:\n",
-    "Modify Note Timer: %dx": "Modificar Temporizador de Notas: %dx",
-    "Money": "Dinero",
-    "Moon Jump on L": "Salto Lunar en L",
-    "MoreResolutionSettings": "MásConfiguracionesDeResolución",
-    "Multiplier:": "Multiplicador:",
-    "Multiplies your output resolution by the value inputted, as a more intensive but effective": "Multiplica tu resolución de salida por el valor ingresado, como una forma más intensiva pero efectiva",
-    "Mute Notification Sound": "Silenciar Sonido de Notificación",
-    "N64 Weird Frames": "Cuadros Extraños N64",
-    "Nayru's Love": "Amor de Nayru",
-    "Network": "Red",
-    "Nighttime Skulltulas will spawn during both day and night.": "Las Skulltulas nocturnas aparecerán tanto de día como de noche.",
-    "No Clip": "Sin Colisión",
-    "No Clip Button Combination:": "Combinación de Botones Sin Colisión:",
-    "No Heart Drops": "Sin Caídas de Corazones",
-    "No Random Drops": "Sin Caídas Aleatorias",
-    "No ReDead/Gibdo Freeze": "Sin Congelación de ReDead/Gibdo",
-    "No Rupee Randomization": "Sin Aleatorización de Rupias",
-    "None##Skips": "Ninguno##Saltos",
-    "Note Play Speed: %dx": "Velocidad de Reproducción de Notas: %dx",
-    "Notification on Autosave": "Notificación de Autoguardado",
-    "Number of Starting Notes: %d notes": "Número de Notas Iniciales: %d notas",
-    "OHKO": "KO",
-    "Ocarina of Time + Master Sword": "Ocarina del Tiempo + Espada Maestra",
-    "Once a hook as been set, Fish will never let go while being reeled in.": "Una vez que se ha puesto un gancho, los peces nunca soltarán mientras se recogen.",
-    "Only change the texture of containers if you have the Stone of Agony.": "Cambiar solo la textura de contenedores si tienes la Piedra de Agonía.",
-    "Open App Files Folder": "Abrir Carpeta de Archivos de la App",
-    "Optimized Debug Warp Screen, with the added ability to chose entrances and time of day.": "Pantalla de Teletransporte Debug optimizada, con la capacidad añadida de elegir entradas y hora del día.",
-    "Override the resolution scale slider and use the settings below, irrespective of window size.": "Anular el control deslizante de escala de resolución y usar las configuraciones de abajo, independientemente del tamaño de ventana.",
-    "Passive Infinite Sword Glitch\n": "Glitch de Espada Infinita Pasiva\n",
-    "Permanent Heart Loss": "Pérdida Permanente de Corazón",
-    "Popout Audio Editor Window": "Abrir Ventana de Editor de Audio",
-    "Popout Bindings Window": "Abrir Ventana de Controles",
-    "Popout Cosmetics Editor Window": "Abrir Ventana de Editor de Cosméticos",
-    "Popout Gameplay Stats Window": "Abrir Ventana de Estadísticas de Jugabilidad",
-    "Popout Input Viewer Settings": "Abrir Configuración de Visor de Entradas",
-    "Popout Mod Menu Window": "Abrir Ventana de Menú de Mods",
-    "Popout Time Splits Window": "Abrir Ventana de Divisiones de Tiempo",
-    "Position": "Posición",
-    "Prevent dropping inputs when playing the Ocarina too quickly.": "Prevenir pérdida de entradas al tocar la Ocarina demasiado rápido.",
-    "Prevent forced conversations with Navi and/or other NPCs.": "Prevenir conversaciones forzadas con Navi y/o otros NPCs.",
-    "Prevent notifications from playing a sound.": "Prevenir que las notificaciones reproduzcan un sonido.",
-    "Prevents ReDeads and Gibdos from being able to freeze you with their scream.": "Previene que ReDeads y Gibdos puedan congelarte con su grito.",
-    "Prevents bugs from automatically despawning after a while when dropped.": "Previene que los bichos desaparezcan automáticamente después de un tiempo al soltarlos.",
-    "Prevents fish from automatically despawning after a while when dropped.": "Previene que los peces desaparezcan automáticamente después de un tiempo al soltarlos.",
-    "Prevents immediately falling off climbable surfaces if climbing on the edges.": "Previene caer inmediatamente de superficies escalables si estás escalando en los bordes.",
-    "Prevents integer scaling factor from exceeding screen bounds.\n\n": "Previene que el factor de escala entero exceda los límites de la pantalla.\n\n",
-    "Prevents the Deku Shield from burning on contact with fire.": "Previene que el Escudo Deku se queme al contacto con fuego.",
-    "Prevents the Forest Stage Deku Nut upgrade from becoming unobtainable": "Previene que la mejora de Nuez Deku del Bosque se vuelva inalcanzable",
-    "Prevents the big Cucco from appearing in the Bombchu Bowling minigame.": "Previene que el Cucco grande aparezca en el minijuego de Bolos de Bombchu.",
-    "Prevents the small Cucco from appearing in the Bombchu Bowling minigame.": "Previene que el Cucco pequeño aparezca en el minijuego de Bolos de Bombchu.",
-    "Pulsate Boss Icon": "Icono de Jefe Pulsante",
-    "Quick Bongo Kill": "Muerte Rápida de Bongo",
-    "Quick Putaway": "Guardado Rápido",
-    "Randomize All Settings": "Aleatorizar Todas las Configuraciones",
-    "Randomizes all randomizer settings to random valid values (excludes tricks).": "Aleatoriza todas las configuraciones del randomizer a valores válidos aleatorios (excluye trucos).",
-    "Rebottle Blue Fire": "Reembottellar Fuego Azul",
-    "Red Ganon Blood": "Sangre de Ganon Roja",
-    "Remember Save Location": "Recordar Ubicación de Guardado",
-    "Remote Bombchu": "Bombchu Remota",
-    "Remove Big Cucco": "Eliminar Cucco Grande",
-    "Remove Power Crouch Stab": "Eliminar Puñalada Agachada de Poder",
-    "Remove Small Cucco": "Eliminar Cucco Pequeño",
-    "Remove the Darkness that appears when charging a Spin Attack.": "Eliminar la Oscuridad que aparece al cargar un Ataque Giratorio.",
-    "Removes the cap of 3 active explosives being deployed at once.": "Elimina el límite de 3 explosivos activos desplegados a la vez.",
-    "Removes the timer to play back the song.": "Elimina el temporizador para reproducir la canción.",
-    "Renders Gauntlets when using the Bow and Hookshot like in OoT3D.": "Renderiza Guanteletes al usar el Arco y Gancho como en OoT3D.",
-    "Renders a health bar for Enemies when Z-Targeted.": "Renderiza una barra de salud para Enemigos cuando se Apunta con Z.",
-    "Replace Navi's overworld quest hints with rando-related gameplay hints.": "Reemplaza las pistas de misión del mundo de Navi con pistas de jugabilidad relacionadas con rando.",
-    "Reset Button Combination:": "Combinación de Botones de Reinicio:",
-    "Resets the Navi timer on scene change. If you have already talked to her,": "Reinicia el temporizador de Navi al cambiar de escena. Si ya has hablado con ella,",
-    "Respawn with Full Health instead of 3 hearts.": "Reaparecer con Salud Completa en lugar de 3 corazones.",
-    "Restore Old Gold Skulltula Cutscene": "Restaurar Cinemática de Gold Skulltula Antigua",
-    "Restore the original red blood from NTSC 1.0/1.1. Disable for Green blood.": "Restaurar la sangre roja original de NTSC 1.0/1.1. Desactivar para sangre verde.",
-    "Restores the wider range of certain shutter doors from NTSC 1.0.\n": "Restaura el rango más amplio de ciertas puertas correderas de NTSC 1.0.\n",
-    "Reworked Targeting": "Apuntado Retrabajado",
-    "Reworks targeting functionality\n": "Retrabaja la funcionalidad de apuntado\n",
-    "Round One Notes: %d notes": "Notas de la Ronda Uno: %d notas",
-    "Round Three Notes: %d notes": "Notas de la Ronda Tres: %d notas",
-    "Round Two Notes: %d notes": "Notas de la Ronda Dos: %d notas",
-    "Rupee Dash Interval %d seconds": "Intervalo de Rupee Dash %d segundos",
-    "Rupee Dash Mode": "Modo Rupee Dash",
-    "Rupees reduce over time, Link suffers damage when the count hits 0.": "Las rupias se reducen con el tiempo, Link sufre daño cuando el conteo llega a 0.",
-    "Sail": "Sail",
-    "Sail is a networking protocol designed to facilitate remote": "Sail es un protocolo de red diseñado para facilitar remoto",
-    "Save States": "Estados de Guardado",
-    "Search In Sidebar": "Buscar en Barra Lateral",
-    "Search Input Autofocus": "Autoenfoque de Entrada de Búsqueda",
-    "Seed": "Semilla",
-    "Seed Entry": "Entrada de Semilla",
-    "Select the UI translation language...": "Seleccionar el idioma de traducción de la interfaz...",
-    "Serrano": "Serrano",
-    "Settings": "Configuración",
-    "Shadow Tag Mode": "Modo Sombra Pegajosa",
-    "Shield with Two-Handed Weapons": "Escudo con Armas a Dos Manos",
-    "Shock Traps": "Trampas de Choque",
-    "Shooting Gallery": "Galería de Tiro",
-    "Shops and Minigames are open both day and night. Requires a scene reload to take effect.": "Tiendas y Minijuegos están abiertos de día y de noche. Requiere recargar escena para tener efecto.",
-    "Show Gauntlets in First-Person": "Mostrar Guanteletes en Primera Persona",
-    "Show a notification when the game is autosaved.": "Mostrar una notificación cuando el juego se autoguarda.",
-    "Signs Hint Entrances": "Letreros Indican Entradas",
-    "Skip Bottle Pickup Messages": "Saltar Mensajes de Recoger Botella",
-    "Skip Consumable Item Pickup Messages": "Saltar Mensajes de Recoger Objetos Consumibles",
-    "Skip Feeding Jabu-Jabu": "Saltar Alimentar a Jabu-Jabu",
-    "Skip Keep Confirmation": "Saltar Confirmación de Keep",
-    "Skip One Point Cutscenes (Chests, Door Unlocks, etc.)": "Saltar Cinemáticas de Un Punto (Cofres, Apertura de Puertas, etc.)",
-    "Skip Pickup Messages for Bottle Swipes.": "Saltar Mensajes de Recoger para Botellas.",
-    "Skip Pickup Messages for new Consumable Items.": "Saltar Mensajes de Recoger para Objetos Consumibles nuevos.",
-    "Skip Playing Scarecrow's Song": "Saltar Tocar Canción del Espantapájaros",
-    "Skip the \"Game Saved\" confirmation screen.": "Saltar la pantalla de confirmación \"Juego Guardado\".",
-    "Skip the part where the Ocarina Playback is called when you play a song.": "Saltar la parte donde se llama la Reproducción de Ocarina al tocar una canción.",
-    "Skip the tower escape sequence between Ganondorf and Ganon.": "Saltar la secuencia de escape de la torre entre Ganondorf y Ganon.",
-    "Skips Link's taking breath animation after coming up from water.": "Salta la animación de Link tomando aire al salir del agua.",
-    "Skips the Frogs' Ocarina Game.": "Salta el Juego de Ocarina de las Ranas.",
-    "Skips the Lost Woods Ocarina Memory Game.": "Salta el Juego de Memoria de Ocarina del Bosque Perdido.",
-    "Skips the Shooting Gallery minigame.": "Salta el minijuego de la Galería de Tiro.",
-    "Solve Amy's Puzzle": "Resolver Puzzle de Amy",
-    "Spawn Bean Skulltula Faster": "Aparecer Bean Skulltula Más Rápido",
-    "Spawn with Full Health": "Aparecer con Salud Completa",
-    "Spawned Enemies Ignored Ingame": "Enemigos Generados Ignorados en el Juego",
-    "Speak to Navi with L but enter First-Person Camera with C-Up.": "Hablar con Navi con L pero entrar a Cámara en Primera Persona con C-Arriba.",
-    "Speed Modifier": "Modificador de Velocidad",
-    "Speed Traps": "Trampas de Velocidad",
-    "Speeds up animation of the pause menu, similar to Majora's Mask": "Acelera la animación del menú de pausa, similar a Majora's Mask",
-    "Speeds up emptying animation when dumping out the contents of a bottle.": "Acelera la animación de vaciado al verter el contenido de una botella.",
-    "Speeds up lifting Silver Rocks and Obelisks.": "Acelera el levantamiento de Rocas de Plata y Obeliscos.",
-    "Speeds up ship in Shadow Temple.": "Acelera el barco en el Templo de las Sombras.",
-    "Spoiler File": "Archivo de Spoiler",
-    "Stops masks from automatically unequipping on certain situations:\n": "Detiene que las máscaras se desequen automáticamente en ciertas situaciones:\n",
-    "Super Tunic": "Super Túnica",
-    "Switch Timer Multiplier": "Multiplicador de Temporizador de Cambio",
-    "Switches Link's age and reloads the area.": "Cambia la edad de Link y recarga el área.",
-    "Syncs the in-game time with the real world time.": "Sincroniza el tiempo del juego con el tiempo del mundo real.",
-    "Target Switch Button Combination:": "Combinación de Botones de Cambio de Objetivo:",
-    "Targetable Gold Skulltula": "Gold Skulltula Apuntable",
-    "Teleport Traps": "Trampas de Teletransporte",
-    "Text to Speech": "Texto a Voz",
-    "Texture Filter (Needs reload)": "Filtro de Textura (Necesita recargar)",
-    "The Pond Owner will not ask to confirm if you want to keep a smaller Fish.": "El Dueño del Estanque no pedirá confirmar si quieres quedarte con un Pez más pequeño.",
-    "The ammunition at the start of the Shooting Gallery minigame as Adult.": "La munición al inicio del minijuego de Galería de Tiro como Adulto.",
-    "The ammunition at the start of the Shooting Gallery minigame as Child.": "La munición al inicio del minijuego de Galería de Tiro como Niño.",
-    "The log level determines which messages are printed to the console.": "El nivel de registro determina qué mensajes se imprimen en la consola.",
-    "The number of Bombchus available at the start of the Bombchu Bowling minigame.": "El número de Bombchus disponibles al inicio del minijuego de Bolos de Bombchu.",
-    "The skybox in the background of the File Select screen will go through the": "El skybox en el fondo de la pantalla de Selección de Archivo pasará por el",
-    "The time between groups of Leevers spawning.": "El tiempo entre grupos de Leevers apareciendo.",
-    "These are NOT like emulator states. They do not save your game progress": "Estos NO son como estados de emulador. No guardan tu progreso del juego",
-    "These enhancements are only useful in the Randomizer mode but do not affect the randomizer logic.": "Estas mejoras solo son útiles en el modo Randomizer pero no afectan la lógica del randomizer.",
-    "This will completely erase the controls config, including registered devices.\nContinue?": "Esto borrará completamente la configuración de controles, incluyendo dispositivos registrados.\n¿Continuar?",
-    "Tier 1 Traps:": "Trampas de Nivel 1:",
-    "Tier 2 Traps:": "Trampas de Nivel 2:",
-    "Tier 3 Traps:": "Trampas de Nivel 3:",
-    "Time Sync": "Sincronización de Tiempo",
-    "Timeless Equipment": "Equipo Atemporal",
-    "Toggle Fullscreen": "Alternar Pantalla Completa",
-    "Toggle Input Viewer": "Alternar Visor de Entradas",
-    "Toggle Timers Window": "Alternar Ventana de Temporizadores",
-    "Toggle modifier instead of holding": "Alternar modificador en lugar de mantener",
-    "Toggles the Check Tracker.": "Alterna el Rastreador de Checks.",
-    "Toggles the Entrance Tracker.": "Alterna el Rastreador de Entradas.",
-    "Toggles the Item Tracker.": "Alterna el Rastreador de Objetos.",
-    "Translate Title Screen": "Traducir Pantalla de Título",
-    "Translate the Debug Warp Screen based on the game language.": "Traducir la Pantalla de Teletransporte Debug según el idioma del juego.",
-    "Trap Options": "Opciones de Trampas",
-    "Trees Drop Sticks": "Los Árboles Suelten Palos",
-    "Tricks/Glitches": "Trucos/Glitches",
-    "Turn on/off changes to the Bombchu Bowling behavior.": "Activar/desactivar cambios al comportamiento de Bolos de Bombchu.",
-    "Turn on/off changes to the Fishing behavior.": "Activar/desactivar cambios al comportamiento de Pesca.",
-    "Turn on/off changes to the Frogs' Ocarina Game behavior.": "Activar/desactivar cambios al comportamiento del Juego de Ocarina de las Ranas.",
-    "Turn on/off changes to the Lost Woods Ocarina Game behavior.": "Activar/desactivar cambios al comportamiento del Juego de Ocarina del Bosque Perdido.",
-    "Turn on/off changes to the shooting gallery behavior.": "Activar/desactivar cambios al comportamiento de la galería de tiro.",
-    "Turns Bunny Hood Invisible while still maintaining its effects.": "Vuelve invisible la Máscara de Conejo mientras mantiene sus efectos.",
-    "Turns on OoT Beta Quest. *WARNING*: This will reset your game!": "Activa la Misión Beta de OoT. *ADVERTENCIA*: ¡Esto reiniciará tu juego!",
-    "Turns the Static Image of Link in the Pause Menu's Equipment Subscreen": "Convierte la Imagen Estática de Link en la Subpantalla de Equipo del Menú de Pausa",
-    "UI Translation": "Traducción de Interfaz",
-    "Unlimited Playback Time##Frogs": "Tiempo de Reproducción Ilimitado##Ranas",
-    "Unlimited Playback Time##LostWoods": "Tiempo de Reproducción Ilimitado##BosquePerdido",
-    "Unrestricted Items": "Objetos Sin Restricciones",
-    "Unsheathe Sword Without Slashing": "Desenvainar Espada sin Cortar",
-    "Use Custom graphics for Dungeon Keys, Big and Small, so that they can be easily told apart.": "Usar gráficos personalizados para Llaves de Mazmorra, Grandes y Pequeñas, para que puedan distinguirse fácilmente.",
-    "Void Damage Multiplier": "Multiplicador de Daño de Vacío",
-    "Void Traps": "Trampas de Vacío",
-    "Warp Point": "Punto de Teletransporte",
-    "Warp Points": "Puntos de Teletransporte",
-    "Warping": "Teletransporte",
-    "Wearing the Bunny Hood grants a speed and jump boost like in Majora's Mask.\n": "Usar la Máscara de Conejo otorga un aumento de velocidad y salto como en Majora's Mask.\n",
-    "When a line is stable, guarantee bite. Otherwise use Default logic.": "Cuando una línea es estable, garantizar mordida. De lo contrario usar lógica predeterminada.",
-    "When obtaining Rupees, randomize what the Rupee is called in the textbox.": "Al obtener Rupias, aleatorizar cómo se llama la Rupia en el cuadro de texto.",
-    "Wide Door Ranges": "Rangos de Puertas Anchos",
-    "Windowed Fullscreen": "Pantalla Completa en Ventana",
-    "With Shuffle Speak, jabber nut model & color will be generic.": "Con Shuffle Speak, el modelo y color de nuez jabber será genérico.",
-    "https://github.com/HarbourMasters/sail": "https://github.com/HarbourMasters/sail",
-    "AspectRatioCustom": "ProporciónPersonalizada",
-    "AspectSep": "SepProporción",
-    "Automatically sets scale factor to fit window. Only available in Pixel Perfect Mode.": "Establece automáticamente el factor de escala para ajustar a la ventana. Solo disponible en Modo Pixel Perfect.",
-    "Item Pool": "Lista de Objetos",
-    "Logic": "Logica"
-  }
-}

run-clang-format.ps1

@@ -1,49 +0,0 @@
-Using Namespace System
-$url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/LLVM-14.0.6-win64.exe"
-$llvmInstallerPath = ".\LLVM-14.0.6-win64.exe"
-$clangFormatFilePath = ".\clang-format.exe"
-$requiredVersion = "clang-format version 14.0.6"
-$currentVersion = ""
-
-function Test-7ZipInstalled {
-    $sevenZipPath = "C:\Program Files\7-Zip\7z.exe"
-    return Test-Path $sevenZipPath -PathType Leaf
-}
-
-if (Test-Path $clangFormatFilePath) {
-    $currentVersion = & $clangFormatFilePath --version
-    if (-not ($currentVersion -eq $requiredVersion)) {
-        # Delete the existing file if the version is incorrect
-        Remove-Item $clangFormatFilePath -Force
-    }
-}
-
-if (-not (Test-Path $clangFormatFilePath) -or ($currentVersion -ne $requiredVersion)) {
-    if (-not (Test-7ZipInstalled)) {
-        Write-Host "7-Zip is not installed. Please install 7-Zip and run the script again."
-        exit
-    }
-
-    $wc = New-Object net.webclient
-    $wc.Downloadfile($url, $PSScriptRoot + $llvmInstallerPath)
-
-    $sevenZipPath = "C:\Program Files\7-Zip\7z.exe"
-    $specificFileInArchive = "bin\clang-format.exe"
-    & "$sevenZipPath" e $llvmInstallerPath $specificFileInArchive
-
-    Remove-Item $llvmInstallerPath -Force
-}
-
-$basePath = (Resolve-Path .).Path
-$files = Get-ChildItem -Path $basePath\soh -Recurse -File `
-    | Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or `
-                      (($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and `
-                       (-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*")))) -and `
-                     (-not ($_.FullName -like "*\soh\assets\*" -or $_.FullName -like "*\soh\build\*")) }
-
-for ($i = 0; $i -lt $files.Length; $i++) {
-    $file = $files[$i]
-    $relativePath = $file.FullName.Substring($basePath.Length + 1)
-    Write-Host "Formatting [$($i+1)/$($files.Length)] $relativePath"
-    .\clang-format.exe -i $file.FullName
-}

run-clang-format.sh

@@ -1,29 +0,0 @@
-# this line does quite a bit, so let's break it down
-#
-# find soh
-# use "find" to look in the "soh" directory
-# this ensures we don't try to format stuff in the submodules
-#
-# -type f
-# only look for files
-#
-# -name "*.c" -o -name "*.cpp"
-# find all .c and .cpp files
-#
-# ( -name "*.h" -o -name "*.hpp" ) ! -path "soh/src/**.h" ! -path "soh/include/**.h"
-# find all .h and .hpp files that aren't in soh/src or soh/include
-# this is because zret decomp only runs clang-format on c files
-# https://github.com/zeldaret/mm/blob/b7e5468ca16315a7e322055eff3d97fe980bbc25/format.py#L182
-#
-# ! -path "soh/assets/*"
-# asset headers are autogenerated, don't fight them
-#
-# -print0
-# separate paths with NUL bytes, avoiding issues with spaces in paths
-#
-# | xargs -0 clang-format-14 -i -verbose
-# use xargs to take each path we've found
-# and pass it as an argument to clang-format
-# verbose to print files being formatted and X out of Y status
-
-find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose

scripts/linux/appimage/soh.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Name=SOH
-Exec=soh.elf
+Exec=soh.sh
 Terminal=false
 Icon=sohIcon
 Type=Application

scripts/linux/appimage/soh.sh.in

@@ -0,0 +1,208 @@
+#!/bin/bash
+HERE="$(dirname "$(readlink -f "${0}")")"/../..
+
+export PATH="$HERE"/bin:"$HERE"/usr/bin:"$PATH"
+export LD_LIBRARY_PATH="$HERE"/usr/lib:"$LD_LIBRARY_PATH"
+export ZENITY=$(command -v zenity)
+
+if [ -z ${SHIP_HOME+x} ]; then
+export SHIP_HOME=$PWD
+fi
+
+if [ -z ${SHIP_BIN_DIR+x} ]; then
+export SHIP_BIN_DIR="$HERE/usr/bin"
+fi
+
+if [[ ! -e "$SHIP_HOME"/mods ]]; then
+    mkdir -p "$SHIP_HOME"/mods
+    touch "$SHIP_HOME"/mods/custom_otr_files_go_here.txt
+fi
+
+while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
+        for romfile in "$SHIP_HOME"/*.*64
+        do
+            if [[ -e "$romfile" ]] || [[ -L "$romfile" ]]; then
+                export ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)"
+                ln -s "$SHIP_BIN_DIR"/{assets,soh.elf,ZAPD} "$ASSETDIR"
+                export OLDPWD="$PWD"
+                mkdir -p "$ASSETDIR"/tmp
+                if [[ -e "$romfile" ]]; then
+                    ln -s "$romfile" "$ASSETDIR"/tmp/rom.z64
+                else
+                    ORIG_ROM_PATH=$(readlink "$romfile")
+                    ln -s "$ORIG_ROM_PATH" "$ASSETDIR"/tmp/rom.z64
+                fi
+                cd "$ASSETDIR"
+                ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')
+
+                # Remap v64 and n64 hashes to their z64 hash equivalent
+                # ZAPD will handle converting the data into z64 format
+                case "$ROMHASH" in
+                a9059b56e761c9034fbe02fe4c24985aaa835dac) # v64
+                    ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099
+                    ;;
+                24708102dc504d3f375a37f4ae4e149c167dc515) # n64
+                    ROMHASH=cee6bc3c2a634b41728f2af8da54d9bf8cc14099
+                    ;;
+                580dd0bd1b6d2c51cc20a764eece84dba558964c) # v64
+                    ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4
+                    ;;
+                d6342c59007e57c1194661ec6880b2f078403f4e) # n64
+                    ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4
+                    ;;
+                d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64
+                    ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5
+                    ;;
+                4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64
+                    ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5
+                    ;;
+                663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64
+                    ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012
+                    ;;
+                24c73d378b0620a380ce5ef9f2b186c6c157a68b) # n64
+                    ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012
+                    ;;
+                8ebf2e29313f44f2d49e5b4191971d09919e8e48) # v64
+                    ROMHASH=f46239439f59a2a594ef83cf68ef65043b1bffe2
+                    ;;
+                4264bf7b875737b8fae77d52322a5099d051fc11) # n64
+                    ROMHASH=f46239439f59a2a594ef83cf68ef65043b1bffe2
+                    ;;
+                973bc6fe56010a8d646166a1182a81b4f13b8cf9) # v64
+                    ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03
+                    ;;
+                d327752c46edc70ff3668b9514083dbbee08927c) # v64
+                    ROMHASH=50bebedad9e0f10746a52b07239e47fa6c284d03
+                    ;;
+                ecdeb1747560834e079c22243febea7f6f26ba3b) # v64
+                    ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da
+                    ;;
+                f19f8662ec7abee29484a272a6fda53e39efe0f1) # n64
+                    ROMHASH=079b855b943d6ad8bd1eb026c0ed169ecbdac7da
+                    ;;
+                ab519ce04a33818ce2c39b3c514a751d807a494a) # v64
+                    ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6
+                    ;;
+                c19a34f7646305e1755249fca2071e178bd7cd00) # n64
+                    ROMHASH=cfecfdc58d650e71a200c81f033de4e6d617a9f6
+                    ;;
+                25e8ae79ea0839ca5c984473f7460d8040c36f9c) # v64
+                    ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f
+                    ;;
+                166c02770d67fcc3954c443eb400a6a3573d3fc0) # n64
+                    ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f
+                    ;;
+                esac
+
+                case "$ROMHASH" in
+                cee6bc3c2a634b41728f2af8da54d9bf8cc14099)
+                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
+                        ROM=GC_NMQ_D
+                        OTRNAME="oot.otr"
+                    fi
+                    ;;
+                0227d7c0074f2d0ac935631990da8ec5914597b4)
+                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
+                        ROM=GC_NMQ_PAL_F
+                        OTRNAME="oot.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                328a1f1beba30ce5e178f031662019eb32c5f3b5)
+                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
+                        ROM=N64_PAL_10
+                        OTRNAME="oot.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                cfbb98d392e4a9d39da8285d10cbef3974c2f012)
+                    if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then
+                        ROM=N64_PAL_11
+                        OTRNAME="oot.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                f46239439f59a2a594ef83cf68ef65043b1bffe2)
+                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
+                        ROM=GC_MQ_PAL_F
+                        OTRNAME="oot-mq.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                50bebedad9e0f10746a52b07239e47fa6c284d03)
+                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
+                        ROM=GC_MQ_D
+                        OTRNAME="oot-mq.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                079b855b943d6ad8bd1eb026c0ed169ecbdac7da)
+                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
+                        ROM=GC_MQ_D
+                        OTRNAME="oot-mq.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                cfecfdc58d650e71a200c81f033de4e6d617a9f6)
+                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
+                        ROM=GC_MQ_D
+                        OTRNAME="oot-mq.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                517bd9714c73cb96c21e7c2ef640d7b55186102f)
+                    if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then
+                        ROM=GC_MQ_D
+                        OTRNAME="oot-mq.otr"
+                    else
+                        continue
+                    fi
+                    ;;
+                *)
+                    echo -e "\n$romfile - $ROMHASH rom hash does not match\n"
+                    continue;;
+                esac
+                if [[ ! -e "$SHIP_HOME"/"$OTRNAME" ]]; then
+                    if [ -n "$ZENITY" ]; then
+                        (echo "# 25%"; echo "25"; sleep 2; echo "# 50%"; echo "50"; sleep 3; echo "# 75%"; echo "75"; sleep 2; echo "# 100%"; echo "100"; sleep 3) |
+                        zenity --progress --title="OTR Generating..." --timeout=10 --percentage=0 --icon-name=soh --window-icon=soh.png --height=80 --width=400 &
+                    else
+                        echo "Processing..."
+                    fi
+                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1
+                    cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME"
+                fi
+            else
+                if [[ (! -e "$SHIP_HOME"/oot.otr) && (! -e "$SHIP_HOME"/oot-mq.otr) ]]; then
+                    if [ -n "$ZENITY" ]; then
+                        zenity --error --timeout=5 --text="Place ROM in $SHIP_HOME" --title="Missing ROM file" --width=500 --width=200
+                    else
+                        echo -e "\nPlace ROM in this folder\n"
+                    fi	
+                    exit
+                fi
+            fi
+        done
+        if [[ (! -e "$SHIP_HOME"/oot.otr) && (! -e "$SHIP_HOME"/oot-mq.otr) ]]; then
+            if [ -n "$ZENITY" ]; then
+                zenity --error --timeout=10 --text="No valid ROMs were provided, No OTR was generated." --title="Incorrect ROM file" --width=500 --width=200
+            else
+                echo "No valid roms provided, no OTR was generated."
+            fi
+            rm -r "$ASSETDIR"
+            exit
+        else
+            (cd "$SHIP_BIN_DIR"; ./soh.elf)
+            exit
+        fi
+        rm -r "$ASSETDIR"
+done	
+	(cd "$SHIP_BIN_DIR"; ./soh.elf)
+exit

soh.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=SOH
-Exec=soh.elf
-Terminal=false
-Icon=sohIcon
-Type=Application
-Categories=Game;
-X-AppImage-Integrate=false

soh/CMakeLists.txt

@@ -1,10 +1,9 @@
-cmake_minimum_required(VERSION 3.26.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
 
 set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
 
 project(soh LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
-set(CMAKE_C_STANDARD 23 CACHE STRING "The C standard to use")
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     enable_language(OBJCXX)
@@ -19,15 +18,15 @@ set (BUILD_SHARED_LIBS OFF CACHE STRING "install/link shared instead of static l
 # Set target arch type if empty. Visual studio solution generator provides it.
 ################################################################################
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if(NOT CMAKE_VS_PLATFORM_NAME)
-        set(CMAKE_VS_PLATFORM_NAME "x64")
-    endif()
-    message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+	if(NOT CMAKE_VS_PLATFORM_NAME)
+		set(CMAKE_VS_PLATFORM_NAME "x64")
+	endif()
+	message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
 
-    if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
-        OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
-        message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
-    endif()
+	if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
+		OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
+		message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
+	endif()
 endif()
 
 ################################################################################
@@ -138,27 +137,20 @@ endforeach()
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set_source_files_properties(soh/OTRGlobals.cpp PROPERTIES COMPILE_FLAGS "/utf-8")
     set_source_files_properties(soh/Enhancements/tts/tts.cpp PROPERTIES COMPILE_FLAGS "/utf-8")
-    set_source_files_properties(soh/Enhancements/custom-message/CustomMessageManager.cpp PROPERTIES COMPILE_FLAGS "/utf-8")
-    set_source_files_properties(soh/Enhancements/custom-message/CustomMessageManager.h PROPERTIES COMPILE_FLAGS "/utf-8")
 endif()
 
 # handle Network removals
 if (!BUILD_REMOTE_CONTROL)
-    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/crowd-control/")
+    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/crowd-control/*")
 endif()
 
 # handle speechsynthesizer removals
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/Darwin")
+    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/Darwin*")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/SAPI")
+    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/SAPI*")
 else()
-    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/(Darwin|SAPI)")
-endif()
-
-find_library(ESPEAK espeak-ng)
-if (NOT ESPEAK)
-    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/ESpeak")
+    list(FILTER soh__ EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/(Darwin|SAPI).*")
 endif()
 
 # soh/Extractor {{{
@@ -184,12 +176,12 @@ file(GLOB_RECURSE src__ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.c" "src/*.h"
 set_source_files_properties(${src__} PROPERTIES COMPILE_OPTIONS "${WARNING_OVERRIDE}")
 
 list(APPEND src__ ${CMAKE_CURRENT_SOURCE_DIR}/Resource.rc)
-list(FILTER src__ EXCLUDE REGEX "src/dmadata/")
-list(FILTER src__ EXCLUDE REGEX "src/elf_message/")
-list(FILTER src__ EXCLUDE REGEX "src/libultra/io/")
-list(FILTER src__ EXCLUDE REGEX "src/libultra/libc/")
-list(FILTER src__ EXCLUDE REGEX "src/libultra/os/")
-list(FILTER src__ EXCLUDE REGEX "src/libultra/rmon/")
+list(FILTER src__ EXCLUDE REGEX "src/dmadata/*")
+list(FILTER src__ EXCLUDE REGEX "src/elf_message/*")
+list(FILTER src__ EXCLUDE REGEX "src/libultra/io/*")
+list(FILTER src__ EXCLUDE REGEX "src/libultra/libc/*")
+list(FILTER src__ EXCLUDE REGEX "src/libultra/os/*")
+list(FILTER src__ EXCLUDE REGEX "src/libultra/rmon/*")
 list(APPEND src__ "src/libultra/libc/sprintf.c")
 list(REMOVE_ITEM src__ "src/libultra/gu/cosf.c")
 list(REMOVE_ITEM src__ "src/libultra/gu/lookat.c")
@@ -232,68 +224,85 @@ endif()
 set(ROOT_NAMESPACE soh)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        VS_GLOBAL_KEYWORD "Win32Proj"
-    )
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
-        )
-    endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+		VS_GLOBAL_KEYWORD "Win32Proj"
+	)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set_target_properties(${PROJECT_NAME} PROPERTIES
         XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
         OUTPUT_NAME "soh-macos"
     )
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-    OUTPUT_NAME "soh.elf"
-    )
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+	OUTPUT_NAME "soh.elf"
+	)
 endif()
 ################################################################################
 # MSVC runtime library
 ################################################################################
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
-            $<$<CONFIG:Debug>:
-                MultiThreadedDebug
-            >
-            $<$<CONFIG:Release>:
-                MultiThreaded
-            >
-            $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-        string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
-            $<$<CONFIG:Debug>:
-                MultiThreadedDebug
-            >
-            $<$<CONFIG:Release>:
-                MultiThreaded
-            >
-            $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
-        )
-    endif()
-    set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
 endif()
 ################################################################################
-# Find/download Dr Libs (For custom audio)
+# Find/download Boost
 ################################################################################
 include(FetchContent)
-
 FetchContent_Declare(
-        dr_libs
-        GIT_REPOSITORY https://github.com/mackron/dr_libs.git
-        GIT_TAG da35f9d6c7374a95353fd1df1d394d44ab66cf01
+    Boost
+    URL      https://archives.boost.io/release/1.81.0/source/boost_1_81_0.tar.gz
+    URL_HASH SHA256=205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
+    SOURCE_SUBDIR "null" # Set to a nonexistent directory so boost is not built (we don't need to build it)
+    DOWNLOAD_EXTRACT_TIMESTAMP false # supress timestamp warning, not needed since the url wont change
 )
-FetchContent_MakeAvailable(dr_libs)
 
+set(Boost_NO_BOOST_CMAKE false)
+set(BOOST_INCLUDEDIR ${FETCHCONTENT_BASE_DIR}/boost-src) # Location where FetchContent stores the source
+message("Searching for Boost installation")
+find_package(Boost)
+
+if (NOT ${Boost_FOUND})
+    message("Boost not found. Downloading now...")
+    FetchContent_MakeAvailable(Boost)
+    message("Boost downloaded to " ${FETCHCONTENT_BASE_DIR}/boost-src)
+    set(BOOST-INCLUDE ${FETCHCONTENT_BASE_DIR}/boost-src)
+else()
+    message("Boost found in " ${Boost_INCLUDE_DIRS})
+    set(BOOST-INCLUDE ${Boost_INCLUDE_DIRS})
+endif()
+################################################################################
+# Compile definitions
+################################################################################
 find_package(SDL2)
 set(SDL2-INCLUDE ${SDL2_INCLUDE_DIRS})
 
@@ -308,103 +317,113 @@ if (BUILD_REMOTE_CONTROL)
     endif()
 endif()
 
-if (ESPEAK)
-    add_compile_definitions(ESPEAK=1)
-endif()
-
-################################################################################
-# Compile definitions
-################################################################################
-
 target_include_directories(${PROJECT_NAME} PRIVATE assets
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/
+	${CMAKE_CURRENT_SOURCE_DIR}/include/
+	${CMAKE_CURRENT_SOURCE_DIR}/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/include
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/log
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/debug
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/menu
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/utils
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/utils/binarytools
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/config
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/type
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/factory
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/audio
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/window
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/window/gui
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/config
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public/libultra
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public/bridge
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/tinyxml2
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/
+	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/libjpeg/include/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic
     ${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type
-    ${SDL2-INCLUDE}
+	${SDL2-INCLUDE}
     ${SDL2-NET-INCLUDE}
-    ${CMAKE_CURRENT_SOURCE_DIR}/assets/
-    ${dr_libs_SOURCE_DIR}
-    .
+    ${BOOST-INCLUDE}
+	${CMAKE_CURRENT_SOURCE_DIR}/assets/
+	.
 )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE
-            "$<$<CONFIG:Debug>:"
-                "_DEBUG;"
-                "_CRT_SECURE_NO_WARNINGS;"
-                "ENABLE_DX11;"
-            ">"
-            "$<$<CONFIG:Release>:"
-                "NDEBUG;"
-            ">"
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG;"
+				"_CRT_SECURE_NO_WARNINGS;"
+				"ENABLE_DX11;"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
             "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>"
-            "INCLUDE_GAME_PRINTF;"
+			"INCLUDE_GAME_PRINTF;"
             "F3DEX_GBI_2"
-            "UNICODE;"
-            "_UNICODE"
-            SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF}
-            LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF}
-            STORMLIB_NO_AUTO_LINK
-            "_CRT_SECURE_NO_WARNINGS;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+			"_CRT_SECURE_NO_WARNINGS;"
             NOMINMAX
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE
-            "$<$<CONFIG:Debug>:"
-                "NOINCLUDE_GAME_PRINTF;"
-                "_DEBUG;"
-                "_CRT_SECURE_NO_WARNINGS;"
-                "ENABLE_OPENGL;"
-            ">"
-            "$<$<CONFIG:Release>:"
-                "NDEBUG;"
-            ">"
-            "INCLUDE_GAME_PRINTF;"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"NOINCLUDE_GAME_PRINTF;"
+				"_DEBUG;"
+				"_CRT_SECURE_NO_WARNINGS;"
+				"ENABLE_OPENGL"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG;"
+			">"
+			"INCLUDE_GAME_PRINTF;"
             "F3DEX_GBI_2"
-            "WIN32;"
-            "UNICODE;"
-            "_UNICODE;"
-            SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF}
-            LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF}
-            STORMLIB_NO_AUTO_LINK
+			"WIN32;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
             NOMINMAX
-        )
-    endif()
+		)
+	endif()
 elseif (CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
-    target_compile_definitions(${PROJECT_NAME} PRIVATE
-        "$<$<CONFIG:Debug>:"
-            "_DEBUG;"
-        ">"
-        "$<$<CONFIG:Release>:"
-            "NDEBUG;"
-        ">"
-        "F3DEX_GBI_2;"
-        "SPDLOG_NO_THREAD_ID;"
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		"$<$<CONFIG:Debug>:"
+			"_DEBUG"
+		">"
+		"$<$<CONFIG:Release>:"
+			"NDEBUG"
+		">"
+        "F3DEX_GBI_2"
+        "SPDLOG_ACTIVE_LEVEL=3;"
+		"SPDLOG_NO_THREAD_ID;"
         "SPDLOG_NO_TLS;"
-        "STBI_NO_THREAD_LOCALS;"
-        SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF}
-        LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF}
-    )
+		"STBI_NO_THREAD_LOCALS;"
+	)
 elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
-    target_compile_definitions(${PROJECT_NAME} PRIVATE
-        "$<$<CONFIG:Debug>:"
-            "_DEBUG;"
-        ">"
-        "$<$<CONFIG:Release>:"
-            "NDEBUG;"
-        ">"
-        "F3DEX_GBI_2;"
-        "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>;"
-        "_CONSOLE;"
-        "_CRT_SECURE_NO_WARNINGS;"
-        "ENABLE_OPENGL;"
-        "UNICODE;"
-        "_UNICODE;"
-        SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF}
-        LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF}
-    )
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		"$<$<CONFIG:Debug>:"
+			"_DEBUG"
+		">"
+		"$<$<CONFIG:Release>:"
+			"NDEBUG"
+		">"
+        "F3DEX_GBI_2"
+        "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>"
+		"SPDLOG_ACTIVE_LEVEL=0;"
+		"_CONSOLE;"
+		"_CRT_SECURE_NO_WARNINGS;"
+		"ENABLE_OPENGL;"
+		"UNICODE;"
+		"_UNICODE"
+	)
 endif()
 ################################################################################
 # Compile and link options
@@ -421,7 +440,6 @@ if(MSVC)
                 /Gy;
                 /W3
             >
-            /bigobj;
             /sdl-;
             /permissive-;
             /MP;
@@ -484,7 +502,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         target_compile_options(${PROJECT_NAME} PRIVATE
             -Wall -Wextra -Wno-error
-            -Wformat-security
             -Wno-return-type
             -Wno-unused-parameter
             -Wno-unused-function
@@ -493,10 +510,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
             -Wno-parentheses
             -Wno-narrowing
             -Wno-missing-braces
+            -Wno-int-conversion
             $<$<COMPILE_LANGUAGE:C>:
                 -Werror-implicit-function-declaration
                 -Wno-incompatible-pointer-types
-                -Wno-int-conversion
             >
             $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
             $<$<COMPILE_LANGUAGE:CXX>:
@@ -512,7 +529,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
     elseif (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
         target_compile_options(${PROJECT_NAME} PRIVATE
             -Wall -Wextra -Wno-error
-            -Wformat-security
             -Wno-return-type
             -Wno-unused-parameter
             -Wno-unused-function
@@ -558,12 +574,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
         )
     else()
         if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-        set(CPU_OPTION -msse2 -mfpmath=sse)
+		set(CPU_OPTION -msse2 -mfpmath=sse)
         endif()
 
         target_compile_options(${PROJECT_NAME} PRIVATE
             -Wall -Wextra -Wno-error
-            -Wformat-security
             -Wno-unused-parameter
             -Wno-unused-function
             -Wno-unused-variable
@@ -571,21 +586,20 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
             -Wno-parentheses
             -Wno-narrowing
             -Wno-missing-braces
+            -Wno-int-conversion
+            -Wno-implicit-int
             $<$<COMPILE_LANGUAGE:C>:
                 -Werror-implicit-function-declaration
-                -Wno-implicit-int
                 -Wno-incompatible-pointer-types
-                -Wno-int-conversion
             >
             $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
             $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
             -pthread
-        ${CPU_OPTION}
+	    ${CPU_OPTION}
         )
 
         target_link_options(${PROJECT_NAME} PRIVATE
             -pthread
-                #-fsanitize=address
             -Wl,-export-dynamic
         )
     endif()
@@ -593,23 +607,22 @@ endif()
 ################################################################################
 # Pre build events
 ################################################################################
-if (CMAKE_GENERATOR MATCHES "Visual Studio")
-    add_custom_command(
-    TARGET ${PROJECT_NAME}
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor ${CMAKE_BINARY_DIR}/soh/assets
-    COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml ${CMAKE_BINARY_DIR}/soh/assets/xml
-    )
+if (MSVC)
+	set(MSVC_CMD ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:soh>/assets ${CMAKE_BINARY_DIR}/soh/assets)
 endif()
 if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS")
     add_custom_command(
-        TARGET ${PROJECT_NAME}
-        POST_BUILD
-        COMMENT "Copying asset xmls..."
-        COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor $<TARGET_FILE_DIR:soh>/assets
-        COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $<TARGET_FILE_DIR:soh>/assets/xml
-        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:soh>/assets/symbols
-    #    COMMAND ${VS_COPY_ASSETS_CMD}
+		TARGET ${PROJECT_NAME}
+		POST_BUILD
+		COMMENT "Copying asset xmls..."
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/soh/assets/extractor $<TARGET_FILE_DIR:soh>/assets/extractor
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/soh/assets/xml $<TARGET_FILE_DIR:soh>/assets/extractor/xmls
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists $<TARGET_FILE_DIR:soh>/assets/extractor/filelists
+        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
+	    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
+		COMMAND ${MSVC_CMD}
     )
 endif()
 ################################################################################
@@ -626,49 +639,34 @@ endif()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     find_package(glfw3 REQUIRED)
-    find_package(Ogg CONFIG REQUIRED)
-    link_libraries(Ogg::ogg)
-
-    find_package(Vorbis CONFIG REQUIRED)
-    link_libraries(Vorbis::vorbisfile)
-    find_package(Opus CONFIG REQUIRED)
-    link_libraries(Opus::opus)
-    find_package(OpusFile CONFIG REQUIRED)
-    link_libraries(OpusFile::opusfile CONFIG REQUIRED)
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        set(ADDITIONAL_LIBRARY_DEPENDENCIES
-            "libultraship;"
-            "ZAPDLib;"
-            "glu32;"
-            "SDL2::SDL2;"
-            "SDL2::SDL2main;"
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set(ADDITIONAL_LIBRARY_DEPENDENCIES
+			"libultraship;"
+			"ZAPDLib;"
+			"glu32;"
+			"SDL2::SDL2;"
+			"SDL2::SDL2main;"
             "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net-static>"
-            "glfw;"
-            "winmm;"
-            "imm32;"
-            "version;"
-            "setupapi"
-            "Ogg::ogg"
-            "Opus::opus"
-            "Vorbis::vorbis"
-            "Vorbis::vorbisenc"
-            "Vorbis::vorbisfile"
-            "OpusFile::opusfile"
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-        set(ADDITIONAL_LIBRARY_DEPENDENCIES
-            "libultraship;"
-            "ZAPDLib;"
-            "glu32;"
-            "SDL2::SDL2;"
-            "SDL2::SDL2main;"
-            "glfw;"
-            "winmm;"
-            "imm32;"
-            "version;"
-            "setupapi"
-        )
-    endif()
+			"glfw;"
+			"winmm;"
+			"imm32;"
+			"version;"
+			"setupapi"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		set(ADDITIONAL_LIBRARY_DEPENDENCIES
+			"libultraship;"
+			"ZAPDLib;"
+			"glu32;"
+			"SDL2::SDL2;"
+			"SDL2::SDL2main;"
+			"glfw;"
+			"winmm;"
+			"imm32;"
+			"version;"
+			"setupapi"
+		)
+	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
     find_package(SDL2)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -694,43 +692,37 @@ else()
     find_package(SDL2)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
-    find_package(Ogg REQUIRED)
-    find_package(Vorbis REQUIRED)
-    find_package(Opus REQUIRED)
-    find_package(OpusFile REQUIRED)
-     set(ADDITIONAL_LIBRARY_DEPENDENCIES
-    "libultraship;"
-        "ZAPDLib;"
-        SDL2::SDL2
-        "Ogg::ogg"
-        "Vorbis::vorbis"
-        "Vorbis::vorbisenc"
-        "Vorbis::vorbisfile"
-        "Opus::opus"
-        "Opusfile::Opusfile"
+ 	set(ADDITIONAL_LIBRARY_DEPENDENCIES
+        "libultraship;"
+		"ZAPDLib;"
+		SDL2::SDL2
         "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net>"
-        ${CMAKE_DL_LIBS}
-        Threads::Threads
-    )
+		${CMAKE_DL_LIBS}
+		Threads::Threads
+	)
 endif()
 
-if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|NintendoSwitch|CafeOS")
+if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS")
 INSTALL(TARGETS soh DESTINATION . COMPONENT ship)
 endif()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 INSTALL(FILES $<TARGET_PDB_FILE:soh> DESTINATION ./debug COMPONENT ship)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.o2r DESTINATION . COMPONENT ship)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION . COMPONENT ship)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/linux/appimage/soh.sh.in ${CMAKE_BINARY_DIR}/linux/soh.sh @ONLY)
 endif()
 
 find_program(CURL NAMES curl DOC "Path to the curl program.  Used to download files.")
-execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt -o ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt OUTPUT_VARIABLE RESULT)
+execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt OUTPUT_VARIABLE RESULT)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/Info.plist.in ${CMAKE_BINARY_DIR}/macosx/Info.plist @ONLY)
-INSTALL(TARGETS soh DESTINATION ../MacOS COMPONENT ship)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/soh-macos.sh.in ${CMAKE_BINARY_DIR}/macosx/soh-macos.sh @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION ../MacOS COMPONENT ship)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.o2r DESTINATION ../Resources COMPONENT ship)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION ../Resources COMPONENT ship)
 elseif(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "NintendoSwitch|CafeOS")
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION . COMPONENT ship)
 endif()
@@ -764,10 +756,10 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "CafeOS")
 wut_create_rpx(${PROJECT_NAME})
 
 wut_create_wuhb(${PROJECT_NAME}
-    NAME       "Ship of Harkinian"
-    SHORTNAME  "SoH"
-    AUTHOR     "${PROJECT_TEAM}"
-    ICON       ${CMAKE_CURRENT_SOURCE_DIR}/icon.jpg
+	NAME       "Ship of Harkinian"
+	SHORTNAME  "SoH"
+	AUTHOR     "${PROJECT_TEAM}"
+	ICON       ${CMAKE_CURRENT_SOURCE_DIR}/icon.jpg
 )
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/soh.rpx ${CMAKE_CURRENT_BINARY_DIR}/soh.wuhb DESTINATION . COMPONENT ship)

soh/Resource.rc

@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include <ship/resource/Resource.h>
+#include "resource.h"
 #include "properties.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

soh/assets/.gitignore

@@ -5,4 +5,3 @@
 *.vtx.inc
 *.dlist.inc
 !*.png
-custom/shaders

soh/assets/custom/accessibility/texts/filechoose_ger.json

@@ -25,5 +25,5 @@
     "quest_sel_vanilla": "Quest - Original",
     "quest_sel_mq": "Quest - Master Quest",
     "quest_sel_randomizer": "Quest - Randomizer",
-    "quest_sel_boss_rush": "Quest - Boss Rush"
-}
+    "quest_sel_boss_rush": "Quest - Bosse Rush"
+}

soh/assets/custom/accessibility/texts/kaleidoscope_eng.json

@@ -2,7 +2,6 @@
     "health": "Health - $0 Hearts",
     "magic": "Magic - $0",
     "rupees": "Rupees - $0",
-    "keys": "Keys - $0",
     "floor": "Floor $0",
     "basement": "Basement $0",
     "item_menu": "Select Item",
@@ -172,7 +171,6 @@
     "153": "STICK UPGRADE 30",
     "154": "NUT UPGRADE 30",
     "155": "NUT UPGRADE 40",
-    "157": "Roc's Feather",
     "255": "",
     "256": "Haunted Wasteland",
     "257": "Gerudos Fortress",

soh/assets/custom/accessibility/texts/kaleidoscope_fra.json

@@ -2,7 +2,6 @@
     "health": "Vie - $0 Coeurs",
     "magic": "Magie - $0",
     "rupees": "Rubis - $0",
-    "keys": "Clés - $0",
     "floor": "Étage $0",
     "basement": "Sous-sol $0",
     "item_menu": "Inventaire",
@@ -172,7 +171,6 @@
     "153": "AMÉLIORATION BÂTON MOJO 30",
     "154": "AMÉLIORATION NOIX MOJO 30",
     "155": "AMÉLIORATION NOIX MOJO 40",
-    "157": "Plume de Roc",
     "255": "",
     "256": "Désert Hanté",
     "257": "Forteresse Gerudo",

soh/assets/custom/accessibility/texts/kaleidoscope_ger.json

@@ -2,7 +2,6 @@
     "health": "Energie - $0 Herzen",
     "magic": "Magie - $0",
     "rupees": "Rubine - $0",
-    "keys": "Schlüssel - $0",
     "floor": "Etage $0",
     "basement": "Keller $0",
     "item_menu": "Gegenstände",
@@ -47,7 +46,7 @@
     "28": "Blaues Feuer",
     "29": "Käfer",
     "30": "Nachtschwärmer",
-    "31": "Milch (Halbe Füllung)",
+    "31": "Milch (1/2)",
     "32": "Irrlicht",
     "33": "Seltsames Ei",
     "34": "Huhn",
@@ -67,7 +66,7 @@
     "48": "Schimmelpilz",
     "49": "Modertrank",
     "50": "Säge",
-    "51": "Zerbr. Goronen-Schwert",
+    "51": "Goronen-Schwert (zerbrochen)",
     "52": "Rezept",
     "53": "Glotzfrosch",
     "54": "Augentropfen",
@@ -78,7 +77,7 @@
     "59": "Kokiri-Schwert",
     "60": "Master-Schwert",
     "61": "Langschwert",
-    "62": "Deku-Schild",
+    "62": "Deku-schild",
     "63": "Hylia-Schild",
     "64": "Spiegel-Schild",
     "65": "Kokiri-Rüstung",
@@ -99,13 +98,13 @@
     "80": "Goronen-Armband",
     "81": "Krafthandschuh",
     "82": "Titanhandschuh",
-    "83": "Silberne Schuppe",
-    "84": "Goldene Schuppe",
-    "85": "Zerbr. Langschwert",
+    "83": "Silberschuppe",
+    "84": "Goldschuppe",
+    "85": "Langschwert (gebrochen)",
     "86": "Große Börse",
     "87": "Riesenbörse",
     "88": "Deku-Kerne",
-    "89": "Angelrute",
+    "89": "Angel",
     "90": "Menuett des Waldes",
     "91": "Bolero des Feuers",
     "92": "Serenade des Wassers",
@@ -117,7 +116,7 @@
     "98": "Salias Lied",
     "99": "Hymne der Sonne",
     "100": "Hymne der Zeit",
-    "101": "Hymne des Sturms",
+    "101": "Song of Storms",
     "102": "Amulett des Waldes",
     "103": "Amulett des Feuers",
     "104": "Amulett des Wassers",
@@ -125,7 +124,7 @@
     "106": "Amulett des Schattens",
     "107": "Amulett des Lichts",
     "108": "Kokiri-Smaragd",
-    "109": "Goronen-Rubin",
+    "109": "Goronen-Opal",
     "110": "Zora-Saphir",
     "111": "Stein des Wissens",
     "112": "Gerudo-Paß",
@@ -136,8 +135,8 @@
     "117": "Kompaß",
     "118": "Labyrinth-Karte",
     "119": "Kleiner Schlüssel",
-    "120": "Kleine Magieflasche",
-    "121": "Große Magieflasche",
+    "120": "MAGIE KLEIN",
+    "121": "MAGIE GROß",
     "122": "Biggoron-Schwert",
     "123": "UNGÜLTIG 1",
     "124": "UNGÜLTIG 2",
@@ -154,25 +153,24 @@
     "135": "50 Rubine",
     "136": "200 Rubine",
     "137": "UNGÜLTIG 8",
-    "138": "DEKU-STÄBE 5",
-    "139": "DEKU-STÄBE 10",
-    "140": "DEKU-NÜSSE 5",
-    "141": "DEKU-NÜSSE 10",
+    "138": "STÄBE 5",
+    "139": "STÄBE 10",
+    "140": "NÜSSE 5",
+    "141": "NÜSSE 10",
     "142": "BOMBEN 5",
     "143": "BOMBEN 10",
     "144": "BOMBEN 20",
     "145": "BOMBEN 30",
-    "146": "PFEILE 5",
-    "147": "PFEILE 10",
-    "148": "PFEILE 30",
-    "149": "DEKU-KERNE 30",
+    "146": "PFEILE KLEIN",
+    "147": "PFEILE MITTEL",
+    "148": "PFEILE GROß",
+    "149": "KERNE 30",
     "150": "KRABBELMINEN 5",
     "151": "KRABBELMINEN 20",
-    "152": "DEKU-STAB-KAPAZITÄT 20",
-    "153": "DEKU-STAB-KAPAZITÄT 30",
-    "154": "DEKU-NUẞ-KAPAZITÄT 30",
-    "155": "DEKU-NUẞ-KAPAZITÄT 40",
-    "157": "Greifenfeder",
+    "152": "STAB UPGRADE 20",
+    "153": "STAB UPGRADE 30",
+    "154": "NUß UPGRADE 30",
+    "155": "NUß UPGRADE 40",
     "255": "",
     "256": "Gespensterwüste",
     "257": "Gerudo-Festung",

soh/assets/custom/accessibility/texts/scenes_ger.json

@@ -9,7 +9,7 @@
     "7": "Schattentempel",
     "8": "Grund des Brunnens",
     "9": "Eishöhle",
-    "10": "", // Treppe zu Ganondorfs Verlies (Keine Title-Card)
+    "10": "", // Treppe zu Ganondorfs Verließ (Keine Title-Card)
     "11": "Gerudo-Arena",
     "12": "Diebesversteck",
     "13": "Ganons Schloß",
@@ -22,7 +22,7 @@
     "20": "Reitendes Unheil - Phantom-Ganon",
     "21": "Subterraner Lavadrachoid - Volvagia",
     "22": "Aquamöbes Wassertentakel - Morpha",
-    "23": "Höllische Hexenarmada - Twinrova",
+    "23": "Höllische Hexenarmada - Killa Ohmaz",
     "24": "Bestialische Schattenmonstrosität - Bongo Bongo",
     "25": "Großmeister des Bösen - Ganondorf",
     "26": "",
@@ -109,4 +109,4 @@
     "107": "",
     "108": "", // Debug: SRD Raum (Keine Title-Card)
     "109": "" // Debug: Schatzkisten Teleport (Keine Title-Card)
-}
+}

soh/assets/custom/objects/custom_snowball/mat_snowball_snow

@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TT_NONE="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<SetTextureImage Path="objects/custom_snowball/LightNoise.rgba32" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_32b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_32b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="128"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_32b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/custom_snowball/model.xml

@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-951" Y="-1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-951" Y="-1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-951" Y="1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-951" Y="1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="-1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="-1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>

soh/assets/custom/objects/custom_snowball/snowball

@@ -0,0 +1,10 @@
+<DisplayList Version="0">
+	<ClearGeometryMode G_LIGHTING="1" />
+	<LoadVertices Path="objects/custom_snowball/snowball_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<CullDisplayList Start="0" End="7"/>
+	<CallDisplayList Path="objects/custom_snowball/mat_snowball_snow"/>
+	<CallDisplayList Path="objects/custom_snowball/snowball_tri_0"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/custom_snowball/snowball_tri_0

@@ -0,0 +1,47 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/custom_snowball/snowball_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="1" V01="4" V02="3" Flag0="0" V10="3" V11="4" V12="5" Flag1="0"/>
+	<Triangles2 V00="4" V01="6" V02="5" Flag0="0" V10="4" V11="7" V12="6" Flag1="0"/>
+	<Triangles2 V00="4" V01="8" V02="7" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
+	<Triangles2 V00="8" V01="10" V02="9" Flag0="0" V10="7" V11="9" V12="11" Flag1="0"/>
+	<Triangles2 V00="7" V01="11" V02="12" Flag0="0" V10="11" V11="13" V12="12" Flag1="0"/>
+	<Triangles2 V00="11" V01="14" V02="13" Flag0="0" V10="15" V11="14" V12="11" Flag1="0"/>
+	<Triangles2 V00="15" V01="16" V02="14" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="18" V02="14" Flag0="0" V10="14" V11="18" V12="19" Flag1="0"/>
+	<Triangles2 V00="18" V01="20" V02="19" Flag0="0" V10="18" V11="21" V12="20" Flag1="0"/>
+	<Triangles2 V00="22" V01="21" V02="18" Flag0="0" V10="22" V11="23" V12="21" Flag1="0"/>
+	<Triangles2 V00="24" V01="23" V02="22" Flag0="0" V10="23" V11="25" V12="21" Flag1="0"/>
+	<Triangles2 V00="21" V01="25" V02="26" Flag0="0" V10="25" V11="27" V12="26" Flag1="0"/>
+	<Triangles2 V00="25" V01="28" V02="27" Flag0="0" V10="29" V11="28" V12="25" Flag1="0"/>
+	<Triangles2 V00="29" V01="30" V02="28" Flag0="0" V10="31" V11="30" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/custom_snowball/snowball_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
+	<Triangles2 V00="4" V01="2" V02="3" Flag0="0" V10="4" V11="3" V12="5" Flag1="0"/>
+	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="6" V02="7" Flag0="0" V10="8" V11="7" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="6" V02="8" Flag0="0" V10="11" V11="6" V12="10" Flag1="0"/>
+	<Triangles2 V00="12" V01="11" V02="10" Flag0="0" V10="12" V11="10" V12="13" Flag1="0"/>
+	<Triangles2 V00="13" V01="10" V02="14" Flag0="0" V10="15" V11="13" V12="14" Flag1="0"/>
+	<Triangles2 V00="15" V01="14" V02="16" Flag0="0" V10="17" V11="13" V12="15" Flag1="0"/>
+	<Triangles2 V00="18" V01="13" V02="17" Flag0="0" V10="19" V11="18" V12="17" Flag1="0"/>
+	<Triangles2 V00="19" V01="17" V02="20" Flag0="0" V10="20" V11="17" V12="21" Flag1="0"/>
+	<Triangles2 V00="22" V01="20" V02="21" Flag0="0" V10="22" V11="21" V12="23" Flag1="0"/>
+	<Triangles2 V00="24" V01="20" V02="22" Flag0="0" V10="25" V11="20" V12="24" Flag1="0"/>
+	<Triangles2 V00="26" V01="25" V02="24" Flag0="0" V10="26" V11="24" V12="27" Flag1="0"/>
+	<Triangles2 V00="27" V01="24" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
+	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="27" V12="29" Flag1="0"/>
+	<LoadVertices Path="objects/custom_snowball/snowball_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="26"/>
+	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
+	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="4" V11="2" V12="5" Flag1="0"/>
+	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="5" V12="7" Flag1="0"/>
+	<Triangles2 V00="8" V01="4" V02="6" Flag0="0" V10="9" V11="4" V12="8" Flag1="0"/>
+	<Triangles2 V00="9" V01="3" V02="4" Flag0="0" V10="10" V11="3" V12="9" Flag1="0"/>
+	<Triangles2 V00="10" V01="11" V02="3" Flag0="0" V10="12" V11="11" V12="10" Flag1="0"/>
+	<Triangles2 V00="3" V01="11" V02="0" Flag0="0" V10="13" V11="14" V12="15" Flag1="0"/>
+	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="19" V11="20" V12="21" Flag1="0"/>
+	<Triangles2 V00="0" V01="22" V02="1" Flag0="0" V10="14" V11="23" V12="16" Flag1="0"/>
+	<Triangles2 V00="17" V01="24" V02="19" Flag0="0" V10="22" V11="25" V12="13" Flag1="0"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/custom_snowball/snowball_vtx_0

@@ -0,0 +1,92 @@
+<Vertex Version="0">
+	<Vtx X="0" Y="-1000" Z="0" S="-933" T="1827" R="0" G="129" B="0" A="255"/>
+	<Vtx X="425" Y="-851" Z="309" S="-729" T="1473" R="54" G="148" B="39" A="255"/>
+	<Vtx X="-162" Y="-851" Z="500" S="-1137" T="1473" R="235" G="148" B="64" A="255"/>
+	<Vtx X="263" Y="-526" Z="809" S="-933" T="1120" R="33" G="189" B="103" A="255"/>
+	<Vtx X="724" Y="-447" Z="526" S="-525" T="1120" R="92" G="199" B="67" A="255"/>
+	<Vtx X="588" Y="0" Z="809" S="-729" T="766" R="75" G="0" B="103" A="255"/>
+	<Vtx X="951" Y="0" Z="309" S="-321" T="766" R="121" G="0" B="39" A="255"/>
+	<Vtx X="851" Y="-526" Z="0" S="-117" T="1120" R="108" G="189" B="0" A="255"/>
+	<Vtx X="425" Y="-851" Z="309" S="-321" T="1473" R="54" G="148" B="39" A="255"/>
+	<Vtx X="425" Y="-851" Z="-309" S="88" T="1473" R="54" G="148" B="217" A="255"/>
+	<Vtx X="0" Y="-1000" Z="0" S="-117" T="1827" R="0" G="129" B="0" A="255"/>
+	<Vtx X="724" Y="-447" Z="-526" S="292" T="1120" R="92" G="199" B="189" A="255"/>
+	<Vtx X="951" Y="0" Z="-309" S="88" T="766" R="121" G="0" B="217" A="255"/>
+	<Vtx X="588" Y="0" Z="-809" S="496" T="766" R="75" G="0" B="153" A="255"/>
+	<Vtx X="263" Y="-526" Z="-809" S="700" T="1120" R="33" G="189" B="153" A="255"/>
+	<Vtx X="425" Y="-851" Z="-309" S="496" T="1473" R="54" G="148" B="217" A="255"/>
+	<Vtx X="-162" Y="-851" Z="-500" S="904" T="1473" R="235" G="148" B="192" A="255"/>
+	<Vtx X="0" Y="-1000" Z="0" S="700" T="1827" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-276" Y="-447" Z="-851" S="1109" T="1120" R="221" G="199" B="148" A="255"/>
+	<Vtx X="0" Y="0" Z="-1000" S="904" T="766" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-588" Y="0" Z="-809" S="1313" T="766" R="181" G="0" B="153" A="255"/>
+	<Vtx X="-688" Y="-526" Z="-500" S="1517" T="1120" R="169" G="189" B="193" A="255"/>
+	<Vtx X="-162" Y="-851" Z="-500" S="1313" T="1473" R="235" G="148" B="192" A="255"/>
+	<Vtx X="-526" Y="-851" Z="0" S="1721" T="1473" R="189" G="148" B="0" A="255"/>
+	<Vtx X="0" Y="-1000" Z="0" S="1517" T="1827" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-894" Y="-447" Z="0" S="1925" T="1120" R="142" G="199" B="0" A="255"/>
+	<Vtx X="-951" Y="0" Z="-309" S="1721" T="766" R="135" G="0" B="217" A="255"/>
+	<Vtx X="-951" Y="0" Z="309" S="2130" T="766" R="135" G="0" B="39" A="255"/>
+	<Vtx X="-688" Y="-526" Z="500" S="2334" T="1120" R="169" G="189" B="63" A="255"/>
+	<Vtx X="-526" Y="-851" Z="0" S="2130" T="1473" R="189" G="148" B="0" A="255"/>
+	<Vtx X="-162" Y="-851" Z="500" S="2538" T="1473" R="235" G="148" B="64" A="255"/>
+	<Vtx X="0" Y="-1000" Z="0" S="2334" T="1827" R="0" G="129" B="0" A="255"/>
+	<Vtx X="-162" Y="-851" Z="500" S="2538" T="1473" R="235" G="148" B="64" A="255"/>
+	<Vtx X="-276" Y="-447" Z="851" S="2742" T="1120" R="221" G="199" B="108" A="255"/>
+	<Vtx X="-688" Y="-526" Z="500" S="2334" T="1120" R="169" G="189" B="63" A="255"/>
+	<Vtx X="-588" Y="0" Z="809" S="2538" T="766" R="181" G="0" B="103" A="255"/>
+	<Vtx X="-951" Y="0" Z="309" S="2130" T="766" R="135" G="0" B="39" A="255"/>
+	<Vtx X="-724" Y="447" Z="526" S="2334" T="412" R="164" G="57" B="67" A="255"/>
+	<Vtx X="-851" Y="526" Z="0" S="1925" T="412" R="148" G="67" B="0" A="255"/>
+	<Vtx X="-425" Y="851" Z="309" S="2130" T="59" R="202" G="108" B="39" A="255"/>
+	<Vtx X="-425" Y="851" Z="-309" S="1721" T="59" R="202" G="108" B="217" A="255"/>
+	<Vtx X="0" Y="1000" Z="0" S="1925" T="-295" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-724" Y="447" Z="-526" S="1517" T="412" R="164" G="57" B="189" A="255"/>
+	<Vtx X="-951" Y="0" Z="-309" S="1721" T="766" R="135" G="0" B="217" A="255"/>
+	<Vtx X="-588" Y="0" Z="-809" S="1313" T="766" R="181" G="0" B="153" A="255"/>
+	<Vtx X="-263" Y="526" Z="-809" S="1109" T="412" R="223" G="67" B="153" A="255"/>
+	<Vtx X="-425" Y="851" Z="-309" S="1313" T="59" R="202" G="108" B="217" A="255"/>
+	<Vtx X="162" Y="851" Z="-500" S="904" T="59" R="21" G="108" B="192" A="255"/>
+	<Vtx X="0" Y="1000" Z="0" S="1109" T="-295" R="0" G="127" B="0" A="255"/>
+	<Vtx X="276" Y="447" Z="-851" S="700" T="412" R="35" G="57" B="148" A="255"/>
+	<Vtx X="0" Y="0" Z="-1000" S="904" T="766" R="0" G="0" B="129" A="255"/>
+	<Vtx X="588" Y="0" Z="-809" S="496" T="766" R="75" G="0" B="153" A="255"/>
+	<Vtx X="688" Y="526" Z="-500" S="292" T="412" R="87" G="67" B="193" A="255"/>
+	<Vtx X="162" Y="851" Z="-500" S="496" T="59" R="21" G="108" B="192" A="255"/>
+	<Vtx X="526" Y="851" Z="0" S="88" T="59" R="67" G="108" B="0" A="255"/>
+	<Vtx X="0" Y="1000" Z="0" S="292" T="-295" R="0" G="127" B="0" A="255"/>
+	<Vtx X="894" Y="447" Z="0" S="-117" T="412" R="114" G="57" B="0" A="255"/>
+	<Vtx X="951" Y="0" Z="-309" S="88" T="766" R="121" G="0" B="217" A="255"/>
+	<Vtx X="951" Y="0" Z="309" S="-321" T="766" R="121" G="0" B="39" A="255"/>
+	<Vtx X="688" Y="526" Z="500" S="-525" T="412" R="87" G="67" B="63" A="255"/>
+	<Vtx X="526" Y="851" Z="0" S="-321" T="59" R="67" G="108" B="0" A="255"/>
+	<Vtx X="162" Y="851" Z="500" S="-729" T="59" R="21" G="108" B="64" A="255"/>
+	<Vtx X="0" Y="1000" Z="0" S="-525" T="-295" R="0" G="127" B="0" A="255"/>
+	<Vtx X="276" Y="447" Z="851" S="-933" T="412" R="35" G="57" B="108" A="255"/>
+	<Vtx X="588" Y="0" Z="809" S="-729" T="766" R="75" G="0" B="103" A="255"/>
+	<Vtx X="688" Y="526" Z="500" S="-525" T="412" R="87" G="67" B="63" A="255"/>
+	<Vtx X="276" Y="447" Z="851" S="-933" T="412" R="35" G="57" B="108" A="255"/>
+	<Vtx X="0" Y="0" Z="1000" S="-1137" T="766" R="0" G="0" B="127" A="255"/>
+	<Vtx X="-263" Y="526" Z="809" S="-1342" T="412" R="223" G="67" B="103" A="255"/>
+	<Vtx X="162" Y="851" Z="500" S="-1137" T="59" R="21" G="108" B="64" A="255"/>
+	<Vtx X="-425" Y="851" Z="309" S="-1546" T="59" R="202" G="108" B="39" A="255"/>
+	<Vtx X="0" Y="1000" Z="0" S="-1342" T="-295" R="0" G="127" B="0" A="255"/>
+	<Vtx X="-724" Y="447" Z="526" S="-1750" T="412" R="164" G="57" B="67" A="255"/>
+	<Vtx X="-588" Y="0" Z="809" S="-1546" T="766" R="181" G="0" B="103" A="255"/>
+	<Vtx X="-276" Y="-447" Z="851" S="-1342" T="1120" R="221" G="199" B="108" A="255"/>
+	<Vtx X="263" Y="-526" Z="809" S="-933" T="1120" R="33" G="189" B="103" A="255"/>
+	<Vtx X="-162" Y="-851" Z="500" S="-1137" T="1473" R="235" G="148" B="64" A="255"/>
+	<Vtx X="951" Y="0" Z="-309" S="88" T="766" R="121" G="0" B="217" A="255"/>
+	<Vtx X="588" Y="0" Z="-809" S="496" T="766" R="75" G="0" B="153" A="255"/>
+	<Vtx X="688" Y="526" Z="-500" S="292" T="412" R="87" G="67" B="193" A="255"/>
+	<Vtx X="0" Y="0" Z="-1000" S="904" T="766" R="0" G="0" B="129" A="255"/>
+	<Vtx X="-588" Y="0" Z="-809" S="1313" T="766" R="181" G="0" B="153" A="255"/>
+	<Vtx X="-263" Y="526" Z="-809" S="1109" T="412" R="223" G="67" B="153" A="255"/>
+	<Vtx X="-951" Y="0" Z="-309" S="1721" T="766" R="135" G="0" B="217" A="255"/>
+	<Vtx X="-951" Y="0" Z="309" S="2130" T="766" R="135" G="0" B="39" A="255"/>
+	<Vtx X="-851" Y="526" Z="0" S="1925" T="412" R="148" G="67" B="0" A="255"/>
+	<Vtx X="951" Y="0" Z="309" S="-321" T="766" R="121" G="0" B="39" A="255"/>
+	<Vtx X="263" Y="-526" Z="-809" S="700" T="1120" R="33" G="189" B="153" A="255"/>
+	<Vtx X="-688" Y="-526" Z="-500" S="1517" T="1120" R="169" G="189" B="193" A="255"/>
+	<Vtx X="851" Y="-526" Z="0" S="-117" T="1120" R="108" G="189" B="0" A="255"/>
+</Vertex>

soh/assets/custom/objects/custom_snowball/snowball_vtx_cull

@@ -0,0 +1,10 @@
+<Vertex Version="0">
+	<Vtx X="-951" Y="-1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-951" Y="-1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-951" Y="1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="-951" Y="1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="-1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="-1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="1000" Z="1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+	<Vtx X="951" Y="1000" Z="-1000" S="0" T="0" R="0" G="0" B="0" A="0"/>
+</Vertex>

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL

@@ -0,0 +1,19 @@
+<DisplayList Version="0">
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potrim"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/gRandoPotDL_tri_0"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potface"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/gRandoPotDL_tri_1"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbase"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/gRandoPotDL_tri_2"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbottom"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/gRandoPotDL_tri_3"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potvoid"/>
+	<CallDisplayList Path="objects/gameplay_dangeon_keep/gRandoPotDL_tri_4"/>
+	<PipeSync/>
+	<SetGeometryMode G_LIGHTING="1" />
+	<ClearGeometryMode G_TEXTURE_GEN="1" />
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_0

@@ -0,0 +1,69 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="5" V01="4" V02="6"/>
+	<Triangle1 V00="5" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="9" V02="7"/>
+	<Triangle1 V00="9" V01="8" V02="10"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="12" V01="14" V02="15"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="3" V01="2" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="6" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="7" V02="5"/>
+	<Triangle1 V00="7" V01="6" V02="8"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="10" V01="12" V02="13"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0" VertexBufferIndex="0" VertexOffset="32" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="3" V02="2"/>
+	<Triangle1 V00="4" V01="5" V02="3"/>
+	<Triangle1 V00="5" V01="4" V02="6"/>
+	<Triangle1 V00="5" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="8" V01="10" V02="11"/>
+	<Triangle1 V00="11" V01="10" V02="12"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0" VertexBufferIndex="0" VertexOffset="48" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="3" V01="0" V02="4"/>
+	<Triangle1 V00="3" V01="4" V02="5"/>
+	<Triangle1 V00="6" V01="7" V02="8"/>
+	<Triangle1 V00="6" V01="8" V02="9"/>
+	<Triangle1 V00="9" V01="8" V02="10"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="11" V01="10" V02="12"/>
+	<Triangle1 V00="11" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="15" V02="13"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0" VertexBufferIndex="0" VertexOffset="64" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<Triangle1 V00="7" V01="6" V02="8"/>
+	<Triangle1 V00="7" V01="8" V02="9"/>
+	<Triangle1 V00="9" V01="8" V02="10"/>
+	<Triangle1 V00="9" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="11" V02="10"/>
+	<Triangle1 V00="12" V01="13" V02="11"/>
+	<Triangle1 V00="13" V01="12" V02="14"/>
+	<Triangle1 V00="13" V01="14" V02="15"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_1

@@ -0,0 +1,31 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="3" V01="4" V02="1"/>
+	<Triangle1 V00="3" V01="5" V02="4"/>
+	<Triangle1 V00="6" V01="7" V02="8"/>
+	<Triangle1 V00="6" V01="8" V02="9"/>
+	<Triangle1 V00="10" V01="9" V02="8"/>
+	<Triangle1 V00="10" V01="8" V02="11"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="12" V01="15" V02="13"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_1" VertexBufferIndex="0" VertexOffset="16" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="3" V02="1"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="7" V02="6"/>
+	<Triangle1 V00="8" V01="6" V02="9"/>
+	<Triangle1 V00="10" V01="11" V02="12"/>
+	<Triangle1 V00="10" V01="12" V02="13"/>
+	<Triangle1 V00="14" V01="13" V02="12"/>
+	<Triangle1 V00="14" V01="12" V02="15"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="6"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="0" V02="3"/>
+	<Triangle1 V00="4" V01="3" V02="5"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_2

@@ -0,0 +1,18 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="16"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<Triangle1 V00="8" V01="9" V02="10"/>
+	<Triangle1 V00="8" V01="10" V02="11"/>
+	<Triangle1 V00="12" V01="13" V02="14"/>
+	<Triangle1 V00="12" V01="14" V02="15"/>
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_2" VertexBufferIndex="0" VertexOffset="16" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_3

@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_3" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_4

@@ -0,0 +1,9 @@
+<DisplayList Version="0">
+	<LoadVertices Path="objects/gameplay_dangeon_keep/gRandoPotDL_vtx_4" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
+	<Triangle1 V00="0" V01="1" V02="2"/>
+	<Triangle1 V00="0" V01="2" V02="3"/>
+	<Triangle1 V00="4" V01="5" V02="6"/>
+	<Triangle1 V00="4" V01="6" V02="7"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0

@@ -0,0 +1,82 @@
+<Vertex Version="0">
+	<Vtx X="-35" Y="133" Z="-20" S="546" T="573" R="159" G="61" B="200" A="255"/>
+	<Vtx X="-35" Y="133" Z="20" S="305" T="573" R="159" G="61" B="56" A="255"/>
+	<Vtx X="-35" Y="146" Z="20" S="305" T="654" R="196" G="149" B="34" A="255"/>
+	<Vtx X="-35" Y="146" Z="-20" S="546" T="654" R="196" G="149" B="222" A="255"/>
+	<Vtx X="-43" Y="146" Z="25" S="278" T="699" R="169" G="178" B="50" A="255"/>
+	<Vtx X="-43" Y="146" Z="-25" S="572" T="699" R="169" G="178" B="206" A="255"/>
+	<Vtx X="-43" Y="160" Z="25" S="278" T="778" R="169" G="78" B="50" A="255"/>
+	<Vtx X="-43" Y="160" Z="-25" S="572" T="778" R="169" G="78" B="206" A="255"/>
+	<Vtx X="-29" Y="160" Z="17" S="325" T="858" R="60" G="107" B="222" A="255"/>
+	<Vtx X="-29" Y="160" Z="-17" S="526" T="858" R="60" G="107" B="34" A="255"/>
+	<Vtx X="-29" Y="134" Z="17" S="325" T="1008" R="87" G="78" B="206" A="255"/>
+	<Vtx X="-29" Y="134" Z="-17" S="526" T="1008" R="87" G="78" B="50" A="255"/>
+	<Vtx X="-35" Y="133" Z="20" S="10" T="1008" R="159" G="61" B="56" A="255"/>
+	<Vtx X="0" Y="133" Z="41" S="252" T="1008" R="0" G="61" B="112" A="255"/>
+	<Vtx X="0" Y="146" Z="41" S="252" T="927" R="0" G="149" B="69" A="255"/>
+	<Vtx X="-35" Y="146" Z="20" S="10" T="927" R="196" G="149" B="34" A="255"/>
+	<Vtx X="-35" Y="146" Z="20" S="10" T="927" R="196" G="149" B="34" A="255"/>
+	<Vtx X="0" Y="146" Z="41" S="252" T="927" R="0" G="149" B="69" A="255"/>
+	<Vtx X="0" Y="146" Z="49" S="278" T="882" R="0" G="178" B="101" A="255"/>
+	<Vtx X="-43" Y="146" Z="25" S="-16" T="882" R="169" G="178" B="50" A="255"/>
+	<Vtx X="0" Y="160" Z="49" S="278" T="803" R="0" G="78" B="101" A="255"/>
+	<Vtx X="-43" Y="160" Z="25" S="-16" T="803" R="169" G="78" B="50" A="255"/>
+	<Vtx X="0" Y="160" Z="34" S="232" T="723" R="0" G="107" B="187" A="255"/>
+	<Vtx X="-29" Y="160" Z="17" S="30" T="723" R="60" G="107" B="222" A="255"/>
+	<Vtx X="0" Y="134" Z="34" S="232" T="573" R="0" G="78" B="155" A="255"/>
+	<Vtx X="-29" Y="134" Z="17" S="30" T="573" R="87" G="78" B="206" A="255"/>
+	<Vtx X="0" Y="133" Z="-41" S="573" T="740" R="0" G="61" B="144" A="255"/>
+	<Vtx X="-35" Y="133" Z="-20" S="573" T="982" R="159" G="61" B="200" A="255"/>
+	<Vtx X="-35" Y="146" Z="-20" S="654" T="982" R="196" G="149" B="222" A="255"/>
+	<Vtx X="0" Y="146" Z="-41" S="654" T="740" R="0" G="149" B="187" A="255"/>
+	<Vtx X="-43" Y="146" Z="-25" S="699" T="1008" R="169" G="178" B="206" A="255"/>
+	<Vtx X="0" Y="146" Z="-49" S="699" T="714" R="0" G="178" B="155" A="255"/>
+	<Vtx X="0" Y="146" Z="-49" S="699" T="714" R="0" G="178" B="155" A="255"/>
+	<Vtx X="-43" Y="146" Z="-25" S="699" T="1008" R="169" G="178" B="206" A="255"/>
+	<Vtx X="-43" Y="160" Z="-25" S="778" T="1008" R="169" G="78" B="206" A="255"/>
+	<Vtx X="0" Y="160" Z="-49" S="778" T="714" R="0" G="78" B="155" A="255"/>
+	<Vtx X="-29" Y="160" Z="-17" S="858" T="962" R="60" G="107" B="34" A="255"/>
+	<Vtx X="0" Y="160" Z="-34" S="858" T="760" R="0" G="107" B="69" A="255"/>
+	<Vtx X="-29" Y="134" Z="-17" S="1008" T="962" R="87" G="78" B="50" A="255"/>
+	<Vtx X="0" Y="134" Z="-34" S="1008" T="760" R="0" G="78" B="101" A="255"/>
+	<Vtx X="35" Y="133" Z="20" S="687" T="137" R="97" G="61" B="56" A="255"/>
+	<Vtx X="35" Y="133" Z="-20" S="446" T="137" R="97" G="61" B="200" A="255"/>
+	<Vtx X="35" Y="146" Z="-20" S="446" T="218" R="60" G="149" B="222" A="255"/>
+	<Vtx X="35" Y="146" Z="20" S="687" T="218" R="60" G="149" B="34" A="255"/>
+	<Vtx X="43" Y="146" Z="-25" S="420" T="263" R="87" G="178" B="206" A="255"/>
+	<Vtx X="43" Y="146" Z="25" S="714" T="263" R="87" G="178" B="50" A="255"/>
+	<Vtx X="43" Y="160" Z="-25" S="420" T="342" R="87" G="78" B="206" A="255"/>
+	<Vtx X="43" Y="160" Z="25" S="714" T="342" R="87" G="78" B="50" A="255"/>
+	<Vtx X="29" Y="160" Z="-17" S="466" T="422" R="196" G="107" B="34" A="255"/>
+	<Vtx X="43" Y="160" Z="25" S="714" T="342" R="87" G="78" B="50" A="255"/>
+	<Vtx X="43" Y="160" Z="-25" S="420" T="342" R="87" G="78" B="206" A="255"/>
+	<Vtx X="29" Y="160" Z="17" S="667" T="422" R="196" G="107" B="222" A="255"/>
+	<Vtx X="29" Y="134" Z="-17" S="466" T="572" R="169" G="78" B="50" A="255"/>
+	<Vtx X="29" Y="134" Z="17" S="667" T="572" R="169" G="78" B="206" A="255"/>
+	<Vtx X="35" Y="133" Z="-20" S="-16" T="305" R="97" G="61" B="200" A="255"/>
+	<Vtx X="0" Y="133" Z="-41" S="-16" T="546" R="0" G="61" B="144" A="255"/>
+	<Vtx X="0" Y="146" Z="-41" S="65" T="546" R="0" G="149" B="187" A="255"/>
+	<Vtx X="35" Y="146" Z="-20" S="65" T="305" R="60" G="149" B="222" A="255"/>
+	<Vtx X="0" Y="146" Z="-49" S="110" T="572" R="0" G="178" B="155" A="255"/>
+	<Vtx X="43" Y="146" Z="-25" S="110" T="278" R="87" G="178" B="206" A="255"/>
+	<Vtx X="0" Y="160" Z="-49" S="189" T="572" R="0" G="78" B="155" A="255"/>
+	<Vtx X="43" Y="160" Z="-25" S="189" T="278" R="87" G="78" B="206" A="255"/>
+	<Vtx X="0" Y="160" Z="-34" S="269" T="526" R="0" G="107" B="69" A="255"/>
+	<Vtx X="29" Y="160" Z="-17" S="269" T="325" R="196" G="107" B="34" A="255"/>
+	<Vtx X="29" Y="160" Z="-17" S="269" T="325" R="196" G="107" B="34" A="255"/>
+	<Vtx X="0" Y="160" Z="-34" S="269" T="526" R="0" G="107" B="69" A="255"/>
+	<Vtx X="0" Y="134" Z="-34" S="419" T="526" R="0" G="78" B="101" A="255"/>
+	<Vtx X="29" Y="134" Z="-17" S="419" T="325" R="169" G="78" B="50" A="255"/>
+	<Vtx X="0" Y="133" Z="41" S="419" T="252" R="0" G="61" B="112" A="255"/>
+	<Vtx X="35" Y="133" Z="20" S="419" T="10" R="97" G="61" B="56" A="255"/>
+	<Vtx X="35" Y="146" Z="20" S="338" T="10" R="60" G="149" B="34" A="255"/>
+	<Vtx X="0" Y="146" Z="41" S="338" T="252" R="0" G="149" B="69" A="255"/>
+	<Vtx X="43" Y="146" Z="25" S="293" T="-16" R="87" G="178" B="50" A="255"/>
+	<Vtx X="0" Y="146" Z="49" S="293" T="278" R="0" G="178" B="101" A="255"/>
+	<Vtx X="43" Y="160" Z="25" S="214" T="-16" R="87" G="78" B="50" A="255"/>
+	<Vtx X="0" Y="160" Z="49" S="214" T="278" R="0" G="78" B="101" A="255"/>
+	<Vtx X="29" Y="160" Z="17" S="134" T="30" R="196" G="107" B="222" A="255"/>
+	<Vtx X="0" Y="160" Z="34" S="134" T="232" R="0" G="107" B="187" A="255"/>
+	<Vtx X="29" Y="134" Z="17" S="-16" T="30" R="169" G="78" B="206" A="255"/>
+	<Vtx X="0" Y="134" Z="34" S="-16" T="232" R="0" G="78" B="155" A="255"/>
+</Vertex>

soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_2

@@ -0,0 +1,26 @@
+<Vertex Version="0">
+	<Vtx X="0" Y="0" Z="-51" S="240" T="240" R="0" G="150" B="185" A="255"/>
+	<Vtx X="0" Y="43" Z="-82" S="240" T="-16" R="0" G="220" B="134" A="255"/>
+	<Vtx X="71" Y="43" Z="-41" S="-16" T="-16" R="106" G="220" B="195" A="255"/>
+	<Vtx X="44" Y="0" Z="-25" S="-16" T="240" R="61" G="150" B="221" A="255"/>
+	<Vtx X="44" Y="0" Z="-25" S="240" T="240" R="61" G="150" B="221" A="255"/>
+	<Vtx X="71" Y="43" Z="-41" S="240" T="-16" R="106" G="220" B="195" A="255"/>
+	<Vtx X="71" Y="43" Z="41" S="-16" T="-16" R="106" G="220" B="61" A="255"/>
+	<Vtx X="44" Y="0" Z="25" S="-16" T="240" R="61" G="150" B="35" A="255"/>
+	<Vtx X="44" Y="0" Z="25" S="240" T="240" R="61" G="150" B="35" A="255"/>
+	<Vtx X="71" Y="43" Z="41" S="240" T="-16" R="106" G="220" B="61" A="255"/>
+	<Vtx X="0" Y="43" Z="82" S="-16" T="-16" R="0" G="220" B="122" A="255"/>
+	<Vtx X="0" Y="0" Z="51" S="-16" T="240" R="0" G="150" B="71" A="255"/>
+	<Vtx X="0" Y="0" Z="51" S="240" T="240" R="0" G="150" B="71" A="255"/>
+	<Vtx X="0" Y="43" Z="82" S="240" T="-16" R="0" G="220" B="122" A="255"/>
+	<Vtx X="-71" Y="43" Z="41" S="-16" T="-16" R="150" G="220" B="61" A="255"/>
+	<Vtx X="-44" Y="0" Z="25" S="-16" T="240" R="195" G="150" B="35" A="255"/>
+	<Vtx X="-44" Y="0" Z="25" S="240" T="240" R="195" G="150" B="35" A="255"/>
+	<Vtx X="-71" Y="43" Z="41" S="240" T="-16" R="150" G="220" B="61" A="255"/>
+	<Vtx X="-71" Y="43" Z="-41" S="-16" T="-16" R="150" G="220" B="195" A="255"/>
+	<Vtx X="-44" Y="0" Z="-25" S="-16" T="240" R="195" G="150" B="221" A="255"/>
+	<Vtx X="-44" Y="0" Z="-25" S="240" T="240" R="195" G="150" B="221" A="255"/>
+	<Vtx X="-71" Y="43" Z="-41" S="240" T="-16" R="150" G="220" B="195" A="255"/>
+	<Vtx X="0" Y="43" Z="-82" S="-16" T="-16" R="0" G="220" B="134" A="255"/>
+	<Vtx X="0" Y="0" Z="-51" S="-16" T="240" R="0" G="150" B="185" A="255"/>
+</Vertex>

soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbase

@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/gameplay_dangeon_keep/PotBaseNoise_8" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="63" Dxt="1024"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="2" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="3" ShiftS="0" MaskT="3" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="28" Lrt="28"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbottom

@@ -0,0 +1,12 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="69" G="38" B="33" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potface

@@ -0,0 +1,21 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetTextureLUT Mode="G_TT_NONE"/>
+	<TileSync/>
+	<SetTextureImage Path="objects/gameplay_dangeon_keep/PotFace_32" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<LoadSync/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
+	<PipeSync/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_MIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potrim

@@ -0,0 +1,12 @@
+<DisplayList Version="0">
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
+	<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="218" G="179" B="131" A="255"/>
+	<EndDisplayList/>
+</DisplayList>
+

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL

@@ -1,14 +0,0 @@
-<DisplayList Version="0">
-	<ClearGeometryMode G_LIGHTING="1" />
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
-	<SetGeometryMode G_LIGHTING="1" />
-	<CullDisplayList Start="0" End="7"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_shrubbery"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_0"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_leaf"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_1"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushBossKeyDL_f3dlite_flower_bosskey"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_2"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_0

@@ -1,8 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="14"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="0" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="11" Flag0="0" V10="7" V11="12" V12="13" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_1

@@ -1,134 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="4" V12="3" Flag1="0"/>
-	<Triangles2 V00="3" V01="6" V02="5" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="5" V11="8" V12="4" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="10" V12="9" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="10" Flag0="0" V10="14" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="12" V01="15" V02="14" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="14" V11="16" V12="13" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="18" V12="17" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="18" Flag0="0" V10="22" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="20" V01="23" V02="22" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="22" V11="24" V12="21" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="26" V12="25" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="26" Flag0="0" V10="30" V11="29" V12="28" Flag1="0"/>
-	<Triangles2 V00="28" V01="31" V02="30" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="20" V02="17" Flag0="0" V10="17" V11="20" V12="16" Flag1="0"/>
-	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="26" V11="25" V12="24" Flag1="0"/>
-	<Triangles2 V00="24" V01="27" V02="26" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
-	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="26" V11="28" V12="25" Flag1="0"/>
-	<Triangle1 V00="29" V01="30" V02="31"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="0" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
-	<Triangles2 V00="4" V01="7" V02="3" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="9" V02="8" Flag0="0" V10="11" V11="12" V12="9" Flag1="0"/>
-	<Triangles2 V00="13" V01="12" V02="11" Flag0="0" V10="11" V11="14" V12="13" Flag1="0"/>
-	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
-	<Triangles2 V00="13" V01="15" V02="12" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="17" V02="16" Flag0="0" V10="19" V11="20" V12="17" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="19" Flag0="0" V10="19" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
-	<Triangles2 V00="21" V01="23" V02="20" Flag0="0" V10="24" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="25" V02="24" Flag0="0" V10="27" V11="28" V12="25" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="27" Flag0="0" V10="27" V11="30" V12="29" Flag1="0"/>
-	<Triangle1 V00="31" V01="29" V02="30"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="0" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="0" V01="19" V02="17" Flag0="0" V10="17" V11="19" V12="16" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="23" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="23" V01="24" V02="21" Flag0="0" V10="25" V11="24" V12="23" Flag1="0"/>
-	<Triangles2 V00="23" V01="26" V02="25" Flag0="0" V10="0" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="0" V01="27" V02="25" Flag0="0" V10="25" V11="27" V12="24" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="31" V11="29" V12="28" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="0" V01="4" V02="3" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="6" V02="3" Flag0="0" V10="3" V11="6" V12="1" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="9" Flag0="0" V10="10" V11="7" V12="9" Flag1="0"/>
-	<Triangles2 V00="10" V01="9" V02="11" Flag0="0" V10="12" V11="10" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="12" Flag0="0" V10="10" V11="12" V12="15" Flag1="0"/>
-	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="19" V11="16" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="14" V11="21" V12="22" Flag1="0"/>
-	<Triangles2 V00="14" V01="23" V02="21" Flag0="0" V10="19" V11="21" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="24" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="14" V11="29" V12="30" Flag1="0"/>
-	<Triangles2 V00="14" V01="31" V02="29" Flag0="0" V10="27" V11="29" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="24" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="20" V11="22" V12="25" Flag1="0"/>
-	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="29" V11="26" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="29" V12="30" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="192" Count="30"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="0" Flag0="0" V10="5" V11="0" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="6" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="3" V11="11" V12="12" Flag1="0"/>
-	<Triangles2 V00="3" V01="13" V02="11" Flag0="0" V10="9" V11="11" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="17" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="3" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="3" V01="21" V02="19" Flag0="0" V10="17" V11="19" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="25" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="3" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="3" V01="29" V02="27" Flag0="0" V10="25" V11="27" V12="29" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="222" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="20" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="25" V12="27" Flag1="0"/>
-	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="30" V11="28" V12="29" Flag1="0"/>
-	<Triangles2 V00="30" V01="29" V02="31" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1" VertexBufferIndex="0" VertexOffset="254" Count="12"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="2" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="4" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="7" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="7" V11="9" V12="11" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_tri_2

@@ -1,134 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="4" V12="3" Flag1="0"/>
-	<Triangles2 V00="3" V01="6" V02="5" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="5" V11="8" V12="4" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="10" V12="9" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="10" Flag0="0" V10="14" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="12" V01="15" V02="14" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="14" V11="16" V12="13" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="18" V12="17" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="18" Flag0="0" V10="22" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="20" V01="23" V02="22" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="22" V11="24" V12="21" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="26" V12="25" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="26" Flag0="0" V10="30" V11="29" V12="28" Flag1="0"/>
-	<Triangles2 V00="28" V01="31" V02="30" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="20" V02="17" Flag0="0" V10="17" V11="20" V12="16" Flag1="0"/>
-	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="26" V11="25" V12="24" Flag1="0"/>
-	<Triangles2 V00="24" V01="27" V02="26" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
-	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="26" V11="28" V12="25" Flag1="0"/>
-	<Triangle1 V00="29" V01="30" V02="31"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="0" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
-	<Triangles2 V00="4" V01="7" V02="3" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="9" V02="8" Flag0="0" V10="11" V11="12" V12="9" Flag1="0"/>
-	<Triangles2 V00="13" V01="12" V02="11" Flag0="0" V10="11" V11="14" V12="13" Flag1="0"/>
-	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
-	<Triangles2 V00="13" V01="15" V02="12" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="17" V02="16" Flag0="0" V10="19" V11="20" V12="17" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="19" Flag0="0" V10="19" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
-	<Triangles2 V00="21" V01="23" V02="20" Flag0="0" V10="24" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="25" V02="24" Flag0="0" V10="27" V11="28" V12="25" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="27" Flag0="0" V10="27" V11="30" V12="29" Flag1="0"/>
-	<Triangle1 V00="31" V01="29" V02="30"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="0" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="0" V01="19" V02="17" Flag0="0" V10="17" V11="19" V12="16" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="23" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="23" V01="24" V02="21" Flag0="0" V10="25" V11="24" V12="23" Flag1="0"/>
-	<Triangles2 V00="23" V01="26" V02="25" Flag0="0" V10="0" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="0" V01="27" V02="25" Flag0="0" V10="25" V11="27" V12="24" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="31" V11="29" V12="28" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="0" V01="4" V02="3" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="6" V02="3" Flag0="0" V10="3" V11="6" V12="1" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="9" Flag0="0" V10="10" V11="7" V12="9" Flag1="0"/>
-	<Triangles2 V00="10" V01="9" V02="11" Flag0="0" V10="12" V11="10" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="12" Flag0="0" V10="10" V11="12" V12="15" Flag1="0"/>
-	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="19" V11="16" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="14" V11="21" V12="22" Flag1="0"/>
-	<Triangles2 V00="14" V01="23" V02="21" Flag0="0" V10="19" V11="21" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="24" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="14" V11="29" V12="30" Flag1="0"/>
-	<Triangles2 V00="14" V01="31" V02="29" Flag0="0" V10="27" V11="29" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="24" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="20" V11="22" V12="25" Flag1="0"/>
-	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="29" V11="26" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="29" V12="30" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="192" Count="30"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="0" Flag0="0" V10="5" V11="0" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="6" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="3" V11="11" V12="12" Flag1="0"/>
-	<Triangles2 V00="3" V01="13" V02="11" Flag0="0" V10="9" V11="11" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="17" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="3" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="3" V01="21" V02="19" Flag0="0" V10="17" V11="19" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="25" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="3" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="3" V01="29" V02="27" Flag0="0" V10="25" V11="27" V12="29" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="222" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="20" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="25" V12="27" Flag1="0"/>
-	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="30" V11="28" V12="29" Flag1="0"/>
-	<Triangles2 V00="30" V01="29" V02="31" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2" VertexBufferIndex="0" VertexOffset="254" Count="12"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="2" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="4" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="7" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="7" V11="9" V12="11" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_0

@@ -1,16 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="0" Y="98" Z="0" S="558" T="-664" R="0" G="0" B="129" A="255"/>
-	<Vtx X="54" Y="0" Z="93" S="-281" T="1008" R="110" G="0" B="192" A="255"/>
-	<Vtx X="-54" Y="0" Z="-93" S="1398" T="1008" R="110" G="0" B="192" A="255"/>
-	<Vtx X="-107" Y="0" Z="0" S="-281" T="1008" R="0" G="0" B="127" A="255"/>
-	<Vtx X="107" Y="0" Z="0" S="1398" T="1008" R="0" G="0" B="127" A="255"/>
-	<Vtx X="54" Y="0" Z="-93" S="-281" T="1008" R="146" G="0" B="192" A="255"/>
-	<Vtx X="-54" Y="0" Z="93" S="1398" T="1008" R="146" G="0" B="192" A="255"/>
-	<Vtx X="0" Y="98" Z="0" S="558" T="-664" R="0" G="0" B="127" A="255"/>
-	<Vtx X="-54" Y="0" Z="-93" S="1398" T="1008" R="146" G="0" B="64" A="255"/>
-	<Vtx X="54" Y="0" Z="93" S="-281" T="1008" R="146" G="0" B="64" A="255"/>
-	<Vtx X="107" Y="0" Z="0" S="1398" T="1008" R="0" G="0" B="129" A="255"/>
-	<Vtx X="-107" Y="0" Z="0" S="-281" T="1008" R="0" G="0" B="129" A="255"/>
-	<Vtx X="-54" Y="0" Z="93" S="1398" T="1008" R="110" G="0" B="64" A="255"/>
-	<Vtx X="54" Y="0" Z="-93" S="-281" T="1008" R="110" G="0" B="64" A="255"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_1

@@ -1,268 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="-25" Y="44" Z="36" S="304" T="432" R="77" G="174" B="197" A="255"/>
-	<Vtx X="-22" Y="48" Z="36" S="432" T="304" R="77" G="174" B="197" A="255"/>
-	<Vtx X="-20" Y="43" Z="38" S="496" T="496" R="35" G="211" B="143" A="255"/>
-	<Vtx X="-28" Y="43" Z="29" S="112" T="304" R="90" G="179" B="211" A="255"/>
-	<Vtx X="-21" Y="50" Z="29" S="304" T="112" R="73" G="161" B="213" A="255"/>
-	<Vtx X="-27" Y="49" Z="25" S="112" T="112" R="87" G="167" B="230" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="-16" T="176" R="77" G="160" B="224" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="81" G="171" B="209" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="176" T="-16" R="93" G="177" B="221" A="255"/>
-	<Vtx X="-24" Y="63" Z="4" S="304" T="432" R="78" G="163" B="220" A="255"/>
-	<Vtx X="-28" Y="61" Z="2" S="432" T="304" R="78" G="163" B="220" A="255"/>
-	<Vtx X="-23" Y="62" Z="-1" S="496" T="496" R="45" G="142" B="31" A="255"/>
-	<Vtx X="-22" Y="59" Z="10" S="112" T="304" R="72" G="167" B="201" A="255"/>
-	<Vtx X="-30" Y="55" Z="5" S="304" T="112" R="90" G="178" B="213" A="255"/>
-	<Vtx X="-28" Y="55" Z="13" S="112" T="112" R="84" G="186" B="191" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="-16" T="176" R="90" G="184" B="203" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="176" T="-16" R="76" G="176" B="194" A="255"/>
-	<Vtx X="-42" Y="37" Z="22" S="304" T="432" R="89" G="181" B="205" A="255"/>
-	<Vtx X="-39" Y="37" Z="27" S="432" T="304" R="89" G="181" B="205" A="255"/>
-	<Vtx X="-40" Y="32" Z="25" S="496" T="496" R="110" G="255" B="193" A="255"/>
-	<Vtx X="-38" Y="40" Z="17" S="112" T="304" R="85" G="169" B="221" A="255"/>
-	<Vtx X="-33" Y="40" Z="26" S="304" T="112" R="73" G="169" B="199" A="255"/>
-	<Vtx X="-33" Y="46" Z="21" S="112" T="112" R="67" G="156" B="216" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="-16" T="176" R="66" G="161" B="204" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="176" T="-16" R="77" G="160" B="224" A="255"/>
-	<Vtx X="-14" Y="61" Z="25" S="304" T="432" R="70" G="163" B="206" A="255"/>
-	<Vtx X="-15" Y="63" Z="20" S="432" T="304" R="70" G="163" B="206" A="255"/>
-	<Vtx X="-9" Y="62" Z="22" S="496" T="496" R="252" G="142" B="201" A="255"/>
-	<Vtx X="-18" Y="55" Z="25" S="112" T="304" R="82" G="178" B="199" A="255"/>
-	<Vtx X="-19" Y="59" Z="16" S="304" T="112" R="84" G="167" B="221" A="255"/>
-	<Vtx X="-24" Y="55" Z="20" S="112" T="112" R="98" G="186" B="214" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="-16" T="176" R="93" G="177" B="221" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="81" G="171" B="209" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="176" T="-16" R="90" G="184" B="203" A="255"/>
-	<Vtx X="-24" Y="55" Z="20" S="112" T="112" R="98" G="186" B="214" A="255"/>
-	<Vtx X="-19" Y="59" Z="16" S="304" T="112" R="84" G="167" B="221" A="255"/>
-	<Vtx X="-41" Y="48" Z="3" S="304" T="432" R="90" G="174" B="219" A="255"/>
-	<Vtx X="-43" Y="44" Z="6" S="432" T="304" R="90" G="174" B="219" A="255"/>
-	<Vtx X="-42" Y="43" Z="0" S="496" T="496" R="116" G="211" B="26" A="255"/>
-	<Vtx X="-34" Y="50" Z="6" S="112" T="304" R="74" G="162" B="214" A="255"/>
-	<Vtx X="-38" Y="43" Z="11" S="304" T="112" R="84" G="179" B="200" A="255"/>
-	<Vtx X="-34" Y="49" Z="14" S="112" T="112" R="65" G="167" B="192" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="-16" T="176" R="76" G="176" B="194" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="176" T="-16" R="66" G="161" B="204" A="255"/>
-	<Vtx X="-18" Y="44" Z="-40" S="304" T="432" R="13" G="174" B="96" A="255"/>
-	<Vtx X="-20" Y="48" Z="-37" S="432" T="304" R="13" G="174" B="96" A="255"/>
-	<Vtx X="-23" Y="43" Z="-37" S="496" T="496" R="81" G="211" B="87" A="255"/>
-	<Vtx X="-11" Y="43" Z="-39" S="112" T="304" R="250" G="179" B="101" A="255"/>
-	<Vtx X="-14" Y="50" Z="-33" S="304" T="112" R="1" G="161" B="85" A="255"/>
-	<Vtx X="-8" Y="49" Z="-36" S="112" T="112" R="235" G="167" B="88" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="-16" T="176" R="245" G="160" B="82" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="176" T="-16" R="239" G="177" B="98" A="255"/>
-	<Vtx X="8" Y="63" Z="-23" S="304" T="432" R="248" G="163" B="86" A="255"/>
-	<Vtx X="12" Y="61" Z="-25" S="432" T="304" R="248" G="163" B="86" A="255"/>
-	<Vtx X="12" Y="62" Z="-19" S="496" T="496" R="206" G="142" B="24" A="255"/>
-	<Vtx X="2" Y="59" Z="-24" S="112" T="304" R="11" G="167" B="90" A="255"/>
-	<Vtx X="10" Y="55" Z="-28" S="304" T="112" R="248" G="178" B="100" A="255"/>
-	<Vtx X="3" Y="55" Z="-31" S="112" T="112" R="14" G="187" B="105" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="-16" T="176" R="1" G="184" B="104" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="176" T="-16" R="16" G="176" B="97" A="255"/>
-	<Vtx X="2" Y="37" Z="-47" S="304" T="432" R="0" G="181" B="102" A="255"/>
-	<Vtx X="-4" Y="37" Z="-47" S="432" T="304" R="0" G="181" B="102" A="255"/>
-	<Vtx X="-1" Y="32" Z="-47" S="496" T="496" R="0" G="255" B="127" A="255"/>
-	<Vtx X="4" Y="40" Z="-42" S="112" T="304" R="244" G="169" B="91" A="255"/>
-	<Vtx X="-4" Y="37" Z="-47" S="432" T="304" R="0" G="181" B="102" A="255"/>
-	<Vtx X="2" Y="37" Z="-47" S="304" T="432" R="0" G="181" B="102" A="255"/>
-	<Vtx X="-6" Y="40" Z="-42" S="304" T="112" R="12" G="169" B="92" A="255"/>
-	<Vtx X="-1" Y="46" Z="-39" S="112" T="112" R="1" G="156" B="78" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="-16" T="176" R="12" G="161" B="84" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="176" T="-16" R="245" G="160" B="82" A="255"/>
-	<Vtx X="-15" Y="61" Z="-25" S="304" T="432" R="8" G="163" B="86" A="255"/>
-	<Vtx X="-10" Y="63" Z="-23" S="432" T="304" R="8" G="163" B="86" A="255"/>
-	<Vtx X="-15" Y="62" Z="-19" S="496" T="496" R="50" G="142" B="24" A="255"/>
-	<Vtx X="-12" Y="55" Z="-28" S="112" T="304" R="8" G="178" B="100" A="255"/>
-	<Vtx X="-4" Y="59" Z="-24" S="304" T="112" R="245" G="167" B="90" A="255"/>
-	<Vtx X="-5" Y="55" Z="-31" S="112" T="112" R="243" G="186" B="105" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="-16" T="176" R="239" G="177" B="98" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="176" T="-16" R="1" G="184" B="104" A="255"/>
-	<Vtx X="18" Y="48" Z="-37" S="304" T="432" R="243" G="174" B="96" A="255"/>
-	<Vtx X="16" Y="44" Z="-40" S="432" T="304" R="243" G="174" B="96" A="255"/>
-	<Vtx X="21" Y="43" Z="-37" S="496" T="496" R="175" G="211" B="87" A="255"/>
-	<Vtx X="12" Y="50" Z="-33" S="112" T="304" R="255" G="162" B="85" A="255"/>
-	<Vtx X="9" Y="43" Z="-39" S="304" T="112" R="6" G="179" B="101" A="255"/>
-	<Vtx X="5" Y="49" Z="-36" S="112" T="112" R="23" G="167" B="88" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="-16" T="176" R="16" G="176" B="97" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="176" T="-16" R="12" G="161" B="84" A="255"/>
-	<Vtx X="44" Y="44" Z="4" S="304" T="432" R="166" G="174" B="219" A="255"/>
-	<Vtx X="42" Y="48" Z="1" S="432" T="304" R="166" G="174" B="219" A="255"/>
-	<Vtx X="43" Y="43" Z="-2" S="496" T="496" R="140" G="211" B="26" A="255"/>
-	<Vtx X="39" Y="43" Z="10" S="112" T="304" R="172" G="179" B="200" A="255"/>
-	<Vtx X="35" Y="50" Z="4" S="304" T="112" R="182" G="161" B="215" A="255"/>
-	<Vtx X="35" Y="49" Z="11" S="112" T="112" R="190" G="167" B="194" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="-16" T="176" R="190" G="160" B="205" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="176" T="-16" R="180" G="177" B="193" A="255"/>
-	<Vtx X="35" Y="49" Z="11" S="112" T="112" R="190" G="167" B="194" A="255"/>
-	<Vtx X="35" Y="50" Z="4" S="304" T="112" R="182" G="161" B="215" A="255"/>
-	<Vtx X="16" Y="63" Z="18" S="304" T="432" R="186" G="163" B="206" A="255"/>
-	<Vtx X="15" Y="61" Z="23" S="432" T="304" R="186" G="163" B="206" A="255"/>
-	<Vtx X="11" Y="62" Z="20" S="496" T="496" R="4" G="142" B="201" A="255"/>
-	<Vtx X="20" Y="59" Z="14" S="112" T="304" R="172" G="167" B="221" A="255"/>
-	<Vtx X="19" Y="55" Z="23" S="304" T="112" R="174" G="178" B="199" A="255"/>
-	<Vtx X="25" Y="55" Z="18" S="112" T="112" R="158" G="187" B="216" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="-16" T="176" R="165" G="184" B="205" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="176" T="-16" R="164" G="176" B="221" A="255"/>
-	<Vtx X="40" Y="37" Z="25" S="304" T="432" R="167" G="181" B="205" A="255"/>
-	<Vtx X="43" Y="37" Z="20" S="432" T="304" R="167" G="181" B="205" A="255"/>
-	<Vtx X="41" Y="32" Z="23" S="496" T="496" R="146" G="255" B="193" A="255"/>
-	<Vtx X="34" Y="40" Z="24" S="112" T="304" R="183" G="169" B="200" A="255"/>
-	<Vtx X="39" Y="40" Z="15" S="304" T="112" R="170" G="169" B="221" A="255"/>
-	<Vtx X="34" Y="46" Z="19" S="112" T="112" R="188" G="156" B="218" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="-16" T="176" R="177" G="161" B="225" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="176" T="-16" R="190" G="160" B="205" A="255"/>
-	<Vtx X="29" Y="61" Z="0" S="304" T="432" R="178" G="163" B="220" A="255"/>
-	<Vtx X="25" Y="63" Z="3" S="432" T="304" R="178" G="163" B="220" A="255"/>
-	<Vtx X="24" Y="62" Z="-3" S="496" T="496" R="211" G="142" B="31" A="255"/>
-	<Vtx X="31" Y="55" Z="3" S="112" T="304" R="166" G="178" B="214" A="255"/>
-	<Vtx X="23" Y="59" Z="8" S="304" T="112" R="184" G="167" B="201" A="255"/>
-	<Vtx X="29" Y="55" Z="11" S="112" T="112" R="171" G="186" B="192" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="-16" T="176" R="180" G="177" B="193" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="176" T="-16" R="165" G="184" B="205" A="255"/>
-	<Vtx X="23" Y="48" Z="34" S="304" T="432" R="179" G="174" B="197" A="255"/>
-	<Vtx X="27" Y="44" Z="34" S="432" T="304" R="179" G="174" B="197" A="255"/>
-	<Vtx X="21" Y="43" Z="36" S="496" T="496" R="221" G="211" B="143" A="255"/>
-	<Vtx X="22" Y="50" Z="27" S="112" T="304" R="183" G="162" B="213" A="255"/>
-	<Vtx X="22" Y="50" Z="27" S="112" T="304" R="183" G="162" B="213" A="255"/>
-	<Vtx X="29" Y="43" Z="27" S="304" T="112" R="166" G="179" B="211" A="255"/>
-	<Vtx X="27" Y="44" Z="34" S="432" T="304" R="179" G="174" B="197" A="255"/>
-	<Vtx X="29" Y="49" Z="22" S="112" T="112" R="168" G="167" B="232" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="-16" T="176" R="164" G="176" B="221" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="176" T="-16" R="177" G="161" B="225" A="255"/>
-	<Vtx X="-25" Y="44" Z="36" S="304" T="432" R="179" G="82" B="59" A="255"/>
-	<Vtx X="-20" Y="43" Z="38" S="496" T="496" R="221" G="45" B="113" A="255"/>
-	<Vtx X="-22" Y="48" Z="36" S="432" T="304" R="179" G="82" B="59" A="255"/>
-	<Vtx X="-28" Y="43" Z="29" S="112" T="304" R="166" G="77" B="45" A="255"/>
-	<Vtx X="-21" Y="50" Z="29" S="304" T="112" R="183" G="95" B="43" A="255"/>
-	<Vtx X="-27" Y="49" Z="25" S="112" T="112" R="169" G="89" B="26" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="176" T="-16" R="163" G="79" B="35" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="175" G="85" B="47" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="-16" T="176" R="179" G="96" B="32" A="255"/>
-	<Vtx X="-24" Y="63" Z="4" S="304" T="432" R="178" G="93" B="36" A="255"/>
-	<Vtx X="-23" Y="62" Z="-1" S="496" T="496" R="211" G="114" B="225" A="255"/>
-	<Vtx X="-28" Y="61" Z="2" S="432" T="304" R="178" G="93" B="36" A="255"/>
-	<Vtx X="-22" Y="59" Z="10" S="112" T="304" R="184" G="89" B="55" A="255"/>
-	<Vtx X="-30" Y="55" Z="5" S="304" T="112" R="166" G="78" B="43" A="255"/>
-	<Vtx X="-28" Y="55" Z="13" S="112" T="112" R="172" G="70" B="65" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="176" T="-16" R="180" G="80" B="62" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="-16" T="176" R="166" G="72" B="53" A="255"/>
-	<Vtx X="-42" Y="37" Z="22" S="304" T="432" R="167" G="75" B="51" A="255"/>
-	<Vtx X="-40" Y="32" Z="25" S="496" T="496" R="146" G="1" B="63" A="255"/>
-	<Vtx X="-39" Y="37" Z="27" S="432" T="304" R="167" G="75" B="51" A="255"/>
-	<Vtx X="-38" Y="40" Z="17" S="112" T="304" R="171" G="87" B="35" A="255"/>
-	<Vtx X="-33" Y="40" Z="26" S="304" T="112" R="183" G="87" B="57" A="255"/>
-	<Vtx X="-33" Y="46" Z="21" S="112" T="112" R="189" G="100" B="40" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="176" T="-16" R="179" G="96" B="32" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="-16" T="176" R="190" G="95" B="52" A="255"/>
-	<Vtx X="-14" Y="61" Z="25" S="304" T="432" R="186" G="93" B="50" A="255"/>
-	<Vtx X="-9" Y="62" Z="22" S="496" T="496" R="4" G="114" B="55" A="255"/>
-	<Vtx X="-15" Y="63" Z="20" S="432" T="304" R="186" G="93" B="50" A="255"/>
-	<Vtx X="-18" Y="55" Z="25" S="112" T="304" R="174" G="78" B="57" A="255"/>
-	<Vtx X="-19" Y="59" Z="16" S="304" T="112" R="172" G="89" B="35" A="255"/>
-	<Vtx X="-24" Y="55" Z="20" S="112" T="112" R="158" G="70" B="42" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="176" T="-16" R="166" G="72" B="53" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="175" G="85" B="47" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="-16" T="176" R="163" G="79" B="35" A="255"/>
-	<Vtx X="-41" Y="48" Z="3" S="304" T="432" R="166" G="82" B="37" A="255"/>
-	<Vtx X="-42" Y="43" Z="0" S="496" T="496" R="140" G="45" B="230" A="255"/>
-	<Vtx X="-43" Y="44" Z="6" S="432" T="304" R="166" G="82" B="37" A="255"/>
-	<Vtx X="-34" Y="50" Z="6" S="112" T="304" R="182" G="94" B="42" A="255"/>
-	<Vtx X="-38" Y="43" Z="11" S="304" T="112" R="172" G="77" B="56" A="255"/>
-	<Vtx X="-34" Y="49" Z="14" S="112" T="112" R="191" G="89" B="64" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="176" T="-16" R="190" G="95" B="52" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="-16" T="176" R="180" G="80" B="62" A="255"/>
-	<Vtx X="-18" Y="44" Z="-40" S="304" T="432" R="243" G="82" B="160" A="255"/>
-	<Vtx X="-23" Y="43" Z="-37" S="496" T="496" R="175" G="45" B="169" A="255"/>
-	<Vtx X="-20" Y="48" Z="-37" S="432" T="304" R="243" G="82" B="160" A="255"/>
-	<Vtx X="-11" Y="43" Z="-39" S="112" T="304" R="6" G="77" B="155" A="255"/>
-	<Vtx X="-14" Y="50" Z="-33" S="304" T="112" R="255" G="95" B="171" A="255"/>
-	<Vtx X="-8" Y="49" Z="-36" S="112" T="112" R="21" G="89" B="168" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="176" T="-16" R="17" G="79" B="158" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="-16" T="176" R="11" G="96" B="174" A="255"/>
-	<Vtx X="8" Y="63" Z="-23" S="304" T="432" R="8" G="93" B="170" A="255"/>
-	<Vtx X="12" Y="62" Z="-19" S="496" T="496" R="50" G="114" B="232" A="255"/>
-	<Vtx X="12" Y="61" Z="-25" S="432" T="304" R="8" G="93" B="170" A="255"/>
-	<Vtx X="2" Y="59" Z="-24" S="112" T="304" R="245" G="89" B="166" A="255"/>
-	<Vtx X="10" Y="55" Z="-28" S="304" T="112" R="8" G="78" B="156" A="255"/>
-	<Vtx X="3" Y="55" Z="-31" S="112" T="112" R="242" G="69" B="151" A="255"/>
-	<Vtx X="3" Y="55" Z="-31" S="112" T="112" R="242" G="69" B="151" A="255"/>
-	<Vtx X="10" Y="55" Z="-28" S="304" T="112" R="8" G="78" B="156" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="176" T="-16" R="240" G="80" B="159" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="-16" T="176" R="255" G="72" B="152" A="255"/>
-	<Vtx X="2" Y="59" Z="-24" S="112" T="304" R="245" G="89" B="166" A="255"/>
-	<Vtx X="2" Y="37" Z="-47" S="304" T="432" R="0" G="75" B="154" A="255"/>
-	<Vtx X="-1" Y="32" Z="-47" S="496" T="496" R="0" G="1" B="129" A="255"/>
-	<Vtx X="-4" Y="37" Z="-47" S="432" T="304" R="0" G="75" B="154" A="255"/>
-	<Vtx X="4" Y="40" Z="-42" S="112" T="304" R="12" G="87" B="165" A="255"/>
-	<Vtx X="-6" Y="40" Z="-42" S="304" T="112" R="244" G="87" B="164" A="255"/>
-	<Vtx X="-1" Y="46" Z="-39" S="112" T="112" R="255" G="100" B="178" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="176" T="-16" R="11" G="96" B="174" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="-16" T="176" R="244" G="95" B="172" A="255"/>
-	<Vtx X="-15" Y="61" Z="-25" S="304" T="432" R="248" G="93" B="170" A="255"/>
-	<Vtx X="-15" Y="62" Z="-19" S="496" T="496" R="206" G="114" B="232" A="255"/>
-	<Vtx X="-10" Y="63" Z="-23" S="432" T="304" R="248" G="93" B="170" A="255"/>
-	<Vtx X="-12" Y="55" Z="-28" S="112" T="304" R="248" G="78" B="156" A="255"/>
-	<Vtx X="-4" Y="59" Z="-24" S="304" T="112" R="11" G="89" B="166" A="255"/>
-	<Vtx X="-5" Y="55" Z="-31" S="112" T="112" R="13" G="70" B="151" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="176" T="-16" R="255" G="72" B="152" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="-16" T="176" R="17" G="79" B="158" A="255"/>
-	<Vtx X="18" Y="48" Z="-37" S="304" T="432" R="13" G="82" B="160" A="255"/>
-	<Vtx X="21" Y="43" Z="-37" S="496" T="496" R="81" G="45" B="169" A="255"/>
-	<Vtx X="16" Y="44" Z="-40" S="432" T="304" R="13" G="82" B="160" A="255"/>
-	<Vtx X="12" Y="50" Z="-33" S="112" T="304" R="1" G="94" B="171" A="255"/>
-	<Vtx X="9" Y="43" Z="-39" S="304" T="112" R="250" G="77" B="155" A="255"/>
-	<Vtx X="5" Y="49" Z="-36" S="112" T="112" R="233" G="89" B="168" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="176" T="-16" R="244" G="95" B="172" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="-16" T="176" R="240" G="80" B="159" A="255"/>
-	<Vtx X="44" Y="44" Z="4" S="304" T="432" R="90" G="82" B="37" A="255"/>
-	<Vtx X="43" Y="43" Z="-2" S="496" T="496" R="116" G="45" B="230" A="255"/>
-	<Vtx X="42" Y="48" Z="1" S="432" T="304" R="90" G="82" B="37" A="255"/>
-	<Vtx X="39" Y="43" Z="10" S="112" T="304" R="84" G="77" B="56" A="255"/>
-	<Vtx X="35" Y="50" Z="4" S="304" T="112" R="74" G="95" B="41" A="255"/>
-	<Vtx X="35" Y="49" Z="11" S="112" T="112" R="66" G="89" B="62" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="176" T="-16" R="76" G="79" B="63" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="-16" T="176" R="66" G="96" B="51" A="255"/>
-	<Vtx X="16" Y="63" Z="18" S="304" T="432" R="70" G="93" B="50" A="255"/>
-	<Vtx X="11" Y="62" Z="20" S="496" T="496" R="252" G="114" B="55" A="255"/>
-	<Vtx X="15" Y="61" Z="23" S="432" T="304" R="70" G="93" B="50" A="255"/>
-	<Vtx X="20" Y="59" Z="14" S="112" T="304" R="84" G="89" B="35" A="255"/>
-	<Vtx X="19" Y="55" Z="23" S="304" T="112" R="82" G="78" B="57" A="255"/>
-	<Vtx X="25" Y="55" Z="18" S="112" T="112" R="98" G="69" B="40" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="176" T="-16" R="92" G="80" B="35" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="-16" T="176" R="91" G="72" B="51" A="255"/>
-	<Vtx X="40" Y="37" Z="25" S="304" T="432" R="89" G="75" B="51" A="255"/>
-	<Vtx X="41" Y="32" Z="23" S="496" T="496" R="110" G="1" B="63" A="255"/>
-	<Vtx X="43" Y="37" Z="20" S="432" T="304" R="89" G="75" B="51" A="255"/>
-	<Vtx X="34" Y="40" Z="24" S="112" T="304" R="73" G="87" B="56" A="255"/>
-	<Vtx X="39" Y="40" Z="15" S="304" T="112" R="86" G="87" B="35" A="255"/>
-	<Vtx X="34" Y="46" Z="19" S="112" T="112" R="68" G="100" B="38" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="176" T="-16" R="66" G="96" B="51" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="-16" T="176" R="79" G="95" B="31" A="255"/>
-	<Vtx X="29" Y="61" Z="0" S="304" T="432" R="78" G="93" B="36" A="255"/>
-	<Vtx X="24" Y="62" Z="-3" S="496" T="496" R="45" G="114" B="225" A="255"/>
-	<Vtx X="25" Y="63" Z="3" S="432" T="304" R="78" G="93" B="36" A="255"/>
-	<Vtx X="31" Y="55" Z="3" S="112" T="304" R="90" G="78" B="42" A="255"/>
-	<Vtx X="23" Y="59" Z="8" S="304" T="112" R="72" G="89" B="55" A="255"/>
-	<Vtx X="29" Y="55" Z="11" S="112" T="112" R="85" G="70" B="64" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="176" T="-16" R="91" G="72" B="51" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="-16" T="176" R="76" G="79" B="63" A="255"/>
-	<Vtx X="29" Y="55" Z="11" S="112" T="112" R="85" G="70" B="64" A="255"/>
-	<Vtx X="31" Y="55" Z="3" S="112" T="304" R="90" G="78" B="42" A="255"/>
-	<Vtx X="23" Y="48" Z="34" S="304" T="432" R="77" G="82" B="59" A="255"/>
-	<Vtx X="21" Y="43" Z="36" S="496" T="496" R="35" G="45" B="113" A="255"/>
-	<Vtx X="27" Y="44" Z="34" S="432" T="304" R="77" G="82" B="59" A="255"/>
-	<Vtx X="22" Y="50" Z="27" S="112" T="304" R="73" G="94" B="43" A="255"/>
-	<Vtx X="29" Y="43" Z="27" S="304" T="112" R="90" G="77" B="45" A="255"/>
-	<Vtx X="29" Y="49" Z="22" S="112" T="112" R="88" G="89" B="24" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="176" T="-16" R="79" G="95" B="31" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="-16" T="176" R="92" G="80" B="35" A="255"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_2

@@ -1,268 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="-38" Y="39" Z="35" S="304" T="432" R="80" G="167" B="214" A="255"/>
-	<Vtx X="-33" Y="42" Z="38" S="432" T="304" R="80" G="167" B="214" A="255"/>
-	<Vtx X="-36" Y="33" Z="43" S="496" T="496" R="84" G="191" B="187" A="255"/>
-	<Vtx X="-37" Y="42" Z="25" S="112" T="304" R="67" G="153" B="223" A="255"/>
-	<Vtx X="-28" Y="47" Z="32" S="304" T="112" R="83" G="163" B="234" A="255"/>
-	<Vtx X="-30" Y="46" Z="23" S="112" T="112" R="74" G="157" B="229" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="-16" T="176" R="48" G="142" B="228" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="82" G="171" B="209" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="176" T="-16" R="88" G="165" B="0" A="255"/>
-	<Vtx X="-17" Y="69" Z="15" S="304" T="432" R="85" G="175" B="207" A="255"/>
-	<Vtx X="-20" Y="69" Z="9" S="432" T="304" R="85" G="175" B="207" A="255"/>
-	<Vtx X="-12" Y="75" Z="8" S="496" T="496" R="61" G="150" B="221" A="255"/>
-	<Vtx X="-20" Y="61" Z="20" S="112" T="304" R="99" G="190" B="211" A="255"/>
-	<Vtx X="-26" Y="61" Z="9" S="304" T="112" R="88" G="190" B="193" A="255"/>
-	<Vtx X="-25" Y="55" Z="16" S="112" T="112" R="95" G="191" B="201" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="-16" T="176" R="111" G="203" B="224" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="176" T="-16" R="83" G="203" B="176" A="255"/>
-	<Vtx X="-48" Y="42" Z="12" S="304" T="432" R="76" G="167" B="208" A="255"/>
-	<Vtx X="-48" Y="39" Z="17" S="432" T="304" R="76" G="167" B="208" A="255"/>
-	<Vtx X="-54" Y="33" Z="11" S="496" T="496" R="102" G="191" B="218" A="255"/>
-	<Vtx X="-40" Y="47" Z="10" S="112" T="304" R="60" G="163" B="195" A="255"/>
-	<Vtx X="-39" Y="42" Z="21" S="304" T="112" R="62" G="153" B="215" A="255"/>
-	<Vtx X="-34" Y="46" Z="16" S="112" T="112" R="61" G="157" B="205" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="-16" T="176" R="44" G="165" B="180" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="176" T="-16" R="48" G="142" B="228" A="255"/>
-	<Vtx X="-19" Y="56" Z="37" S="304" T="432" R="85" G="172" B="214" A="255"/>
-	<Vtx X="-16" Y="60" Z="33" S="432" T="304" R="85" G="172" B="214" A="255"/>
-	<Vtx X="-10" Y="59" Z="41" S="496" T="496" R="59" G="166" B="189" A="255"/>
-	<Vtx X="-24" Y="50" Z="31" S="112" T="304" R="91" G="170" B="234" A="255"/>
-	<Vtx X="-19" Y="59" Z="24" S="304" T="112" R="99" G="185" B="221" A="255"/>
-	<Vtx X="-25" Y="52" Z="23" S="112" T="112" R="95" G="176" B="230" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="-16" T="176" R="88" G="165" B="0" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="82" G="171" B="209" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="176" T="-16" R="111" G="203" B="224" A="255"/>
-	<Vtx X="-25" Y="52" Z="23" S="112" T="112" R="95" G="176" B="230" A="255"/>
-	<Vtx X="-19" Y="59" Z="24" S="304" T="112" R="99" G="185" B="221" A="255"/>
-	<Vtx X="-36" Y="60" Z="-1" S="304" T="432" R="79" G="172" B="203" A="255"/>
-	<Vtx X="-40" Y="56" Z="-1" S="432" T="304" R="79" G="172" B="203" A="255"/>
-	<Vtx X="-39" Y="59" Z="-10" S="496" T="496" R="88" G="166" B="239" A="255"/>
-	<Vtx X="-29" Y="59" Z="7" S="112" T="304" R="80" G="185" B="188" A="255"/>
-	<Vtx X="-38" Y="50" Z="7" S="304" T="112" R="64" G="170" B="189" A="255"/>
-	<Vtx X="-31" Y="52" Z="12" S="112" T="112" R="70" G="176" B="186" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="-16" T="176" R="83" G="203" B="176" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="176" T="-16" R="44" G="165" B="180" A="255"/>
-	<Vtx X="-11" Y="39" Z="-50" S="304" T="432" R="252" G="167" B="90" A="255"/>
-	<Vtx X="-16" Y="42" Z="-48" S="432" T="304" R="252" G="167" B="90" A="255"/>
-	<Vtx X="-19" Y="33" Z="-52" S="496" T="496" R="18" G="191" B="108" A="255"/>
-	<Vtx X="-3" Y="42" Z="-45" S="112" T="304" R="251" G="153" B="74" A="255"/>
-	<Vtx X="-13" Y="47" Z="-40" S="304" T="112" R="233" G="163" B="83" A="255"/>
-	<Vtx X="-5" Y="46" Z="-38" S="112" T="112" R="242" G="157" B="78" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="-16" T="176" R="0" G="142" B="55" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="176" T="-16" R="212" G="165" B="76" A="255"/>
-	<Vtx X="-4" Y="69" Z="-22" S="304" T="432" R="0" G="175" B="98" A="255"/>
-	<Vtx X="2" Y="69" Z="-22" S="432" T="304" R="0" G="175" B="98" A="255"/>
-	<Vtx X="-1" Y="75" Z="-14" S="496" T="496" R="0" G="150" B="70" A="255"/>
-	<Vtx X="-7" Y="61" Z="-27" S="112" T="304" R="245" G="190" B="108" A="255"/>
-	<Vtx X="5" Y="61" Z="-27" S="304" T="112" R="11" G="190" B="108" A="255"/>
-	<Vtx X="-1" Y="55" Z="-30" S="112" T="112" R="0" G="191" B="109" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="-16" T="176" R="228" G="203" B="112" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="176" T="-16" R="28" G="203" B="112" A="255"/>
-	<Vtx X="14" Y="42" Z="-48" S="304" T="432" R="4" G="167" B="90" A="255"/>
-	<Vtx X="9" Y="39" Z="-50" S="432" T="304" R="4" G="167" B="90" A="255"/>
-	<Vtx X="17" Y="33" Z="-52" S="496" T="496" R="238" G="191" B="108" A="255"/>
-	<Vtx X="11" Y="47" Z="-40" S="112" T="304" R="23" G="163" B="83" A="255"/>
-	<Vtx X="9" Y="39" Z="-50" S="432" T="304" R="4" G="167" B="90" A="255"/>
-	<Vtx X="14" Y="42" Z="-48" S="304" T="432" R="4" G="167" B="90" A="255"/>
-	<Vtx X="1" Y="42" Z="-45" S="304" T="112" R="5" G="153" B="74" A="255"/>
-	<Vtx X="3" Y="46" Z="-38" S="112" T="112" R="14" G="157" B="78" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="-16" T="176" R="44" G="165" B="76" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="176" T="-16" R="0" G="142" B="55" A="255"/>
-	<Vtx X="-23" Y="56" Z="-35" S="304" T="432" R="250" G="172" B="95" A="255"/>
-	<Vtx X="-21" Y="60" Z="-31" S="432" T="304" R="250" G="172" B="95" A="255"/>
-	<Vtx X="-31" Y="59" Z="-29" S="496" T="496" R="29" G="166" B="85" A="255"/>
-	<Vtx X="-15" Y="50" Z="-37" S="112" T="304" R="230" G="170" B="90" A="255"/>
-	<Vtx X="-11" Y="59" Z="-29" S="304" T="112" R="237" G="185" B="104" A="255"/>
-	<Vtx X="-7" Y="52" Z="-33" S="112" T="112" R="231" G="176" B="96" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="-16" T="176" R="212" G="165" B="76" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="176" T="-16" R="228" G="203" B="112" A="255"/>
-	<Vtx X="19" Y="60" Z="-31" S="304" T="432" R="6" G="172" B="95" A="255"/>
-	<Vtx X="21" Y="56" Z="-35" S="432" T="304" R="6" G="172" B="95" A="255"/>
-	<Vtx X="28" Y="59" Z="-29" S="496" T="496" R="227" G="166" B="85" A="255"/>
-	<Vtx X="9" Y="59" Z="-29" S="112" T="304" R="19" G="185" B="104" A="255"/>
-	<Vtx X="13" Y="50" Z="-37" S="304" T="112" R="26" G="170" B="90" A="255"/>
-	<Vtx X="5" Y="52" Z="-33" S="112" T="112" R="25" G="176" B="96" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="-16" T="176" R="28" G="203" B="112" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="176" T="-16" R="44" G="165" B="76" A="255"/>
-	<Vtx X="49" Y="39" Z="15" S="304" T="432" R="180" G="167" B="208" A="255"/>
-	<Vtx X="50" Y="42" Z="10" S="432" T="304" R="180" G="167" B="208" A="255"/>
-	<Vtx X="55" Y="33" Z="9" S="496" T="496" R="154" G="191" B="218" A="255"/>
-	<Vtx X="40" Y="42" Z="19" S="112" T="304" R="194" G="153" B="215" A="255"/>
-	<Vtx X="41" Y="47" Z="8" S="304" T="112" R="196" G="163" B="195" A="255"/>
-	<Vtx X="35" Y="46" Z="15" S="112" T="112" R="195" G="157" B="205" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="-16" T="176" R="208" G="142" B="228" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="176" T="-16" R="212" G="165" B="180" A="255"/>
-	<Vtx X="35" Y="46" Z="15" S="112" T="112" R="195" G="157" B="205" A="255"/>
-	<Vtx X="41" Y="47" Z="8" S="304" T="112" R="196" G="163" B="195" A="255"/>
-	<Vtx X="21" Y="69" Z="8" S="304" T="432" R="171" G="175" B="207" A="255"/>
-	<Vtx X="18" Y="69" Z="13" S="432" T="304" R="171" G="175" B="207" A="255"/>
-	<Vtx X="13" Y="75" Z="6" S="496" T="496" R="195" G="150" B="221" A="255"/>
-	<Vtx X="27" Y="61" Z="7" S="112" T="304" R="168" G="190" B="193" A="255"/>
-	<Vtx X="21" Y="61" Z="18" S="304" T="112" R="157" G="190" B="211" A="255"/>
-	<Vtx X="26" Y="55" Z="14" S="112" T="112" R="161" G="191" B="201" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="-16" T="176" R="173" G="203" B="176" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="176" T="-16" R="145" G="203" B="224" A="255"/>
-	<Vtx X="34" Y="42" Z="36" S="304" T="432" R="176" G="167" B="214" A="255"/>
-	<Vtx X="39" Y="39" Z="33" S="432" T="304" R="176" G="167" B="214" A="255"/>
-	<Vtx X="37" Y="33" Z="41" S="496" T="496" R="172" G="191" B="187" A="255"/>
-	<Vtx X="29" Y="47" Z="30" S="112" T="304" R="173" G="163" B="234" A="255"/>
-	<Vtx X="38" Y="42" Z="23" S="304" T="112" R="189" G="153" B="223" A="255"/>
-	<Vtx X="31" Y="46" Z="21" S="112" T="112" R="182" G="157" B="229" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="-16" T="176" R="168" G="165" B="0" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="176" T="-16" R="208" G="142" B="228" A="255"/>
-	<Vtx X="41" Y="56" Z="-2" S="304" T="432" R="177" G="172" B="203" A="255"/>
-	<Vtx X="37" Y="60" Z="-3" S="432" T="304" R="177" G="172" B="203" A="255"/>
-	<Vtx X="40" Y="59" Z="-12" S="496" T="496" R="168" G="166" B="239" A="255"/>
-	<Vtx X="39" Y="50" Z="6" S="112" T="304" R="192" G="170" B="189" A="255"/>
-	<Vtx X="30" Y="59" Z="5" S="304" T="112" R="176" G="185" B="188" A="255"/>
-	<Vtx X="32" Y="52" Z="10" S="112" T="112" R="186" G="176" B="186" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="-16" T="176" R="212" G="165" B="180" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="176" T="-16" R="173" G="203" B="176" A="255"/>
-	<Vtx X="17" Y="60" Z="31" S="304" T="432" R="171" G="172" B="214" A="255"/>
-	<Vtx X="20" Y="56" Z="35" S="432" T="304" R="171" G="172" B="214" A="255"/>
-	<Vtx X="11" Y="59" Z="39" S="496" T="496" R="197" G="166" B="189" A="255"/>
-	<Vtx X="21" Y="59" Z="22" S="112" T="304" R="157" G="185" B="221" A="255"/>
-	<Vtx X="21" Y="59" Z="22" S="112" T="304" R="157" G="185" B="221" A="255"/>
-	<Vtx X="26" Y="50" Z="29" S="304" T="112" R="165" G="170" B="234" A="255"/>
-	<Vtx X="20" Y="56" Z="35" S="432" T="304" R="171" G="172" B="214" A="255"/>
-	<Vtx X="26" Y="52" Z="21" S="112" T="112" R="161" G="176" B="230" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="-16" T="176" R="145" G="203" B="224" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="176" T="-16" R="168" G="165" B="0" A="255"/>
-	<Vtx X="-38" Y="39" Z="35" S="304" T="432" R="176" G="89" B="42" A="255"/>
-	<Vtx X="-36" Y="33" Z="43" S="496" T="496" R="172" G="65" B="69" A="255"/>
-	<Vtx X="-33" Y="42" Z="38" S="432" T="304" R="176" G="89" B="42" A="255"/>
-	<Vtx X="-37" Y="42" Z="25" S="112" T="304" R="189" G="103" B="33" A="255"/>
-	<Vtx X="-28" Y="47" Z="32" S="304" T="112" R="173" G="93" B="22" A="255"/>
-	<Vtx X="-30" Y="46" Z="23" S="112" T="112" R="182" G="99" B="27" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="176" T="-16" R="168" G="91" B="0" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="174" G="85" B="47" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="-16" T="176" R="208" G="114" B="28" A="255"/>
-	<Vtx X="-17" Y="69" Z="15" S="304" T="432" R="171" G="81" B="49" A="255"/>
-	<Vtx X="-12" Y="75" Z="8" S="496" T="496" R="195" G="106" B="35" A="255"/>
-	<Vtx X="-20" Y="69" Z="9" S="432" T="304" R="171" G="81" B="49" A="255"/>
-	<Vtx X="-20" Y="61" Z="20" S="112" T="304" R="157" G="66" B="45" A="255"/>
-	<Vtx X="-26" Y="61" Z="9" S="304" T="112" R="168" G="66" B="63" A="255"/>
-	<Vtx X="-25" Y="55" Z="16" S="112" T="112" R="161" G="65" B="55" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="176" T="-16" R="173" G="53" B="80" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="-16" T="176" R="145" G="53" B="32" A="255"/>
-	<Vtx X="-48" Y="42" Z="12" S="304" T="432" R="180" G="89" B="48" A="255"/>
-	<Vtx X="-54" Y="33" Z="11" S="496" T="496" R="154" G="65" B="38" A="255"/>
-	<Vtx X="-48" Y="39" Z="17" S="432" T="304" R="180" G="89" B="48" A="255"/>
-	<Vtx X="-40" Y="47" Z="10" S="112" T="304" R="196" G="93" B="61" A="255"/>
-	<Vtx X="-39" Y="42" Z="21" S="304" T="112" R="194" G="103" B="41" A="255"/>
-	<Vtx X="-34" Y="46" Z="16" S="112" T="112" R="195" G="99" B="51" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="176" T="-16" R="208" G="114" B="28" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="-16" T="176" R="212" G="91" B="76" A="255"/>
-	<Vtx X="-19" Y="56" Z="37" S="304" T="432" R="171" G="84" B="42" A="255"/>
-	<Vtx X="-10" Y="59" Z="41" S="496" T="496" R="197" G="90" B="67" A="255"/>
-	<Vtx X="-16" Y="60" Z="33" S="432" T="304" R="171" G="84" B="42" A="255"/>
-	<Vtx X="-24" Y="50" Z="31" S="112" T="304" R="165" G="86" B="22" A="255"/>
-	<Vtx X="-19" Y="59" Z="24" S="304" T="112" R="157" G="71" B="35" A="255"/>
-	<Vtx X="-25" Y="52" Z="23" S="112" T="112" R="161" G="80" B="26" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="176" T="-16" R="145" G="53" B="32" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="174" G="85" B="47" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="-16" T="176" R="168" G="91" B="0" A="255"/>
-	<Vtx X="-36" Y="60" Z="-1" S="304" T="432" R="177" G="84" B="53" A="255"/>
-	<Vtx X="-39" Y="59" Z="-10" S="496" T="496" R="168" G="90" B="17" A="255"/>
-	<Vtx X="-40" Y="56" Z="-1" S="432" T="304" R="177" G="84" B="53" A="255"/>
-	<Vtx X="-29" Y="59" Z="7" S="112" T="304" R="176" G="71" B="68" A="255"/>
-	<Vtx X="-38" Y="50" Z="7" S="304" T="112" R="192" G="86" B="67" A="255"/>
-	<Vtx X="-31" Y="52" Z="12" S="112" T="112" R="186" G="80" B="70" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="176" T="-16" R="212" G="91" B="76" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="-16" T="176" R="173" G="53" B="80" A="255"/>
-	<Vtx X="-11" Y="39" Z="-50" S="304" T="432" R="4" G="89" B="166" A="255"/>
-	<Vtx X="-19" Y="33" Z="-52" S="496" T="496" R="238" G="65" B="148" A="255"/>
-	<Vtx X="-16" Y="42" Z="-48" S="432" T="304" R="4" G="89" B="166" A="255"/>
-	<Vtx X="-3" Y="42" Z="-45" S="112" T="304" R="5" G="103" B="182" A="255"/>
-	<Vtx X="-13" Y="47" Z="-40" S="304" T="112" R="23" G="93" B="173" A="255"/>
-	<Vtx X="-5" Y="46" Z="-38" S="112" T="112" R="14" G="99" B="178" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="176" T="-16" R="44" G="91" B="180" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="-16" T="176" R="0" G="114" B="201" A="255"/>
-	<Vtx X="-4" Y="69" Z="-22" S="304" T="432" R="0" G="81" B="158" A="255"/>
-	<Vtx X="-1" Y="75" Z="-14" S="496" T="496" R="0" G="106" B="186" A="255"/>
-	<Vtx X="2" Y="69" Z="-22" S="432" T="304" R="0" G="81" B="158" A="255"/>
-	<Vtx X="-7" Y="61" Z="-27" S="112" T="304" R="11" G="66" B="148" A="255"/>
-	<Vtx X="5" Y="61" Z="-27" S="304" T="112" R="245" G="66" B="148" A="255"/>
-	<Vtx X="-1" Y="55" Z="-30" S="112" T="112" R="0" G="65" B="147" A="255"/>
-	<Vtx X="-1" Y="55" Z="-30" S="112" T="112" R="0" G="65" B="147" A="255"/>
-	<Vtx X="5" Y="61" Z="-27" S="304" T="112" R="245" G="66" B="148" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="176" T="-16" R="228" G="53" B="144" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="-16" T="176" R="28" G="53" B="144" A="255"/>
-	<Vtx X="-7" Y="61" Z="-27" S="112" T="304" R="11" G="66" B="148" A="255"/>
-	<Vtx X="14" Y="42" Z="-48" S="304" T="432" R="252" G="89" B="166" A="255"/>
-	<Vtx X="17" Y="33" Z="-52" S="496" T="496" R="18" G="65" B="148" A="255"/>
-	<Vtx X="9" Y="39" Z="-50" S="432" T="304" R="252" G="89" B="166" A="255"/>
-	<Vtx X="11" Y="47" Z="-40" S="112" T="304" R="233" G="93" B="173" A="255"/>
-	<Vtx X="1" Y="42" Z="-45" S="304" T="112" R="251" G="103" B="182" A="255"/>
-	<Vtx X="3" Y="46" Z="-38" S="112" T="112" R="242" G="99" B="178" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="176" T="-16" R="0" G="114" B="201" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="-16" T="176" R="212" G="91" B="180" A="255"/>
-	<Vtx X="-23" Y="56" Z="-35" S="304" T="432" R="6" G="84" B="161" A="255"/>
-	<Vtx X="-31" Y="59" Z="-29" S="496" T="496" R="227" G="90" B="171" A="255"/>
-	<Vtx X="-21" Y="60" Z="-31" S="432" T="304" R="6" G="84" B="161" A="255"/>
-	<Vtx X="-15" Y="50" Z="-37" S="112" T="304" R="26" G="86" B="166" A="255"/>
-	<Vtx X="-11" Y="59" Z="-29" S="304" T="112" R="19" G="71" B="152" A="255"/>
-	<Vtx X="-7" Y="52" Z="-33" S="112" T="112" R="25" G="80" B="160" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="176" T="-16" R="28" G="53" B="144" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="-16" T="176" R="44" G="91" B="180" A="255"/>
-	<Vtx X="19" Y="60" Z="-31" S="304" T="432" R="250" G="84" B="161" A="255"/>
-	<Vtx X="28" Y="59" Z="-29" S="496" T="496" R="29" G="90" B="171" A="255"/>
-	<Vtx X="21" Y="56" Z="-35" S="432" T="304" R="250" G="84" B="161" A="255"/>
-	<Vtx X="9" Y="59" Z="-29" S="112" T="304" R="237" G="71" B="152" A="255"/>
-	<Vtx X="13" Y="50" Z="-37" S="304" T="112" R="230" G="86" B="166" A="255"/>
-	<Vtx X="5" Y="52" Z="-33" S="112" T="112" R="231" G="80" B="160" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="176" T="-16" R="212" G="91" B="180" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="-16" T="176" R="228" G="53" B="144" A="255"/>
-	<Vtx X="49" Y="39" Z="15" S="304" T="432" R="76" G="89" B="48" A="255"/>
-	<Vtx X="55" Y="33" Z="9" S="496" T="496" R="102" G="65" B="38" A="255"/>
-	<Vtx X="50" Y="42" Z="10" S="432" T="304" R="76" G="89" B="48" A="255"/>
-	<Vtx X="40" Y="42" Z="19" S="112" T="304" R="62" G="103" B="41" A="255"/>
-	<Vtx X="41" Y="47" Z="8" S="304" T="112" R="60" G="93" B="61" A="255"/>
-	<Vtx X="35" Y="46" Z="15" S="112" T="112" R="61" G="99" B="51" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="176" T="-16" R="44" G="91" B="76" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="-16" T="176" R="48" G="114" B="28" A="255"/>
-	<Vtx X="21" Y="69" Z="8" S="304" T="432" R="85" G="81" B="49" A="255"/>
-	<Vtx X="13" Y="75" Z="6" S="496" T="496" R="61" G="106" B="35" A="255"/>
-	<Vtx X="18" Y="69" Z="13" S="432" T="304" R="85" G="81" B="49" A="255"/>
-	<Vtx X="27" Y="61" Z="7" S="112" T="304" R="88" G="66" B="63" A="255"/>
-	<Vtx X="21" Y="61" Z="18" S="304" T="112" R="99" G="66" B="45" A="255"/>
-	<Vtx X="26" Y="55" Z="14" S="112" T="112" R="95" G="65" B="55" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="176" T="-16" R="111" G="53" B="32" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="-16" T="176" R="83" G="53" B="80" A="255"/>
-	<Vtx X="34" Y="42" Z="36" S="304" T="432" R="80" G="89" B="42" A="255"/>
-	<Vtx X="37" Y="33" Z="41" S="496" T="496" R="84" G="65" B="69" A="255"/>
-	<Vtx X="39" Y="39" Z="33" S="432" T="304" R="80" G="89" B="42" A="255"/>
-	<Vtx X="29" Y="47" Z="30" S="112" T="304" R="83" G="93" B="22" A="255"/>
-	<Vtx X="38" Y="42" Z="23" S="304" T="112" R="67" G="103" B="33" A="255"/>
-	<Vtx X="31" Y="46" Z="21" S="112" T="112" R="74" G="99" B="27" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="176" T="-16" R="48" G="114" B="28" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="-16" T="176" R="88" G="91" B="0" A="255"/>
-	<Vtx X="41" Y="56" Z="-2" S="304" T="432" R="79" G="84" B="53" A="255"/>
-	<Vtx X="40" Y="59" Z="-12" S="496" T="496" R="88" G="90" B="17" A="255"/>
-	<Vtx X="37" Y="60" Z="-3" S="432" T="304" R="79" G="84" B="53" A="255"/>
-	<Vtx X="39" Y="50" Z="6" S="112" T="304" R="64" G="86" B="67" A="255"/>
-	<Vtx X="30" Y="59" Z="5" S="304" T="112" R="80" G="71" B="68" A="255"/>
-	<Vtx X="32" Y="52" Z="10" S="112" T="112" R="70" G="80" B="70" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="176" T="-16" R="83" G="53" B="80" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="-16" T="176" R="44" G="91" B="76" A="255"/>
-	<Vtx X="32" Y="52" Z="10" S="112" T="112" R="70" G="80" B="70" A="255"/>
-	<Vtx X="39" Y="50" Z="6" S="112" T="304" R="64" G="86" B="67" A="255"/>
-	<Vtx X="17" Y="60" Z="31" S="304" T="432" R="85" G="84" B="42" A="255"/>
-	<Vtx X="11" Y="59" Z="39" S="496" T="496" R="59" G="90" B="67" A="255"/>
-	<Vtx X="20" Y="56" Z="35" S="432" T="304" R="85" G="84" B="42" A="255"/>
-	<Vtx X="21" Y="59" Z="22" S="112" T="304" R="99" G="71" B="35" A="255"/>
-	<Vtx X="26" Y="50" Z="29" S="304" T="112" R="91" G="86" B="22" A="255"/>
-	<Vtx X="26" Y="52" Z="21" S="112" T="112" R="95" G="80" B="26" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="176" T="-16" R="88" G="91" B="0" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="-16" T="176" R="111" G="53" B="32" A="255"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushBossKeyDL_vtx_cull

@@ -1,10 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="-107" Y="0" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="-107" Y="0" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="-107" Y="98" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="-107" Y="98" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="0" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="0" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="98" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="98" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL

@@ -1,14 +0,0 @@
-<DisplayList Version="0">
-	<ClearGeometryMode G_LIGHTING="1" />
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
-	<SetGeometryMode G_LIGHTING="1" />
-	<CullDisplayList Start="0" End="7"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_shrubbery"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushFairyDL_tri_0"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_leaf"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushFairyDL_tri_1"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushFairyDL_f3dlite_flower_fairy"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushFairyDL_tri_2"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_0

@@ -1,8 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="14"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="0" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="11" Flag0="0" V10="7" V11="12" V12="13" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_1

@@ -1,134 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="4" V12="3" Flag1="0"/>
-	<Triangles2 V00="3" V01="6" V02="5" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="5" V11="8" V12="4" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="10" V12="9" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="10" Flag0="0" V10="14" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="12" V01="15" V02="14" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="14" V11="16" V12="13" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="18" V12="17" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="18" Flag0="0" V10="22" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="20" V01="23" V02="22" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="22" V11="24" V12="21" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="26" V12="25" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="26" Flag0="0" V10="30" V11="29" V12="28" Flag1="0"/>
-	<Triangles2 V00="28" V01="31" V02="30" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="20" V02="17" Flag0="0" V10="17" V11="20" V12="16" Flag1="0"/>
-	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="26" V11="25" V12="24" Flag1="0"/>
-	<Triangles2 V00="24" V01="27" V02="26" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
-	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="26" V11="28" V12="25" Flag1="0"/>
-	<Triangle1 V00="29" V01="30" V02="31"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="0" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
-	<Triangles2 V00="4" V01="7" V02="3" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="9" V02="8" Flag0="0" V10="11" V11="12" V12="9" Flag1="0"/>
-	<Triangles2 V00="13" V01="12" V02="11" Flag0="0" V10="11" V11="14" V12="13" Flag1="0"/>
-	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
-	<Triangles2 V00="13" V01="15" V02="12" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="17" V02="16" Flag0="0" V10="19" V11="20" V12="17" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="19" Flag0="0" V10="19" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
-	<Triangles2 V00="21" V01="23" V02="20" Flag0="0" V10="24" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="25" V02="24" Flag0="0" V10="27" V11="28" V12="25" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="27" Flag0="0" V10="27" V11="30" V12="29" Flag1="0"/>
-	<Triangle1 V00="31" V01="29" V02="30"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="0" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="0" V01="19" V02="17" Flag0="0" V10="17" V11="19" V12="16" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="23" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="23" V01="24" V02="21" Flag0="0" V10="25" V11="24" V12="23" Flag1="0"/>
-	<Triangles2 V00="23" V01="26" V02="25" Flag0="0" V10="0" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="0" V01="27" V02="25" Flag0="0" V10="25" V11="27" V12="24" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="31" V11="29" V12="28" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="0" V01="4" V02="3" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="6" V02="3" Flag0="0" V10="3" V11="6" V12="1" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="9" Flag0="0" V10="10" V11="7" V12="9" Flag1="0"/>
-	<Triangles2 V00="10" V01="9" V02="11" Flag0="0" V10="12" V11="10" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="12" Flag0="0" V10="10" V11="12" V12="15" Flag1="0"/>
-	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="19" V11="16" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="14" V11="21" V12="22" Flag1="0"/>
-	<Triangles2 V00="14" V01="23" V02="21" Flag0="0" V10="19" V11="21" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="24" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="14" V11="29" V12="30" Flag1="0"/>
-	<Triangles2 V00="14" V01="31" V02="29" Flag0="0" V10="27" V11="29" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="24" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="20" V11="22" V12="25" Flag1="0"/>
-	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="29" V11="26" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="29" V12="30" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="192" Count="30"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="0" Flag0="0" V10="5" V11="0" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="6" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="3" V11="11" V12="12" Flag1="0"/>
-	<Triangles2 V00="3" V01="13" V02="11" Flag0="0" V10="9" V11="11" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="17" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="3" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="3" V01="21" V02="19" Flag0="0" V10="17" V11="19" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="25" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="3" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="3" V01="29" V02="27" Flag0="0" V10="25" V11="27" V12="29" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="222" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="20" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="25" V12="27" Flag1="0"/>
-	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="30" V11="28" V12="29" Flag1="0"/>
-	<Triangles2 V00="30" V01="29" V02="31" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1" VertexBufferIndex="0" VertexOffset="254" Count="12"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="2" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="4" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="7" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="7" V11="9" V12="11" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_tri_2

@@ -1,134 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="0" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="1" Flag0="0" V10="5" V11="4" V12="3" Flag1="0"/>
-	<Triangles2 V00="3" V01="6" V02="5" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="5" V11="8" V12="4" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="10" V12="9" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="10" Flag0="0" V10="14" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="12" V01="15" V02="14" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="14" V11="16" V12="13" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="18" V12="17" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="18" Flag0="0" V10="22" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="20" V01="23" V02="22" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="22" V11="24" V12="21" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="26" V12="25" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="26" Flag0="0" V10="30" V11="29" V12="28" Flag1="0"/>
-	<Triangles2 V00="28" V01="31" V02="30" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="32" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="20" V02="17" Flag0="0" V10="17" V11="20" V12="16" Flag1="0"/>
-	<Triangles2 V00="21" V01="22" V02="23" Flag0="0" V10="24" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="26" V11="25" V12="24" Flag1="0"/>
-	<Triangles2 V00="24" V01="27" V02="26" Flag0="0" V10="19" V11="26" V12="27" Flag1="0"/>
-	<Triangles2 V00="19" V01="28" V02="26" Flag0="0" V10="26" V11="28" V12="25" Flag1="0"/>
-	<Triangle1 V00="29" V01="30" V02="31"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="64" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="3" V02="0" Flag0="0" V10="0" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="4" V02="5" Flag0="0" V10="6" V11="7" V12="4" Flag1="0"/>
-	<Triangles2 V00="4" V01="7" V02="3" Flag0="0" V10="8" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="9" V02="8" Flag0="0" V10="11" V11="12" V12="9" Flag1="0"/>
-	<Triangles2 V00="13" V01="12" V02="11" Flag0="0" V10="11" V11="14" V12="13" Flag1="0"/>
-	<Triangles2 V00="6" V01="13" V02="14" Flag0="0" V10="6" V11="15" V12="13" Flag1="0"/>
-	<Triangles2 V00="13" V01="15" V02="12" Flag0="0" V10="16" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="17" V02="16" Flag0="0" V10="19" V11="20" V12="17" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="19" Flag0="0" V10="19" V11="22" V12="21" Flag1="0"/>
-	<Triangles2 V00="6" V01="21" V02="22" Flag0="0" V10="6" V11="23" V12="21" Flag1="0"/>
-	<Triangles2 V00="21" V01="23" V02="20" Flag0="0" V10="24" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="25" V02="24" Flag0="0" V10="27" V11="28" V12="25" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="27" Flag0="0" V10="27" V11="30" V12="29" Flag1="0"/>
-	<Triangle1 V00="31" V01="29" V02="30"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="96" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="2" V11="1" V12="3" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="5" V12="4" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="9" V11="8" V12="7" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="9" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="9" V11="11" V12="8" Flag1="0"/>
-	<Triangles2 V00="12" V01="13" V02="14" Flag0="0" V10="15" V11="13" V12="12" Flag1="0"/>
-	<Triangles2 V00="15" V01="16" V02="13" Flag0="0" V10="17" V11="16" V12="15" Flag1="0"/>
-	<Triangles2 V00="15" V01="18" V02="17" Flag0="0" V10="0" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="0" V01="19" V02="17" Flag0="0" V10="17" V11="19" V12="16" Flag1="0"/>
-	<Triangles2 V00="20" V01="21" V02="22" Flag0="0" V10="23" V11="21" V12="20" Flag1="0"/>
-	<Triangles2 V00="23" V01="24" V02="21" Flag0="0" V10="25" V11="24" V12="23" Flag1="0"/>
-	<Triangles2 V00="23" V01="26" V02="25" Flag0="0" V10="0" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="0" V01="27" V02="25" Flag0="0" V10="25" V11="27" V12="24" Flag1="0"/>
-	<Triangles2 V00="28" V01="29" V02="30" Flag0="0" V10="31" V11="29" V12="28" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="128" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="1" V12="0" Flag1="0"/>
-	<Triangles2 V00="0" V01="4" V02="3" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="6" V02="3" Flag0="0" V10="3" V11="6" V12="1" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="9" Flag0="0" V10="10" V11="7" V12="9" Flag1="0"/>
-	<Triangles2 V00="10" V01="9" V02="11" Flag0="0" V10="12" V11="10" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="12" Flag0="0" V10="10" V11="12" V12="15" Flag1="0"/>
-	<Triangles2 V00="16" V01="17" V02="18" Flag0="0" V10="19" V11="16" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="21" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="21" V01="20" V02="22" Flag0="0" V10="14" V11="21" V12="22" Flag1="0"/>
-	<Triangles2 V00="14" V01="23" V02="21" Flag0="0" V10="19" V11="21" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="26" Flag0="0" V10="27" V11="24" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="29" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="14" V11="29" V12="30" Flag1="0"/>
-	<Triangles2 V00="14" V01="31" V02="29" Flag0="0" V10="27" V11="29" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="160" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="24" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="24" V01="25" V02="22" Flag0="0" V10="20" V11="22" V12="25" Flag1="0"/>
-	<Triangles2 V00="26" V01="27" V02="28" Flag0="0" V10="29" V11="26" V12="28" Flag1="0"/>
-	<Triangles2 V00="29" V01="28" V02="30" Flag0="0" V10="31" V11="29" V12="30" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="192" Count="30"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="4" V02="0" Flag0="0" V10="5" V11="0" V12="4" Flag1="0"/>
-	<Triangles2 V00="6" V01="7" V02="8" Flag0="0" V10="9" V11="6" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="11" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="11" V01="10" V02="12" Flag0="0" V10="3" V11="11" V12="12" Flag1="0"/>
-	<Triangles2 V00="3" V01="13" V02="11" Flag0="0" V10="9" V11="11" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="15" V02="16" Flag0="0" V10="17" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="16" V02="18" Flag0="0" V10="19" V11="17" V12="18" Flag1="0"/>
-	<Triangles2 V00="19" V01="18" V02="20" Flag0="0" V10="3" V11="19" V12="20" Flag1="0"/>
-	<Triangles2 V00="3" V01="21" V02="19" Flag0="0" V10="17" V11="19" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="23" V02="24" Flag0="0" V10="25" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="24" V02="26" Flag0="0" V10="27" V11="25" V12="26" Flag1="0"/>
-	<Triangles2 V00="27" V01="26" V02="28" Flag0="0" V10="3" V11="27" V12="28" Flag1="0"/>
-	<Triangles2 V00="3" V01="29" V02="27" Flag0="0" V10="25" V11="27" V12="29" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="222" Count="32"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="0" V12="2" Flag1="0"/>
-	<Triangles2 V00="3" V01="2" V02="4" Flag0="0" V10="5" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="5" V01="4" V02="6" Flag0="0" V10="7" V11="5" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="8" V02="5" Flag0="0" V10="3" V11="5" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="10" V02="11" Flag0="0" V10="12" V11="9" V12="11" Flag1="0"/>
-	<Triangles2 V00="12" V01="11" V02="13" Flag0="0" V10="14" V11="12" V12="13" Flag1="0"/>
-	<Triangles2 V00="14" V01="13" V02="15" Flag0="0" V10="7" V11="14" V12="15" Flag1="0"/>
-	<Triangles2 V00="7" V01="16" V02="14" Flag0="0" V10="12" V11="14" V12="16" Flag1="0"/>
-	<Triangles2 V00="17" V01="18" V02="19" Flag0="0" V10="20" V11="17" V12="19" Flag1="0"/>
-	<Triangles2 V00="20" V01="19" V02="21" Flag0="0" V10="22" V11="20" V12="21" Flag1="0"/>
-	<Triangles2 V00="22" V01="21" V02="23" Flag0="0" V10="7" V11="22" V12="23" Flag1="0"/>
-	<Triangles2 V00="7" V01="24" V02="22" Flag0="0" V10="20" V11="22" V12="24" Flag1="0"/>
-	<Triangles2 V00="25" V01="26" V02="27" Flag0="0" V10="28" V11="25" V12="27" Flag1="0"/>
-	<Triangles2 V00="28" V01="27" V02="29" Flag0="0" V10="30" V11="28" V12="29" Flag1="0"/>
-	<Triangles2 V00="30" V01="29" V02="31" Flag0="0" V10="7" V11="30" V12="31" Flag1="0"/>
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2" VertexBufferIndex="0" VertexOffset="254" Count="12"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="3" V11="2" V12="1" Flag1="0"/>
-	<Triangles2 V00="4" V01="5" V02="6" Flag0="0" V10="7" V11="4" V12="6" Flag1="0"/>
-	<Triangles2 V00="7" V01="6" V02="8" Flag0="0" V10="9" V11="7" V12="8" Flag1="0"/>
-	<Triangles2 V00="9" V01="8" V02="10" Flag0="0" V10="0" V11="9" V12="10" Flag1="0"/>
-	<Triangles2 V00="0" V01="11" V02="9" Flag0="0" V10="7" V11="9" V12="11" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_0

@@ -1,16 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="0" Y="98" Z="0" S="558" T="-664" R="0" G="0" B="129" A="255"/>
-	<Vtx X="54" Y="0" Z="93" S="-281" T="1008" R="110" G="0" B="192" A="255"/>
-	<Vtx X="-54" Y="0" Z="-93" S="1398" T="1008" R="110" G="0" B="192" A="255"/>
-	<Vtx X="-107" Y="0" Z="0" S="-281" T="1008" R="0" G="0" B="127" A="255"/>
-	<Vtx X="107" Y="0" Z="0" S="1398" T="1008" R="0" G="0" B="127" A="255"/>
-	<Vtx X="54" Y="0" Z="-93" S="-281" T="1008" R="146" G="0" B="192" A="255"/>
-	<Vtx X="-54" Y="0" Z="93" S="1398" T="1008" R="146" G="0" B="192" A="255"/>
-	<Vtx X="0" Y="98" Z="0" S="558" T="-664" R="0" G="0" B="127" A="255"/>
-	<Vtx X="-54" Y="0" Z="-93" S="1398" T="1008" R="146" G="0" B="64" A="255"/>
-	<Vtx X="54" Y="0" Z="93" S="-281" T="1008" R="146" G="0" B="64" A="255"/>
-	<Vtx X="107" Y="0" Z="0" S="1398" T="1008" R="0" G="0" B="129" A="255"/>
-	<Vtx X="-107" Y="0" Z="0" S="-281" T="1008" R="0" G="0" B="129" A="255"/>
-	<Vtx X="-54" Y="0" Z="93" S="1398" T="1008" R="110" G="0" B="64" A="255"/>
-	<Vtx X="54" Y="0" Z="-93" S="-281" T="1008" R="110" G="0" B="64" A="255"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_1

@@ -1,268 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="-25" Y="44" Z="36" S="304" T="432" R="77" G="174" B="197" A="255"/>
-	<Vtx X="-22" Y="48" Z="36" S="432" T="304" R="77" G="174" B="197" A="255"/>
-	<Vtx X="-20" Y="43" Z="38" S="496" T="496" R="35" G="211" B="143" A="255"/>
-	<Vtx X="-28" Y="43" Z="29" S="112" T="304" R="90" G="179" B="211" A="255"/>
-	<Vtx X="-21" Y="50" Z="29" S="304" T="112" R="73" G="161" B="213" A="255"/>
-	<Vtx X="-27" Y="49" Z="25" S="112" T="112" R="87" G="167" B="230" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="-16" T="176" R="77" G="160" B="224" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="81" G="171" B="209" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="176" T="-16" R="93" G="177" B="221" A="255"/>
-	<Vtx X="-24" Y="63" Z="4" S="304" T="432" R="78" G="163" B="220" A="255"/>
-	<Vtx X="-28" Y="61" Z="2" S="432" T="304" R="78" G="163" B="220" A="255"/>
-	<Vtx X="-23" Y="62" Z="-1" S="496" T="496" R="45" G="142" B="31" A="255"/>
-	<Vtx X="-22" Y="59" Z="10" S="112" T="304" R="72" G="167" B="201" A="255"/>
-	<Vtx X="-30" Y="55" Z="5" S="304" T="112" R="90" G="178" B="213" A="255"/>
-	<Vtx X="-28" Y="55" Z="13" S="112" T="112" R="84" G="186" B="191" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="-16" T="176" R="90" G="184" B="203" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="176" T="-16" R="76" G="176" B="194" A="255"/>
-	<Vtx X="-42" Y="37" Z="22" S="304" T="432" R="89" G="181" B="205" A="255"/>
-	<Vtx X="-39" Y="37" Z="27" S="432" T="304" R="89" G="181" B="205" A="255"/>
-	<Vtx X="-40" Y="32" Z="25" S="496" T="496" R="110" G="255" B="193" A="255"/>
-	<Vtx X="-38" Y="40" Z="17" S="112" T="304" R="85" G="169" B="221" A="255"/>
-	<Vtx X="-33" Y="40" Z="26" S="304" T="112" R="73" G="169" B="199" A="255"/>
-	<Vtx X="-33" Y="46" Z="21" S="112" T="112" R="67" G="156" B="216" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="-16" T="176" R="66" G="161" B="204" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="176" T="-16" R="77" G="160" B="224" A="255"/>
-	<Vtx X="-14" Y="61" Z="25" S="304" T="432" R="70" G="163" B="206" A="255"/>
-	<Vtx X="-15" Y="63" Z="20" S="432" T="304" R="70" G="163" B="206" A="255"/>
-	<Vtx X="-9" Y="62" Z="22" S="496" T="496" R="252" G="142" B="201" A="255"/>
-	<Vtx X="-18" Y="55" Z="25" S="112" T="304" R="82" G="178" B="199" A="255"/>
-	<Vtx X="-19" Y="59" Z="16" S="304" T="112" R="84" G="167" B="221" A="255"/>
-	<Vtx X="-24" Y="55" Z="20" S="112" T="112" R="98" G="186" B="214" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="-16" T="176" R="93" G="177" B="221" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="81" G="171" B="209" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="176" T="-16" R="90" G="184" B="203" A="255"/>
-	<Vtx X="-24" Y="55" Z="20" S="112" T="112" R="98" G="186" B="214" A="255"/>
-	<Vtx X="-19" Y="59" Z="16" S="304" T="112" R="84" G="167" B="221" A="255"/>
-	<Vtx X="-41" Y="48" Z="3" S="304" T="432" R="90" G="174" B="219" A="255"/>
-	<Vtx X="-43" Y="44" Z="6" S="432" T="304" R="90" G="174" B="219" A="255"/>
-	<Vtx X="-42" Y="43" Z="0" S="496" T="496" R="116" G="211" B="26" A="255"/>
-	<Vtx X="-34" Y="50" Z="6" S="112" T="304" R="74" G="162" B="214" A="255"/>
-	<Vtx X="-38" Y="43" Z="11" S="304" T="112" R="84" G="179" B="200" A="255"/>
-	<Vtx X="-34" Y="49" Z="14" S="112" T="112" R="65" G="167" B="192" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="-16" T="176" R="76" G="176" B="194" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="176" T="-16" R="66" G="161" B="204" A="255"/>
-	<Vtx X="-18" Y="44" Z="-40" S="304" T="432" R="13" G="174" B="96" A="255"/>
-	<Vtx X="-20" Y="48" Z="-37" S="432" T="304" R="13" G="174" B="96" A="255"/>
-	<Vtx X="-23" Y="43" Z="-37" S="496" T="496" R="81" G="211" B="87" A="255"/>
-	<Vtx X="-11" Y="43" Z="-39" S="112" T="304" R="250" G="179" B="101" A="255"/>
-	<Vtx X="-14" Y="50" Z="-33" S="304" T="112" R="1" G="161" B="85" A="255"/>
-	<Vtx X="-8" Y="49" Z="-36" S="112" T="112" R="235" G="167" B="88" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="-16" T="176" R="245" G="160" B="82" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="176" T="-16" R="239" G="177" B="98" A="255"/>
-	<Vtx X="8" Y="63" Z="-23" S="304" T="432" R="248" G="163" B="86" A="255"/>
-	<Vtx X="12" Y="61" Z="-25" S="432" T="304" R="248" G="163" B="86" A="255"/>
-	<Vtx X="12" Y="62" Z="-19" S="496" T="496" R="206" G="142" B="24" A="255"/>
-	<Vtx X="2" Y="59" Z="-24" S="112" T="304" R="11" G="167" B="90" A="255"/>
-	<Vtx X="10" Y="55" Z="-28" S="304" T="112" R="248" G="178" B="100" A="255"/>
-	<Vtx X="3" Y="55" Z="-31" S="112" T="112" R="14" G="187" B="105" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="-16" T="176" R="1" G="184" B="104" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="176" T="-16" R="16" G="176" B="97" A="255"/>
-	<Vtx X="2" Y="37" Z="-47" S="304" T="432" R="0" G="181" B="102" A="255"/>
-	<Vtx X="-4" Y="37" Z="-47" S="432" T="304" R="0" G="181" B="102" A="255"/>
-	<Vtx X="-1" Y="32" Z="-47" S="496" T="496" R="0" G="255" B="127" A="255"/>
-	<Vtx X="4" Y="40" Z="-42" S="112" T="304" R="244" G="169" B="91" A="255"/>
-	<Vtx X="-4" Y="37" Z="-47" S="432" T="304" R="0" G="181" B="102" A="255"/>
-	<Vtx X="2" Y="37" Z="-47" S="304" T="432" R="0" G="181" B="102" A="255"/>
-	<Vtx X="-6" Y="40" Z="-42" S="304" T="112" R="12" G="169" B="92" A="255"/>
-	<Vtx X="-1" Y="46" Z="-39" S="112" T="112" R="1" G="156" B="78" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="-16" T="176" R="12" G="161" B="84" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="176" T="-16" R="245" G="160" B="82" A="255"/>
-	<Vtx X="-15" Y="61" Z="-25" S="304" T="432" R="8" G="163" B="86" A="255"/>
-	<Vtx X="-10" Y="63" Z="-23" S="432" T="304" R="8" G="163" B="86" A="255"/>
-	<Vtx X="-15" Y="62" Z="-19" S="496" T="496" R="50" G="142" B="24" A="255"/>
-	<Vtx X="-12" Y="55" Z="-28" S="112" T="304" R="8" G="178" B="100" A="255"/>
-	<Vtx X="-4" Y="59" Z="-24" S="304" T="112" R="245" G="167" B="90" A="255"/>
-	<Vtx X="-5" Y="55" Z="-31" S="112" T="112" R="243" G="186" B="105" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="-16" T="176" R="239" G="177" B="98" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="176" T="-16" R="1" G="184" B="104" A="255"/>
-	<Vtx X="18" Y="48" Z="-37" S="304" T="432" R="243" G="174" B="96" A="255"/>
-	<Vtx X="16" Y="44" Z="-40" S="432" T="304" R="243" G="174" B="96" A="255"/>
-	<Vtx X="21" Y="43" Z="-37" S="496" T="496" R="175" G="211" B="87" A="255"/>
-	<Vtx X="12" Y="50" Z="-33" S="112" T="304" R="255" G="162" B="85" A="255"/>
-	<Vtx X="9" Y="43" Z="-39" S="304" T="112" R="6" G="179" B="101" A="255"/>
-	<Vtx X="5" Y="49" Z="-36" S="112" T="112" R="23" G="167" B="88" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="-16" T="176" R="16" G="176" B="97" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="176" T="-16" R="12" G="161" B="84" A="255"/>
-	<Vtx X="44" Y="44" Z="4" S="304" T="432" R="166" G="174" B="219" A="255"/>
-	<Vtx X="42" Y="48" Z="1" S="432" T="304" R="166" G="174" B="219" A="255"/>
-	<Vtx X="43" Y="43" Z="-2" S="496" T="496" R="140" G="211" B="26" A="255"/>
-	<Vtx X="39" Y="43" Z="10" S="112" T="304" R="172" G="179" B="200" A="255"/>
-	<Vtx X="35" Y="50" Z="4" S="304" T="112" R="182" G="161" B="215" A="255"/>
-	<Vtx X="35" Y="49" Z="11" S="112" T="112" R="190" G="167" B="194" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="-16" T="176" R="190" G="160" B="205" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="176" T="-16" R="180" G="177" B="193" A="255"/>
-	<Vtx X="35" Y="49" Z="11" S="112" T="112" R="190" G="167" B="194" A="255"/>
-	<Vtx X="35" Y="50" Z="4" S="304" T="112" R="182" G="161" B="215" A="255"/>
-	<Vtx X="16" Y="63" Z="18" S="304" T="432" R="186" G="163" B="206" A="255"/>
-	<Vtx X="15" Y="61" Z="23" S="432" T="304" R="186" G="163" B="206" A="255"/>
-	<Vtx X="11" Y="62" Z="20" S="496" T="496" R="4" G="142" B="201" A="255"/>
-	<Vtx X="20" Y="59" Z="14" S="112" T="304" R="172" G="167" B="221" A="255"/>
-	<Vtx X="19" Y="55" Z="23" S="304" T="112" R="174" G="178" B="199" A="255"/>
-	<Vtx X="25" Y="55" Z="18" S="112" T="112" R="158" G="187" B="216" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="-16" T="176" R="165" G="184" B="205" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="176" T="-16" R="164" G="176" B="221" A="255"/>
-	<Vtx X="40" Y="37" Z="25" S="304" T="432" R="167" G="181" B="205" A="255"/>
-	<Vtx X="43" Y="37" Z="20" S="432" T="304" R="167" G="181" B="205" A="255"/>
-	<Vtx X="41" Y="32" Z="23" S="496" T="496" R="146" G="255" B="193" A="255"/>
-	<Vtx X="34" Y="40" Z="24" S="112" T="304" R="183" G="169" B="200" A="255"/>
-	<Vtx X="39" Y="40" Z="15" S="304" T="112" R="170" G="169" B="221" A="255"/>
-	<Vtx X="34" Y="46" Z="19" S="112" T="112" R="188" G="156" B="218" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="-16" T="176" R="177" G="161" B="225" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="176" T="-16" R="190" G="160" B="205" A="255"/>
-	<Vtx X="29" Y="61" Z="0" S="304" T="432" R="178" G="163" B="220" A="255"/>
-	<Vtx X="25" Y="63" Z="3" S="432" T="304" R="178" G="163" B="220" A="255"/>
-	<Vtx X="24" Y="62" Z="-3" S="496" T="496" R="211" G="142" B="31" A="255"/>
-	<Vtx X="31" Y="55" Z="3" S="112" T="304" R="166" G="178" B="214" A="255"/>
-	<Vtx X="23" Y="59" Z="8" S="304" T="112" R="184" G="167" B="201" A="255"/>
-	<Vtx X="29" Y="55" Z="11" S="112" T="112" R="171" G="186" B="192" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="-16" T="176" R="180" G="177" B="193" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="176" T="-16" R="165" G="184" B="205" A="255"/>
-	<Vtx X="23" Y="48" Z="34" S="304" T="432" R="179" G="174" B="197" A="255"/>
-	<Vtx X="27" Y="44" Z="34" S="432" T="304" R="179" G="174" B="197" A="255"/>
-	<Vtx X="21" Y="43" Z="36" S="496" T="496" R="221" G="211" B="143" A="255"/>
-	<Vtx X="22" Y="50" Z="27" S="112" T="304" R="183" G="162" B="213" A="255"/>
-	<Vtx X="22" Y="50" Z="27" S="112" T="304" R="183" G="162" B="213" A="255"/>
-	<Vtx X="29" Y="43" Z="27" S="304" T="112" R="166" G="179" B="211" A="255"/>
-	<Vtx X="27" Y="44" Z="34" S="432" T="304" R="179" G="174" B="197" A="255"/>
-	<Vtx X="29" Y="49" Z="22" S="112" T="112" R="168" G="167" B="232" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="-16" T="176" R="164" G="176" B="221" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="176" T="-16" R="177" G="161" B="225" A="255"/>
-	<Vtx X="-25" Y="44" Z="36" S="304" T="432" R="179" G="82" B="59" A="255"/>
-	<Vtx X="-20" Y="43" Z="38" S="496" T="496" R="221" G="45" B="113" A="255"/>
-	<Vtx X="-22" Y="48" Z="36" S="432" T="304" R="179" G="82" B="59" A="255"/>
-	<Vtx X="-28" Y="43" Z="29" S="112" T="304" R="166" G="77" B="45" A="255"/>
-	<Vtx X="-21" Y="50" Z="29" S="304" T="112" R="183" G="95" B="43" A="255"/>
-	<Vtx X="-27" Y="49" Z="25" S="112" T="112" R="169" G="89" B="26" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="176" T="-16" R="163" G="79" B="35" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="175" G="85" B="47" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="-16" T="176" R="179" G="96" B="32" A="255"/>
-	<Vtx X="-24" Y="63" Z="4" S="304" T="432" R="178" G="93" B="36" A="255"/>
-	<Vtx X="-23" Y="62" Z="-1" S="496" T="496" R="211" G="114" B="225" A="255"/>
-	<Vtx X="-28" Y="61" Z="2" S="432" T="304" R="178" G="93" B="36" A="255"/>
-	<Vtx X="-22" Y="59" Z="10" S="112" T="304" R="184" G="89" B="55" A="255"/>
-	<Vtx X="-30" Y="55" Z="5" S="304" T="112" R="166" G="78" B="43" A="255"/>
-	<Vtx X="-28" Y="55" Z="13" S="112" T="112" R="172" G="70" B="65" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="176" T="-16" R="180" G="80" B="62" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="-16" T="176" R="166" G="72" B="53" A="255"/>
-	<Vtx X="-42" Y="37" Z="22" S="304" T="432" R="167" G="75" B="51" A="255"/>
-	<Vtx X="-40" Y="32" Z="25" S="496" T="496" R="146" G="1" B="63" A="255"/>
-	<Vtx X="-39" Y="37" Z="27" S="432" T="304" R="167" G="75" B="51" A="255"/>
-	<Vtx X="-38" Y="40" Z="17" S="112" T="304" R="171" G="87" B="35" A="255"/>
-	<Vtx X="-33" Y="40" Z="26" S="304" T="112" R="183" G="87" B="57" A="255"/>
-	<Vtx X="-33" Y="46" Z="21" S="112" T="112" R="189" G="100" B="40" A="255"/>
-	<Vtx X="-29" Y="46" Z="22" S="176" T="-16" R="179" G="96" B="32" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="-16" T="176" R="190" G="95" B="52" A="255"/>
-	<Vtx X="-14" Y="61" Z="25" S="304" T="432" R="186" G="93" B="50" A="255"/>
-	<Vtx X="-9" Y="62" Z="22" S="496" T="496" R="4" G="114" B="55" A="255"/>
-	<Vtx X="-15" Y="63" Z="20" S="432" T="304" R="186" G="93" B="50" A="255"/>
-	<Vtx X="-18" Y="55" Z="25" S="112" T="304" R="174" G="78" B="57" A="255"/>
-	<Vtx X="-19" Y="59" Z="16" S="304" T="112" R="172" G="89" B="35" A="255"/>
-	<Vtx X="-24" Y="55" Z="20" S="112" T="112" R="158" G="70" B="42" A="255"/>
-	<Vtx X="-24" Y="54" Z="15" S="176" T="-16" R="166" G="72" B="53" A="255"/>
-	<Vtx X="-26" Y="48" Z="16" S="-16" T="-16" R="175" G="85" B="47" A="255"/>
-	<Vtx X="-24" Y="51" Z="22" S="-16" T="176" R="163" G="79" B="35" A="255"/>
-	<Vtx X="-41" Y="48" Z="3" S="304" T="432" R="166" G="82" B="37" A="255"/>
-	<Vtx X="-42" Y="43" Z="0" S="496" T="496" R="140" G="45" B="230" A="255"/>
-	<Vtx X="-43" Y="44" Z="6" S="432" T="304" R="166" G="82" B="37" A="255"/>
-	<Vtx X="-34" Y="50" Z="6" S="112" T="304" R="182" G="94" B="42" A="255"/>
-	<Vtx X="-38" Y="43" Z="11" S="304" T="112" R="172" G="77" B="56" A="255"/>
-	<Vtx X="-34" Y="49" Z="14" S="112" T="112" R="191" G="89" B="64" A="255"/>
-	<Vtx X="-33" Y="46" Z="16" S="176" T="-16" R="190" G="95" B="52" A="255"/>
-	<Vtx X="-30" Y="51" Z="12" S="-16" T="176" R="180" G="80" B="62" A="255"/>
-	<Vtx X="-18" Y="44" Z="-40" S="304" T="432" R="243" G="82" B="160" A="255"/>
-	<Vtx X="-23" Y="43" Z="-37" S="496" T="496" R="175" G="45" B="169" A="255"/>
-	<Vtx X="-20" Y="48" Z="-37" S="432" T="304" R="243" G="82" B="160" A="255"/>
-	<Vtx X="-11" Y="43" Z="-39" S="112" T="304" R="6" G="77" B="155" A="255"/>
-	<Vtx X="-14" Y="50" Z="-33" S="304" T="112" R="255" G="95" B="171" A="255"/>
-	<Vtx X="-8" Y="49" Z="-36" S="112" T="112" R="21" G="89" B="168" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="176" T="-16" R="17" G="79" B="158" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="-16" T="176" R="11" G="96" B="174" A="255"/>
-	<Vtx X="8" Y="63" Z="-23" S="304" T="432" R="8" G="93" B="170" A="255"/>
-	<Vtx X="12" Y="62" Z="-19" S="496" T="496" R="50" G="114" B="232" A="255"/>
-	<Vtx X="12" Y="61" Z="-25" S="432" T="304" R="8" G="93" B="170" A="255"/>
-	<Vtx X="2" Y="59" Z="-24" S="112" T="304" R="245" G="89" B="166" A="255"/>
-	<Vtx X="10" Y="55" Z="-28" S="304" T="112" R="8" G="78" B="156" A="255"/>
-	<Vtx X="3" Y="55" Z="-31" S="112" T="112" R="242" G="69" B="151" A="255"/>
-	<Vtx X="3" Y="55" Z="-31" S="112" T="112" R="242" G="69" B="151" A="255"/>
-	<Vtx X="10" Y="55" Z="-28" S="304" T="112" R="8" G="78" B="156" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="176" T="-16" R="240" G="80" B="159" A="255"/>
-	<Vtx X="-1" Y="48" Z="-31" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="-16" T="176" R="255" G="72" B="152" A="255"/>
-	<Vtx X="2" Y="59" Z="-24" S="112" T="304" R="245" G="89" B="166" A="255"/>
-	<Vtx X="2" Y="37" Z="-47" S="304" T="432" R="0" G="75" B="154" A="255"/>
-	<Vtx X="-1" Y="32" Z="-47" S="496" T="496" R="0" G="1" B="129" A="255"/>
-	<Vtx X="-4" Y="37" Z="-47" S="432" T="304" R="0" G="75" B="154" A="255"/>
-	<Vtx X="4" Y="40" Z="-42" S="112" T="304" R="12" G="87" B="165" A="255"/>
-	<Vtx X="-6" Y="40" Z="-42" S="304" T="112" R="244" G="87" B="164" A="255"/>
-	<Vtx X="-1" Y="46" Z="-39" S="112" T="112" R="255" G="100" B="178" A="255"/>
-	<Vtx X="-5" Y="46" Z="-37" S="176" T="-16" R="11" G="96" B="174" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="-16" T="176" R="244" G="95" B="172" A="255"/>
-	<Vtx X="-15" Y="61" Z="-25" S="304" T="432" R="248" G="93" B="170" A="255"/>
-	<Vtx X="-15" Y="62" Z="-19" S="496" T="496" R="206" G="114" B="232" A="255"/>
-	<Vtx X="-10" Y="63" Z="-23" S="432" T="304" R="248" G="93" B="170" A="255"/>
-	<Vtx X="-12" Y="55" Z="-28" S="112" T="304" R="248" G="78" B="156" A="255"/>
-	<Vtx X="-4" Y="59" Z="-24" S="304" T="112" R="11" G="89" B="166" A="255"/>
-	<Vtx X="-5" Y="55" Z="-31" S="112" T="112" R="13" G="70" B="151" A="255"/>
-	<Vtx X="-1" Y="54" Z="-29" S="176" T="-16" R="255" G="72" B="152" A="255"/>
-	<Vtx X="-7" Y="51" Z="-32" S="-16" T="176" R="17" G="79" B="158" A="255"/>
-	<Vtx X="18" Y="48" Z="-37" S="304" T="432" R="13" G="82" B="160" A="255"/>
-	<Vtx X="21" Y="43" Z="-37" S="496" T="496" R="81" G="45" B="169" A="255"/>
-	<Vtx X="16" Y="44" Z="-40" S="432" T="304" R="13" G="82" B="160" A="255"/>
-	<Vtx X="12" Y="50" Z="-33" S="112" T="304" R="1" G="94" B="171" A="255"/>
-	<Vtx X="9" Y="43" Z="-39" S="304" T="112" R="250" G="77" B="155" A="255"/>
-	<Vtx X="5" Y="49" Z="-36" S="112" T="112" R="233" G="89" B="168" A="255"/>
-	<Vtx X="3" Y="46" Z="-37" S="176" T="-16" R="244" G="95" B="172" A="255"/>
-	<Vtx X="5" Y="51" Z="-32" S="-16" T="176" R="240" G="80" B="159" A="255"/>
-	<Vtx X="44" Y="44" Z="4" S="304" T="432" R="90" G="82" B="37" A="255"/>
-	<Vtx X="43" Y="43" Z="-2" S="496" T="496" R="116" G="45" B="230" A="255"/>
-	<Vtx X="42" Y="48" Z="1" S="432" T="304" R="90" G="82" B="37" A="255"/>
-	<Vtx X="39" Y="43" Z="10" S="112" T="304" R="84" G="77" B="56" A="255"/>
-	<Vtx X="35" Y="50" Z="4" S="304" T="112" R="74" G="95" B="41" A="255"/>
-	<Vtx X="35" Y="49" Z="11" S="112" T="112" R="66" G="89" B="62" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="176" T="-16" R="76" G="79" B="63" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="-16" T="176" R="66" G="96" B="51" A="255"/>
-	<Vtx X="16" Y="63" Z="18" S="304" T="432" R="70" G="93" B="50" A="255"/>
-	<Vtx X="11" Y="62" Z="20" S="496" T="496" R="252" G="114" B="55" A="255"/>
-	<Vtx X="15" Y="61" Z="23" S="432" T="304" R="70" G="93" B="50" A="255"/>
-	<Vtx X="20" Y="59" Z="14" S="112" T="304" R="84" G="89" B="35" A="255"/>
-	<Vtx X="19" Y="55" Z="23" S="304" T="112" R="82" G="78" B="57" A="255"/>
-	<Vtx X="25" Y="55" Z="18" S="112" T="112" R="98" G="69" B="40" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="176" T="-16" R="92" G="80" B="35" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="-16" T="176" R="91" G="72" B="51" A="255"/>
-	<Vtx X="40" Y="37" Z="25" S="304" T="432" R="89" G="75" B="51" A="255"/>
-	<Vtx X="41" Y="32" Z="23" S="496" T="496" R="110" G="1" B="63" A="255"/>
-	<Vtx X="43" Y="37" Z="20" S="432" T="304" R="89" G="75" B="51" A="255"/>
-	<Vtx X="34" Y="40" Z="24" S="112" T="304" R="73" G="87" B="56" A="255"/>
-	<Vtx X="39" Y="40" Z="15" S="304" T="112" R="86" G="87" B="35" A="255"/>
-	<Vtx X="34" Y="46" Z="19" S="112" T="112" R="68" G="100" B="38" A="255"/>
-	<Vtx X="34" Y="46" Z="14" S="176" T="-16" R="66" G="96" B="51" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="-16" T="176" R="79" G="95" B="31" A="255"/>
-	<Vtx X="29" Y="61" Z="0" S="304" T="432" R="78" G="93" B="36" A="255"/>
-	<Vtx X="24" Y="62" Z="-3" S="496" T="496" R="45" G="114" B="225" A="255"/>
-	<Vtx X="25" Y="63" Z="3" S="432" T="304" R="78" G="93" B="36" A="255"/>
-	<Vtx X="31" Y="55" Z="3" S="112" T="304" R="90" G="78" B="42" A="255"/>
-	<Vtx X="23" Y="59" Z="8" S="304" T="112" R="72" G="89" B="55" A="255"/>
-	<Vtx X="29" Y="55" Z="11" S="112" T="112" R="85" G="70" B="64" A="255"/>
-	<Vtx X="26" Y="54" Z="14" S="176" T="-16" R="91" G="72" B="51" A="255"/>
-	<Vtx X="27" Y="48" Z="14" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="31" Y="51" Z="10" S="-16" T="176" R="76" G="79" B="63" A="255"/>
-	<Vtx X="29" Y="55" Z="11" S="112" T="112" R="85" G="70" B="64" A="255"/>
-	<Vtx X="31" Y="55" Z="3" S="112" T="304" R="90" G="78" B="42" A="255"/>
-	<Vtx X="23" Y="48" Z="34" S="304" T="432" R="77" G="82" B="59" A="255"/>
-	<Vtx X="21" Y="43" Z="36" S="496" T="496" R="35" G="45" B="113" A="255"/>
-	<Vtx X="27" Y="44" Z="34" S="432" T="304" R="77" G="82" B="59" A="255"/>
-	<Vtx X="22" Y="50" Z="27" S="112" T="304" R="73" G="94" B="43" A="255"/>
-	<Vtx X="29" Y="43" Z="27" S="304" T="112" R="90" G="77" B="45" A="255"/>
-	<Vtx X="29" Y="49" Z="22" S="112" T="112" R="88" G="89" B="24" A="255"/>
-	<Vtx X="30" Y="46" Z="20" S="176" T="-16" R="79" G="95" B="31" A="255"/>
-	<Vtx X="25" Y="51" Z="20" S="-16" T="176" R="92" G="80" B="35" A="255"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_2

@@ -1,268 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="-38" Y="39" Z="35" S="304" T="432" R="80" G="167" B="214" A="255"/>
-	<Vtx X="-33" Y="42" Z="38" S="432" T="304" R="80" G="167" B="214" A="255"/>
-	<Vtx X="-36" Y="33" Z="43" S="496" T="496" R="84" G="191" B="187" A="255"/>
-	<Vtx X="-37" Y="42" Z="25" S="112" T="304" R="67" G="153" B="223" A="255"/>
-	<Vtx X="-28" Y="47" Z="32" S="304" T="112" R="83" G="163" B="234" A="255"/>
-	<Vtx X="-30" Y="46" Z="23" S="112" T="112" R="74" G="157" B="229" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="-16" T="176" R="48" G="142" B="228" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="82" G="171" B="209" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="176" T="-16" R="88" G="165" B="0" A="255"/>
-	<Vtx X="-17" Y="69" Z="15" S="304" T="432" R="85" G="175" B="207" A="255"/>
-	<Vtx X="-20" Y="69" Z="9" S="432" T="304" R="85" G="175" B="207" A="255"/>
-	<Vtx X="-12" Y="75" Z="8" S="496" T="496" R="61" G="150" B="221" A="255"/>
-	<Vtx X="-20" Y="61" Z="20" S="112" T="304" R="99" G="190" B="211" A="255"/>
-	<Vtx X="-26" Y="61" Z="9" S="304" T="112" R="88" G="190" B="193" A="255"/>
-	<Vtx X="-25" Y="55" Z="16" S="112" T="112" R="95" G="191" B="201" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="-16" T="176" R="111" G="203" B="224" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="176" T="-16" R="83" G="203" B="176" A="255"/>
-	<Vtx X="-48" Y="42" Z="12" S="304" T="432" R="76" G="167" B="208" A="255"/>
-	<Vtx X="-48" Y="39" Z="17" S="432" T="304" R="76" G="167" B="208" A="255"/>
-	<Vtx X="-54" Y="33" Z="11" S="496" T="496" R="102" G="191" B="218" A="255"/>
-	<Vtx X="-40" Y="47" Z="10" S="112" T="304" R="60" G="163" B="195" A="255"/>
-	<Vtx X="-39" Y="42" Z="21" S="304" T="112" R="62" G="153" B="215" A="255"/>
-	<Vtx X="-34" Y="46" Z="16" S="112" T="112" R="61" G="157" B="205" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="-16" T="176" R="44" G="165" B="180" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="176" T="-16" R="48" G="142" B="228" A="255"/>
-	<Vtx X="-19" Y="56" Z="37" S="304" T="432" R="85" G="172" B="214" A="255"/>
-	<Vtx X="-16" Y="60" Z="33" S="432" T="304" R="85" G="172" B="214" A="255"/>
-	<Vtx X="-10" Y="59" Z="41" S="496" T="496" R="59" G="166" B="189" A="255"/>
-	<Vtx X="-24" Y="50" Z="31" S="112" T="304" R="91" G="170" B="234" A="255"/>
-	<Vtx X="-19" Y="59" Z="24" S="304" T="112" R="99" G="185" B="221" A="255"/>
-	<Vtx X="-25" Y="52" Z="23" S="112" T="112" R="95" G="176" B="230" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="-16" T="176" R="88" G="165" B="0" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="82" G="171" B="209" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="176" T="-16" R="111" G="203" B="224" A="255"/>
-	<Vtx X="-25" Y="52" Z="23" S="112" T="112" R="95" G="176" B="230" A="255"/>
-	<Vtx X="-19" Y="59" Z="24" S="304" T="112" R="99" G="185" B="221" A="255"/>
-	<Vtx X="-36" Y="60" Z="-1" S="304" T="432" R="79" G="172" B="203" A="255"/>
-	<Vtx X="-40" Y="56" Z="-1" S="432" T="304" R="79" G="172" B="203" A="255"/>
-	<Vtx X="-39" Y="59" Z="-10" S="496" T="496" R="88" G="166" B="239" A="255"/>
-	<Vtx X="-29" Y="59" Z="7" S="112" T="304" R="80" G="185" B="188" A="255"/>
-	<Vtx X="-38" Y="50" Z="7" S="304" T="112" R="64" G="170" B="189" A="255"/>
-	<Vtx X="-31" Y="52" Z="12" S="112" T="112" R="70" G="176" B="186" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="-16" T="176" R="83" G="203" B="176" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="176" T="-16" R="44" G="165" B="180" A="255"/>
-	<Vtx X="-11" Y="39" Z="-50" S="304" T="432" R="252" G="167" B="90" A="255"/>
-	<Vtx X="-16" Y="42" Z="-48" S="432" T="304" R="252" G="167" B="90" A="255"/>
-	<Vtx X="-19" Y="33" Z="-52" S="496" T="496" R="18" G="191" B="108" A="255"/>
-	<Vtx X="-3" Y="42" Z="-45" S="112" T="304" R="251" G="153" B="74" A="255"/>
-	<Vtx X="-13" Y="47" Z="-40" S="304" T="112" R="233" G="163" B="83" A="255"/>
-	<Vtx X="-5" Y="46" Z="-38" S="112" T="112" R="242" G="157" B="78" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="-16" T="176" R="0" G="142" B="55" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="176" T="-16" R="212" G="165" B="76" A="255"/>
-	<Vtx X="-4" Y="69" Z="-22" S="304" T="432" R="0" G="175" B="98" A="255"/>
-	<Vtx X="2" Y="69" Z="-22" S="432" T="304" R="0" G="175" B="98" A="255"/>
-	<Vtx X="-1" Y="75" Z="-14" S="496" T="496" R="0" G="150" B="70" A="255"/>
-	<Vtx X="-7" Y="61" Z="-27" S="112" T="304" R="245" G="190" B="108" A="255"/>
-	<Vtx X="5" Y="61" Z="-27" S="304" T="112" R="11" G="190" B="108" A="255"/>
-	<Vtx X="-1" Y="55" Z="-30" S="112" T="112" R="0" G="191" B="109" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="-16" T="176" R="228" G="203" B="112" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="176" T="-16" R="28" G="203" B="112" A="255"/>
-	<Vtx X="14" Y="42" Z="-48" S="304" T="432" R="4" G="167" B="90" A="255"/>
-	<Vtx X="9" Y="39" Z="-50" S="432" T="304" R="4" G="167" B="90" A="255"/>
-	<Vtx X="17" Y="33" Z="-52" S="496" T="496" R="238" G="191" B="108" A="255"/>
-	<Vtx X="11" Y="47" Z="-40" S="112" T="304" R="23" G="163" B="83" A="255"/>
-	<Vtx X="9" Y="39" Z="-50" S="432" T="304" R="4" G="167" B="90" A="255"/>
-	<Vtx X="14" Y="42" Z="-48" S="304" T="432" R="4" G="167" B="90" A="255"/>
-	<Vtx X="1" Y="42" Z="-45" S="304" T="112" R="5" G="153" B="74" A="255"/>
-	<Vtx X="3" Y="46" Z="-38" S="112" T="112" R="14" G="157" B="78" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="-16" T="176" R="44" G="165" B="76" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="171" B="94" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="176" T="-16" R="0" G="142" B="55" A="255"/>
-	<Vtx X="-23" Y="56" Z="-35" S="304" T="432" R="250" G="172" B="95" A="255"/>
-	<Vtx X="-21" Y="60" Z="-31" S="432" T="304" R="250" G="172" B="95" A="255"/>
-	<Vtx X="-31" Y="59" Z="-29" S="496" T="496" R="29" G="166" B="85" A="255"/>
-	<Vtx X="-15" Y="50" Z="-37" S="112" T="304" R="230" G="170" B="90" A="255"/>
-	<Vtx X="-11" Y="59" Z="-29" S="304" T="112" R="237" G="185" B="104" A="255"/>
-	<Vtx X="-7" Y="52" Z="-33" S="112" T="112" R="231" G="176" B="96" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="-16" T="176" R="212" G="165" B="76" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="176" T="-16" R="228" G="203" B="112" A="255"/>
-	<Vtx X="19" Y="60" Z="-31" S="304" T="432" R="6" G="172" B="95" A="255"/>
-	<Vtx X="21" Y="56" Z="-35" S="432" T="304" R="6" G="172" B="95" A="255"/>
-	<Vtx X="28" Y="59" Z="-29" S="496" T="496" R="227" G="166" B="85" A="255"/>
-	<Vtx X="9" Y="59" Z="-29" S="112" T="304" R="19" G="185" B="104" A="255"/>
-	<Vtx X="13" Y="50" Z="-37" S="304" T="112" R="26" G="170" B="90" A="255"/>
-	<Vtx X="5" Y="52" Z="-33" S="112" T="112" R="25" G="176" B="96" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="-16" T="176" R="28" G="203" B="112" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="176" T="-16" R="44" G="165" B="76" A="255"/>
-	<Vtx X="49" Y="39" Z="15" S="304" T="432" R="180" G="167" B="208" A="255"/>
-	<Vtx X="50" Y="42" Z="10" S="432" T="304" R="180" G="167" B="208" A="255"/>
-	<Vtx X="55" Y="33" Z="9" S="496" T="496" R="154" G="191" B="218" A="255"/>
-	<Vtx X="40" Y="42" Z="19" S="112" T="304" R="194" G="153" B="215" A="255"/>
-	<Vtx X="41" Y="47" Z="8" S="304" T="112" R="196" G="163" B="195" A="255"/>
-	<Vtx X="35" Y="46" Z="15" S="112" T="112" R="195" G="157" B="205" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="-16" T="176" R="208" G="142" B="228" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="176" T="-16" R="212" G="165" B="180" A="255"/>
-	<Vtx X="35" Y="46" Z="15" S="112" T="112" R="195" G="157" B="205" A="255"/>
-	<Vtx X="41" Y="47" Z="8" S="304" T="112" R="196" G="163" B="195" A="255"/>
-	<Vtx X="21" Y="69" Z="8" S="304" T="432" R="171" G="175" B="207" A="255"/>
-	<Vtx X="18" Y="69" Z="13" S="432" T="304" R="171" G="175" B="207" A="255"/>
-	<Vtx X="13" Y="75" Z="6" S="496" T="496" R="195" G="150" B="221" A="255"/>
-	<Vtx X="27" Y="61" Z="7" S="112" T="304" R="168" G="190" B="193" A="255"/>
-	<Vtx X="21" Y="61" Z="18" S="304" T="112" R="157" G="190" B="211" A="255"/>
-	<Vtx X="26" Y="55" Z="14" S="112" T="112" R="161" G="191" B="201" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="-16" T="176" R="173" G="203" B="176" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="176" T="-16" R="145" G="203" B="224" A="255"/>
-	<Vtx X="34" Y="42" Z="36" S="304" T="432" R="176" G="167" B="214" A="255"/>
-	<Vtx X="39" Y="39" Z="33" S="432" T="304" R="176" G="167" B="214" A="255"/>
-	<Vtx X="37" Y="33" Z="41" S="496" T="496" R="172" G="191" B="187" A="255"/>
-	<Vtx X="29" Y="47" Z="30" S="112" T="304" R="173" G="163" B="234" A="255"/>
-	<Vtx X="38" Y="42" Z="23" S="304" T="112" R="189" G="153" B="223" A="255"/>
-	<Vtx X="31" Y="46" Z="21" S="112" T="112" R="182" G="157" B="229" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="-16" T="176" R="168" G="165" B="0" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="176" T="-16" R="208" G="142" B="228" A="255"/>
-	<Vtx X="41" Y="56" Z="-2" S="304" T="432" R="177" G="172" B="203" A="255"/>
-	<Vtx X="37" Y="60" Z="-3" S="432" T="304" R="177" G="172" B="203" A="255"/>
-	<Vtx X="40" Y="59" Z="-12" S="496" T="496" R="168" G="166" B="239" A="255"/>
-	<Vtx X="39" Y="50" Z="6" S="112" T="304" R="192" G="170" B="189" A="255"/>
-	<Vtx X="30" Y="59" Z="5" S="304" T="112" R="176" G="185" B="188" A="255"/>
-	<Vtx X="32" Y="52" Z="10" S="112" T="112" R="186" G="176" B="186" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="-16" T="176" R="212" G="165" B="180" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="176" T="-16" R="173" G="203" B="176" A="255"/>
-	<Vtx X="17" Y="60" Z="31" S="304" T="432" R="171" G="172" B="214" A="255"/>
-	<Vtx X="20" Y="56" Z="35" S="432" T="304" R="171" G="172" B="214" A="255"/>
-	<Vtx X="11" Y="59" Z="39" S="496" T="496" R="197" G="166" B="189" A="255"/>
-	<Vtx X="21" Y="59" Z="22" S="112" T="304" R="157" G="185" B="221" A="255"/>
-	<Vtx X="21" Y="59" Z="22" S="112" T="304" R="157" G="185" B="221" A="255"/>
-	<Vtx X="26" Y="50" Z="29" S="304" T="112" R="165" G="170" B="234" A="255"/>
-	<Vtx X="20" Y="56" Z="35" S="432" T="304" R="171" G="172" B="214" A="255"/>
-	<Vtx X="26" Y="52" Z="21" S="112" T="112" R="161" G="176" B="230" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="-16" T="176" R="145" G="203" B="224" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="174" G="171" B="209" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="176" T="-16" R="168" G="165" B="0" A="255"/>
-	<Vtx X="-38" Y="39" Z="35" S="304" T="432" R="176" G="89" B="42" A="255"/>
-	<Vtx X="-36" Y="33" Z="43" S="496" T="496" R="172" G="65" B="69" A="255"/>
-	<Vtx X="-33" Y="42" Z="38" S="432" T="304" R="176" G="89" B="42" A="255"/>
-	<Vtx X="-37" Y="42" Z="25" S="112" T="304" R="189" G="103" B="33" A="255"/>
-	<Vtx X="-28" Y="47" Z="32" S="304" T="112" R="173" G="93" B="22" A="255"/>
-	<Vtx X="-30" Y="46" Z="23" S="112" T="112" R="182" G="99" B="27" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="176" T="-16" R="168" G="91" B="0" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="174" G="85" B="47" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="-16" T="176" R="208" G="114" B="28" A="255"/>
-	<Vtx X="-17" Y="69" Z="15" S="304" T="432" R="171" G="81" B="49" A="255"/>
-	<Vtx X="-12" Y="75" Z="8" S="496" T="496" R="195" G="106" B="35" A="255"/>
-	<Vtx X="-20" Y="69" Z="9" S="432" T="304" R="171" G="81" B="49" A="255"/>
-	<Vtx X="-20" Y="61" Z="20" S="112" T="304" R="157" G="66" B="45" A="255"/>
-	<Vtx X="-26" Y="61" Z="9" S="304" T="112" R="168" G="66" B="63" A="255"/>
-	<Vtx X="-25" Y="55" Z="16" S="112" T="112" R="161" G="65" B="55" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="176" T="-16" R="173" G="53" B="80" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="-16" T="176" R="145" G="53" B="32" A="255"/>
-	<Vtx X="-48" Y="42" Z="12" S="304" T="432" R="180" G="89" B="48" A="255"/>
-	<Vtx X="-54" Y="33" Z="11" S="496" T="496" R="154" G="65" B="38" A="255"/>
-	<Vtx X="-48" Y="39" Z="17" S="432" T="304" R="180" G="89" B="48" A="255"/>
-	<Vtx X="-40" Y="47" Z="10" S="112" T="304" R="196" G="93" B="61" A="255"/>
-	<Vtx X="-39" Y="42" Z="21" S="304" T="112" R="194" G="103" B="41" A="255"/>
-	<Vtx X="-34" Y="46" Z="16" S="112" T="112" R="195" G="99" B="51" A="255"/>
-	<Vtx X="-34" Y="47" Z="21" S="176" T="-16" R="208" G="114" B="28" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="-16" T="176" R="212" G="91" B="76" A="255"/>
-	<Vtx X="-19" Y="56" Z="37" S="304" T="432" R="171" G="84" B="42" A="255"/>
-	<Vtx X="-10" Y="59" Z="41" S="496" T="496" R="197" G="90" B="67" A="255"/>
-	<Vtx X="-16" Y="60" Z="33" S="432" T="304" R="171" G="84" B="42" A="255"/>
-	<Vtx X="-24" Y="50" Z="31" S="112" T="304" R="165" G="86" B="22" A="255"/>
-	<Vtx X="-19" Y="59" Z="24" S="304" T="112" R="157" G="71" B="35" A="255"/>
-	<Vtx X="-25" Y="52" Z="23" S="112" T="112" R="161" G="80" B="26" A="255"/>
-	<Vtx X="-25" Y="55" Z="20" S="176" T="-16" R="145" G="53" B="32" A="255"/>
-	<Vtx X="-27" Y="48" Z="17" S="-16" T="-16" R="174" G="85" B="47" A="255"/>
-	<Vtx X="-28" Y="50" Z="24" S="-16" T="176" R="168" G="91" B="0" A="255"/>
-	<Vtx X="-36" Y="60" Z="-1" S="304" T="432" R="177" G="84" B="53" A="255"/>
-	<Vtx X="-39" Y="59" Z="-10" S="496" T="496" R="168" G="90" B="17" A="255"/>
-	<Vtx X="-40" Y="56" Z="-1" S="432" T="304" R="177" G="84" B="53" A="255"/>
-	<Vtx X="-29" Y="59" Z="7" S="112" T="304" R="176" G="71" B="68" A="255"/>
-	<Vtx X="-38" Y="50" Z="7" S="304" T="112" R="192" G="86" B="67" A="255"/>
-	<Vtx X="-31" Y="52" Z="12" S="112" T="112" R="186" G="80" B="70" A="255"/>
-	<Vtx X="-34" Y="50" Z="14" S="176" T="-16" R="212" G="91" B="76" A="255"/>
-	<Vtx X="-29" Y="55" Z="14" S="-16" T="176" R="173" G="53" B="80" A="255"/>
-	<Vtx X="-11" Y="39" Z="-50" S="304" T="432" R="4" G="89" B="166" A="255"/>
-	<Vtx X="-19" Y="33" Z="-52" S="496" T="496" R="238" G="65" B="148" A="255"/>
-	<Vtx X="-16" Y="42" Z="-48" S="432" T="304" R="4" G="89" B="166" A="255"/>
-	<Vtx X="-3" Y="42" Z="-45" S="112" T="304" R="5" G="103" B="182" A="255"/>
-	<Vtx X="-13" Y="47" Z="-40" S="304" T="112" R="23" G="93" B="173" A="255"/>
-	<Vtx X="-5" Y="46" Z="-38" S="112" T="112" R="14" G="99" B="178" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="176" T="-16" R="44" G="91" B="180" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="-16" T="176" R="0" G="114" B="201" A="255"/>
-	<Vtx X="-4" Y="69" Z="-22" S="304" T="432" R="0" G="81" B="158" A="255"/>
-	<Vtx X="-1" Y="75" Z="-14" S="496" T="496" R="0" G="106" B="186" A="255"/>
-	<Vtx X="2" Y="69" Z="-22" S="432" T="304" R="0" G="81" B="158" A="255"/>
-	<Vtx X="-7" Y="61" Z="-27" S="112" T="304" R="11" G="66" B="148" A="255"/>
-	<Vtx X="5" Y="61" Z="-27" S="304" T="112" R="245" G="66" B="148" A="255"/>
-	<Vtx X="-1" Y="55" Z="-30" S="112" T="112" R="0" G="65" B="147" A="255"/>
-	<Vtx X="-1" Y="55" Z="-30" S="112" T="112" R="0" G="65" B="147" A="255"/>
-	<Vtx X="5" Y="61" Z="-27" S="304" T="112" R="245" G="66" B="148" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="176" T="-16" R="228" G="53" B="144" A="255"/>
-	<Vtx X="-1" Y="48" Z="-32" S="-16" T="-16" R="0" G="85" B="162" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="-16" T="176" R="28" G="53" B="144" A="255"/>
-	<Vtx X="-7" Y="61" Z="-27" S="112" T="304" R="11" G="66" B="148" A="255"/>
-	<Vtx X="14" Y="42" Z="-48" S="304" T="432" R="252" G="89" B="166" A="255"/>
-	<Vtx X="17" Y="33" Z="-52" S="496" T="496" R="18" G="65" B="148" A="255"/>
-	<Vtx X="9" Y="39" Z="-50" S="432" T="304" R="252" G="89" B="166" A="255"/>
-	<Vtx X="11" Y="47" Z="-40" S="112" T="304" R="233" G="93" B="173" A="255"/>
-	<Vtx X="1" Y="42" Z="-45" S="304" T="112" R="251" G="103" B="182" A="255"/>
-	<Vtx X="3" Y="46" Z="-38" S="112" T="112" R="242" G="99" B="178" A="255"/>
-	<Vtx X="-1" Y="47" Z="-40" S="176" T="-16" R="0" G="114" B="201" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="-16" T="176" R="212" G="91" B="180" A="255"/>
-	<Vtx X="-23" Y="56" Z="-35" S="304" T="432" R="6" G="84" B="161" A="255"/>
-	<Vtx X="-31" Y="59" Z="-29" S="496" T="496" R="227" G="90" B="171" A="255"/>
-	<Vtx X="-21" Y="60" Z="-31" S="432" T="304" R="6" G="84" B="161" A="255"/>
-	<Vtx X="-15" Y="50" Z="-37" S="112" T="304" R="26" G="86" B="166" A="255"/>
-	<Vtx X="-11" Y="59" Z="-29" S="304" T="112" R="19" G="71" B="152" A="255"/>
-	<Vtx X="-7" Y="52" Z="-33" S="112" T="112" R="25" G="80" B="160" A="255"/>
-	<Vtx X="-5" Y="55" Z="-32" S="176" T="-16" R="28" G="53" B="144" A="255"/>
-	<Vtx X="-7" Y="50" Z="-37" S="-16" T="176" R="44" G="91" B="180" A="255"/>
-	<Vtx X="19" Y="60" Z="-31" S="304" T="432" R="250" G="84" B="161" A="255"/>
-	<Vtx X="28" Y="59" Z="-29" S="496" T="496" R="29" G="90" B="171" A="255"/>
-	<Vtx X="21" Y="56" Z="-35" S="432" T="304" R="250" G="84" B="161" A="255"/>
-	<Vtx X="9" Y="59" Z="-29" S="112" T="304" R="237" G="71" B="152" A="255"/>
-	<Vtx X="13" Y="50" Z="-37" S="304" T="112" R="230" G="86" B="166" A="255"/>
-	<Vtx X="5" Y="52" Z="-33" S="112" T="112" R="231" G="80" B="160" A="255"/>
-	<Vtx X="5" Y="50" Z="-37" S="176" T="-16" R="212" G="91" B="180" A="255"/>
-	<Vtx X="3" Y="55" Z="-32" S="-16" T="176" R="228" G="53" B="144" A="255"/>
-	<Vtx X="49" Y="39" Z="15" S="304" T="432" R="76" G="89" B="48" A="255"/>
-	<Vtx X="55" Y="33" Z="9" S="496" T="496" R="102" G="65" B="38" A="255"/>
-	<Vtx X="50" Y="42" Z="10" S="432" T="304" R="76" G="89" B="48" A="255"/>
-	<Vtx X="40" Y="42" Z="19" S="112" T="304" R="62" G="103" B="41" A="255"/>
-	<Vtx X="41" Y="47" Z="8" S="304" T="112" R="60" G="93" B="61" A="255"/>
-	<Vtx X="35" Y="46" Z="15" S="112" T="112" R="61" G="99" B="51" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="176" T="-16" R="44" G="91" B="76" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="-16" T="176" R="48" G="114" B="28" A="255"/>
-	<Vtx X="21" Y="69" Z="8" S="304" T="432" R="85" G="81" B="49" A="255"/>
-	<Vtx X="13" Y="75" Z="6" S="496" T="496" R="61" G="106" B="35" A="255"/>
-	<Vtx X="18" Y="69" Z="13" S="432" T="304" R="85" G="81" B="49" A="255"/>
-	<Vtx X="27" Y="61" Z="7" S="112" T="304" R="88" G="66" B="63" A="255"/>
-	<Vtx X="21" Y="61" Z="18" S="304" T="112" R="99" G="66" B="45" A="255"/>
-	<Vtx X="26" Y="55" Z="14" S="112" T="112" R="95" G="65" B="55" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="176" T="-16" R="111" G="53" B="32" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="-16" T="176" R="83" G="53" B="80" A="255"/>
-	<Vtx X="34" Y="42" Z="36" S="304" T="432" R="80" G="89" B="42" A="255"/>
-	<Vtx X="37" Y="33" Z="41" S="496" T="496" R="84" G="65" B="69" A="255"/>
-	<Vtx X="39" Y="39" Z="33" S="432" T="304" R="80" G="89" B="42" A="255"/>
-	<Vtx X="29" Y="47" Z="30" S="112" T="304" R="83" G="93" B="22" A="255"/>
-	<Vtx X="38" Y="42" Z="23" S="304" T="112" R="67" G="103" B="33" A="255"/>
-	<Vtx X="31" Y="46" Z="21" S="112" T="112" R="74" G="99" B="27" A="255"/>
-	<Vtx X="35" Y="47" Z="19" S="176" T="-16" R="48" G="114" B="28" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="-16" T="176" R="88" G="91" B="0" A="255"/>
-	<Vtx X="41" Y="56" Z="-2" S="304" T="432" R="79" G="84" B="53" A="255"/>
-	<Vtx X="40" Y="59" Z="-12" S="496" T="496" R="88" G="90" B="17" A="255"/>
-	<Vtx X="37" Y="60" Z="-3" S="432" T="304" R="79" G="84" B="53" A="255"/>
-	<Vtx X="39" Y="50" Z="6" S="112" T="304" R="64" G="86" B="67" A="255"/>
-	<Vtx X="30" Y="59" Z="5" S="304" T="112" R="80" G="71" B="68" A="255"/>
-	<Vtx X="32" Y="52" Z="10" S="112" T="112" R="70" G="80" B="70" A="255"/>
-	<Vtx X="30" Y="55" Z="12" S="176" T="-16" R="83" G="53" B="80" A="255"/>
-	<Vtx X="28" Y="48" Z="15" S="-16" T="-16" R="82" G="85" B="47" A="255"/>
-	<Vtx X="35" Y="50" Z="12" S="-16" T="176" R="44" G="91" B="76" A="255"/>
-	<Vtx X="32" Y="52" Z="10" S="112" T="112" R="70" G="80" B="70" A="255"/>
-	<Vtx X="39" Y="50" Z="6" S="112" T="304" R="64" G="86" B="67" A="255"/>
-	<Vtx X="17" Y="60" Z="31" S="304" T="432" R="85" G="84" B="42" A="255"/>
-	<Vtx X="11" Y="59" Z="39" S="496" T="496" R="59" G="90" B="67" A="255"/>
-	<Vtx X="20" Y="56" Z="35" S="432" T="304" R="85" G="84" B="42" A="255"/>
-	<Vtx X="21" Y="59" Z="22" S="112" T="304" R="99" G="71" B="35" A="255"/>
-	<Vtx X="26" Y="50" Z="29" S="304" T="112" R="91" G="86" B="22" A="255"/>
-	<Vtx X="26" Y="52" Z="21" S="112" T="112" R="95" G="80" B="26" A="255"/>
-	<Vtx X="29" Y="50" Z="23" S="176" T="-16" R="88" G="91" B="0" A="255"/>
-	<Vtx X="26" Y="55" Z="18" S="-16" T="176" R="111" G="53" B="32" A="255"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushFairyDL_vtx_cull

@@ -1,10 +0,0 @@
-<Vertex Version="0">
-	<Vtx X="-107" Y="0" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="-107" Y="0" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="-107" Y="98" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="-107" Y="98" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="0" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="0" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="98" Z="93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-	<Vtx X="107" Y="98" Z="-93" S="0" T="0" R="0" G="0" B="0" A="0"/>
-</Vertex>

soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL

@@ -1,14 +0,0 @@
-<DisplayList Version="0">
-	<ClearGeometryMode G_LIGHTING="1" />
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushHeartDL_vtx_cull" VertexBufferIndex="0" VertexOffset="0" Count="8"/>
-	<SetGeometryMode G_LIGHTING="1" />
-	<CullDisplayList Start="0" End="7"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_shrubbery"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushHeartDL_tri_0"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_leaf"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushHeartDL_tri_1"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/mat_gFieldBushHeartDL_f3dlite_flower_heart"/>
-	<CallDisplayList Path="objects/gameplay_field_keep/gFieldBushHeartDL_tri_2"/>
-	<EndDisplayList/>
-</DisplayList>
-

soh/assets/custom/objects/gameplay_field_keep/gFieldBushHeartDL_tri_0

@@ -1,8 +0,0 @@
-<DisplayList Version="0">
-	<LoadVertices Path="objects/gameplay_field_keep/gFieldBushHeartDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="14"/>
-	<Triangles2 V00="0" V01="1" V02="2" Flag0="0" V10="0" V11="3" V12="4" Flag1="0"/>
-	<Triangles2 V00="0" V01="5" V02="6" Flag0="0" V10="7" V11="8" V12="9" Flag1="0"/>
-	<Triangles2 V00="7" V01="10" V02="11" Flag0="0" V10="7" V11="12" V12="13" Flag1="0"/>
-	<EndDisplayList/>
-</DisplayList>
-